From a69908c5364246f1d25ec7617e1d8fff7d7b4361 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 27 Jan 2022 14:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/AppSpecialPeople/addPrisonUser.vue | 171 +++++++++++--------- src/sass/AppSpecialPeople/detail.vue | 77 ++++----- src/sass/AppSpecialPeople/img/del-icon.png | Bin 0 -> 1415 bytes src/sass/AppSpecialPeople/img/edit-icon.png | Bin 0 -> 1352 bytes 4 files changed, 133 insertions(+), 115 deletions(-) create mode 100644 src/sass/AppSpecialPeople/img/del-icon.png create mode 100644 src/sass/AppSpecialPeople/img/edit-icon.png diff --git a/src/sass/AppSpecialPeople/addPrisonUser.vue b/src/sass/AppSpecialPeople/addPrisonUser.vue index f415eec9..663220a6 100644 --- a/src/sass/AppSpecialPeople/addPrisonUser.vue +++ b/src/sass/AppSpecialPeople/addPrisonUser.vue @@ -46,79 +46,33 @@ -
- 详细地址 -
- + + +
+ +
+ {{item.label}} +
+ +
-
-
- 所属网格 -
- + +
+ {{item.label}} +
+ {{ $dict.getLabel(item.dict, form[item.formDbName]) || '请选择'}} + +
-
-
- 是否累犯 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - -
-
-
- 原罪名 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - -
-
-
- 服刑场所 -
- -
-
-
- 危险性评估 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - -
-
-
- 安置情况 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - -
-
-
- 安置时间 -
- {{ $dateFormat(form.startDate,'YYYY-MM-DD') || '请选择' }} - -
-
-
- 衔接情况 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - -
-
-
- 衔接时间 -
- {{ $dateFormat(form.startDate,'YYYY-MM-DD') || '请选择' }} - -
-
-
- 是否重新犯罪 -
- {{ $dict.getLabel('houselivingStatus', form.livingStatus) || '请选择'}} - + +
+ {{item.label}} +
+ {{ $dateFormat(form[item.formDbName],'YYYY-MM-DD') || '请选择' }} + +
+
@@ -126,7 +80,7 @@
请选择 - +
@@ -138,13 +92,82 @@ export default { data() { return { form: { - }, dateShow: false, deteParams: {year: true, month: true, day: true, hour: false, minute: false, second: false}, showSelect: false, selectDict: '', - selectName: '' + selectName: '', + + tableIndex: 0, + tableData: [ + { + list: [ + { + label: '详细地址', + type: 'input', + formDbName: 'address' + }, + { + label: '所属网格', + type: 'gird', + formDbName: 'girdId' + }, + { + label: '是否累犯', + type: 'select', + dict: 'shouseholdRelation', + formDbName: 'shouseholdRelation' + }, + { + label: '原罪名', + type: 'select', + dict: 'houselivingStatus', + formDbName: 'houselivingStatus' + }, + { + label: '服刑场所', + type: 'input', + formDbName: 'value' + }, + { + label: '危险性评估', + type: 'select', + dict: 'houselivingStatus', + formDbName: 'houselivingStatus', + }, + { + label: '安置情况', + type: 'select', + dict: 'houselivingStatus', + formDbName: 'houselivingStatus', + }, + { + label: '安置时间', + type: 'time', + formDbName: 'houselivingStatus', + }, + { + label: '衔接情况', + type: 'select', + dict: 'houselivingStatus', + formDbName: 'houselivingStatus', + }, + { + label: '衔接时间', + type: 'time', + formDbName: 'houselivingStatus', + }, + { + label: '是否重新犯罪', + type: 'select', + dict: 'houselivingStatus', + formDbName: 'houselivingStatus', + }, + ] + } + ], + selectList: [] } }, computed: {...mapState(['user'])}, @@ -171,6 +194,8 @@ export default { }, selectClick(dictName, formName) { + console.log(dictName) + this.selectList = this.$dict.getDict(dictName) this.dictName = dictName this.selectName = formName this.showSelect = true diff --git a/src/sass/AppSpecialPeople/detail.vue b/src/sass/AppSpecialPeople/detail.vue index e1f4f5f2..c2da460f 100644 --- a/src/sass/AppSpecialPeople/detail.vue +++ b/src/sass/AppSpecialPeople/detail.vue @@ -35,10 +35,10 @@
本月新增
-
-
{{item.label}}
-
{{item.value}}
-
+
+

{{item.value}}

+

{{item.label}}

+
@@ -55,16 +55,15 @@
@@ -87,7 +86,7 @@ export default { areaId: '', areaName: '', tabs: ['统计信息', '人员信息'], - tabIndex: 0, + tabIndex: 1, addressArea: '', statisticsList: [], statisticsListMon: [], @@ -169,7 +168,7 @@ export default { // this.$emit('change', { // type: 'Add', // }) - uni.navigateTo({url: './add'}) + uni.navigateTo({url: './addPrisonUser'}) }, idNumberInit(idNumber) { if(!idNumber) { @@ -189,6 +188,19 @@ export default { this.userList[index].check = true } + }, + toEdit(row) { + // uni.navigateTo({url: './add'}) + }, + del(row) { + this.$confirm('确定删除该数据?').then(() => { + // this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${id}`).then((res) => { + // if (res.code == 0) { + // this.$u.toast('撤回成功！') + // this.getList() + // } + // }) + }) } } } @@ -298,7 +310,6 @@ export default { width: 33%; padding: 40px 0; text-align: center; - h3{ font-size: 64px; font-family: DINAlternate-Bold, DINAlternate; @@ -315,17 +326,6 @@ export default { line-height: 40px; } } - - .num { - display: flex; - justify-content:space-between; - float: none; - width: 100%; - height: 60px; - line-height: 60px; - padding: 0 30px; - box-sizing: border-box; - } } .color-org{ .num-item{ @@ -376,24 +376,23 @@ export default { } .user-info{ width: 100%; - .user-tel { - display: flex; - justify-content: space-between; - - .name{ + .name{ font-size: 32px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: #333; line-height: 44px; margin-bottom: 8px; - } - - .tel { - color: #999; + .btn-icon{ + float: right; + img{ + width: 48px; + height: 48px; + margin-left: 40px; + vertical-align: baseline; + } } } - .phone{ width: 100%; font-size: 26px; @@ -402,12 +401,6 @@ export default { line-height: 36px; display: flex; justify-content: space-between; - - .edit, - .del { - padding: 0 20px; - color: #2197f2; - } } } } diff --git a/src/sass/AppSpecialPeople/img/del-icon.png b/src/sass/AppSpecialPeople/img/del-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0f536bfb4d1447fb8bb29932f26139be15ad7e82 GIT binary patch literal 1415 zcmV;21$g?2P)Px)K}keGRA@upnrUoQRTRg6_m#FF)G2M*6bRz57!YYh7R3)3Fz~@GRH+{js0NG> zL$DYyge^pfvc-TAA}z=VQAxcAk0~=l%er{lIe$-N^0sSHj< z3s>KnMDv@D*sA z?)5ueCDrJu8$ix zT}e4`7*=j}#oEX;Ya$FC=uU<*R%;J@gUC2n623bC>$h60BL;yl1C9jX^m*%9Zhz?1 z5%!e9wHoNr1qS#bR0VqvSu|6}!&7=9b+MG%p`_xn?k)T-*x{F>u(Zfx{dfU%xCeIZ zflXgq&sNQbZaJ`Q1C$?wNzcHzkx+dNURz|*%q@UN`nggM1hfY(B9h}u!kP0>xYA-> zJsY~_z|J3G(ceCsiFM@V$-2p(=dIO-XDLmWHyZNBcmQA(GHTC7 z)lQoLoDMY60Q7KEun=@-sbjkAcQ|swqIi0QRh_qg55X!J&>M0evi3|}Jrpf;HpE2h zjTvaXj+8~);M={g!tQ-rgEO`3%sPh=#EC7w7(j}yDw>f_Gl^&@8<6|{{WZs Vg+*=VdDZ{`002ovPDHLkV1g%8p5_1m literal 0 HcmV?d00001 diff --git a/src/sass/AppSpecialPeople/img/edit-icon.png b/src/sass/AppSpecialPeople/img/edit-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6bb392b40894b4256f9b29b630a8a3d95d38e8 GIT binary patch literal 1352 zcmV-O1-JT%P)Px)0!c(cRA@upT3u`uRTTctOlP;Wlr7TMk`M@C5fe;GOZoAEMzkVo6%&jtCdLQ+ z0j=1GkWdm$eDFa8(O9Fz2f9btL}(-;V!K<~9d@_vc02c&JF{DN zx7+T_>~?XTr`^ms=YHS4=boQ?hfsiLD9m+=VQeR&tpKfK=CvTI22hnS9|m)Xh%Ny9 z8#DI_RXtl@MS*;WC$|Q4oo|RM*u#P!Vdl*MoZ4a{`jHfRUlaJy=c7?KSey=uV3e0* z8qYI}CjnHt88nMdlt_68Wq7r=lKysL(>8(re%4m`MHd4v09fo~5C^gm0$%!KP&wJ$ zOmRDUwg~7t`(wU3767%t;Ov?+2+C8n)pTkug*gdG@F0GhnRBj^T{Ldwh={?oZ!Qv9 z!6n@0v+FqXnOqHKelVLm%_0!cC)a|t{_EiLxfbXeDBfJ>E5DE`m_|T`%9VaTSG;JG z3v=ds8n`q_TT(-88i8QQIK;p!PR$lmo`A!()#|b2m@@=qhUK_8zko?Y551?WjPr-#!T< z#9;MfZ$6gO3HB~*nvm8xp%CKUY>ZmYt9|5_;burib-6VRykC|i3 zxZdP1!(B}t+72vQ`0Kuf*T0>K;ma-sIZy8B%DJ?g$-_!?nftNoW$M|ISYSS)I*@3lf z@}O{s9=t0XZ9=n{ST=ruXlSC;WY)Jwof3zq` z{Fe`Ry`*f+ytVoN9j_;MQ%PTNq>?DvE2boglD_0ilCUmbNNd4V~=cpXq|9lJCU&YxsB2%R21ZMn|}ajdxQs}H=gwX0000< KMNUMnLSTZ-3VNde literal 0 HcmV?d00001