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/components/roleTree/index.vue

@@ -26,6 +26,7 @@
                     style="height: 100%; overflow: auto;"
                     class="filter-tree tree-line"
                     :class="treeClass"
+                    @check-change="checkChange"
                     :data="treeData"
                     :props="defaultProps"
                     :default-checked-keys="nodeList"
@@ -116,15 +117,25 @@
             }
         },
         methods: {
+            checkChange (row, type, c) {
+                if (!type) {
+                    if (this.nodeList.length > 0) {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
+                        }
+                    }
+                }
+            },
             treeClass () {
-
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList.length) {
+                if (this.nodeList.length > 0) {
                     let ids = ''
                     this.nodeList.forEach(item => {
                         if (ids.length > 0) {
@@ -134,18 +145,27 @@
                             ids = item
                         }
                     })
-                    let oldList = []
                     this.$http.get('SarInstitution/institution/getNextById', {
                         ids: ids
                     }, {
                         _this: this
                     }, res => {
-                        oldList = res
+                        let oldList2 = res.concat(this.roleList)
+                        let result = []
+                        let obj = {}
+                        for(let i = 0; i < oldList2.length; i++){
+                            if(!obj[oldList2[i].id]){
+                                result.push(oldList2[i]);
+                                obj[oldList2[i].id] = true;
+                            }
+                        }
+                        this.isVisible2 = false
+                        this.$emit('checkedRole', result)
                     })
                 } else {
+                    this.isVisible2 = false
+                    this.$emit('checkedRole', this.roleList)
                 }
-                this.isVisible2 = false
-                this.$emit('checkedRole', this.roleList)
             },
             drawerCheck (data) {
                 if (this.checkBox) {

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/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"