elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2-18的bug

feture-12345
是小王呀\24601 6 months ago
parent
f514edb1ee
commit
0b6e49d59b
3 changed files with 29 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/modules/base/smartExcel/cpts/excel-info.vue
  2. 28
      src/views/modules/base/smartExcel/cpts/filling-info.vue
  3. 12
      src/views/modules/base/smartExcel/index.vue

8
src/views/modules/base/smartExcel/cpts/excel-info.vue
View File

@ -36,19 +36,19 @@
<div>{{formData.createByName}}</div>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-col :span="8" >
<el-form-item label="任务类型">
<div>{{formData.type || '数据填报'}}</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<el-form-item label="完成时限">
<div>{{formData.completeLimitDay}}</div>
<div><span v-if="formData.taskPeriod!=='once'">每周期的第</span>{{formData.completeLimitDay}}<span v-if="formData.taskPeriod!=='once'">天内完成</span></div>
</el-form-item>
</el-col>
<el-col :span="16" v-if="formData.taskPeriod!=='once'">
<el-form-item label="任务完成有效期">
<div>{{formData.startTime }}-{{formData.endTime }}</div>
<div>{{formData.startTime.slice(0, 10) }}-{{formData.endTime.slice(0, 10) }}</div>
</el-form-item>
</el-col>
<el-col :span="16">

28
src/views/modules/base/smartExcel/cpts/filling-info.vue
View File

@ -18,12 +18,17 @@
</el-col>
<el-col :span="8">
<el-form-item label="任务周期">
<div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
<div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' :
formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' :
'每季度' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="完成时限">
<div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周</span>{{formData.completeLimitDay}} {{ formData.completeLimitHour }}</div>
<div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周期内的第</span>{{formData.completeLimitDay }}<span
v-if="formData.taskPeriod == 'once'"> {{formData.completeLimitHour}}</span>
<span v-if="formData.taskPeriod !== 'once'">内完成</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -36,13 +41,13 @@
<div>{{ formData.createByName }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任务接收人">
<div style="display: flex;flex-direction: row; align-items: center;">
<div>{{ formData.userName }}</div>
<el-button v-if="formData.taskStateName !== '已存档'" @click="oncClickInfo('adjust1')" style="margin-left: 10px;"
type="primary">转派其他接收人</el-button>
<el-button v-if="formData.taskStateName !== '已存档'" @click="oncClickInfo('adjust1')"
style="margin-left: 10px;" type="primary">转派其他接收人</el-button>
</div>
</el-form-item>
@ -73,9 +78,11 @@
<div class="flex-wrap flex">
<div class="item flex flex-y flex-center-deputy"
@click="handleClickShowView(formData.subWorkBookId, formData.taskStateName)" :key="index">
<img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor:pointer ;">
<img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor:pointer ;">
<div class="agencyName">{{ formData.taskTitle }}</div>
<div :class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">（{{ formData.taskStateName }}）</div>
<div
:class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">
（{{ formData.taskStateName }}）</div>
</div>
</div>
<div class="flex title flex-center-deputy">
@ -89,8 +96,10 @@
</el-table-column>
<el-table-column prop="taskStateName" fixed="right" label="状态" align="center">
<template slot-scope="scope">
<div :class="scope.row.taskState === 'archived'?'green':scope.row.taskState === 'submit'?'blue':scope.row.taskState === 'rejected'?'black':'orange'">{{
scope.row.taskStateName }}</div>
<div
:class="scope.row.taskState === 'archived'?'green':scope.row.taskState === 'submit'?'blue':scope.row.taskState === 'rejected'?'black':'orange'">
{{
scope.row.taskStateName }}</div>
</template>
</el-table-column>
</el-table>
@ -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

12
src/views/modules/base/smartExcel/index.vue
View File

@ -50,7 +50,7 @@
</div>
</el-form>
</div>
<div class="m-table">
<div class="m-table" >
<div class="div_btn">
<el-button size="small" type="primary " @click="handleAdd">新增</el-button>
</div>
@ -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: {
},

Write Preview
Loading…
Cancel
Save