elink-star
/
epmet-work-pc
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

V1.0
wxz 2 years ago
parent
f3aaed4d87
commit
7f99aec6ac
7 changed files with 49 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.development
  2. 6
      src/js/columns/constants/index.js
  3. 2
      src/views/components/resiForm.vue
  4. 2
      src/views/components/resiInfo.vue
  5. 2
      src/views/dataBoard/renfang/resi/classNew.vue
  6. 18
      src/views/modules/base/residentManagement/unemployment/addForm.vue
  7. 53
      src/views/modules/base/residentManagement/unemployment/unemployment.vue

2
.env.development
View File

@ -1,6 +1,6 @@
NODE_ENV=development 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://192.168.1.140/api
# VUE_APP_API_SERVER = http://219.146.91.110:30801/api # VUE_APP_API_SERVER = http://219.146.91.110:30801/api
# VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api

6
src/js/columns/constants/index.js
View File

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

2
src/views/components/resiForm.vue
View File

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

2
src/views/components/resiInfo.vue
View File

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

2
src/views/dataBoard/renfang/resi/classNew.vue
View File

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

18
src/views/modules/base/residentManagement/unemployment/addForm.vue
View File

@ -263,19 +263,19 @@
<div class="info-prop" v-if="formType == 'detail'"> <div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">是否残疾: </span> <span class="info-title-2">是否残疾: </span>
<span>{{ <span>{{
formData.healthStatus != null formData.disabilityFlag != null
? formData.healthStatus == 1 ? formData.disabilityFlag == 0
? "健康" ? "健康"
: formData.healthStatus == 0 : formData.disabilityFlag == 1
? "伤残" ? "伤残"
: "--" : "--"
: "--" : "--"
}}</span> }}</span>
</div> </div>
<el-form-item label-width="100px" label="是否残疾" v-else> <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 <el-option
v-for="item in healthStatusList" v-for="item in disabilityFlagList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@ -285,7 +285,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="formData.healthStatus == 0"> <el-row v-if="formData.disabilityFlag == 1">
<el-col :span="12"> <el-col :span="12">
<div class="info-prop" v-if="formType == 'detail'"> <div class="info-prop" v-if="formType == 'detail'">
<span class="info-title-2">残疾类别: </span> <span class="info-title-2">残疾类别: </span>
@ -520,7 +520,7 @@ import nextTick from "dai-js/tools/nextTick";
import { import {
genderList, genderList,
binaryOptionList, binaryOptionList,
healthStatusList, disabilityFlagList,
} from "@/js/columns/constants"; } from "@/js/columns/constants";
let loading; // 加载动画 let loading; // 加载动画
@ -546,7 +546,7 @@ export default {
genderList, genderList,
binaryOptionList, binaryOptionList,
healthStatusList, disabilityFlagList,
formData: { formData: {
name: "", name: "",
@ -560,7 +560,7 @@ export default {
placeOfDomicile: "", placeOfDomicile: "",
currentResidence: "", currentResidence: "",
cultureLevel: "", cultureLevel: "",
healthStatus: null, disabilityFlag: null,
originWorkUnit: "", originWorkUnit: "",
disabilityCategoryCode: "", disabilityCategoryCode: "",
disabilityLevel: "", disabilityLevel: "",

53
src/views/modules/base/residentManagement/unemployment/unemployment.vue
View File

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