+
{{ item.organizationName }}
diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue
index 6c50e0a90..494d87d82 100644
--- a/src/views/modules/base/smartImport/cpts/completeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/completeTask.vue
@@ -42,12 +42,11 @@
>查看
-
下载导入失败数据下载导入失败数据
@@ -92,6 +91,7 @@
From 26d6d9b5ae1256e91e9693287bfbc923a8d0e80c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 19 Apr 2024 17:12:36 +0800
Subject: [PATCH 09/35] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/resi.vue | 39 ++++++++++++++-------
src/views/modules/portrayal/jumin/index.vue | 13 ++-----
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 763a14985..2130fb430 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -968,16 +968,36 @@ export default {
}
);
},
- handelCLickShowCheckPassword(row) {
- this.editUserId = row.resiId;
- this.showCheckPassword = true;
+ async handelCLickShowCheckPassword(row) {
+ const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
+ const { data, code, msg } = await requestPost(url);
+ if(code==0){
+ if(data==true){
+ this.editUserId = row.resiId;
+ this.saveCheckPassword()
+ }
+ else{
+ this.editUserId = row.resiId;
+ this.showCheckPassword = true;
+ }
+ }
+ else{
+ this.$message.error(msg);
+ }
},
handelClickCheckPassword() {
- this.$refs.checkPasswordFrom.validate(async (vali) => {
+ this.$refs.checkPasswordFrom.validate((vali) => {
if (vali) {
- const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+ this.saveCheckPassword(this.checkPasswordFrom.password);
+ } else {
+ return false;
+ }
+ });
+ },
+ async saveCheckPassword(password){
+ const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
let parm = {
- password: this.checkPasswordFrom.password,
+ password,
};
const { data, code, msg } = await requestPost(url, parm);
if (code === 0) {
@@ -991,12 +1011,7 @@ export default {
} else {
this.$message.error(msg);
}
- } else {
- return false;
- }
- });
},
-
handleAdd() {
this.$router.push({ name: "add-resi" });
},
@@ -1177,7 +1192,7 @@ export default {
watch: {
$route: {
handler: function (newVal, oldVal) {
- if (newVal.name == "base-resi") {
+ if (newVal.name == "base-resi" && oldVal.name!='edit-resi') {
this.$nextTick(() => {
this.$refs.myResiSearch.form.attentionCrowds = [];
this.$refs.myResiSearch.form.healthStatus = [];
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index 03da1e86c..d373b1a77 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -21,7 +21,6 @@
@@ -1273,18 +1272,11 @@ export default {
// const { data, code, msg } = await requestPost(url, parm);
// },
async handelClickJumpEdit() {
- console.log(this)
const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
const { data, code, msg } = await requestPost(url);
- console.log(this.form.password)
- console.log(data, code, msg)
if(code==0){
-
- if(data==false){
- this.$router.push({
- name: "edit-resi",
-
- });
+ if(data==true){
+ this.handleSaveTuomin()
}
else{
this.checkType = "edit";
@@ -1294,7 +1286,6 @@ export default {
else{
this.$message.error(msg);
}
-
},
async getDictName(url, params, value, itemType, opction) {
try {
From 3e90793af87543666cf3d827af86e5f150dc3bc4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 19 Apr 2024 17:36:48 +0800
Subject: [PATCH 10/35] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E4=B8=8D=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/resi.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 98a30aa60..55e81ea73 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -445,7 +445,7 @@ export default {
// this.handleSearchFrom();
},
activated() {
- // this.handleSearchFrom();
+ this.handleSearchFrom();
},
methods: {
mouseOverNode(event) {
From de18ed868671be5e79f51a166dc77b9af6bbc7a8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 09:47:23 +0800
Subject: [PATCH 11/35] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/editResi.vue | 90 ++++++++++++++++++-
.../components/resiExpand/editExpand.vue | 18 ++--
2 files changed, 91 insertions(+), 17 deletions(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 10e4975e9..f856bf897 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -828,6 +828,10 @@
+
+
+
@@ -852,11 +856,14 @@ import {
} from "@/js/columns/constants";
import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
import resiExpand from "./resiExpand/editExpand.vue";
+import addExpand from "./resiExpand/index.vue";
+
export default {
data() {
return {
loading: false,
-
+ dialogTitle:null,
+ dialogVisible:false,
houseType: true,
formList: [],
orgOptions: [],
@@ -1648,7 +1655,7 @@ export default {
key === "partyFlag")
) {
const formId = key === "partyFlag" ? "parymemberInfoDto" : key;
- this.showDialog({ index: key, value: formId }, true);
+ this.loadExpand({ index: key, value: formId }, true);
for (let i in this.footerInputList) {
const incidenceFormId = this.incidence[formId].formId;
if (this.footerInputList[i].id === incidenceFormId) {
@@ -2086,7 +2093,7 @@ export default {
}
},
- showDialog({ index, value }, event) {
+ loadExpand({ index, value }, event,) {
// 设置 partyFlag
if (value === 1 || value === 0 || value === 2) {
this.form.baseInfoDto.categoryInfo.partyFlag = value;
@@ -2157,7 +2164,82 @@ export default {
}
}
},
+ showDialog({ index, value }, event) {
+ if (value == 1) {
+ value = 'parymemberInfoDto'
+ this.form.baseInfoDto.categoryInfo.partyFlag = 1;
+ } else if (value == 0) {
+ this.form.baseInfoDto.categoryInfo.partyFlag = 0;
+ } else if (value == 2) {
+ this.form.baseInfoDto.categoryInfo.partyFlag = 2;
+ }
+ if (index != 3 && index) {
+ this.form.baseInfoDto.categoryInfo[value] = event ? 1 : 0;
+ } else if (index == 3) {
+ if (event) {
+ this.form.baseInfoDto.categoryInfo.specialCrowdFlag = 1;
+ if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+ this.form.baseInfoDto.categoryInfo[value] = 1
+ }
+ this.form.specialDto.specialCategoryCodes.push(value);
+ } else {
+ this.form.specialDto.specialCategoryCodes = this.form.specialDto.specialCategoryCodes.filter(item => item != value);
+ if (value == 'unitedFrontFlag' || value == 'petitionOfficerFlag') {
+ this.form.baseInfoDto.categoryInfo[value] = 0
+ }
+ }
+ }
+ const map = {
+ 'parymemberInfoDto': { formId: 'parymemberInfoDto', formType: 'parymemberInfoDto', title: '党员信息' },
+ 'disabilityFlag': { formId: 'healthDto', formType: 'healthDto', title: '残疾信息' },
+ 'seriousIllnessFlag': { formId: 'seriousIllnessDto', formType: 'seriousIllnessDto', title: '大病信息' },
+ 'chronicDiseaseFlag': { formId: 'chronicDiseaseDto', formType: 'chronicDiseaseDto', title: '慢病信息' },
+ 'deathFlag': { formId: 'deathDto', formType: 'deathDto', title: '死亡' },
+ 'oldPeopleFlag': { formId: 'oldPeopleDto', formType: 'oldPeopleDto', title: '老年人信息' },
+ 'subsistenceAllowanceFlag': { formId: 'subsistenceAllowanceDto', formType: 'subsistenceAllowanceDto', title: '低保人员信息' },
+ 'veteranFlag': { formId: 'veteranDto', formType: 'veteranDto', title: '退役军人信息' },
+ 'ensureHouseFlag': { formId: 'ensureHouseDto', formType: 'ensureHouseDto', title: '保障性住房信息' },
+ 'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
+ 'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
+ 'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
+ };
+
+ if (map[value] && event == true) {
+ this.dialogTitle = map[value].title;
+ this.dialogVisible = (event == true || value == "parymemberInfoDto") && this.dialogTitle != "";
+ this.$nextTick(() => {
+ this.$refs["addExpand"].formList = [
+ this.footerInputList.find((item) => item.id === map[value].formId),
+ ];
+ this.$refs["addExpand"].formType = map[value].formType;
+ this.$refs["addExpand"].showForm();
+ });
+ }else{
+ this.$refs["resiExpand"].formList = this.$refs[
+ "resiExpand"
+ ].formList.filter(
+ (item) => item.formId !== this.incidence[value].formId
+ );
+
+ this.footerInputList.forEach((item) => {
+ if (item.id === this.incidence[value].formId) {
+ item.children.forEach((child) => {
+ child.value = child.itemType === "checkbox" ? [] : null;
+ });
+ }
+ });
+ delete this.form[this.incidence[value].formType];
+ }
+ },
+ submitExpandAdd(form, formType) {
+ this.form[formType] = form[formType];
+ this.dialogVisible = false;
+ },
+ hideExpand(formType) {
+ delete this.form[formType];
+ this.dialogVisible = false;
+ },
// 提交扩展信息
submitExpand(_form, { changId, changPid, changType }) {
if (changType == "checkbox") {
@@ -2185,7 +2267,7 @@ export default {
}
},
},
- components: { stafftag, resiExpand },
+ components: { stafftag, resiExpand ,addExpand},
computed: {},
watch: {},
};
diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue
index 97128f50b..644911953 100644
--- a/src/views/components/resiExpand/editExpand.vue
+++ b/src/views/components/resiExpand/editExpand.vue
@@ -70,6 +70,7 @@
+
@@ -95,6 +96,7 @@ export default {
return {
formType: null,
formList: [],
+ treeCheckKeyList:[],
form: {
// 党员信息
parymemberInfoDto: {
@@ -188,21 +190,12 @@ export default {
lazyLoad: (node, resolve) => {
this.handleNextOrgTreeClick(node, resolve)
},
- isLeaf: (data, node) => {
- console.log(data);
- //根据后台返回的数据判断是否还有下级 是否显示箭头图标
- //el-tree懒加载无子级数据时去掉下拉箭头
- if (data.partyOrgLevel == 7 || data.childrenQty == 0) {
- return true
- }
- },
checkStrictly: true,
multiple: false,
},
changId:null,
changPid:null,
changType:null,
- partyOrgIdPath:null
};
},
props: {
@@ -244,9 +237,8 @@ export default {
if (item.itemType == 'checkbox') {
this.form[item.pformName][item.formName] = item.value || []
} else if (item.itemType == 'cascader1' && item.orgPath) {
- this.partyOrgIdPath = item.orgPath.split(':')[0]
await this.getOrgTree()
- this.form[item.pformName][item.formName] = item.value || null
+ this.form[item.pformName][item.formName] = item.orgPath.split(':') || null
} else{
this.form[item.pformName][item.formName] = item.value != null?item.value:null;
}
@@ -285,7 +277,7 @@ export default {
await this.getTreeChildenList(node, resolve)
},
async getTreeChildenList(node, resolve) {
- if (node.data.partyOrgLevel <= 8) {
+ if (node.data.partyOrgLevel == 7) {
resolve(null);
return;
}
@@ -306,7 +298,7 @@ export default {
},
async getOrgTree() {
try {
- const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { partyOrgId:this.partyOrgIdPath,depth:8 })
+ const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot')
this.formList.forEach(c => {
if (c.formId == "parymemberInfoDto") {
for (let i of c.form[0].children) {
From 7b4be7b22899f9b6bea08a431e5c00eb930fca67 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 09:57:03 +0800
Subject: [PATCH 12/35] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/editResi.vue | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index f856bf897..41430c83f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -2165,12 +2165,14 @@ export default {
}
},
showDialog({ index, value }, event) {
- if (value == 1) {
+ if (value === 1) {
value = 'parymemberInfoDto'
this.form.baseInfoDto.categoryInfo.partyFlag = 1;
- } else if (value == 0) {
+ } else if (value === 0) {
+ value = 'parymemberInfoDto'
this.form.baseInfoDto.categoryInfo.partyFlag = 0;
- } else if (value == 2) {
+ } else if (value === 2) {
+ value = 'parymemberInfoDto'
this.form.baseInfoDto.categoryInfo.partyFlag = 2;
}
if (index != 3 && index) {
@@ -2204,7 +2206,6 @@ export default {
'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
};
-
if (map[value] && event == true) {
this.dialogTitle = map[value].title;
this.dialogVisible = (event == true || value == "parymemberInfoDto") && this.dialogTitle != "";
From 044c48e0ee96e166f83a5882c9fea7605185f411 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 10:14:05 +0800
Subject: [PATCH 13/35] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E5=85=9A=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/portrayal/jumin/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index d373b1a77..fcbd35342 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -1048,7 +1048,7 @@ export default {
password: [{ required: true, message: "请输入密码", trigger: "blur" }],
},
incidence: {
- parymemberInfoDto: {
+ partyFlag: {
formId: "parymemberInfoDto",
formType: "parymemberInfoDto",
title: "党员信息",
From 35003eaed3cdaed49e3b1cafe11cbab0cefda7d7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 16:08:17 +0800
Subject: [PATCH 14/35] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/scss/modules/index.scss | 33 +++++++++++-----------
src/views/modules/home/index.vue | 44 ++++++++++++++++--------------
2 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss
index f86d332f9..abf63be8b 100644
--- a/src/assets/scss/modules/index.scss
+++ b/src/assets/scss/modules/index.scss
@@ -46,7 +46,7 @@
position: relative;
// position: fixed;
padding-left: 14px;
- height: 30px;
+ height: 16px;
margin-right: 10px;
font-size: 15px;
z-index: 1;
@@ -109,13 +109,12 @@
}
.header {
- padding: 4px 0;
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 0, 0, 0.85);
line-height: 17px;
- margin-top: 10px;
+ margin-top: 16px;
margin-left: 10px;
>img {
@@ -128,7 +127,7 @@
.newqsa {
border-left: 4px solid #2683DB;
- height: 70%;
+ height: 100%;
// width: 4px;
margin-left: -10px;
padding-left: 8px;
@@ -155,28 +154,26 @@
.m-search {
box-sizing: border-box;
- padding: 40px 80px;
+ padding: 0px 16px;
margin-bottom: 10px;
- height: 200px;
+ height: 220px;
+ display: flex;
+ flex-direction: column;
// background-image: url("../../images/index/chaxun-bg.png");
background-size: cover;
position: relative;
.wrap {
- position: absolute;
- top: 0;
- left: 0;
+
width: 100%;
}
.mewq {
// background-color: #333;
+ margin-top: 24px;
width: inherit;
- margin-left: -69px;
height: 64px;
- margin-top: 85px;
box-sizing: border-box;
- margin-right: -68px;
display: grid;
grid-template-columns: repeat(7, 1fr);
gap: 5px;
@@ -249,13 +246,12 @@
margin-top: 15px;
display: flex;
align-items: center;
- margin-left: 10px;
.search-input {
position: relative;
left: 0;
right: 0;
- width: 98%;
+ width: 100%;
height: 48px;
background: #ffffff;
border-radius: 4px;
@@ -353,7 +349,7 @@
overflow: hidden;
.flex_box {
- height: calc(100% - 30px);
+ height: 100%;
width: 100%;
overflow: hidden;
display: flex;
@@ -562,8 +558,9 @@
}
.m-tb {
- height: 260px;
-
+ height: 238px;
+ display: flex;
+ flex-direction: column;
.cnt {
box-sizing: border-box;
margin-top: 20px;
@@ -674,4 +671,6 @@
.update-settings {
margin-right: 25px;
+ display: flex;
+ align-items: center;
}
\ No newline at end of file
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index b7f71809f..90cc3a5fa 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -22,7 +22,7 @@
更新设置
