From 6f3d579344dd5aaaf898eec41887de789a476a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 18 Feb 2025 15:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=E9=99=90=E7=9A=84?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=EF=BC=8C=E7=AA=97=E5=8F=A3=E7=9A=84=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/smartExcel/cpts/acceptingPersonel.vue | 6 ++++-- .../modules/base/smartExcel/cpts/excel-info.vue | 17 +++++++++-------- .../cpts/excel-template-confirmation.vue | 12 ++++++------ .../modules/base/smartExcel/cpts/excel-view.vue | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue index 7bc9402fe..296cadb02 100644 --- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue +++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue @@ -338,14 +338,16 @@ export default { }, watch: { 'formData.taskPeriod': function (newPeriod) { - if (newPeriod === 'once') { + if (this.showType!=='edit') { + if (newPeriod === 'once') { this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突 } else { this.formData.completeLimitDay = ''; // 如果不是 'once'，可以设置一个默认值 } + } + }, 'formData.completeLimitDay': function (newPeriod) { - if (newPeriod<0) { console.log(newPeriod,"第一次"); this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突 diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index fb2f77b5a..d30279419 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-info.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue @@ -41,6 +41,13 @@
{{formData.type || '数据填报'}}
+ + +
{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : + formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : + '每季度' }}
+ +
- +
{{formData.startTime?formData.startTime.slice(0, 10):formData.startTime }}-{{formData.endTime?formData.endTime.slice(0, 10):formData.endTime }}
 - - -
{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : - formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : - '每季度' }}
- - +
diff --git a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue index ebbb5bc7d..bd9b11e31 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue @@ -91,12 +91,12 @@ export default { }, mounted() { console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx' - // const newUrl = this.fileUrl.replace( - // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, - // `${location.origin}` - // ); - // this.urlToFile(newUrl,this.fileName) - this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName) + const newUrl = this.fileUrl.replace( + /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, + `${location.origin}` + ); + this.urlToFile(newUrl,this.fileName) + // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName) }, props: { diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index 74f23a630..816ecc8c5 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -9,7 +9,7 @@
- 第{{ item.taskNum }}个周期提交 + {{ item.taskPeriodName }}