From 60948aaa138e124267ce189f4195e6b4b3f5c666 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 18 Mar 2024 21:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=A0=A1=E9=AA=8C=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E5=B1=85=E6=B0=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/pages/smartImport.scss        |  7 +-
 src/views/components/addResi.vue              | 15 +++--
 .../base/smartImport/cpts/createdTask.vue     | 67 +++++++++++++------
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss
index ab75a4236..1bf746981 100644
--- a/src/assets/scss/pages/smartImport.scss
+++ b/src/assets/scss/pages/smartImport.scss
@@ -13,7 +13,9 @@
         }
     }
   }
-
+.font_color_red{
+  color: red;
+}
   .content_box{
     display: flex;
     .left{
@@ -105,5 +107,4 @@
     to {
       transform: rotate(-360deg);
     }
-  }
-  
\ No newline at end of file
+  }
\ No newline at end of file
diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index 8ef63d166..1d11c3001 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -16,7 +16,7 @@
                                 <el-select v-model="form.baseInfoDto.idType" placeholder="请选择" size="small"
                                     class="list_item_width_1" clearable>
                                     <el-option v-for="(item, index) in idTypeList" :key="index" :label="item.label"
-                                        :value="item.value"></el-option>
+                                        :value="item.value" @click.native="handelCLickIdType(item.value)"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
@@ -1183,10 +1183,15 @@ export default {
         handelClickDelHouse(i) {
             this.form.resideInfoDtos = this.form.resideInfoDtos.filter((item, index) => index != i)
         },
-        handleValidBlur() {
-            if (this.form.baseInfoDto.idType != 1) return
+        handelCLickIdType(val){
+          if(val === 1){
             this.getResidentInfoByIdNum()
-
+          }
+        },
+        handleValidBlur() {
+            if (this.form.baseInfoDto.idType == 1) {
+              this.getResidentInfoByIdNum()
+            }
             if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.idNum)) return
             const { user } = this.$store.state
             let huji = '', i = 0
@@ -1217,7 +1222,7 @@ export default {
                 }
                 let { code, data, msg } = await requestGet(url,parm)
                 if (code == 0 && data != null) {
-                    this.$confirm(`该居民已存在于“${data.name}”是否继续填写`, {
+                    this.$confirm(`该居民已存在于“${data.homeNames.join(',')}”是否继续填写`, {
                     confirmButtonText: '前往修改',
                     cancelButtonText: '继续填写',
                     type: 'warning'
diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index 3afdd5cb6..da8cf094e 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -3,7 +3,12 @@
     <h3 class="title-small">基本信息</h3>
     <div class="content_box">
       <div class="left">
-        <el-form :model="form" :rules="rules" ref="importForm" label-width="100px">
+        <el-form
+          :model="form"
+          :rules="rules"
+          ref="importForm"
+          label-width="100px"
+        >
           <el-form-item label="任务类型" prop="importCategory">
             <el-select
               v-model="form.importCategory"
@@ -28,10 +33,13 @@
               <span v-if="categoryName">{{
                 this.$store.state.user.agencyName + categoryName || ""
               }}</span>
-              <span  v-if="categoryName">导入模板.xlsx</span>
+              <span v-if="categoryName">导入模板.xlsx</span>
               <span v-else>请先选择任务类型</span>
-              <el-button type="text" @click="handelClickDownModule"
-              v-if="categoryName">点击下载</el-button
+              <el-button
+                type="text"
+                @click="handelClickDownModule"
+                v-if="categoryName"
+                >点击下载</el-button
               ></span
             >
           </el-form-item>
@@ -40,6 +48,7 @@
               v-model="form.taskName"
               size="small"
               class="u-item-width-normal"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -121,6 +130,9 @@
       width="75%"
     >
       <div v-if="dataList.length > 0" style="height: 600px; overflow-y: scroll">
+        <p style="margin-top: 0px;">
+          说明：系统将会将您上传的表格列自动匹配到平台对应的数据列，匹配错误或没有匹配上的列（红色高亮）您还可以手动匹配
+        </p>
         <el-table
           ref="ref_table"
           :data="dataList"
@@ -139,19 +151,33 @@
             prop="userTableHeader"
             header-align="center"
             align="center"
-            label="表格信息"
+            label="上传表格列"
             min-width="80"
           >
             <template slot-scope="scope">
-              {{ scope.row.userTableHeader || "--" }}
+              <span
+                :class="[
+                  scope.row.itemGroupId && scope.row.itemGroupId != ''
+                    ? ''
+                    : 'font_color_red',
+                ]"
+                >{{ scope.row.userTableHeader || "--" }}</span
+              >
             </template>
           </el-table-column>
-
+          <el-table-column
+            header-align="center"
+            align="center"
+            label="对应到"
+            min-width="50"
+          >
+            <template slot-scope="scope"><span v-if="scope.row.itemGroupId"> =></span> </template>
+          </el-table-column>
           <el-table-column
             prop="itemGroupId"
             header-align="center"
             align="center"
-            label="平台对应信息"
+            label="平台数据列"
             min-width="110"
           >
             <template slot-scope="scope">
@@ -229,7 +255,7 @@ export default {
       dataListLoading: false,
       dataList: [],
       groupList: [],
-      fileCode:null,
+      fileCode: null,
     };
   },
   props: {},
@@ -238,7 +264,7 @@ export default {
     await this.loadPersonGroup();
   },
   methods: {
-    handelClearCategory(){
+    handelClearCategory() {
       this.categoryName = null;
     },
     async loadPersonGroup() {
@@ -278,7 +304,6 @@ export default {
         this.$message.error(msg);
       }
     },
-    
 
     handelClickCategory(label) {
       this.categoryName = label;
@@ -340,7 +365,7 @@ export default {
       if (!this.form.importCategory || !this.form.taskName) {
         this.$message.error("请完善基本信息!");
         this.dataListLoading = false;
-        return false
+        return false;
       }
       return fileType && isLt1M;
     },
@@ -436,17 +461,17 @@ export default {
         });
     },
     handelClickUpload() {
-      this.$refs["importForm"].validate( (valid) => {
+      this.$refs["importForm"].validate((valid) => {
         if (valid) {
-           this.saveImportResiHouseExcel()
+          this.saveImportResiHouseExcel();
         }
       });
     },
-   async saveImportResiHouseExcel(){
+    async saveImportResiHouseExcel() {
       const { fileCode, dataList } = this;
-      if(!fileCode){
+      if (!fileCode) {
         this.$message.error("请先上传文件");
-        return
+        return;
       }
       let obj = dataList.reduce((acc, item) => {
         if (item.userTableHeader) {
@@ -459,12 +484,14 @@ export default {
       formData.append("fileCode", fileCode);
       formData.append("taskName", this.form.taskName);
       await this.$http
-        .post("/actual/base/intelligentImportData/importResiHouseExcel", formData)
+        .post(
+          "/actual/base/intelligentImportData/importResiHouseExcel",
+          formData
+        )
         .then((res) => {
           console.log("res-up", res);
           if (res.data.code == 0 && res.data.msg == "success") {
-
-            this.$emit("handelClickUpload",fileCode);
+            this.$emit("handelClickUpload", fileCode);
           } else this.$message.error(res.data.msg);
         })
         .catch((err) => {