Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON 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/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -1601,7 +1601,6 @@
                         this.FBGBUSSName = ""
                     }
                     this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
-                    console.log(this.LSBBBUSSFileList)
                     this.form.LSBBBUSS = this.form.FBGBUSS
                     this.form.LSBBBUSSName = this.form.FBGBUSSName
                     this.FBGBUSSFileList= []

src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue

@@ -2700,7 +2700,7 @@
                     this.formKey++
                     this.form.standSn = this.form.standNum
                     this.form.standNumber = this.form.standNum
-                    this.form.standYear = this.regDate(year)
+                    this.form.standYear = year
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){

src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue

@@ -1005,9 +1005,9 @@
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
-                    standYear: [
+                    // standYear: [
-                        { required: true, message: '请输入标准年份'},
+                    //     { required: true, message: '请输入标准年份'},
-                    ],
+                    // ],
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,7 +1140,7 @@
                     this.formKey++
                     this.form.standSn = this.form.standNum
                     this.form.standNumber = this.form.standNum
-                    this.form.standYear = this.regDate(year)
+                    this.form.standYear = year
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){

src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue

@@ -1078,9 +1078,9 @@
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
-                    standYear: [
+                    // standYear: [
-                        { required: true, message: '请输入标准年份'},
+                    //     { required: true, message: '请输入标准年份'},
-                    ],
+                    // ],
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1218,7 +1218,7 @@
                     this.formKey++
                     this.form.standSn = this.form.standNum
                     this.form.standNumber = this.form.standNum
-                    this.form.standYear = this.regDate(year)
+                    this.form.standYear = year
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){

src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue

@@ -1005,9 +1005,9 @@
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
-                    standYear: [
+                    // standYear: [
-                        { required: true, message: '请输入标准年份'},
+                    //     { required: true, message: '请输入标准年份'},
-                    ],
+                    // ],
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1140,7 +1140,7 @@
                     this.formKey++
                     this.form.standSn = this.form.standNum
                     this.form.standNumber = this.form.standNum
-                    this.form.standYear = this.regDate(year)
+                    this.form.standYear = year
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){

src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue

@@ -1088,9 +1088,9 @@
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
-                    standYear: [
+                    // standYear: [
-                        { required: true, message: '请输入标准年份'},
+                    //     { required: true, message: '请输入标准年份'},
-                    ],
+                    // ],
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1228,7 +1228,7 @@
                     this.formKey++
                     this.form.standSn = this.form.standNum
                     this.form.standNumber = this.form.standNum
-                    this.form.standYear = this.regDate(year)
+                    this.form.standYear = year
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){