Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -92,7 +92,32 @@ export default {
       isBoolean: false
     }
   },
+  created() {
+    let _this = this;
+    //窗口改变时
+    window.onresize = function () {
+      _this.handleRefreshTable();
+    };
+  },
+  updated() {
+    this.handleRefreshTable()
+  },
   methods: {
+    handleRefreshTable() {
+      this.$nextTick(() => {
+        // 获取页面中已注册过ref的所有的子组件。
+        let refList = this.$refs.appView.$refs;
+        if (refList) {
+          for (let i of Object.keys(refList)) {
+            // 根据doLayout方法判断子组件是不是el-table
+            if (refList[i] && refList[i].doLayout) {
+              // 执行doLayout方法
+              refList[i].doLayout();
+            }
+          }
+        }
+      })
+    },
     // 点击下拉选项事件
     handleCommand(command) {
       // 退出登录
@@ -227,6 +252,8 @@ export default {
       } else {
         this.isBoolean = false
       }
+      //切换标签时
+      this.handleRefreshTable();
     }
   },
   mounted() {

src/components/workTree/index.vue

@@ -12,14 +12,23 @@
         :inline="true"
         @submit.native.prevent
       >
-        <el-form-item class="form-item-disabled" style="margin: 10px;">
+        <el-form-item class="form-item-disabled" style="margin: 0px 10px;">
           <el-input
             v-model="filterText"
             placeholder="请输入姓名"
-            @input="changeInput"
           ></el-input>
-        </el-form-item>
+        </el-form-item> 
-      </el-form>
+        <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-primary" type="primary" size="mini" @click="changeInput(filterText)">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-default" @click="resetSelect" size="mini">
+              清空
+            </el-button>
+          </el-form-item>
+      </el-form> 
       <el-tree
         v-if="open1 && isVisible2"
         node-key="id"
@@ -142,6 +151,10 @@ export default {
         this.open1 = true
       }
     }),
+    resetSelect(){
+      this.filterText=''
+      this.changeInput(this.filterText)
+    },
     checkChange2 (row, type, c) {
       if (this.checkBox) {
       } else {
@@ -350,4 +363,7 @@ export default {
     }
   }
 }
+/deep/.el-input__inner{
+  height: 28px;
+}
 </style>

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -235,6 +235,7 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <loading :loading="loading">数据获取中</loading>
     <!-- 选择项目抽屉-->
     <el-drawer
       title="选择项目"
@@ -461,6 +462,7 @@ export default {
           return time.getTime() < Date.now() - 8.64e7;
         },
       },
+      loading:false,
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框
       categoryName: [], //项目细分类下拉框
@@ -474,12 +476,7 @@ export default {
       saveLoading: false,
       fileType: '',
       bpnId: '',
-      decomposeOptions: [
+      decomposeOptions: [], //分解单来源数据
-        {
-            value: "BDR",
-            label: '不带入'
-        }
-      ], //分解单来源数据
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
@@ -576,16 +573,16 @@ export default {
       });
     },
     typeList(row){
-      // this.decomposeOptions = []
+      this.decomposeOptions = []
       this.$http.get("SarStandItems/sar-stand-items/getFileType", {
         standId: row.standId
       }, {}, res => {
-        // this.decomposeOptions.push(
+        this.decomposeOptions.push(
-        //   {
+          {
-        //     value: "BDR",
+            value: "BDR",
-        //     label: '不带入'
+            label: '不带入'
-        //   }
+          }
-        // )
+        )
         res.data.forEach(item => {
           this.decomposeOptions.push(item)
         })
@@ -951,15 +948,14 @@ export default {
         this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
         this.commentText = mes.commentText;
+        this.loading=false
       });
     },
   },
   mounted() {
+    this.loading=true
     this.optionsChange()
     this.bpnId = this.$route.query.bpnId
-    if (this.bpnId !== undefined) {
-      this.getData()
-    }
     this.getProjectData();
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -970,21 +966,28 @@ export default {
     }, e => {
     });
     //查找分解单来源数据
-    // this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+    this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
-    //   _this: this
+      _this: this
-    // }, res => {
+    }, res => {
-    //   this.decomposeOptions.push(
+      this.decomposeOptions.push(
-    //     {
+        {
-    //       attrField: 'BDR',
+          value: 'BDR',
-    //       attrName: '不带入'
+          label: '不带入'
-    //     }
+        }
-    //   )
+      )
-    //   res.data.forEach(item => {
+      res.data.forEach(item => {
-    //     if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+        if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
-    //       this.decomposeOptions.push(item)
+          let itemTemp={
-    //     }
+            value:item.attrField,
-    //   })
+            label:item.attrName
-    // })
+          }
+          this.decomposeOptions.push(itemTemp)
+        }
+      })
+       if (this.bpnId !== undefined) {
+        this.getData()
+      }
+    })
   }
 };
 </script>

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3945,7 +3945,7 @@ export default {
                 if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
                   nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
                 }
-                nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
+                nowstandinfo.standCode = nowstandinfo.standSort+" "+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
                 this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
                   _this: this,
                   loading: 'isSubmit'