From f2282036d4415abe73edb357b95d0fe2f17b871c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Jul 2023 09:47:52 +0800
Subject: [PATCH] bug #399 #429

---
 src/views/components/resiForm.vue             | 66 ++++++++++++++-----
 src/views/components/resiInfo.vue             | 31 ++++++---
 src/views/modules/base/resi.vue               |  2 +-
 src/views/modules/base/smartImport.vue        | 22 +++----
 .../communityService/fuwuzhaoren/index.vue    |  1 -
 5 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 25d872e7b..0d654f9e7 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -176,7 +176,7 @@
                         <template v-for="itemj in footerInputList">
                             <section v-if="item.groupId == itemj.id" class="f-flex" style="flex-wrap: wrap;">
                               <el-form-item  v-for="(itemk,index) in itemj.children" 
-                                             :key="index" label-width="100px" 
+                                             :key="index" label-width="105px" 
                                              :label="itemk.label" 
                                              :class="itemk.itemType=='textarea'?'textareaDidth':''" >
                                   <template v-if="itemk.itemType == 'radio1'" >
@@ -697,8 +697,8 @@ export default {
           itemType:"radio1",
           formName:"elderlyFlag",
           opction:[
-            {label:'是',value:1},
-            {label:'否',value:0}
+            {label:'有',value:1},
+            {label:'无',value:0}
           ]
         },
         {
@@ -786,14 +786,15 @@ export default {
         itemType:"datepicker1",
         formName:"joinCommunityTime",
         opction:[
-        ]},{
-        label:"是否请长假",
-        itemType:"radio1",
-        formName:"longHolidayFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]}
+        ]},
+        // {
+        // label:"是否请长假",
+        // itemType:"radio1",
+        // formName:"longHolidayFlag",
+        // opction:[
+        //   {label:'是',value:1},
+        //   {label:'否',value:0},
+        // ]}
         ]
       },{
         id:'ensureHouseDto',
@@ -865,7 +866,7 @@ export default {
         opction:[
         ]},{
         label:"失业原因",
-        itemType:"input1",
+        itemType:"select1",
         formName:"unemploymentReason",
         opction:[
         ]} ,{
@@ -877,7 +878,7 @@ export default {
           {label:'否',value:0}
         ]}, {
         label:"劳动能力就业愿望",
-        itemType:"input1",
+        itemType:"select1",
         formName:"employmentWish",
         opction:[
         ]}
@@ -1228,7 +1229,7 @@ export default {
       {groupId:'economyDto',label:'经济情况'},
       {groupId:'resideInfoDto',label:'居住'},
       {groupId:'familyInfoDto',label:'家庭'},
-      {groupId:'birthRecordDTO',label:'出生人员'},
+      {groupId:'birthRecordDTO',label:'出生信息'},
     ]
    }
   },
@@ -1299,6 +1300,8 @@ export default {
       this.getVolunteerDict()
       this.gethobbyDict()
       this.getWelfareDict()
+      this.getUnemployment()
+      this.getCareer()
     },
     getGridList () {
       const { user } = this.$store.state
@@ -1440,6 +1443,37 @@ export default {
         console.log(error,'获取公益岗位字典');
       }
     },
+    async getUnemployment(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'unemployment_cause'})
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'unemploymentReason'){
+                  i.opction = data.data
+              }
+          }
+        })
+
+      } catch (error) {
+        console.log(error,'获取失业原因字典');
+      }
+    },
+    async getCareer(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'career_goals'})
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'employmentWish'){
+                  i.opction = data.data
+              }
+          }
+        })
+
+      } catch (error) {
+        console.log(error,'获取就业愿望字典');
+      }
+    },
+    
     async getHouseholdDict(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
@@ -1747,7 +1781,7 @@ export default {
         } else {
           await this.getFamilyInfoDetailById(this.form.resiId)
         }
-      } else if (tab._props.label == '出生人员') {
+      } else if (tab._props.label == '出生信息') {
         if (!this.form.resiId) {
           this.newForm.birthRecordDTO = this.form.birthRecordDTO
         } else {
@@ -2205,7 +2239,7 @@ export default {
           }
         })
     },
-    // 出生人员
+    // 出生信息
     residentBirthRecord(id) {
       if(this.newForm.birthRecordDTO) return
       this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => {
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index bf214bc17..65b4c6952 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -1118,13 +1118,7 @@
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
               <div class="f-labels">劳动能力就业愿望 :</div>
-              <span class="f-left8 f-font-color">{{
-                residentUnemployedObj
-                  ? residentUnemployedObj.employmentWish
-                    ? residentUnemployedObj.employmentWish
-                    : "--"
-                  : "--"
-              }}</span>
+              <span class="f-left8 f-font-color">{{careerText}}</span>
             </div>
           </el-col>
         </el-row>
@@ -1598,6 +1592,7 @@ export default {
       householdArr: [],
       houseArr: [],
       unemploymentArr: [],
+      careerArr:[],
       chronicArr: [],
       resideArr: [],
       marriageArr: [],
@@ -1805,6 +1800,16 @@ export default {
       });
       return text;
     },
+    careerText(){
+      let text = "--";
+      console.log(this.careerArr);
+      this.careerArr.forEach((item) => {
+        if (item.value == this.residentUnemployedObj.employmentWish) {
+          text = item.label;
+        }
+      });
+      return text;
+    },
     volunteerCategoryArr() {
       let arr = [];
       if (this.residentVolunteerObj.volunteerCategory) {
@@ -2045,6 +2050,7 @@ export default {
         this.getResidentEnsureHouse();
       } else if (tab._props.label == "失业") {
         this.getUnemployment();
+        this.getCareer()
         this.getResidentUnemployed();
       } else if (tab._props.label == "退役军人") {
         this.getVeteranDetailById();
@@ -2526,13 +2532,22 @@ export default {
     async getUnemployment() {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
-          dictType: "unemployment_reason",
+          dictType: "unemployment_cause",
         });
         this.unemploymentArr = data.data;
       } catch (error) {
         console.log(error, "获取失业原因字典");
       }
     },
+
+    async getCareer(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'career_goals'})
+        this.careerArr = data.data;
+      } catch (error) {
+        console.log(error,'获取就业愿望字典');
+      }
+    },
     async handleTuomin(type) {
       const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
       const { data, code, msg } = await requestPost(url);
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 8b192596a..0f07f9e18 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1877,7 +1877,7 @@ export default {
 		.dialog-h-content {
 			max-height: calc(83vh - 80px);
 			box-sizing: border-box;
-			padding: 50px 80px;
+			padding: 50px 70px;
 			overflow: auto;
 		}
 	}
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index ba5d630fb..27716a362 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/src/views/modules/base/smartImport.vue
@@ -350,7 +350,6 @@ export default {
 			}
 			return fileType && isLt1M;
 		},
-
 		async uploadHttpRequest(file) {
 			this.importLoading = true;
 			this.importBtnTitle = "正在上传中...";
@@ -364,7 +363,7 @@ export default {
 					if (res.data.code == 0 && res.data.msg == "success") {
 						console.log(res.data.data);
 						const data = res.data.data;
-
+						this.afterSuccess()
 						this.dataList = [
 							...Object.keys(data.option.exist).map((k) => {
 								return {
@@ -456,17 +455,16 @@ export default {
 		},
 
 		afterSuccess() {
-			this.$confirm('导入成功，是否到系统管理-导入记录中查看进度?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-				center: true
+			this.$message({
+				showClose: true,
+				dangerouslyUseHTMLString: true,
+				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+				duration: 3000
+			});
+			let than = this
+			document.getElementById('clickA').addEventListener('click',function(){
+				than.$router.replace('/main/importRecord-index');
 			})
-				.then(() => {
-					this.$router.replace('/main/importRecord-index');
-				})
-				.catch(() => {});
-
 			this.dataList = [];
 			this.importOption = {};
 			this.importCode = "";
diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index ecae1af8a..cf83246e0 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -205,7 +205,6 @@
                            min-width="150"
                            label="来自"
                            :show-overflow-tooltip="true">
-
           </el-table-column>
           <el-table-column prop="serviceTimeStart"
                            align="center"