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

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

@@ -179,7 +179,7 @@
                                                 </span>
                                                 <span style="width: 20%;margin-left: 15px;"
                                                       v-if="item.id !== '' && index == 0  && !item.id.startsWith('ATT')">
-                                                <el-button type="primary" size="mini"
+                                                <el-button type="primary" size="mini" :disabled="disabledXX"
                                                            plain icon="el-icon-edit"
                                                            @click="handleFilePreviewOne(item,'onlineEdit')"></el-button>
                                                 </span>
@@ -189,6 +189,7 @@
                                             <!--                      :disabled="disabledXX"-->
                                             <!--                      disabled-->
                                             <el-button
+                                                :disabled="disabledXX"
                                                     type="primary"
                                                     class="common-button-primary"
                                                     size="mini"
@@ -2062,14 +2063,18 @@
                     this.form.modelData[this.zrIndex].zrUserId = data[0].id
                     this.form.modelData[this.zrIndex].zrUserIdName = data[0].name
                 } else {
-                    this.form.modelData.forEach(item => {
+                    try {
+                      this.form.modelData.forEach(item => {
                         this.zrIdList.forEach(items => {
-                            if (item.id === items) {
+                          if (item.id === items) {
-                                item.zrUserId = data[0].id
+                            item.zrUserId = data[0].id
-                                item.zrUserIdName = data[0].name
+                            item.zrUserIdName = data[0].name
-                            }
+                          }
                         })
-                    })
+                      })
+                    }catch (e) {
+                      console.log(e)
+                    }
                 }
                 if (this.userType === 'bzhUserId') {
                     this.roleForm.bzhUserId = data[0].id

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2844,7 +2844,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
+          // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         synopsis: [
           {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
@@ -2879,7 +2879,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {validator: this.verify.validateStandardItem2, trigger: 'change'}
+          // {validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         standYear: [
           {required: true, message: '标准年份不能为空', trigger: 'change'},

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2434,7 +2434,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
+          // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
@@ -2468,7 +2468,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
+          // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         standYear: [
           // {required: true, message: '标准年份/系列不能为空', trigger: 'change'},