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

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -67,6 +67,7 @@
                   <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
                     <el-input
                             v-model="form.standName"
+                            disabled
                             placeholder="请输入标准中文名称"
                             clearable
                     ></el-input>

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

@@ -3558,6 +3558,10 @@ export default {
         idList += item.id
         nameList += item.name
       })
+      this.sarBussionessSearch.QCDW = data[0].institutionName
+      this.sarBussionessSearch.QCDWId = data[0].institutionId
+      this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
+      this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
       if (this.drawerTitle === '查询起草人') {
         this.sarBussionessSearch['QCRBUSS'] = nameList
       }
@@ -3566,12 +3570,8 @@ export default {
         this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
       }
       // this.sarBussionessStandEO['QCRBUSS'] = nameList
-
-
     },
     choiceQCDW(type, title, id) {
-
-
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title