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

src/components/CustomFormComponents/Select.vue

@@ -12,6 +12,7 @@
         :placeholder="placeholder"
         :disabled="disabled"
         clearable
+        filterable
         @change="handleChange"
       >
         <el-option

src/pages/details/otherStandardDetails/index.vue

@@ -3024,7 +3024,13 @@
         this.$refs['relatedTermsSelect'].handleSubmit(() => {
           this.selectSarStandItems()
           this.btnLoading = false
+          this.$message({
+            message: '关联成功',
+            type: 'success'
+          });
         })
+
+
       },
       closeRelatedTermsDrawer() {
         this.$refs['relatedTermsDrawer'].closeDrawer()

src/pages/localTool/standardWarning.vue

@@ -1071,7 +1071,6 @@ export default {
         }
 
         .more {
-           width: 100%;
            margin-top: 30px;
           /deep/ .el-input__inner {
             width: 155px;

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -659,7 +659,8 @@
                     :disabled="formdisableflag"
                   ></custom-textarea>
                 </template>
-                <template v-else-if="field.attrType === 'SEL_OPTION'">
+<!--                起草单位-->
+                <template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' ">
                   <template>
                     <custom-select
                       :key="field.attrField"
@@ -4842,7 +4843,7 @@ export default {
           }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
-          rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})
+          // rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})
         }
         if (rule.length > 0) {
           rules[item.attrField] = rule