【居民分类管理】修改一波bug

.env.development

@@ -1,6 +1,6 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://localhost:9001/api
+VUE_APP_API_SERVER =  http://localhost:8080/api
 # VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api

src/js/columns/constants/index.js

@@ -39,13 +39,13 @@ export const politicsStatusList = [
     value: 0
   }
 ]
-export const healthStatusList = [
+export const disabilityFlagList = [
   {
-    label: '健康',
+    label: '是',
     value: 1
   },
   {
-    label: '伤残',
+    label: '否',
     value: 0
   }
 ]

src/views/components/resiForm.vue

@@ -1785,7 +1785,7 @@ export default {
       await this.getDictData('public_welfare_post_type', 'jobPost')
     },
     async getUnemployment () {
-      await this.getDictData('unemployment_cause', 'unemploymentReason')
+      await this.getDictData('unemployment_reason', 'unemploymentReason')
     },
     async getCareer () {
       await this.getDictData('career_goals', 'employmentWish')

src/views/components/resiInfo.vue

@@ -2450,7 +2450,7 @@ export default {
         async getUnemployment() {
             try {
                 const { data } = await this.$http.post("sys/dict/data/dictlist", {
-                    dictType: "unemployment_cause",
+                    dictType: "unemployment_reason",
                 });
                 this.unemploymentArr = data.data;
             } catch (error) {

src/views/dataBoard/renfang/resi/classNew.vue

@@ -684,7 +684,7 @@ export default {
     async getUnemployment() {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
-          dictType: "unemployment_cause",
+          dictType: "unemployment_reason",
         });
         this.unemploymentArr = data.data;
       } catch (error) {

src/views/modules/base/residentManagement/unemployment/addForm.vue

@@ -263,19 +263,19 @@
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">是否残疾: </span>
               <span>{{
-                formData.healthStatus != null
+                formData.disabilityFlag != null
-                  ? formData.healthStatus == 1
+                  ? formData.disabilityFlag == 0
                     ? "健康"
-                    : formData.healthStatus == 0
+                    : formData.disabilityFlag == 1
                     ? "伤残"
                     : "--"
                   : "--"
               }}</span>
             </div>
             <el-form-item label-width="100px" label="是否残疾" v-else>
-              <el-select v-model="formData.healthStatus" clearable>
+              <el-select v-model="formData.disabilityFlag" clearable>
                 <el-option
-                  v-for="item in healthStatusList"
+                  v-for="item in disabilityFlagList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -285,7 +285,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.healthStatus == 0">
+        <el-row v-if="formData.disabilityFlag == 1">
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">残疾类别: </span>
@@ -512,7 +512,7 @@
     </div>
   </div>
 </template>
-    
+
       <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -520,7 +520,7 @@ import nextTick from "dai-js/tools/nextTick";
 import {
   genderList,
   binaryOptionList,
-  healthStatusList,
+  disabilityFlagList,
 } from "@/js/columns/constants";
 
 let loading; // 加载动画
@@ -546,7 +546,7 @@ export default {
 
       genderList,
       binaryOptionList,
-      healthStatusList,
+      disabilityFlagList,
 
       formData: {
         name: "",
@@ -560,7 +560,7 @@ export default {
         placeOfDomicile: "",
         currentResidence: "",
         cultureLevel: "",
-        healthStatus: null,
+        disabilityFlag: null,
         originWorkUnit: "",
         disabilityCategoryCode: "",
         disabilityLevel: "",
@@ -634,7 +634,7 @@ export default {
           return false;
         }
         if( this.formType == 'edit'){
-          this.formData.categorizedResiId = this.scopeId 
+          this.formData.categorizedResiId = this.scopeId
         }
         const url =
           this.formType === "edit"
@@ -778,7 +778,7 @@ if (Array.isArray(arr)) {
   },
 };
 </script>
-    
+
       <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
@@ -814,4 +814,4 @@ if (Array.isArray(arr)) {
 .width-two {
   width: 553px;
 }
-</style>
+</style>

src/views/modules/base/residentManagement/unemployment/unemployment.vue

@@ -2,7 +2,7 @@
   <div class="g-main">
     <div>
       <div class="m-search">
-        <section 
+        <section
         :class="
             showSercahStatus ? 'm-form-box-height-auto' : 'm-form-box-height'
           ">
@@ -41,7 +41,7 @@
           </el-form-item>
           <el-form-item label="文化程度">
             <el-select
-              v-model="formData.education"
+              v-model="formData.cultureLevel"
               placeholder="请选择"
               size="small"
               class="u-item-width-normal"
@@ -58,7 +58,7 @@
           </el-form-item>
           <el-form-item label="出生日期">
             <el-date-picker
-              v-model="formData.birthdayStartTime"
+              v-model="formData.birthdayStart"
               type="date"
               size="small"
               class="u-item-width-daterange"
@@ -69,7 +69,7 @@
             </el-date-picker>
             <span class="u-data-tag">至</span>
             <el-date-picker
-              v-model="formData.birthdayEndTime"
+              v-model="formData.birthdayEnd"
               type="date"
               size="small"
               value-format="yyyy-MM-dd"
@@ -81,14 +81,14 @@
           </el-form-item>
           <el-form-item label="是否残疾">
             <el-select
-              v-model="formData.healthStatus"
+              v-model="formData.disabilityFlag"
               placeholder="请输入"
               size="small"
               class="u-item-width-normal"
               clearable
             >
               <el-option
-                v-for="item in healthStatusList"
+                v-for="item in disabilityFlagList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -157,14 +157,14 @@
           </el-form-item>
           <el-form-item label="失业原因">
             <el-select
-              v-model="formData.education"
+              v-model="formData.unemploymentReason"
               placeholder="请选择"
               size="small"
               class="u-item-width-normal"
               clearable
             >
               <el-option
-                v-for="item in dicts.unemployment_cause"
+                v-for="item in dicts.unemployment_reason"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -174,7 +174,7 @@
           </el-form-item>
           <el-form-item label="是否领取失业金">
             <el-select
-              v-model="formData.unemploymentMoney"
+              v-model="formData.unempCompensationFlag"
               placeholder="请输入"
               size="small"
               class="u-item-width-normal"
@@ -390,7 +390,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="genderName"
+            prop="disabilityFlag"
             align="center"
             width="80"
             label="是否残疾"
@@ -398,11 +398,11 @@
           >
             <template slot-scope="scope">
               <span>{{
-                scope.row.gender != null
+                scope.row.disabilityFlag != null
-                  ? scope.row.gender == 1
+                  ? scope.row.disabilityFlag == 0
-                    ? "健康"
+                    ? "否"
-                    : scope.row.gender == 0
+                    : scope.row.disabilityFlag == 1
-                    ? "伤残"
+                    ? "是"
                     : "--"
                   : "--"
               }}</span>
@@ -450,7 +450,7 @@
           </el-table-column>
 
           <el-table-column
-            prop="unemploymentMoney"
+            prop="unempCompensationFlag"
             align="center"
             width="100"
             label="是否领取失业金"
@@ -458,10 +458,10 @@
           >
             <template slot-scope="scope">
               <span>{{
-                scope.row.unemploymentMoney != null
+                scope.row.unempCompensationFlag != null
-                  ? scope.row.unemploymentMoney == "1"
+                  ? scope.row.unempCompensationFlag == "1"
                     ? "是"
-                    : scope.row.unemploymentMoney == "0"
+                    : scope.row.unempCompensationFlag == "0"
                     ? "否"
                     : "--"
                   : "--"
@@ -571,13 +571,13 @@
     </el-dialog>
   </div>
 </template>
-  
+
     <script>
 import { requestPost } from "@/js/dai/request";
 import {
   genderList,
   binaryOptionList,
-  healthStatusList,
+  disabilityFlagList,
 } from "@/js/columns/constants";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
@@ -617,7 +617,7 @@ export default {
       tableData: [],
       genderList,
       binaryOptionList,
-      healthStatusList,
+      disabilityFlagList,
       formData: {
         name: "",
         mobile: "",
@@ -626,13 +626,13 @@ export default {
         birthdayEnd: "",
         currentResidence: "",
         cultureLevel: "",
-        healthStatus: null,
+        disabilityFlag: null,
         unemploymentTimeStart: "",
         unemploymentTimeEnd: "",
         unemploymentNum: "",
         unemploymentReason: "",
         employmentNum: "",
-        unemploymentMoney: "",
+        unempCompensationFlag: "",
         employmentHardFlag: null,
         employmentWish: "",
         specialSkill: "",
@@ -665,7 +665,7 @@ export default {
       dicts: {
         educationList: [],
         nationList: [],
-        unemployment_cause: [],
+        unemployment_reason: [],
       }, //字典对象
     };
   },
@@ -699,10 +699,10 @@ export default {
             formCode: "resi_base_info",
           }),
           this.$http.post("sys/dict/data/dictlist", {
-            dictType: "unemployment_cause",
+            dictType: "unemployment_reason",
           }),
         ];
-        const dictKeys = ["nationList", "educationList", "unemployment_cause"]; // 对应的键名
+        const dictKeys = ["nationList", "educationList", "unemployment_reason"]; // 对应的键名
 
         const results = await Promise.all(requests);
         results.forEach((result, index) => {
@@ -842,7 +842,7 @@ export default {
     },
     //   删除处理
     async cancelFuwu(id) {
-      const url = "/actual/base/resiUnemployment/delete";
+      const url = "/actual/base/resiCategorized/unemployed/deleteBatch";
       const { data, code, msg } = await requestPost(url, id);
       if (code === 0) {
         this.$message.success("删除成功！");
@@ -1001,5 +1001,4 @@ export default {
   margin-right: 10px;
 }
 </style>
-  
+
-