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 00000000..0f536bfb Binary files /dev/null and b/src/sass/AppSpecialPeople/img/del-icon.png differ diff --git a/src/sass/AppSpecialPeople/img/edit-icon.png b/src/sass/AppSpecialPeople/img/edit-icon.png new file mode 100644 index 00000000..3b6bb392 Binary files /dev/null and b/src/sass/AppSpecialPeople/img/edit-icon.png differ