Merge branch 'fix_bug' into preview

# Conflicts:
#	src/views/modules/base/smartImport/cpts/createdTask.vue

src/views/components/editResi.vue

@@ -1049,10 +1049,6 @@ export default {
         economyDto: {
           monthIncome: null, //月收入
         },
-        subsistenceAllowanceDto: {
-          reasons: null,
-          category: [],
-        },
       },
       orgOption:[],
       footerInputList: [
@@ -1475,7 +1471,7 @@ export default {
             {
               label: "子女死亡日期",
               itemType: "datepicker1",
-              formName: "certificateDate",
+              formName: "childDeathDate",
               pformName: "specialSupportDto",
               opction: [],
             },
@@ -1636,7 +1632,6 @@ export default {
               this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId,i);
             }
             this.form = { ...res.data.data };
-
             this.form.baseInfoDto.idNum = this.$route.params.idNum;
             this.form.baseInfoDto.mobile = this.$route.params.mobile;
             if (!res.data.data.familyInfoDto) {
@@ -1670,6 +1665,12 @@ export default {
                 specialCategoryCodes: [],
               };
             }
+            if (!res.data.data.subsistenceAllowanceDto) {
+              this.form.subsistenceAllowanceDto = {
+                reasons: [],
+                category:null ,
+              };
+            }
             if (!res.data.data.unemployedDto) {
               this.form.unemployedDto = {
                 originWorkUnit: null, //原工作单位
@@ -1709,7 +1710,7 @@ export default {
                           formData.partyOrgIdPath || null;
                         }
                         this.footerInputList[i].children[index].value =
-                          formData[formName] || null;
+                          formData[formName] != null?formData[formName]:null
                         this.footerInputList[i].children[index].id =
                           formData.id;
                       }
@@ -2201,7 +2202,6 @@ export default {
     // 提交扩展信息
     submitExpand(_form, { changId, changPid, changType }) {
       if (changType == "checkbox") {
-        this.form[changPid] = {};
         this.form[changPid][changId] = [];
         this.form[changPid][changId].push(..._form[changPid][changId]);
       } else {

src/views/components/resiExpand/editExpand.vue

@@ -119,6 +119,7 @@ export default {
                     disabilityDesc: null,
                     guardianFlag: null,
                     guardianName: null,
+                    guardianMobile:null,
                     specialSkillFlag: null,
                     workCapacityFlag: null
                 },
@@ -142,8 +143,8 @@ export default {
                 },
                 // 低保人员
                 subsistenceAllowanceDto: {
-                    reasons: null,
-                    category: []
+                    reasons: [],
+                    category:null ,
                 },
                 // 退役军人
                 veteranDto: {
@@ -179,7 +180,6 @@ export default {
                 volunteerDto: {
                     volunteerCategory: []
                 },
-
             },
             casProps: {
                 value: 'id',
@@ -234,7 +234,6 @@ export default {
         },
         showForm() {
             this.$nextTick(() => {
-                // console.log(this.formList,'拓展组件formList');
                 // console.log(this.form,'拓展组件form');
                 const promises = this.formList.forEach((item) => {
                     item.form.map(async (group) => {
@@ -248,8 +247,8 @@ export default {
                                 this.partyOrgIdPath = item.orgPath.split(':')[0]
                                 await this.getOrgTree()
                                 this.form[item.pformName][item.formName] = item.value || null
-                            } else {
-                                this.form[item.pformName][item.formName] = item.value || null
+                            } else{
+                                this.form[item.pformName][item.formName] = item.value != null?item.value:null;
                             }
                             if (item.opctionUrl) {
                                 try {

src/views/modules/base/smartImport/cpts/completeTask.vue

@@ -45,7 +45,7 @@
         <i class="el-icon-download" style="margin-left: 16px;"></i>
         <a
         v-if="resultDescFile"
-        :href="this.resultDescFile"
+        :href="resultDescFile"
               target="_blank"
               style="color: #ff4d4f; cursor: pointer"
               >下载结果说明</a

src/views/modules/base/smartImport/cpts/createdTask.vue

@@ -84,6 +84,7 @@
     <div class="content_box">
       <div class="left">
         <el-upload
+        v-if="fileList.length === 0"
           :headers="$getElUploadHeaders()"
           name="processFile"
           action="uploadUlr"
@@ -98,6 +99,12 @@
           <i class="el-icon-upload" style="font-size: 58px; color: #c5c9d1"></i>
           <div class="el-upload__text" v-html="$t('upload.text')"></div>
         </el-upload>
+        <section  v-else class="uploadList">
+          <div v-for="file in fileList" :key="file.id" :file="file" style="display: flex; align-items: center">
+            <span>{{ file.name }}</span>
+            <i class="el-icon-close" @click="removeFile(file)" style="cursor: pointer;"></i>
+          </div>
+        </section>
       </div>
       <div class="right">
         <p>4、上传按导入模板整理后的excel数据文件。</p>
@@ -157,7 +164,7 @@
             <template slot-scope="scope">
               <span
                 :class="[
-                  scope.row.itemGroupId && scope.row.itemGroupId != ''
+                  scope.row.itemId && scope.row.itemId != ''
                     ? ''
                     : 'font_color_red',
                 ]"
@@ -171,7 +178,7 @@
             label="对应到"
             min-width="50"
           >
-            <template slot-scope="scope"><span v-if="scope.row.itemGroupId"> =></span> </template>
+            <template slot-scope="scope"><span v-if="scope.row.itemId"> =></span> </template>
           </el-table-column>
           <el-table-column
             prop="itemGroupId"
@@ -255,7 +262,8 @@ export default {
       dataListLoading: false,
       dataList: [],
       groupList: [],
-      fileCode: null,
+      fileCode:null,
+      fileList:[]
     };
   },
   props: {},
@@ -379,6 +387,7 @@ export default {
             const { fileName, url } = res.data.data;
             this.createdFileName = fileName;
             this.createdFileUrl = url;
+            this.fileList.push({name:fileName,url:url})
             this.checkExtractExcelHead();
           } else {
             this.$message.error(res.data.msg);
@@ -392,6 +401,9 @@ export default {
         });
       this.$refs.upload.clearFiles();
     },
+    removeFile(){
+      this.fileList = [];
+    },
     // 下载全部模板
     async handleExportModuleAll() {
       let url = "/actual/base/residentBaseInfo/import/download-template";
@@ -512,5 +524,14 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/detail-main.scss";
 @import "@/assets/scss/pages/smartImport.scss";
+.uploadList{
+  width: 99%;
+  height: 180px;
+  border: 1px dashed  #ccc;
+  border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>
   

src/views/modules/base/smartImport/index.vue

@@ -199,6 +199,8 @@ export default {
     handleClose() {
       this.pageType = "list";
       this.processStatus = null;
+      this.pageNo = 1;
+      this.getTableData();
     },
     //  新增弹出框组件确定事件
     handleOk(type) {

src/views/modules/portrayal/jumin/index.vue

@@ -1077,7 +1077,7 @@ export default {
             {
               label: "子女死亡日期",
               itemType: "datepicker1",
-              formName: "certificateDate",
+              formName: "childDeathDate",
               opction: [],
             },
             {