From 8fdd56b0c90cbc5ec349f046a8923b3e6f728ba3 Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 23 Nov 2022 18:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCheckpointRegistration.vue | 60 +- .../AppCheckpointRegistration/Edit.vue | 520 ++++++++++++++++++ .../AppCheckpointRegistration/UserInfo.vue | 7 +- .../AppCommunityManagement.vue | 141 ++++- 4 files changed, 688 insertions(+), 40 deletions(-) create mode 100644 src/project/pingchang/AppCheckpointRegistration/Edit.vue diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 92287fc4..96be59bf 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -20,23 +20,30 @@
异常人员
- - -
-
-
+
{{ areaName }} 地区选择
+
+ + +
+
+
{{gatewayName || '卡口选择'}}
卡口选择
+
+
{{handleName || '处置方式'}}
+ + 处置方式 +
@@ -61,6 +68,7 @@
+
@@ -86,13 +94,13 @@ export default { showGateSelect: false, gateList: [], statusImgList: [ - require('./components/img/status0.png'), - require('./components/img/status1.png'), - require('./components/img/status2.png'), - require('./components/img/status3.png'), - require('./components/img/status4.png'), - require('./components/img/status5.png'), - require('./components/img/status6.png'), + require('./components/img/status0.png'), + require('./components/img/status1.png'), + require('./components/img/status2.png'), + require('./components/img/status3.png'), + require('./components/img/status4.png'), + require('./components/img/status5.png'), + require('./components/img/status6.png'), ], options: [ { @@ -101,7 +109,12 @@ export default { backgroundColor: '#dd524d' } } - ] + ], + + handleType: '', + handleName: '', + showhandleSelect: false, + handleList: [], } }, computed: { ...mapState(['user']) }, @@ -111,6 +124,8 @@ export default { this.getCropAreaId() this.getGatewayList() this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => { + this.handleList = this.$dict.getDict('EP_handleType') + this.handleList.unshift({dictValue: '', dictName: '全部'}) this.getList() this.getTotal() }) @@ -136,7 +151,7 @@ export default { this.getList() }, getList() { - this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`) + this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}&handleType=${this.handleType}`) .then((res) => { if (res.code == 0) { @@ -202,6 +217,12 @@ export default { this.gatewayId = e[0].value this.getListInit() }, + handleconfirm(e) { + console.log(e) + this.handleName = e[0].label + this.handleType = e[0].value + this.getListInit() + }, toUser(row) { uni.navigateTo({url: `./UserInfo?id=${row.id}`}) }, @@ -304,6 +325,13 @@ export default { .top-search { padding: 20px 32px; background-color: #fff; + display: flex; + .left { + width: 240px; + } + .right { + width: calc(100% - 240px); + } } .top-select { display: flex; @@ -428,7 +456,7 @@ export default { } } } - .gateway-name { + .gateway-name { max-width: calc(100% - 48px); word-break: break-all; overflow: hidden; diff --git a/src/project/pingchang/AppCheckpointRegistration/Edit.vue b/src/project/pingchang/AppCheckpointRegistration/Edit.vue new file mode 100644 index 00000000..12ad274a --- /dev/null +++ b/src/project/pingchang/AppCheckpointRegistration/Edit.vue @@ -0,0 +1,520 @@ + + + + + diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue index 143d3548..4f57e713 100644 --- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue +++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue @@ -36,7 +36,7 @@
-
行程信息
+
行程信息编辑
出行方式
@@ -221,7 +221,7 @@

{{item.remarks}}

- +
风险处置
移交人员
@@ -286,6 +286,9 @@ export default { } uni.setStorageSync('checkPointContent', i) uni.navigateTo({url: './ChangeUser?delta=1'}) + }, + toEdit() { + uni.navigateTo({url: `./Edit?id=${this.info.id}`}) } }, } diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue index 0d289e3d..692d4f72 100644 --- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue +++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue @@ -1,27 +1,54 @@