Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/components/tools/HeaderNotice.vue

@@ -156,7 +156,7 @@ export default {
                     return
                 }
                 this.loadData()
-            }, 6000)
+            }, 2000)
         },
         loadData () {
             try {

src/views/system/UserAnnouncementList.vue

@@ -167,6 +167,7 @@
               if(res.success){
                 that.$message.success(res.message);
                 that.loadData();
+                Utils.$emit('demo','msg');
               }
             });
           }

src/views/system/modules/AddressListLeft.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :loading="cardLoading" :bordered="false" style="height: 100%;">
     <a-spin :spinning="loading">
-      <a-input-search @search="handleSearch" style="width:100%;margin-top: 10px" placeholder="输入机构名称查询..." allowClear enterButton />
+      <a-input-search @search="handleSearch" style="width:100%;margin-bottom:5px" placeholder="输入机构名称查询..." allowClear enterButton />
 
       <a-tree
         showLine
@@ -67,18 +67,18 @@
         promise.then(res => {
           if (res.success) {
             this.treeDataSource = res.result
-            // update-begin- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
+            // update-begin- ---  author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
             // 默认选中第一条数据、默认展开所有第一级
-            // if (res.result.length > 0) {
-            //   this.expandedKeys = []
-            //   res.result.forEach((item, index) => {
-            //     if (index === 0) {
-            //       this.selectedKeys = [item.id]
-            //       this.emitInput(item.orgCode)
-            //     }
-            //     this.expandedKeys.push(item.id)
-            //   })
-            // }
+            if (res.result.length > 0) {
+              this.expandedKeys = []
+              res.result.forEach((item, index) => {
+                if (index === 0) {
+                  this.selectedKeys = [item.id]
+                  this.emitInput(item.orgCode)
+                }
+                this.expandedKeys.push(item.id)
+              })
+            }
            // update-end- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
           } else {
             this.$message.warn(res.message)

src/views/system/modules/AddressListRight.vue

@@ -105,19 +105,19 @@
             title: '虚拟网号',
             width: '10%',
             align: 'center',
-            dataIndex: 'nVirtualNo'
+            dataIndex: 'nvirtualNo'
           },
           {
             title: '公司电话',
             width: '10%',
             align: 'center',
-            dataIndex: 'nCompanyPhone'
+            dataIndex: 'ncompanyPhone'
           },
           {
             title: '公司内线',
             width: '10%',
             align: 'center',
-            dataIndex: 'nCompanyLine'
+            dataIndex: 'ncompanyLine'
           },
           {
             title: '家电',