Commit 5950334f authored by 康振飞's avatar 康振飞

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

parents 77479028 407d16b4
......@@ -1447,6 +1447,7 @@ export default {
quantity:'生产数量',
beginTime:'开始时间',
endTime:'结束时间',
planEndTime:'计划结束时间',
action:'操作'
}
}
......@@ -60,7 +60,9 @@
<Col span="16" class="row">
<p>{{l("beginTime")}}{{row.beginTime}}</p>
<p>
<span v-if="getStatus(row.status)">计划</span>结束时间:{{row.endTime}}
<span v-if="getStatus(row.status)">{{l("planEndTime")}}</span>
<span v-else>{{l("endTime")}}</span>
{{row.endTime}}
</p>
<p v-if="getStatus(row.status)&&getTimes(row.endTime)>0">
剩余时间:
......
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