From 312a02ca89c0aecf36025adae7322cc89fcc4223 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 18 Apr 2022 09:15:41 +0800 Subject: [PATCH 1/6] 111 --- src/assets/scss/pages/caiji.scss | 11 ++- .../base/epidemic/natFocus/natFocusList.vue | 7 +- .../base/epidemic/veroFocus/veroFocusList.vue | 5 +- src/views/pages/caijisuccess.vue | 92 +++++++++---------- 4 files changed, 65 insertions(+), 50 deletions(-) diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index 5b9e9d6d..f886d62c 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -99,7 +99,7 @@ font-family: Source Han Serif SC; font-weight: 400; color: #333333; - line-height: 30px; + text-align: left; .content_long{ @@ -108,9 +108,16 @@ align-items: flex-start; .content_title{ - flex:0 0 85px; + min-width: 85px; + // flex:0 0 85px; + flex-shrink: 0; + text-align: right; } } + + .marginT10{ + margin-top:10px; + } } .main { diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 011cbc1b..c8215e63 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -316,7 +316,7 @@ { this.$refs.ref_form_edit.initForm('edit', row) }) }, handleDetail (row) { + this.editFormTitle = "查看核酸检测关注名单" this.editFormShow = true this.$nextTick(() => { this.$refs.ref_form_edit.initForm('detail', row) diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue index 20341268..4c65d7c9 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue @@ -317,7 +317,7 @@ { this.$refs.ref_form_edit.initForm('edit', row) @@ -679,6 +681,7 @@ export default { }, handleDetail (row) { + this.editFormTitle = "查看疫苗接种关注名单" this.editFormShow = true this.$nextTick(() => { this.$refs.ref_form_edit.initForm('detail', row) diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue index 469047a9..3d5a82ca 100644 --- a/src/views/pages/caijisuccess.vue +++ b/src/views/pages/caijisuccess.vue @@ -9,32 +9,33 @@
提交成功
请截图保存，方便核验人员查看
-
+
所属社区：
{{formData.shequName}}
-
+
所属房屋：
-
{{formData.address}}
+ +
所属房屋：所属房屋：所属房屋：所属房屋：
-
- 房主姓名： - {{formData.houseHolderName}} +
+
房主姓名：
+
{{formData.houseHolderName}}
-
- 成员{{index+1}}： - {{item.name}} +
+
成员{{index+1}}：
+
{{item.name}}
-
- 身份证号： - {{item.idNum}} +
+
身份证号：
+
{{item.idNum}}
-
- 手机号： - {{item.mobile}} +
+
手机号：
+
{{item.mobile}}
@@ -75,37 +76,36 @@ export default { let query = this.$route.query this.formData = query.formData - // this.formData = { - // address: "金玉良缘1花好月圆1单元3123123", - // buildId: "1494482424728395778", - // buildName: "花好月圆", - // customerId: "45687aa479955f9d06204d415238f7cc", - // homeId: "other", - // homeName: "3123123", - // houseHolderName: "张三", - // houseType: "1", - // memberList: [ - // { - // customerId: "45687aa479955f9d06204d415238f7cc", - // domicilePlace: "23123", - // heSuanCount: "2", - // idNum: "312312", - // mobile: "15111111111", - // name: "张三", - // }, - // { - // customerId: "45687aa479955f9d06204d415238f7cc", - // domicilePlace: "123123", - // heSuanCount: null, - // idNum: "王二麻", - // mobile: "3123123123", - // name: "李四", - // } - // ] - - - - // } + this.formData = { + shequName: '清江路社区', + address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123", + buildId: "1494482424728395778", + buildName: "花好月圆", + customerId: "45687aa479955f9d06204d415238f7cc", + homeId: "other", + homeName: "3123123", + houseHolderName: "张三", + houseType: "1", + memberList: [ + { + customerId: "45687aa479955f9d06204d415238f7cc", + domicilePlace: "23123", + heSuanCount: "2", + idNum: "312312", + mobile: "15111111111", + name: "张三", + }, + { + customerId: "45687aa479955f9d06204d415238f7cc", + domicilePlace: "123123", + heSuanCount: null, + idNum: "王二麻", + mobile: "3123123123", + name: "李四", + } + ] + + } console.log(this.formData) }, From 11f26bb9330cb6f95fb58c6cfd556f3f4e2b20ac Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 18 Apr 2022 09:18:36 +0800 Subject: [PATCH 2/6] 11 --- src/views/pages/caijisuccess.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue index 3d5a82ca..8bf80bfc 100644 --- a/src/views/pages/caijisuccess.vue +++ b/src/views/pages/caijisuccess.vue @@ -16,8 +16,8 @@
所属房屋：
- -
所属房屋：所属房屋：所属房屋：所属房屋：
+
{{formData.address}}
+
房主姓名：
From a69c396d7d5f3274ece243d7d36d360aaee47b81 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 18 Apr 2022 10:26:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/roomTable copy.vue | 4 ++++ src/views/modules/base/community/roomTable.vue | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/views/modules/base/community/roomTable copy.vue b/src/views/modules/base/community/roomTable copy.vue index 4420c911..ecc109bb 100644 --- a/src/views/modules/base/community/roomTable copy.vue +++ b/src/views/modules/base/community/roomTable copy.vue @@ -295,7 +295,11 @@ export default { }, async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentState) { + this.tableLoading = true + this.ownerName = ownerName + this.ownerPhone = ownerPhone + this.rentState = rentState let params = { pageSize: this.pageSize, pageNo: this.pageNo, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index b57557e9..91e30c8e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -171,6 +171,9 @@ export default { // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 + ownerName: '', + ownerPhone: '', + rentFlag: '', validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 selection: [], @@ -234,6 +237,10 @@ export default { async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentFlag) { this.tableLoading = true + this.ownerName = ownerName + this.ownerPhone = ownerPhone + this.rentFlag = rentFlag + let params if (fromTree) { From f8ca6d78cda46288071f9da01817cee170a3a281 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 18 Apr 2022 17:28:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=87=E9=9B=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 14 ++++++++++++++ src/views/pages/caijisuccess.vue | 25 ------------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index dbc9e5f3..496ab839 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -912,9 +912,23 @@ export default { } /deep/ .mint-popup-bottom { + height: 300px; width: 100vw; } +// /deep/ .picker { +// height: 300px; +// } +/deep/ .picker-items { + height: 250px; + width: 100vw; +} +/deep/ .picker-slot-center { + width: 100vw; +} +/deep/ .picker-center-highlight { + top: 35%; +} .picker-toolbar-title { display: flex; flex-direction: row; diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue index 8bf80bfc..82fa267b 100644 --- a/src/views/pages/caijisuccess.vue +++ b/src/views/pages/caijisuccess.vue @@ -122,29 +122,4 @@ export default { From b20cf20edd1e4e39d9d7ab66807323bcf9f64fa2 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 19 Apr 2022 09:32:10 +0800 Subject: [PATCH 5/6] dd --- .../modules/visual/basicinfo/peopleList.vue | 26 +++++++++++-------- .../modules/visual/measure/dialogInfo.vue | 2 +- src/views/modules/visual/measure/service.vue | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue index 91e30121..0009c234 100644 --- a/src/views/modules/visual/basicinfo/peopleList.vue +++ b/src/views/modules/visual/basicinfo/peopleList.vue @@ -68,16 +68,15 @@
- -
-
@@ -112,7 +111,7 @@ export default { headerList: [], tableData: [], searchName: '', - pageSize: 7, + pageSize: 10, pageNo: 1, total: 0, orgLevel: 'search', @@ -236,8 +235,13 @@ export default { height: 780px; margin: 20px auto; } +.warning-table { + height: 640px; +} .pagination { + padding-right: 0; margin-top: 0; + text-align: right; } .g-bread { padding: 10px 20px; diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue index 1f1faaea..5ba13eb3 100644 --- a/src/views/modules/visual/measure/dialogInfo.vue +++ b/src/views/modules/visual/measure/dialogInfo.vue @@ -92,7 +92,7 @@
-
+
尚有 ${item.serviceDemandTotal} 个需求未完成
` }else { - desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成需求 ${item.serviceDemandTotal} 个
` + desc += `
共有 ${item.totalService} ${unit} ${item.legendName} 完成 ${item.serviceDemandTotal} 个需求
` } }) From d61018b8bdf21b92d0fac10a7ba259760569f347 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 19 Apr 2022 15:52:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 44239586..866ee5f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,7 +115,7 @@ export const moduleShujuRoutes = { name: "home2", meta: { title: "主页2", - isTab: true, + isTab: false, }, }, { @@ -125,7 +125,7 @@ export const moduleShujuRoutes = { name: "visual-basicinfo-people", meta: { title: "个人详情", - isTab: true, + isTab: false, }, }, { @@ -135,7 +135,7 @@ export const moduleShujuRoutes = { name: "visual-basicinfo-people-list", meta: { title: "人员列表", - isTab: true, + isTab: false, }, }, ],