From 97759ee9d2305a9b37ab673a0741f01916e4d32b Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 28 Apr 2022 14:30:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppHealthReport/components/Detail.vue | 2 +- .../AppVillageInfo/components/Event.vue | 2 +- .../oms/apps/AppArticles/components/Event.vue | 2 +- .../apps/AppGridBlock/components/list.vue | 67 +++---------------- .../AppHealthReport/components/Detail.vue | 2 +- 5 files changed, 12 insertions(+), 63 deletions(-) diff --git a/packages/3.0.0/AppHealthReport/components/Detail.vue b/packages/3.0.0/AppHealthReport/components/Detail.vue index 6f73a123..8b908e78 100644 --- a/packages/3.0.0/AppHealthReport/components/Detail.vue +++ b/packages/3.0.0/AppHealthReport/components/Detail.vue @@ -184,7 +184,7 @@ tableData: [], recordList: [], colConfigs: [ - {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'}, + {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'}, {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' } ], tabList: ['基本信息', '每日上报', '异常处理'] diff --git a/packages/wechat/AppVillageInfo/components/Event.vue b/packages/wechat/AppVillageInfo/components/Event.vue index abdd3764..29cb34a9 100644 --- a/packages/wechat/AppVillageInfo/components/Event.vue +++ b/packages/wechat/AppVillageInfo/components/Event.vue @@ -84,7 +84,7 @@ { prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v) }, { prop: 'title', label: '标题', align: 'left' }, { prop: 'status', label: '发布状态', align: 'center', formart: v => this.dict.getLabel('villInfoStatus', v) }, - { prop: 'createDate', label: '发布时间', dateFormart: 'YYYY-MM-DD', align: 'center' }, + { prop: 'createDate', label: '发布时间', dateFormat: 'YYYY-MM-DD', align: 'center' }, { prop: 'createUser', label: '发布人', align: 'center' }, { prop: 'areaName', label: '来源地区', align: 'center' }, { slot: 'options', label: '操作' } diff --git a/project/oms/apps/AppArticles/components/Event.vue b/project/oms/apps/AppArticles/components/Event.vue index 58acab5a..70f8006a 100644 --- a/project/oms/apps/AppArticles/components/Event.vue +++ b/project/oms/apps/AppArticles/components/Event.vue @@ -108,7 +108,7 @@ export default { return [ {prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v)}, {prop: 'title', label: '标题', align: 'left'}, - {prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center'}, + {prop: 'createDate', label: '创建时间', dateFormat: 'YYYY-MM-DD', align: 'center'}, {prop: 'createUser', label: '发布人', align: 'center'}, {slot: 'options', label: '操作'} ] diff --git a/project/sass/apps/AppGridBlock/components/list.vue b/project/sass/apps/AppGridBlock/components/list.vue index f6673505..b1b55ffb 100644 --- a/project/sass/apps/AppGridBlock/components/list.vue +++ b/project/sass/apps/AppGridBlock/components/list.vue @@ -102,6 +102,7 @@ :size.sync="page.size" @selection-change="(v) => (ids = v.map((e) => e.id))" @getList="getList()" + :dict="dict" > import AMapLoader from "@amap/amap-jsapi-loader"; -import Template from '../../../../../packages/wechat/AppAskForm/components/Template.vue'; export default { - components: {Template}, name: "List", label: "网格区块", props: { @@ -260,63 +259,13 @@ export default { let _ = this; return [ {type: 'selection'}, - { - prop: "girdName", - align: "left", - label: "网格名称", - }, - { - prop: "girdCode", - align: "center", - label: "网格编码", - }, - { - prop: "girdType", - align: "center", - label: "网格类型", - render(h, {row}) { - return h("span", {}, _.dict.getLabel("girdType", row.girdType) || '-'); - }, - }, - { - prop: "girdLevel", - align: "center", - label: "网格层级", - render(h, {row}) { - return h("span", {}, _.dict.getLabel("girdLevel", row.girdLevel) || '-'); - }, - }, - { - prop: "plottingStatus", - align: "center", - label: "标绘状态", - render(h, {row}) { - return h( - "span", - { - style: { - color: _.dict.getColor("plottingStatus", row.plottingStatus), - }, - }, - _.dict.getLabel("plottingStatus", row.plottingStatus) - ); - }, - }, - { - prop: "createTime", - align: "center", - label: "创建时间", - render(h, {row}) { - return h("span", {}, row.createTime.substring(0, 11)); - }, - }, - { - prop: "girdMemberNames", - align: "center", - slot: 'user', - width: 200, - label: "网格员", - }, + {prop: "girdName", align: "left", label: "网格名称",}, + {prop: "girdCode", align: "center", label: "网格编码",}, + {prop: "girdType", align: "center", label: "网格类型", dict: "girdType"}, + {prop: "girdLevel", align: "center", label: "网格层级", dict: "girdLevel"}, + {prop: "plottingStatus", align: "center", label: "标绘状态", dict: "plottingStatus"}, + {prop: "createTime", align: "center", label: "创建时间", dateFormat: "YYYY-MM-DD"}, + {prop: "girdMemberNames", align: "center", slot: 'user', width: 200, label: "网格员"}, ]; }, }, diff --git a/project/sass/apps/AppHealthReport/components/Detail.vue b/project/sass/apps/AppHealthReport/components/Detail.vue index d62d6e63..a24d2230 100644 --- a/project/sass/apps/AppHealthReport/components/Detail.vue +++ b/project/sass/apps/AppHealthReport/components/Detail.vue @@ -74,7 +74,7 @@ currIndex: 0, tableData: [], colConfigs: [ - {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'}, + {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'}, { prop: 'status', label: '健康状态', From 192af3122363db1a9176e175b98c7f0a21609806 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 28 Apr 2022 14:32:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=B6=88=E9=99=A4=20?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/jianping/AppHelpedResident/hrAdd.vue | 82 +++++++++++++++---- .../jianping/AppHelpedResident/hrDetail.vue | 37 ++++++++- 2 files changed, 97 insertions(+), 22 deletions(-) diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue index d08e8ecd..f227e9c4 100644 --- a/packages/jianping/AppHelpedResident/hrAdd.vue +++ b/packages/jianping/AppHelpedResident/hrAdd.vue @@ -78,7 +78,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -224,49 +224,83 @@ + + + + @@ -457,7 +491,19 @@ export default { }else { this.form[formName] = '02' } - } + }, + decimalInput(name) { + if(!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])){ + this.form[name] = '' + return this.$message.error('最多只保留两位小数点') + } + }, + numberInput(name) { + if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){ + this.form[name] = '' + return this.$message.error('请输入正整数') + } + }, }, created() { this.getDetail() diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index 83eb6e6e..c8d479b8 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -150,6 +150,21 @@ + + +