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/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 731d2592e..2032ddd83 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -35,7 +35,7 @@
-
+
{{ item.organizationName }}
@@ -62,6 +62,7 @@
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 763a14985..1b5048f7e 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -503,6 +503,7 @@ export default { const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form; // 深复制对象 let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form)); + _obj.attentionCrowds = _obj.attentionCrowds.flat() console.log('213', _obj) switch (this.valueb) { case '党员': @@ -601,7 +602,7 @@ export default { this.$refs.myResiSearch.form.categoryKey = categoryKey; this.$refs.myResiSearch.form.agencyId = agencyId; } - // //呵呵呵哒 + // if (this.valueb == '党员') { // _obj.partyFlag = 1 // this.getTableData(_obj); @@ -968,16 +969,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 +1012,7 @@ export default { } else { this.$message.error(msg); } - } else { - return false; - } - }); }, - handleAdd() { this.$router.push({ name: "add-resi" }); }, @@ -1177,9 +1193,9 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi") { + if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) { this.$nextTick(() => { - this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; @@ -1196,7 +1212,7 @@ export default { }else if(newVal.params.category === 'PARTY_FLAG'){ this.$refs.myResiSearch.form.partyFlag =1; } - this.handleSearchFrom(); + this.handleSearchFrom(); }); } }, 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 @@ + diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index f9619d9fa..fcbd35342 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,7 +21,7 @@
{{ item.name }}