Commit 65efb352 authored by 周远喜's avatar 周远喜

ok

parent 77a5571f
......@@ -23,7 +23,7 @@
<span v-else v-text="placeholder"> </span>
</div>
</DatePicker>
<div class="time-view" v-else-if="!edit && startDate && endDate">
<div class="time-view" v-else-if="!edit &&( startDate || endDate)">
<span>{{ startDate }}</span>
<span class="jian-tou">{{ jg }} {{ unit }}</span>
<span>{{ endDate }}</span>
......
......@@ -22,11 +22,11 @@
<Filed :span="24" :name="l('userIds')">
<User v-for="(li,i) in entity.userIds" :value="li" :key="i" class="ml10" />
</Filed>
<Filed :span="12" :name="l('startDate')">
<Filed :span="12" name="计划日期">
<DateRange :value="entity"></DateRange>
</Filed>
<Filed :span="12" :name="l('plansToStartDate')">
<DateRange :value="entity" start="plansToStartDate" end="plansToEndTime"></DateRange>
<Filed :span="12" name="执行日期">
<DateRange :value="entity" start="runStartDate" end="runEndTime"></DateRange>
</Filed>
<Filed :span="24" :name="l('note')">
<div v-html="entity.note"></div>
......@@ -173,6 +173,13 @@ export default {
id: this.eid,
status: this.status,
};
if(this.status==1){
params.runStartDate="";
}else if(this.status==2){
params.runEndDate="";
}else if(this.status==3){
params.runEndDate="";
}
Api.updatepart(params).then((r) => {
if (r.success) {
this.$Message.success("任务状态汇报成功");
......
......@@ -205,15 +205,13 @@ export default {
render: (h, params) => {
return h("DateRange", {
props: {
value: params.row,
start: "plansToStartDate",
end: "plansToEndTime",
value: params.row
},
});
},
},
{
key: "startDate",
key: "runStartDate",
title: "执行日期",
align: "center",
high: true,
......@@ -468,10 +466,10 @@ export default {
status: valStatus,
};
if (valStatus == 1) {
params.startDate = "";
params.runStartDate = "";
}
if (valStatus == 2) {
params.endDate = "";
params.runEndDate = "";
}
Api.updatepart(params)
.then((r) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment