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

2-17bug

feture-12345
是小王呀\24601 6 months ago
parent
67aabe1ef7
commit
c3a92b6bd7
6 changed files with 86 additions and 34 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. 2
      src/assets/scss/modules/management/list-main.scss
  2. 56
      src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
  3. 3
      src/views/modules/base/smartExcel/cpts/excel-add.vue
  4. 18
      src/views/modules/base/smartExcel/cpts/excel-info.vue
  5. 12
      src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
  6. 27
      src/views/modules/base/smartExcel/filling.vue

2
src/assets/scss/modules/management/list-main.scss
View File

@ -73,7 +73,7 @@
box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
position: relative;
padding:24px 16px 10px;
height: 100%;
/deep/ .el-table th, .el-table tr{
height:54px;
}

56
src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
View File

@ -38,13 +38,34 @@
</el-table>
<el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"
style="margin-left: 3%; margin-top: 10px;">
<el-row>
<el-form-item label="任务要求" prop="taskIntroduction" style="display: block">
<el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
placeholder="请输入事件内容，不超过500字" v-model.trim="formData.taskIntroduction"></el-input>
</el-form-item>
<el-form-item label="完成时限" prop="completeLimitDay" v-if="formData.taskPeriod">
<template v-if="formData.taskPeriod === 'once'">
<el-date-picker v-model="formData.completeLimitDay" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" >
</el-date-picker>
</template>
<template v-if="formData.taskPeriod !== 'once'">
<div>
<span>每周期的第 </span>
<el-input-number v-model="formData.completeLimitDay" :max="365" label="天数"
style="width: 150px;padding: 0 5px;"></el-input-number>
<span> 天内完成</span>
</div>
</el-row>
</template>
</el-form-item>
<el-form-item label="任务有效期" prop="effectiveDateRange" v-if="formData.taskPeriod !=='once'"
:rules="[{ required: true, message: '任务有效期不能为空', trigger:'blur' }]">
<template>
<el-date-picker v-model="formData.effectiveDateRange" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</template>
</el-form-item>
</el-form>
<span v-if="showType == 'adjust' || showType == 'edit' || showType == 'adjust1'" slot="footer" class="dialog-footer"
style="margin-left: 40%;">
@ -62,9 +83,10 @@ export default {
return {
tableData: [],
formData: {
effectiveDateRange:[],
taskTitle: '',//任务主题
taskType: '1',//任务类型
taskPeriod: 'once',//任务周期
taskPeriod: '',//任务周期
completeLimitDay: '',//完成时限 一次性时传日期，周期性时传天数
completeLimitHour: '',//完成时限 周期或者一次性都传小时
receiverIds: '',//分发人员
@ -92,10 +114,16 @@ export default {
};
},
created() {
console.log(this.formDatas,"sdfljksdlk");
this.formData.taskPeriod=this.formDatas.taskPeriod
this.formData.completeLimitDay=this.formDatas.completeLimitDay
this.formData.effectiveDateRange.push(this.formDatas.startTime,this.formDatas.endTime)
console.log(this.formData.effectiveDateRange,"sdfjksdf");
},
methods: {
async handleConfirm() {
console.log(this.showType, "dsklmfklds");
console.log(this.selfTag),"dsfkljdslk";
let userIdList = this.selfTag.map(item => {
return item.staffId
@ -114,7 +142,7 @@ export default {
this.$message.error(res.internalMsg)
}
});
this.updateState()
// this.updateState()
} else if (this.showType == "adjust1") {
let parms = {
userId: userIdList.toString(),
@ -130,15 +158,21 @@ export default {
this.$message.error(res.internalMsg)
}
});
this.updateState()
// this.updateState()
}
else {
let parms = {
const parms = {
userIdList: userIdList,
id: this.taskId,
taskIntroduction: this.formData.taskIntroduction
taskIntroduction: this.formData.taskIntroduction,
completeLimitDay:this.formData.completeLimitDay
}
if (this.formData.effectiveDateRange) {
parms.startTime = this.formData.effectiveDateRange[0];
parms.endTime = this.formData.effectiveDateRange[1];
delete this.formData.effectiveDateRange;
}
console.log([parms,"sdjdfsl"]);
requestPost('/actual/base/communityOneTablePublish/update', parms).then(res => {
return this.$emit('handelPersonel')
});
@ -146,7 +180,7 @@ export default {
},
async updateState() {
console.log(this.formDatas,"sdfkljslkdjf");
if(this.showType=="adjust1"){
const url = '/actual/base/communityOneTablePeriodPublish/update'
const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction } = this.formDatas;
@ -270,15 +304,11 @@ export default {
},
mounted() {
console.log(this.showType, this.taskId, "sdlfkl;sdf");
this.formData.taskIntroduction = this.formDatas.taskIntroduction
console.log(this.formData.taskIntroduction,"dsfjhfds");
this.getOrgTreeList()
if(this.showType=="adjust"){
this.getPeriodPublish()
}
},
props: {
taskId: {

3
src/views/modules/base/smartExcel/cpts/excel-add.vue
View File

@ -26,7 +26,7 @@
<el-radio label="quarterly">每季度</el-radio>
</el-radio-group>
<br>
<div>说明：当任务周期选择每周/每月/每半月/每季度时，系统会于每个时间阶段的第一天自动创建阶段性子任务</div>
<div style="color: red;">说明：当任务周期选择每周/每月/每半月/每季度时，系统会于每个时间阶段的第一天自动创建阶段性子任务</div>
</el-form-item>
<el-form-item label="完成时限" prop="completeLimitDay" v-if="form.taskPeriod">
<template v-if="form.taskPeriod === 'once'">
@ -48,6 +48,7 @@
:rules="[{ required: true, message: '任务有效期不能为空', trigger:'blur' }]">
<template>
<el-date-picker v-model="form.effectiveDateRange" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</template>

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

@ -15,6 +15,7 @@
style="display: flex;margin-left: 10px;
justify-content: center; align-items: center; width: 60px; height: 20px; border: 2px solid #ADD8E6; color: #ADD8E6; font-size: 12px;">
{{ formData.taskStateName }}
</div>
</div>
@ -35,11 +36,21 @@
<div>{{formData.createByName}}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="16" >
<el-form-item label="任务类型">
<div>{{formData.type || '数据填报'}}</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="完成时限">
<div>{{formData.completeLimitDay}}</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>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="任务周期">
<div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
@ -71,9 +82,12 @@
style="width: 70%;margin-left: 3%; margin-top: 30px;" >
<el-table-column label="序号" fixed="left" type="index" align="center" width="80" />
<el-table-column prop="taskPeriodName" align="center" :show-overflow-tooltip="true" label="任务周期">
<template slot-scope="scope">
<template slot-scope="scope" v-if="taskPeriod === 'once'">
{{taskPeriod === 'once'?'一次性':`第${scope.row.taskNum}个周期`}}
</template>
<template slot-scope="scope" v-else>
{{scope.row.taskPeriodName}}
</template>
</el-table-column>
<el-table-column fixed="right" label="汇报情况" align="center">
<template slot-scope="scope">

12
src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
View File

@ -72,12 +72,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: {

27
src/views/modules/base/smartExcel/filling.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="g-main">
<div class="g-main" :style="{ height: tableHeight }">
<div v-show="pageType == 'list'">
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
@ -148,18 +148,26 @@ export default {
return {
taskId: "",
statusArray: [
{
label: '未提交',
value: 'notSubmit'
},
{
label: '已提交',
value: 'submit'
value: 'submit',
},
{
label: '已驳回',
value: 'rejected',
},
{
label: '已改派',
value: 'reassigned',
}],
label: '已存档',
value: 'archived',
},
{
label: '已取消',
value: 'cancel',
},],
pageType: "list", // 列表list 新增add 详情info
tableData: [],
formData: {
@ -186,12 +194,11 @@ export default {
};
},
computed: {
maxTableHeight() {
const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
const _h = this.clientHeight - 275 - this.searchH;
return this.$store.state.inIframe ? h : _h;
tableHeight() {
return (this.clientHeight - 140) + 'px'
},
...mapGetters(["clientHeight", "iframeHeight"]),
...mapGetters(['clientHeight', 'resolution']),
},
watch: {
},

Write Preview
Loading…
Cancel
Save