diff --git a/src/views/modules/base/smartExcel/cpts/excel-info.vue b/src/views/modules/base/smartExcel/cpts/excel-info.vue index 994369466..ecb469139 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-info.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue @@ -36,19 +36,19 @@
{{formData.createByName}}
- +
{{formData.type || '数据填报'}}
- + -
{{formData.completeLimitDay}}
+
每周期的第{{formData.completeLimitDay}}天内完成
-
{{formData.startTime }}-{{formData.endTime }}
+
{{formData.startTime.slice(0, 10) }}-{{formData.endTime.slice(0, 10) }}
diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue index b8c885c17..d33af12e6 100644 --- a/src/views/modules/base/smartExcel/cpts/filling-info.vue +++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue @@ -18,12 +18,17 @@ -
{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}
+
{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : + formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : + '每季度' }}
-
每周{{formData.completeLimitDay}} {{ formData.completeLimitHour }}
+
每周期内的第{{formData.completeLimitDay }} {{formData.completeLimitHour}} + 内完成 +
@@ -36,13 +41,13 @@
{{ formData.createByName }}
- +
{{ formData.userName }}
- 转派其他接收人 + 转派其他接收人
@@ -73,9 +78,11 @@
- +
{{ formData.taskTitle }}
-
({{ formData.taskStateName }})
+
+ ({{ formData.taskStateName }})
@@ -89,8 +96,10 @@ @@ -139,6 +148,7 @@ export default { pageNo: 1, pageSize: 100, taskId: this.formData.taskId, + userId:this.formData.userId }; await requestGet('/actual/base/communityOneTablePeriodPublish/getPeriodTaskList', parms).then(res => { this.tableData = res.data.list diff --git a/src/views/modules/base/smartExcel/index.vue b/src/views/modules/base/smartExcel/index.vue index bdc27e7cd..c6957ea1a 100644 --- a/src/views/modules/base/smartExcel/index.vue +++ b/src/views/modules/base/smartExcel/index.vue @@ -50,7 +50,7 @@
-
+
新增
@@ -190,11 +190,11 @@ export default { }, computed: { maxTableHeight() { - const h = this.clientHeight - this.searchH - 275; - const _h = this.clientHeight - 275 - this.searchH; - return this.$store.state.inIframe ? h : _h; - }, - ...mapGetters(["clientHeight"]), + const h = this.clientHeight - this.searchH - 200 + this.iframeHeight; + const _h = this.clientHeight - 200 - this.searchH; + return this.$store.state.inIframe ? h : _h; + }, + ...mapGetters(["clientHeight", "iframeHeight"]), }, watch: { },