tasktime

pages/produce/execute/taskTime/index.vue

@@ -51,7 +51,7 @@
                 <p class="gs_p">
                     <span class="b_size">100</span>  秒
         </p>-->
-            <p class="gs_footer">
+            <p class="gs_footer" v-if="topInfoShow.subWorkHourStatus==0">
                 <a class="gs_edit" @click="editItem(item, index)">
                     <Icon type="md-create" />
                     编辑
@@ -65,13 +65,7 @@
             <Icon type="ios-add" style="vertical-align: middle" />
         </a>
     </div>
-    <div style="
-        text-align: center;
-        height: 50px;
-        width: 100%;
-        position: absolute;
-        bottom: 25px;
-      ">
+    <div style="text-align: center;height: 50px;width: 100%; position: absolute;bottom: 25px;" v-if="topInfoShow.subWorkHourStatus==0">
         <Button type="primary" v-noClick @click="submitWorkHour" style="height: 50px; width: 100px">
             提交
         </Button>

pages/produce/workHour/index.vue

@@ -44,10 +44,10 @@
                     <Ellipsis :text="row.mesCode" :lines="1" tooltip transfer />
                     </Col>
                     <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="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>
                     </Col>
@@ -158,7 +158,7 @@ export default {
                     title: this.l("subWorkHourStatus"),
                     align: "center",
                     high: true,
-                    code: "workHour.status",
+                    code: "orderList.workHourStatus",
                     width: 120,
                 },
                 {

pages/technology/details/detail.vue

 <template>
-  <div class="detail">
+<div class="detail">
     <Row>
         <Filed :span="12" :name="l('taskSeq')">{{entity.taskSeq}}</Filed>
         <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
@@ -14,25 +14,36 @@
         <!-- <Filed :span="12" :name="l('isImportantResources')">
         <state code="Process.state" :value="entity.isImportantResources" type="text"></state>
       </Filed> -->
-      <Filed :span="12" :name="l('setupTime')"><OutputTime :value="entity.setupTime"></OutputTime></Filed>
-      <Filed :span="12" :name="l('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed>
-      <Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed>
-      <Filed :span="12" :name="l('realWorkingHours')"><OutputTime :value="entity.realWorkingHours"></OutputTime></Filed>
+        <Filed :span="12" :name="l('setupTime')">
+            <OutputTime :value="entity.setupTime"></OutputTime>
+        </Filed>
+        <Filed :span="12" :name="l('runtime')">
+            <OutputTime :value="entity.runtime"></OutputTime>
+        </Filed>
+        <Filed :span="12" :name="l('performanceWorkingHours')">
+            <OutputTime :value="entity.performanceWorkingHours"></OutputTime>
+        </Filed>
+        <Filed :span="12" :name="l('performanceHours')">
+            <OutputTime :value="entity.performanceHours"></OutputTime>
+        </Filed>
         <Filed :span="12" :name="l('isOutside')">
             <state code="Process.state" :value="entity.isOutside" type="text"></state>
         </Filed>
-      <Filed :span="12" :name="l('outsideTime')"><OutputTime :value="entity.outsideTime"></OutputTime></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')" >
+        <Filed :span="24" :name="l('taskContent')">
             <div v-html="entity.taskContent" class="tohtml"></div>
         </Filed>
     </Row>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -41,8 +52,16 @@ export default {
         return {
             entity: {},
             rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }]
+                name: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }],
+                code: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }]
             }
         };
     },
@@ -56,7 +75,9 @@ export default {
     },
     methods: {
         load(v) {
-      Api.get({ id: v }).then(r => {
+            Api.get({
+                id: v
+            }).then(r => {
                 this.entity = r.result;
                 this.$emit("on-load");
             });