From f6803380619f49a89fb4b83fc5d4364f961d6278 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 16:50:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/police/AppPeopleList/Add.vue | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/project/police/AppPeopleList/Add.vue b/src/project/police/AppPeopleList/Add.vue index f077f206..b1cce122 100644 --- a/src/project/police/AppPeopleList/Add.vue +++ b/src/project/police/AppPeopleList/Add.vue @@ -100,7 +100,7 @@
- + *
现住址 @@ -115,7 +115,7 @@
- + *
组 @@ -124,7 +124,7 @@
- + *
户 @@ -249,18 +249,18 @@ export default { // if(!this.form.birthDate) { // return this.$u.toast('请选择出生日期') // } - // if(!this.form.currentAreaId) { - // return this.$u.toast('请选择现住址') - // } - // if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) { - // return this.$u.toast('现住址必须选到村级') - // } - // if(!this.form.currentAddressGroup) { - // return this.$u.toast('请输入组') - // } - // if(!this.form.currentAddressNo) { - // return this.$u.toast('请输入户') - // } + if(!this.form.currentAreaId) { + return this.$u.toast('请选择现住址') + } + if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) { + return this.$u.toast('现住址必须选到村级') + } + if(!this.form.currentAddressGroup) { + return this.$u.toast('请输入组') + } + if(!this.form.currentAddressNo) { + return this.$u.toast('请输入户') + } // if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) { // return this.$u.toast('户籍地必须选到村级') // } @@ -322,9 +322,9 @@ export default { this.$http.post(`/app/appresident/detail?id=${this.form.id}`).then(res => { if (res.code === 0) { this.form = {...res.data.resident} - var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber) - this.form.birthDate = info.birthday - this.form.sex = info.gender + // var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber) + // this.form.birthDate = info.birthday + // this.form.sex = info.gender } }) } From 7056701201257f5442e3d01c5f76e0e7e5383866 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 16:55:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/AppResidentFile/components/document.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/project/police/AppResidentFile/components/document.vue b/src/project/police/AppResidentFile/components/document.vue index 107073f7..5212b1b0 100644 --- a/src/project/police/AppResidentFile/components/document.vue +++ b/src/project/police/AppResidentFile/components/document.vue @@ -6,8 +6,9 @@
{{ top.detail.realName || top.detail.name }} - - {{ IDObj.btn }} + {{resident.idNumber}} +
@@ -30,7 +31,7 @@ {{resident.currentAddressNo}}户
-
+ From 154ad8bdc8a5a7f961ac771ab91b34632307ad7a Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 17:00:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/police/AppPeopleList/Add.vue | 4 +- .../police/AppPeopleList/AppPeopleList.vue | 2 +- .../police/AppPeopleList/DetailCard.vue | 222 ------------ .../police/AppPeopleList/ExamineList.vue | 276 --------------- .../police/AppPeopleList/PeopleList.vue | 320 ------------------ 5 files changed, 3 insertions(+), 821 deletions(-) delete mode 100644 src/project/police/AppPeopleList/DetailCard.vue delete mode 100644 src/project/police/AppPeopleList/ExamineList.vue delete mode 100644 src/project/police/AppPeopleList/PeopleList.vue diff --git a/src/project/police/AppPeopleList/Add.vue b/src/project/police/AppPeopleList/Add.vue index b1cce122..d3318eb5 100644 --- a/src/project/police/AppPeopleList/Add.vue +++ b/src/project/police/AppPeopleList/Add.vue @@ -47,7 +47,7 @@
姓名 - +
@@ -56,7 +56,7 @@
身份证号 - +
diff --git a/src/project/police/AppPeopleList/AppPeopleList.vue b/src/project/police/AppPeopleList/AppPeopleList.vue index dc9870f8..db557863 100644 --- a/src/project/police/AppPeopleList/AppPeopleList.vue +++ b/src/project/police/AppPeopleList/AppPeopleList.vue @@ -127,7 +127,7 @@ export default { }, toDetailCard(item) { - uni.navigateTo({url: `./DetailCard?id=${item.id}`}) + uni.navigateTo({url: `./DetailPeople?id=${item.id}`}) }, changeArea(e) { diff --git a/src/project/police/AppPeopleList/DetailCard.vue b/src/project/police/AppPeopleList/DetailCard.vue deleted file mode 100644 index a776af71..00000000 --- a/src/project/police/AppPeopleList/DetailCard.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - diff --git a/src/project/police/AppPeopleList/ExamineList.vue b/src/project/police/AppPeopleList/ExamineList.vue deleted file mode 100644 index 1266b12c..00000000 --- a/src/project/police/AppPeopleList/ExamineList.vue +++ /dev/null @@ -1,276 +0,0 @@ - - - - - diff --git a/src/project/police/AppPeopleList/PeopleList.vue b/src/project/police/AppPeopleList/PeopleList.vue deleted file mode 100644 index 147bcfb8..00000000 --- a/src/project/police/AppPeopleList/PeopleList.vue +++ /dev/null @@ -1,320 +0,0 @@ - - - - - From ff22be10ea92e53936f126b59c2aaa312e4e0ab4 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 17:11:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/AppPeopleList/DetailPeople.vue | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/project/police/AppPeopleList/DetailPeople.vue b/src/project/police/AppPeopleList/DetailPeople.vue index 61581191..33aee945 100644 --- a/src/project/police/AppPeopleList/DetailPeople.vue +++ b/src/project/police/AppPeopleList/DetailPeople.vue @@ -10,10 +10,6 @@
{{ data.resident && data.resident.name }} 已注销 - 户主 - - {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }} -
{{ data.resident.phone }}
@@ -50,7 +46,22 @@
身份证号 - {{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }} + {{ data.resident.idNumber}} +
+ +
+ 性别 + {{ $dict.getLabel('sex', data.resident.sex) }} +
+ +
+ 出生日期 + {{ data.resident.birthDate }} +
+ +
+ 年龄 + {{ data.resident.age }}
@@ -111,16 +122,6 @@ {{ data.resident.currentAddressGroup }}组{{ data.resident.currentAddressNo }}户
-
- 户籍地址 - {{ data.resident.householdAreaName }} -
- -
- 户籍详细地址 - {{ data.resident.householdAddress }} -
-
处理结果 {{ data.resident.auditStatus == 1 ? '通过' : '不通过' }} From a3c5176c0a263a648be3067ac804b8531cd7b4e7 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 17:14:08 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/AppPeopleList/DetailPeople.vue | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/project/police/AppPeopleList/DetailPeople.vue b/src/project/police/AppPeopleList/DetailPeople.vue index 33aee945..b02b64c1 100644 --- a/src/project/police/AppPeopleList/DetailPeople.vue +++ b/src/project/police/AppPeopleList/DetailPeople.vue @@ -11,28 +11,11 @@
{{ data.resident && data.resident.name }} 已注销
-
{{ data.resident.phone }}
- -
-
-
- - -
-
- - -
- -

{{item.name}}

-

{{item.applicationName}}

-
-
@@ -168,8 +151,6 @@ export default { tabIndex: 0, } }, - computed: {}, - watch: {}, onLoad(o) { this.id = o.id this.type = o.type @@ -181,7 +162,7 @@ export default { }) }, onShow() { - document.title = '家庭成员信息' + document.title = '居民详情' }, methods: { getDetail() { From 10b197b5537d8e90f1dd313c832ec5f205826869 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 16 Jun 2022 17:32:46 +0800 Subject: [PATCH 6/8] BUG 30239 --- .../AppMessageNotification/chooseUser.vue | 51 ++-- .../components/img/gird--select-icon.png | Bin 0 -> 1276 bytes .../components/img/tx@2x.png | Bin 0 -> 1467 bytes .../AppMessageNotification/selectDeptUser.vue | 281 ++++++++++++++++++ 4 files changed, 305 insertions(+), 27 deletions(-) create mode 100644 src/project/police/AppMessageNotification/components/img/gird--select-icon.png create mode 100644 src/project/police/AppMessageNotification/components/img/tx@2x.png create mode 100644 src/project/police/AppMessageNotification/selectDeptUser.vue diff --git a/src/project/police/AppMessageNotification/chooseUser.vue b/src/project/police/AppMessageNotification/chooseUser.vue index 37bd1f39..a1bb5b98 100644 --- a/src/project/police/AppMessageNotification/chooseUser.vue +++ b/src/project/police/AppMessageNotification/chooseUser.vue @@ -9,24 +9,16 @@
-
-

部门

-
- - - -
-
-
-

人员

-
- - - -
-
-
+
+

+

+ +
{{ item.name }}
+ + +
+

{{ item.name }}

@@ -48,6 +40,7 @@ import {mapState} from 'vuex' export default { name: "chooseUser", + appName: "条件选择", data() { return { value: '', @@ -62,12 +55,16 @@ export default { }, computed: { ...mapState(['user']), - moreText() { - if (this.userList.length) return '已选择' - }, - moreTextDept() { - if (this.deptList.length) return '已选择' - }, + deptUserList: { + set(v) { + this.userList = v.filter(e => e.kind == 'user') + this.deptList = v.filter(e => e.kind == 'dept') + }, + get() { + let {userList, deptList} = this + return [userList, deptList].flat() + } + } }, methods: { getTagList() { @@ -75,10 +72,7 @@ export default { if (res?.code == 0) { res.data.records.map((item) => { item.tagList.map((items) => { - items.isCheck = false - if (this.tagIdList.includes(items.id)) { - items.isCheck = true - } + items.isCheck = this.tagIdList.includes(items.id); }) }) this.tagList = res.data.records @@ -281,5 +275,8 @@ export default { font-size: 28px !important; } + .right { + float: right; + } } diff --git a/src/project/police/AppMessageNotification/components/img/gird--select-icon.png b/src/project/police/AppMessageNotification/components/img/gird--select-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..205144d26b442ba78547c82b8b09585c5b7ac0d7 GIT binary patch literal 1276 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 +
+
+
+ + / + {{ item.name }} + +
+
+
+
+ +
+
+
{{ item.name }}
+ +
+
+
+
+
+ +
+
+
+
{{ e.phone }}
+
+
+ +
+
+
确定选择
+
+
+ + + + + From e57b338560533893cd90e9ba6c437fdf07983a50 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 16 Jun 2022 17:49:13 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMessageNotification/chooseUser.vue | 22 +++++++++++-------- .../AppMessageNotification/selectDeptUser.vue | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/project/police/AppMessageNotification/chooseUser.vue b/src/project/police/AppMessageNotification/chooseUser.vue index a1bb5b98..914363d0 100644 --- a/src/project/police/AppMessageNotification/chooseUser.vue +++ b/src/project/police/AppMessageNotification/chooseUser.vue @@ -9,16 +9,17 @@
+
+

部门/人员

+ + + 已选择 + 请选择 + + +
-
-

-

- -
{{ item.name }}
- - -
-

{{ item.name }}

@@ -67,6 +68,9 @@ export default { } }, methods: { + toSelectDept() { + uni.navigateTo({url: `./selectDeptUser`}) + }, getTagList() { this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => { if (res?.code == 0) { diff --git a/src/project/police/AppMessageNotification/selectDeptUser.vue b/src/project/police/AppMessageNotification/selectDeptUser.vue index 288cedfe..2a37efb3 100644 --- a/src/project/police/AppMessageNotification/selectDeptUser.vue +++ b/src/project/police/AppMessageNotification/selectDeptUser.vue @@ -54,7 +54,7 @@ export default { } }, onLoad() { - this.selected = this.$route.query.selected.map(id => ({id})) || [] + this.selected = this.$route.query.selected?.map(id => ({id})) || [] this.getAllDepts() }, methods: { From 42e289250dc029c21df5eb7c9b8a2b468405e431 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 16 Jun 2022 18:23:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/modules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/modules.js b/src/common/modules.js index 1ab93bd8..723034fa 100644 --- a/src/common/modules.js +++ b/src/common/modules.js @@ -26,7 +26,7 @@ export const config = { if (!!params?.action) { action = params.action delete params.action - } else if (!!params.suiteId) { + } else if (!!params?.suiteId) { action = "/app/wxcptp/portal/agentSign" } return http.post(action, null, {