From 8de133a20d6f2dad17bb0f6c7ee046fe9de353a2 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 9 Nov 2022 10:19:02 +0800 Subject: [PATCH 1/9] 1 --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index d1c8a3e7c..e6abb72d8 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api -# VUE_APP_NODE_ENV=dev_sdtdt -VUE_APP_NODE_ENV=dev +VUE_APP_NODE_ENV=dev_sdtdt +# VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file From 99767f4ecd84a52e930460370574a87ff525531d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Nov 2022 11:17:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/epidemic/natFocus/nfVisiteList.vue | 95 +++++++++++++++++- .../base/epidemic/veroFocus/vfVisiteList.vue | 98 +++++++++++++++++-- 2 files changed, 183 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index a95eec6df..e8984d8c4 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -37,6 +37,23 @@ + + + +
- + + +
+
+ +
+ 随访时间： + {{ formData.visitTime||'--' }} +
+
+ 随访内容： + {{ formData.content||'--' }} +
+ +
+
+
取 消 - {{formType==='add'?'取 消':'关 闭'}} + 确 定
+
@@ -116,6 +154,7 @@ export default { data () { return { tableLoading: false, + formType: 'add', tableData: [], total: 0, @@ -188,11 +227,33 @@ export default { }, handleAdd () { + this.formData.id = '' + this.formType = 'add' + this.dialogVisible = true + }, + + handleWatch (row) { + this.formType = 'detail' + this.formData = JSON.parse(JSON.stringify(row)) this.dialogVisible = true }, async handleComfirm () { + + this.$refs['ref_form'].validate((valid, messageObj) => { + if (!valid) { + app.util.validateRule(messageObj) + + } else { + this.handleAddVisit() + } + + }) + + }, + + async handleAddVisit () { this.formData.visitTime = this.formData.visitTime + ':00' let url = "/epmetuser/followup/save" // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save" @@ -205,7 +266,6 @@ export default { } else { this.$message.error(msg) } - }, handleCancle () { @@ -215,6 +275,31 @@ export default { }, + async handleDel (rowData) { + let message = "确认删除?"; + + this.$confirm(message, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.delEvent(rowData.id); + }).catch((err) => { }); + }, + async delEvent (id) { + const url = "/epmetuser/followup/delete"; + let idsArr = [id]; + + const { data, code, msg } = await requestPost(url, idsArr); + + if (code === 0) { + this.$message.success("删除成功！"); + this.loadTable(); + } else { + this.$message.error("操作失败！"); + } + }, + //导出表格 async handleExport () { let today = new Date() @@ -324,5 +409,7 @@ export default { \ No newline at end of file diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue index 882deeffb..5c7885fe5 100644 --- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue +++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue @@ -33,12 +33,29 @@ header-align="center" align="center" label="随访内容" + :show-overflow-tooltip="true" min-width="280"> + + +
@@ -59,7 +76,8 @@ append-to-body @closed="handleCancle">
- + + +
+
+ +
+ 随访时间： + {{ formData.visitTime||'--' }} +
+
+ 随访内容： + {{ formData.content||'--' }} +
+ +
+
+
取 消 - {{formType==='add'?'取 消':'关 闭'}} + 确 定
@@ -118,7 +155,7 @@ export default { data () { return { tableLoading: false, - + formType: 'add', tableData: [], total: 0, pageSize: 20, @@ -189,11 +226,33 @@ export default { }, handleAdd () { + this.formData.id = '' + this.formType = 'add' + this.dialogVisible = true + }, + + handleWatch (row) { + this.formType = 'detail' + this.formData = JSON.parse(JSON.stringify(row)) this.dialogVisible = true }, async handleComfirm () { + + this.$refs['ref_form'].validate((valid, messageObj) => { + if (!valid) { + app.util.validateRule(messageObj) + + } else { + this.handleAddVisit() + } + + }) + + }, + async handleAddVisit () { + this.formData.visitTime = this.formData.visitTime + ':00' let url = "/epmetuser/followup/save" // let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save" @@ -206,15 +265,40 @@ export default { } else { this.$message.error(msg) } - }, handleCancle () { - this.$refs.ref_form.resetFields() + this.formData.visitTime = '' + this.formData.content = '' this.dialogVisible = false }, + async handleDel (rowData) { + let message = "确认删除?"; + + this.$confirm(message, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.delEvent(rowData.id); + }).catch((err) => { }); + }, + async delEvent (id) { + const url = "/epmetuser/followup/delete"; + let idsArr = [id]; + + const { data, code, msg } = await requestPost(url, idsArr); + + if (code === 0) { + this.$message.success("删除成功！"); + this.loadTable(); + } else { + this.$message.error("操作失败！"); + } + }, + //导出表格 async handleExport () { let today = new Date() @@ -324,5 +408,7 @@ export default { \ No newline at end of file From b45c08a6d5b6c348dcbab701f8d9b7fca25304cc Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Nov 2022 14:10:55 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=BD=A2=E6=88=90=E6=9F=A5=E8=AF=A2=E6=94=B9=E6=88=90?= =?UTF-8?q?name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhongdianxingcheng/zhongdianxingcheng.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue index c3084c377..184dc1c5f 100644 --- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue @@ -99,6 +99,7 @@ export default { colorArray: [], pieData: [], + name: '', code: '', dangerLevel: '', @@ -192,11 +193,15 @@ export default { }, async handleAreaChange (val) { + + debugger if (val.length > 0) { // this.code = val.join('-') - this.code = val[val.length - 1] + // this.code = val[val.length - 1] + this.name = this.$refs["sourceArea"].getCheckedNodes()[0].label } else { - this.code = '' + // this.code = '' + this.name = '' } await this.getPieChart() @@ -268,7 +273,8 @@ export default { const url = "/epmetuser/tripreport/emphasisTripPieDetail"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail"; let params = { - code: this.code, + + name: this.name, }; @@ -418,7 +424,7 @@ export default { const url = "/epmetuser/tripreport/list"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list"; let params = { - code: this.code, + name: this.name, dangerLevel: this.dangerLevel, pageNo: this.demand.pageNo, pageSize: this.demand.pageSize, @@ -491,6 +497,9 @@ export default { this.getApiData(); window.scrollTo(0, 0); }, + // sourceAllCode (val) { + // // debugger + // } }, }; From 87618a57f0a6e478b044c5c7b635853d77c2fb08 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 9 Nov 2022 14:42:47 +0800 Subject: [PATCH 4/9] 111 --- .../epidemic/travelPanshi/travelPanshi.vue | 101 ++++++++++++------ .../travelPanshi/travelPanshiDetail.vue | 12 +++ .../travelPanshi/travelPanshiForm.vue | 24 +++++ 3 files changed, 105 insertions(+), 32 deletions(-) diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue index b0f12aa69..23918787d 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue @@ -39,23 +39,6 @@ - - - - - - - - -
-
@@ -83,6 +66,36 @@ + + + + + + + + + + + + + + + + - - - + + --> - - + --> - - + --> - + + + 来源地： {{ formData.sourceAddress||'--' }}
+
+ 7天内到达或途经： + {{ formData.passBy||'--' }} +
详细地址： {{ formData.sourceDetailAddress||'--' }} @@ -92,10 +96,18 @@ 上报时间： {{ formData.reportingTime||'--' }}
+
+ 管控措施： + {{ formData.controlMeasures||'--' }} +
类型： {{ formData.tripDataTypeName||'--' }}
+
+ 上报人： + {{ formData.createdByName||'--' }} +
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue index c136bce6a..ad0f5ff16 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue @@ -117,6 +117,15 @@ v-model="formData.sourceDetailAddress"> + + + + @@ -274,6 +283,19 @@ + + + + Date: Wed, 9 Nov 2022 16:05:31 +0800 Subject: [PATCH 5/9] 11 --- .../scss/modules/visual/issue-info.scss | 10 ++ .../travelPanshi/travelPanshiDetail.vue | 9 +- .../travelPanshi/travelPanshiForm.vue | 4 +- .../zhongdianxingcheng/detail.vue | 110 ++++++++++++++---- 4 files changed, 102 insertions(+), 31 deletions(-) diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss index dc3fe2fdb..20ac3ed44 100644 --- a/src/assets/scss/modules/visual/issue-info.scss +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -90,11 +90,21 @@ flex: 0 0 1; font-size: 14px; } + .info-title-3 { + // width: 140px; + flex: 0 0 140px; + font-size: 14px; + } + > span, > div { display: block; max-width: 300px; } + .info-content{ + flex: 0 0 500px; + max-width: 500px; + } &::before { content: ""; diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue index 2f4f172a9..915d8ff91 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue @@ -32,14 +32,15 @@ 来源地： {{ formData.sourceAddress||'--' }} -
- 7天内到达或途经： - {{ formData.passBy||'--' }} -
+
详细地址： {{ formData.sourceDetailAddress||'--' }}
+
+ 7天内到达或途经： + {{ formData.passBy||'--' }} +
来曹事由： {{ formData.describeContent||'--' }} diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue index ad0f5ff16..e39473b3a 100644 --- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue +++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue @@ -270,7 +270,7 @@ label="0">否 - - + -->
+
+ 姓名： + {{ formData.name||'--' }} +
+ +
+ 手机号： + {{ formData.showMobile||'--' }} +
- 姓名： - {{ info.name||'--' }} + 证件号： + {{ formData.showIdCard||'--' }} +
+
+ 户籍地： + {{ formData.registeredResidence||'--' }}
- 手机： - {{ info.mobile||'--' }} + 来源地： + {{ formData.sourceAddress||'--' }}
- 证件号： - {{ info.idCard||'--' }} + 详细地址： + {{ formData.sourceDetailAddress||'--' }}
- 来源地： - {{ info.sourceAddress||'--' }} + 7天内到达或途经： + {{ formData.passBy||'--' }} +
+
+ 来曹事由： + {{ formData.describeContent||'--' }} +
+
+ 48小时核酸： + {{ formData.natOutcomeName||'--' }}
- 来曹事由： - {{ info.describeContent||'--' }} + 来到本地时间： + {{ formData.arriveDate||'--' }} +
+ +
+ 在曹居住地点： + {{ formData.presentAddress||'--' }} +
+
+ 详细地址： + {{ formData.detailAddress||'--' }} +
+
+ 返回方式： + {{ formData.trafficTypeName||'--' }} +
+
+ 具体方式： + {{ formData.trafficTypeExplain||'--' }} +
+
+ 7天内旅居史情况： + {{ formData.sojournHistoryName||'--' }} +
+
+ 隔离状态： + {{ formData.isolateTypeName||'--' }}
- 48小时核酸： - {{ info.natOutComeName||'--' }} + 备注： + {{ formData.remark||'--' }} +
+
+ 是否落实"落地检"： + {{ formData.isArriveCheckName||'--' }} +
+
+ 是否到达曹县： + {{ formData.isArriveName||'--' }} +
+ +
+ 上报时间： + {{ formData.reportingTime||'--' }}
- 7天旅居史： - {{ info.sojournHistoryName||'--' }} + 管控措施： + {{ formData.controlMeasures||'--' }}
- 隔离状态： - {{ info.isolateTypeName||'--' }} + 类型： + {{ formData.tripDataTypeName||'--' }}
- 来曹时间： - {{ info.arriveDate||'--' }} + 上报人： + {{ formData.createdByName||'--' }}
@@ -92,7 +152,7 @@ export default { data () { return { - info: { + formData: { name: "", mobile: "", idCard: "", @@ -132,8 +192,8 @@ export default { }); if (code === 0) { - this.$set(this.info, 'mobile', data.mobile) - this.$set(this.info, 'idCard', data.idCard) + this.$set(this.formData, 'mobile', data.mobile) + this.$set(this.formData, 'idCard', data.idCard) } else { this.$message.error(msg); } @@ -151,7 +211,7 @@ export default { //加载组织数据 async getInfo () { - const url = "/epmetuser/tripreport/emphasisTripDetail"; + const url = "/epmetuser/tripreport/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail"; let params = { id: this.detailId, @@ -160,10 +220,10 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.info = data + this.formData = data - if (this.info.topicInfo && this.info.topicInfo.publishedTime) { - this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd") + if (this.formData.topicInfo && this.formData.topicInfo.publishedTime) { + this.formData.topicInfo.publishedTimeShow = dateFormat(new Date(this.formData.topicInfo.publishedTime * 1000), "yyyy-MM-dd") } } else { From 1332ca92a0090b6917b1016494410110509aa8f2 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 10 Nov 2022 17:32:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/tinymce2/index.vue | 17 ++- .../regionalParty/activitysDetail.vue | 121 +++++++----------- .../regionalParty/activitysForm.vue | 2 +- 3 files changed, 64 insertions(+), 76 deletions(-) diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index 8f7f561d6..89323c172 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -93,7 +93,7 @@ export default { toolbar: // "formats undo redo paste print fontsizeselect fontselect template fullpage|wordcount ltr rtl visualchars visualblocks toc spellchecker searchreplace|save preview pagebreak nonbreaking|media image|outdent indent aligncenter alignleft alignright alignjustify lineheight underline quicklink h2 h3 blockquote numlist bullist table removeformat forecolor backcolor bold italic strikethrough hr charmap link insertdatetime|subscript superscript cut codesample code |anchor preview fullscreen|help", "formats undo redo|fontsizeselect|fontselect|forecolor backcolor bold italic underline strikethrough removeformat|image media link|outdent indent|aligncenter alignleft alignright alignjustify lineheight quicklink h2 h3 blockquote numlist bullist table|subscript superscript codesample code|preview fullscreen|wordcount|help", - content_style: "p {margin: 5px 0; font-size: 14px}", + content_style: "p {margin: 5px 0; font-size: 14px} img{max-width:100%;}", fontsize_formats: "12px 14px 16px 18px 24px 36px 48px 56px 72px", font_formats: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;", @@ -152,6 +152,21 @@ export default { // tinymce.init; // 初始化 const revert_data = (content) => { + // content = + // ' '; + // content = content.replace(/<(img).*?(>|\/>|<\/img>)/g, function (mats) { + // if (mats.indexOf("style") < 0) { + // return mats.replace( + // /<\s*img/, + // '
-
-
+
-
所属网格： {{ formData.gridName }} @@ -24,8 +21,7 @@
活动内容： -

+

服务人数： @@ -42,90 +38,70 @@
活动地图：
-
-
活动成果： -

- +

-
- 关 闭 - + 关 闭
-
- - - diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 4777fb487..1c1dfc789 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -349,7 +349,7 @@ export default { let style_img = "style='width:50px;height:40px;' " if (this.formData.content) { - this.formData.content = this.formData.content.replace(/ Date: Thu, 10 Nov 2022 17:44:38 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BF=98=E6=9C=89=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E4=B9=9F=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/cpts/edit.vue | 425 ++++++++++++---------- 1 file changed, 234 insertions(+), 191 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index cc4fcbf79..afc83f45b 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -1,205 +1,235 @@ @@ -385,7 +427,7 @@ export default { }, }, - data () { + data() { return { iniLoaded: false, loading: false, @@ -407,19 +449,19 @@ export default { computed: {}, watch: { editParams: { - handler () { + handler() { this.computeFmData(); }, deep: true, }, }, - async mounted () { + async mounted() { this.initForm(); }, methods: { - async initForm () { + async initForm() { this.iniFmData(); if (this.formId && this.formType != "add") { @@ -427,11 +469,11 @@ export default { } }, - computeFmData () { + computeFmData() { console.log(this.fmData); }, - iniFmData () { + iniFmData() { const { editParams, fmData, editParamsDiv } = this; editParams.forEach((item, index) => { if (typeof item.value == "function") { @@ -503,7 +545,7 @@ export default { this.iniLoaded = true; }, - handleClickHtmlNode (e) { + handleClickHtmlNode(e) { //在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断 if (e.target.localName.toLowerCase() === "a") { // 通过判端目标节点以后，就能在这里对其进行操作啦。 @@ -512,7 +554,7 @@ export default { } }, - async getFmOptions (index, url, params, cookFn) { + async getFmOptions(index, url, params, cookFn) { const { data, code, msg } = await requestPost(url, { ...params, }); @@ -525,13 +567,13 @@ export default { } }, - handleChangeCascader (vals, item) { + handleChangeCascader(vals, item) { this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { item.handleChangeFn(vals, item, this); } }, - handleChangeSelect (vals, item) { + handleChangeSelect(vals, item) { console.log(vals, item); this.fmData[item["keyName"]] = vals; if (typeof item.handleChangeFn == "function") { @@ -539,14 +581,14 @@ export default { } }, - beforeImgUpload (file, item) { + beforeImgUpload(file, item) { if (typeof item.beforeImgUpload == "function") { if (!item.beforeImgUpload(file, item, this)) return false; } return true; }, - handleImgRemove (file, item) { + handleImgRemove(file, item) { console.log("handleImgRemove", file); let url = file.response ? file.response.data.url : file.url; if (url) { @@ -568,7 +610,7 @@ export default { } }, - handleImgExceed (res, item) { + handleImgExceed(res, item) { console.log(res); // this.$message({ // type: "warning", @@ -576,7 +618,7 @@ export default { // }); }, - handleImgSuccess (res, file, item) { + handleImgSuccess(res, file, item) { console.log("handleImgSuccess", res); if (res.code === 0 && res.msg === "success") { let { fmData } = this; @@ -612,12 +654,12 @@ export default { } }, - handleImgError (res, file, item) { + handleImgError(res, file, item) { console.log(res); }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap (item) { + initMap(item) { let { latitude, longitude } = this.$store.state.user; map = new daiMap( @@ -756,12 +798,12 @@ export default { } }, - watchImg (src) { + watchImg(src) { window.open(src); }, // 过滤文本 - dormatHtml (content) { + dormatHtml(content) { if ( content.startsWith( "\n\n\n\n\n" @@ -773,7 +815,7 @@ export default { return content; }, - cookBeforeSubmit (data) { + cookBeforeSubmit(data) { Object.keys(data).forEach((k) => { if (typeof data[k] == "string") { data[k] = this.dormatHtml(data[k]); @@ -782,7 +824,7 @@ export default { return data; }, - async handleComfirm () { + async handleComfirm() { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; @@ -814,7 +856,7 @@ export default { }); }, - async submit () { + async submit() { const { editConfig, fmData, formType, editFixedParams } = this; if ( typeof editConfig.beforeSubmit == "function" && @@ -854,7 +896,7 @@ export default { } }, - handleCancle () { + handleCancle() { this.$emit("close"); }, }, @@ -927,13 +969,14 @@ export default { .item { min-width: 45%; - .item-rich-text { + /deep/ .item-rich-text { width: 817px; max-height: 500px; overflow: auto; img { max-width: 100%; + height: auto; } &.z-show { box-sizing: border-box; From 1ce89f516744e743bc5de7c717630477a7066ab4 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 11 Nov 2022 15:37:58 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 57 +++++++++++-------- .../plugins/rent/rentcontractreview.vue | 4 +- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index e5924a369..0ca43f14d 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -140,7 +140,7 @@ - +
@@ -187,6 +187,15 @@ + + + + + - + - + @@ -286,7 +295,7 @@
- + @@ -483,9 +492,9 @@ export default { lesseeUnit: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], - lesseeHouseAddress: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], + // lesseeHouseAddress: [ + // { required: true, message: this.$t('validate.required'), trigger: 'blur' } + // ], signDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], @@ -495,9 +504,9 @@ export default { endDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], - fileList: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], + // fileList: [ + // { required: true, message: this.$t('validate.required'), trigger: 'blur' } + // ], // agencyImgList: [ // { required: true, message: this.$t('validate.required'), trigger: 'blur' } // ] @@ -939,20 +948,20 @@ export default { if (!valid) { return false } - const isUploadIdCardImgList = this.dataForm.tenantList.some(item => { - return item.idCardImgList.length == 0 - }) - if (isUploadIdCardImgList) { - this.$message.error('请上传成员证件照片') - return - } - const isUploadImgList = this.dataForm.tenantList.some(item => { - return item.imgList.length == 0 - }) - if (isUploadImgList) { - this.$message.error('请上传成员照片') - return - } + // const isUploadIdCardImgList = this.dataForm.tenantList.some(item => { + // return item.idCardImgList.length == 0 + // }) + // if (isUploadIdCardImgList) { + // this.$message.error('请上传成员证件照片') + // return + // } + // const isUploadImgList = this.dataForm.tenantList.some(item => { + // return item.imgList.length == 0 + // }) + // if (isUploadImgList) { + // this.$message.error('请上传成员照片') + // return + // } if (this.dataForm.lessorRelation == '中介') { if (this.dataForm.agencyImgList.length == 0) { this.$message.error('请上传中介委托照片') diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index a1d211e33..9049969df 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -104,10 +104,10 @@ - + - +
From 9c6a0141ae9ef312243a81140fcabf8ef2b06c59 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 11 Nov 2022 15:46:15 +0800 Subject: [PATCH 9/9] 11 --- src/views/modules/base/epidemic/vaccin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue index 488e094a0..46616b4c4 100644 --- a/src/views/modules/base/epidemic/vaccin.vue +++ b/src/views/modules/base/epidemic/vaccin.vue @@ -394,7 +394,7 @@ export default { this.tableData = data.list; this.tableData.forEach((item) => { - item.isResiUserShow = item.isResiUser === "0" ? "否" : "是"; + item.isResiUserShow = item.isLocalResiUser === "1" ? "是" : "否"; if (item.natResult === "1") { item.natResultShow = "阳性"; } else if (item.natResult === "0") {