Skip to content

M
mes-ui
Commit a0de9c00 authored by renjintao's avatar renjintao
Browse files
Options

tasktime

parent 9971fe60
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 77 deletions
pages/produce/execute/taskTime/index.vue
View file @ a0de9c00
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<p class="gs_p"> <p class="gs_p">
<span class="b_size">100</span> 秒 <span class="b_size">100</span> 秒
</p>--> </p>-->
<p class="gs_footer"> <p class="gs_footer" v-if="topInfoShow.subWorkHourStatus==0">
<a class="gs_edit" @click="editItem(item, index)"> <a class="gs_edit" @click="editItem(item, index)">
<Icon type="md-create" /> <Icon type="md-create" />
编辑 编辑
...@@ -65,13 +65,7 @@ ...@@ -65,13 +65,7 @@
<Icon type="ios-add" style="vertical-align: middle" /> <Icon type="ios-add" style="vertical-align: middle" />
</a> </a>
</div> </div>
<div style=" <div style="text-align: center;height: 50px;width: 100%; position: absolute;bottom: 25px;" v-if="topInfoShow.subWorkHourStatus==0">
text-align: center;
height: 50px;
width: 100%;
position: absolute;
bottom: 25px;
">
<Button type="primary" v-noClick @click="submitWorkHour" style="height: 50px; width: 100px"> <Button type="primary" v-noClick @click="submitWorkHour" style="height: 50px; width: 100px">
提交 提交
</Button> </Button>
......
pages/produce/workHour/index.vue
View file @ a0de9c00
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
<Ellipsis :text="row.mesCode" :lines="1" tooltip transfer /> <Ellipsis :text="row.mesCode" :lines="1" tooltip transfer />
</Col> </Col>
<Col :span="4"> <Col :span="4">
<div class="statuBg" :style="tdStyle(row.subWorkHourStatus)"></div> <div class="statuBg" :style="tdStyle(row.subWorkHourStatus?row.subWorkHourStatus:0)"></div>
<div class="boxTitle"> <div class="boxTitle">
<div class="text"> <div class="text">
<state code="orderList.workHourStatus" ref="state" :value="row.subWorkHourStatus" type="text" :color="false"></state> <state code="orderList.workHourStatus" ref="state" :value="row.subWorkHourStatus?row.subWorkHourStatus:0" type="text" :color="false"></state>
</div> </div>
</div> </div>
</Col> </Col>
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
title: this.l("subWorkHourStatus"), title: this.l("subWorkHourStatus"),
align: "center", align: "center",
high: true, high: true,
code: "workHour.status", code: "orderList.workHourStatus",
width: 120, width: 120,
}, },
{ {
......
pages/technology/details/detail.vue
View file @ a0de9c00
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('taskSeq')">{{entity.taskSeq}}</Filed> <Filed :span="12" :name="l('taskSeq')">{{entity.taskSeq}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed> <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('equipType')">{{entity.equipType}}</Filed> <Filed :span="12" :name="l('equipType')">{{entity.equipType}}</Filed>
<Filed :span="12" :name="l('resourceType')"> <Filed :span="12" :name="l('resourceType')">
<!-- <state code="Process.routing_detail.resource_type" :value="entity.resourceType" type="text"></state> --> <!-- <state code="Process.routing_detail.resource_type" :value="entity.resourceType" type="text"></state> -->
{{entity.resourceCode}} {{entity.resourceCode}}
</Filed> </Filed>
<Filed :span="12" :name="l('isImportant')"> <Filed :span="12" :name="l('isImportant')">
<state code="Process.state" :value="entity.isImportant" type="text"></state> <state code="Process.state" :value="entity.isImportant" type="text"></state>
</Filed> </Filed>
<!-- <Filed :span="12" :name="l('isImportantResources')"> <!-- <Filed :span="12" :name="l('isImportantResources')">
<state code="Process.state" :value="entity.isImportantResources" type="text"></state> <state code="Process.state" :value="entity.isImportantResources" type="text"></state>
</Filed> --> </Filed> -->
<Filed :span="12" :name="l('setupTime')"><OutputTime :value="entity.setupTime"></OutputTime></Filed> <Filed :span="12" :name="l('setupTime')">
<Filed :span="12" :name="l('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed> <OutputTime :value="entity.setupTime"></OutputTime>
<Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed> </Filed>
<Filed :span="12" :name="l('realWorkingHours')"><OutputTime :value="entity.realWorkingHours"></OutputTime></Filed> <Filed :span="12" :name="l('runtime')">
<Filed :span="12" :name="l('isOutside')"> <OutputTime :value="entity.runtime"></OutputTime>
<state code="Process.state" :value="entity.isOutside" type="text"></state> </Filed>
</Filed> <Filed :span="12" :name="l('performanceWorkingHours')">
<Filed :span="12" :name="l('outsideTime')"><OutputTime :value="entity.outsideTime"></OutputTime></Filed> <OutputTime :value="entity.performanceWorkingHours"></OutputTime>
<Filed :span="12" :name="l('isParticipateIntime')"> </Filed>
<state code="Process.state" :value="entity.isParticipateIntime" type="text"></state> <Filed :span="12" :name="l('performanceHours')">
</Filed> <OutputTime :value="entity.performanceHours"></OutputTime>
<Filed :span="12" :name="l('efficiencyValue')">{{entity.efficiencyValue}}</Filed> </Filed>
<Filed :span="12" :name="l('singleOut')">{{entity.singleOut}}</Filed> <Filed :span="12" :name="l('isOutside')">
<Filed :span="24" :name="l('taskContent')" > <state code="Process.state" :value="entity.isOutside" type="text"></state>
<div v-html="entity.taskContent" class="tohtml"></div> </Filed>
</Filed> <Filed :span="12" :name="l('outsideTime')">
<OutputTime :value="entity.outsideTime"></OutputTime>
</Filed>
<Filed :span="12" :name="l('isParticipateIntime')">
<state code="Process.state" :value="entity.isParticipateIntime" type="text"></state>
</Filed>
<Filed :span="12" :name="l('efficiencyValue')">{{entity.efficiencyValue}}</Filed>
<Filed :span="12" :name="l('singleOut')">{{entity.singleOut}}</Filed>
<Filed :span="24" :name="l('taskContent')">
<div v-html="entity.taskContent" class="tohtml"></div>
</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
name: "Add", name: "Add",
data() { data() {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
code: [{ required: true, message: "必填", trigger: "blur" }] required: true,
} message: "必填",
}; trigger: "blur"
}, }],
props: { code: [{
eid: Number required: true,
}, message: "必填",
mounted() { trigger: "blur"
if (this.eid > 0) { }]
this.load(this.eid); }
} };
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit("on-load");
});
}, },
handleClose() { props: {
this.$emit("on-close"); eid: Number
}, },
l(key) { mounted() {
key = "routing_detail" + "." + key; if (this.eid > 0) {
return this.$t(key); this.load(this.eid);
} }
}, },
watch: { methods: {
eid(v) { load(v) {
if (v > 0) { Api.get({
this.load(v); id: v
} }).then(r => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "routing_detail" + "." + key;
return this.$t(key);
}
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
} }
}
}; };
</script> </script>
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