tasktime

pages/produce/execute/components/orderlistWorkHour.vue

@@ -3,12 +3,9 @@
     <div class="card_box">
         <Card class="card_order" v-for="(item,index) in listTasks" :style="order==item.id?'box-shadow: 0px 0px 15px #333;':''" @click.native="goPage(item)" :key="index" :class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3':
                 (item.status==7?'card_border4':(item.status==-1?'card_border5':''))))">
-            <!-- :class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
-        (item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))"-->
             <p slot="title">
                 {{item.mesCode}}
-                <state code="taskList.status" ref="state" class="fr" :value="item.status" type="text"></state>
-                <!-- <span >{{item.status}}</span> -->
+                <state code="orderList.workHourStatus" ref="state" class="fr" :value="item.workHourStatus" type="text"></state>
             </p>
             <p class="order_tit">{{item.productName}}</p>
             <p>

pages/produce/execute/taskTime/index.vue

-
 <template>
-  <div class="gs_set">
+<div class="gs_set">
     <div style="text-align: center; background: wihte; height: 50px">
         产品名称：
-      <span class="">{{ topInfoShow.productName }}</span
-      >&nbsp;&nbsp;&nbsp;&nbsp; 工序号：
-      <span class="">{{ topInfoShow.taskSeq }}</span
-      >&nbsp;&nbsp;&nbsp;&nbsp; 工序名称：
-      <span class="">{{ topInfoShow.name }}</span
-      >&nbsp;&nbsp;&nbsp;&nbsp; 派工数量:
-      <span class="">{{ topInfoShow.count }}</span
-      >&nbsp;&nbsp;&nbsp;&nbsp; 绩效单件：
-      <span class="">{{ topInfoShow.performanceHours }}</span
-      >&nbsp;&nbsp;&nbsp;&nbsp; 绩效准结：
+        <span class="">{{ topInfoShow.productName }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 工序号：
+        <span class="">{{ topInfoShow.taskSeq }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 工序名称：
+        <span class="">{{ topInfoShow.name }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 派工数量:
+        <span class="">{{ topInfoShow.count }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 绩效单件：
+        <span class="">{{ topInfoShow.performanceHours }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 绩效准结：
         <span class="">{{ topInfoShow.performanceWorkingHours }}</span>
     </div>
     <div class="gs_top">
@@ -41,21 +35,13 @@
                 <span class="fr">{{ item.userCardNo }}</span>
             </p>
             <p>所属车间：{{ item.workShopTitle }}</p>
-           
+
             <p>所属班组：{{ item.groupTitle }}</p>
             <p class="gs_time">
                 <span v-show="!item.showInputWorkHour" class="b_size">{{
             item.workHour
           }}</span>
-          <InputNumber
-            style="margin: 10px 0"
-            v-show="item.showInputWorkHour"
-            :max="maxHour"
-            :min="1"
-            :editable="false"
-            v-model="item.workHour"
-            @on-change="testChange(item.workHour)"
-          ></InputNumber>
+                <InputNumber style="margin: 10px 0" v-show="item.showInputWorkHour" :max="maxHour" :min="1" :editable="false" v-model="item.workHour" @on-change="testChange(item.workHour)"></InputNumber>
                 工时
             </p>
 
@@ -68,13 +54,9 @@
             <p class="gs_footer">
                 <a class="gs_edit" @click="editItem(item, index)">
                     <Icon type="md-create" />
-            编辑</a
-          >
-          <a
-            class="gs_del"
-            style="position: absolute; right: 0px; width: 50%"
-            @click="delItem(item.id)"
-          >
+                    编辑
+                </a>
+                <a class="gs_del" style="position: absolute; right: 0px; width: 50%" @click="delItem(item.id)">
                     <Icon type="ios-trash-outline" />删除
                 </a>
             </p>
@@ -83,52 +65,37 @@
             <Icon type="ios-add" style="vertical-align: middle" />
         </a>
     </div>
-    <div
-      style="
+    <div style="
         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>
         &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
-      <Button
-        class="mr20"
-        style="background: #d0d2d9; height: 50px; width: 100px"
-        v-noClick
-        @click="editCancel"
-      >
+        <Button class="mr20" style="background: #d0d2d9; height: 50px; width: 100px" v-noClick @click="editCancel">
             取消
         </Button>
     </div>
 
     <!-- 新增弹框 -->
-    <Modal
-      v-model="addmodal"
-      width="1100"
-      :mask-closable="false"
-      title="添加人员"
-      footer-hide
-    >
+    <Modal v-model="addmodal" width="1100" :mask-closable="false" title="添加人员" footer-hide>
         <addview ref="addview" @on-close="cancel" @on-ok="addInfo"></addview>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import addview from "./add";
 import Api from "../api";
 export default {
     name: "starOrder",
-  components: { addview },
+    components: {
+        addview
+    },
     data() {
         return {
             starmodal: false,
@@ -154,7 +121,10 @@ export default {
         // this.treeHeight = window.innerHeight - 120;
         this.Initload();
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {
@@ -190,7 +160,9 @@ export default {
                     if (res.result.allHours == res.result.waitHours) {
                         let id = this.$route.query.id;
                         // 获取既定users
-            Api.getentryusers({ Id: id }).then((res) => {
+                        Api.getentryusers({
+                            Id: id
+                        }).then((res) => {
                             let result = res.result;
 
                             // 默认工时分配
@@ -258,13 +230,11 @@ export default {
         // 工时分配列表
         getWorkTimelist() {
             let parm = {
-        conditions: [
-          {
+                conditions: [{
                     fieldName: "dispatchId",
                     fieldValue: this.$route.query.id,
                     conditionalType: "Equal",
-          },
-        ],
+                }, ],
             };
             Api.getentrylist(parm).then((rest) => {
                 if (rest.success) {
@@ -317,7 +287,9 @@ export default {
             Api.subupdatehours(this.cardMan).then((res) => {
                 if (res.success) {
                     let id = this.$route.query.id;
-          Api.workhourstatus({ Id: id }).then((res) => {
+                    Api.workhourstatus({
+                        Id: id
+                    }).then((res) => {
                         if (res.success) {
                             this.$Message.success("已提交");
                             this.laodHorse();
@@ -368,8 +340,7 @@ export default {
             // 修改之前未保存的编辑
             Api.subupdatehours(this.cardMan);
 
-      let parme = [
-        {
+            let parme = [{
                 userTitle: formdata.userName,
                 userId: formdata.userId,
                 userCardNo: formdata.cardNo,
@@ -377,8 +348,7 @@ export default {
                 dispatchId: this.$route.query.id,
                 routingDetailId: this.$route.query.routid,
                 count: this.$route.query.quantity,
-        },
-      ];
+            }, ];
             Api.subcreatemodelhours(parme).then((res) => {
                 if (res.success) {
                     this.laodHorse();