From ae0e8da35f9bedd31be0f40c70e32351c1c4b73c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 2 Jun 2022 17:46:01 +0800
Subject: [PATCH] s

---
 client/src/views/ability/mQualityTask.vue | 77 +++++++++++------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue
index 5ad8c34..f516dc4 100644
--- a/client/src/views/ability/mQualityTask.vue
+++ b/client/src/views/ability/mQualityTask.vue
@@ -124,13 +124,6 @@
             <el-tag type="danger" effect="plain" v-else>未确认</el-tag>
           </template>
         </el-table-column>
-       <!-- <el-table-column label="改动内容">
-          <template #default="scope">
-            <span v-if="scope.row.value2.name">{{ scope.row.value2.name }}</span>
-            <span v-else-if="typeof scope.row.value2=='String'">{{ scope.row.value2 }}</span>
-          </template>
-
-        </el-table-column>-->
         <el-table-column label="报送文件">
           <template slot-scope="scope" v-if="scope.row.files">
             <el-link
@@ -321,21 +314,15 @@
         </el-form-item>
         <el-form-item label="备案城市" v-if="qualiForm.type==='OTHER'">
           <el-select
-            v-model="qualiForm.province"
-            placeholder="省份"
-            clearable
-            @change="getCites(qualiForm.province)"
-          >
-            <el-option
-              v-for="item in proviceOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="qualiForm.city"
-            placeholder="所在市"
+            v-model="qualiForm.citys"
+            placeholder="备案城市"
+            style="width: 100%;"
+            filterable
+            remote
+            multiple
+            reserve-keyword
+            :remote-method="searchCity"
+            :loading="loading"
           >
             <el-option
               v-for="item in cityOptions"
@@ -366,6 +353,11 @@
             style="width: 100%;"
             v-model="qualiForm.city"
             placeholder="所在市"
+            filterable
+            remote
+            reserve-keyword
+            :remote-method="searchCity"
+            :loading="loading"
           >
             <el-option
               v-for="item in cityOptions"
@@ -467,22 +459,14 @@
         </el-form-item>
         <el-form-item label="备案城市" v-if="qualiForm.type==='OTHER'">
           <el-select
-            v-model="qualiForm.province"
-            placeholder="省份"
-            clearable
-            disabled
-          >
-            <el-option
-              v-for="item in proviceOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="qualiForm.city"
-            placeholder="所在市"
+            v-model="qualiForm.citys"
+            placeholder="备案城市"
+            style="width: 100%;"
+            filterable
+            remote
+            multiple
             disabled
+            reserve-keyword
           >
             <el-option
               v-for="item in cityOptions"
@@ -496,7 +480,6 @@
           <el-select
             v-model="qualiForm.province"
             placeholder="省份"
-            clearable
             style="width: 100%"
             disabled
           >
@@ -598,6 +581,7 @@
         taskList: {count: 0,},
         recordList: {count: 0,},
         drawer: false,
+        loading: false,
         showForm: false,
         multiple: true,
         listLoading: false,
@@ -684,8 +668,22 @@
       getProvince(){
         provinceLists({page:1,page_size:60}).then(res=>{
           this.proviceOptions = res.data.results;
+        });
+        cityLists().then(res=>{
+          this.cityOptions = res.data.results;
         })
       },
+      searchCity(query){
+        if (query !== '') {
+          this.loading = true;
+          cityLists({search:query}).then(res=>{
+            this.cityOptions = res.data.results;
+            this.loading = false;
+          })
+        } else {
+          this.cityOptions = [];
+        }
+      },
       getCites(province){
         this.qualiForm.city ='';
         cityLists({parent:province,page:1,page_size:100}).then(res=>{
@@ -818,6 +816,7 @@
         that.$refs[form].validate((valid) => {
           if (valid) {
             if(that.qualiForm.type==='OTHER'){
+              that.qualiForm.citys=[];
               let city = parseInt(that.qualiForm.city);
               let province = parseInt(that.qualiForm.province);
               that.qualiForm.citys.push(province);
@@ -827,7 +826,7 @@
             obj.qtask = that.qtask;
             obj.value2 = that.qualiForm;
             if(obj.value2.grade===''){
-              obj.value2.grade=null
+              obj.value2.grade=null;
             }
             const isEdit = that.dialogType === "edit";
             if (isEdit) {