diff --git a/.env.development b/.env.development index a3e8ed2df..7888047ce 100644 --- a/.env.development +++ b/.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 diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index 1e2a9d558..9ba80e489 100644 --- a/src/js/columns/constants/index.js +++ b/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 } ] diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index abe067cc0..a918057f9 100644 --- a/src/views/components/resiForm.vue +++ b/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') diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 055ea214d..3efcd6518 100644 --- a/src/views/components/resiInfo.vue +++ b/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) { diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue index 13b01c5f2..b3b307f24 100644 --- a/src/views/dataBoard/renfang/resi/classNew.vue +++ b/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) { diff --git a/src/views/modules/base/residentManagement/unemployment/addForm.vue b/src/views/modules/base/residentManagement/unemployment/addForm.vue index 6a027c7a1..8ac8fbabb 100644 --- a/src/views/modules/base/residentManagement/unemployment/addForm.vue +++ b/src/views/modules/base/residentManagement/unemployment/addForm.vue @@ -263,19 +263,19 @@
是否残疾: {{ - formData.healthStatus != null - ? formData.healthStatus == 1 + formData.disabilityFlag != null + ? formData.disabilityFlag == 0 ? "健康" - : formData.healthStatus == 0 + : formData.disabilityFlag == 1 ? "伤残" : "--" : "--" }}
- + - +
残疾类别: @@ -512,7 +512,7 @@
- + - + \ No newline at end of file + diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue index 03c2df0d0..2b9212d86 100644 --- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue +++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue @@ -2,7 +2,7 @@