1

src/views/components/import/conditionImport/FormSearch.vue

@@ -84,10 +84,17 @@
                                                 <div v-else-if="item.children[index+1].dataType==3" style="width:100%">
                                                     <el-select v-model="form[item.children[index+1].value]" size="small" multiple filterable collapse-tags placeholder="请选择,可多选" style="width:100%">
                                                         <el-option
-                                                            v-for="item in item.children[index+1].value=='GJ'?countryList.filter(item=>item.value!='CN'):constants[item.children[index+1].value]"
-                                                            :key="item.value"
-                                                            :label="item.label"
-                                                            :value="item.value">
+                                                            v-if="item.children[index+1].value=='GJ'"
+                                                            @click.native.stop="selectAll"
+                                                            :label="checked?'取消全选':'全选'"
+                                                            :value="-1">
+                                                        </el-option>
+                                                        <el-option
+                                                            v-for="item1 in item.children[index+1].value=='GJ'?countryList1:constants[item.children[index+1].value]"
+                                                            :key="item1.value"
+                                                            :disabled="item.children[index+1].value=='GJ' && checked"
+                                                            :label="item1.label"
+                                                            :value="item1.value">
                                                         </el-option>
                                                     </el-select>
                                                 </div>
@@ -153,24 +160,27 @@ export default {
                     value:3
                 },
             ],
+            checked:false,
+            countryList1:[]
         }
     },
     watch:{
         DBType(val){
             this.dbType = val == 'WD'?'2':'1'
-            if(val == 'WD'){
-                this.$set(this.form,'GJ',JSON.parse(JSON.stringify(this.selected))) 
-            }else{
-               this.$set(this.form,'GJ',[]) 
+            this.setGJValue()
+        },
+        'countryList'(){
+            this.countryList1 = this.countryList.filter(item=>item.value!='CN')
+        },
+        'selected'(val){
+            if(this.selected){
+                this.setGJValue()
             }
-        }
+        },
     },
     mounted() {
-        if(this.DBType == 'WD'){
-            this.$set(this.form,'GJ',JSON.parse(JSON.stringify(this.selected))) 
-        }else{
-            this.$set(this.form,'GJ',[]) 
-        }
+        this.countryList1 = this.countryList.filter(item=>item.value!='CN')
+        this.setGJValue()
         var field=JSON.parse(JSON.stringify(this.$constants.searchField))
         this.filedList =[].concat(...field.map(item=>{return item.children}))
         if(this.editData && this.editData.component == 'FormSearch'){
@@ -181,14 +191,28 @@ export default {
         }
     },
     methods: {
+        setGJValue(){
+            if(this.DBType == 'WD'){
+                this.$set(this.form,'GJ',JSON.parse(JSON.stringify(this.selected))) 
+                if(this.countryList1.length>0){
+                    if(this.form.GJ.length == this.countryList1.length){
+                        this.checked = true
+                    }
+                }
+            }else{
+                this.$set(this.form,'GJ',[]) 
+            }
+        },
         selectAll () {
-            if (this.form.GJ.length < this.countryList.length) { // 非全选时，点击选择全部
-                this.form.GJ = this.countryList.map((item) => {
+            if (this.form.GJ.length < this.countryList1.length) { // 非全选时，点击选择全部
+                this.form.GJ = this.countryList1.map((item) => {
                     return item.value
                 })
+                this.checked = true
                 // this.form.GJ.unshift('-1')
             } else { // 全选时，点击置空
                 this.form.GJ = []
+                this.checked = false
             }
         },
         cancel(){
@@ -224,7 +248,14 @@ export default {
                                 }
                                 
                             }
-                        }else{
+                        }else if(keys[i]=='GJ'){
+                            if(this.form[keys[i]].length==1){
+                                str1 = str1 + keys[i] + '=(' + this.form[keys[i]][0] +')'
+                            }else if(!this.checked){
+                                str1 = str1 + keys[i] + '=(' + this.form[keys[i]].join(" OR ") +')'
+                            }
+                        }
+                        else{
                             // this.form[keys[i]].forEach((item,index)=>{
                             //     if(index<this.form[keys[i]].length-1){
                             //         str1 = str1 + keys[i] + '=' + item + ' AND '

src/views/components/import/conditionImport/customSearch.vue

@@ -13,7 +13,7 @@
                     <div style="overflow-y:auto;overflow-x:hidden;" :style="{height:tableHeight-120+'px'}">
                        <el-checkbox-group v-model="checkList">
                         <div v-for="item in countryList1" :key="item.value" class="item">
-                            <el-checkbox :label="item.value">{{ item.label }}({{ item.value }})</el-checkbox>
+                            <el-checkbox :label="item.value" :disabled="checked">{{ item.label }}({{ item.value }})</el-checkbox>
                         </div>
                             
                         </el-checkbox-group> 
@@ -64,6 +64,11 @@ export default {
     'countryList'(){
       this.countryList1 = this.countryList.filter(item=>item.value!='CN')
     },
+    'selected'(val){
+      if(this.selected){
+        this.checkList = JSON.parse(JSON.stringify(this.selected))
+      }
+    },
   },
   computed: {},
   created() {},
@@ -117,15 +122,24 @@ export default {
         if(val){
           if(this.checkList.length==1){
             var a = `GJ=${this.checkList[0]}`
-          }else{
+          }else if(!this.checked){
             var a = `GJ=(${this.checkList.join(" OR ")})`
+          }else{
+            var a = ''
           }
-          var str = `${val} AND ${a}`
+          if(a){
+            var str = `${val} AND ${a}`
+          }else{
+             var str = `${val}`
+          }
+          
         }else{
           if(this.checkList.length==1){
             var str = `GJ=${this.checkList[0]}`
-          }else{
+          }else if(!this.checked){
             var str = `GJ=(${this.checkList.join(" OR ")})`
+          }else{
+            var str = ''
           }
         }
         this.$emit('search',str,params)

src/views/components/import/conditionImport/search.vue

@@ -216,6 +216,7 @@ export default {
                })
                var b = this.countryList.filter(item=>{return important.indexOf(item.value)==-1})
                this.countryList = a.concat(b)
+               this.selected = this.countryList.map(item=>item.value).filter(item=>item!='CN')
         },
         changeComponent(val){
             this.isComponent = val