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

pages/order/bill/index.vue

@@ -28,8 +28,11 @@
                 <Col :span="12" style="text-align: right;padding-right:10px">{{li.productName}}</Col>
               </Row>
               <Row class="bady-c">
-                <Col :span="8">订单状态：{{li.status}}</Col>
-                <Col :span="16">工艺规程：{{li.actualFinishDate}}</Col>
+                <Col :span="24">
+                  订单状态：
+                  <State code="plan.order.status" :value="parseInt(li.status)" />
+                </Col>
+                <!-- <Col :span="16">工艺规程：{{li.actualFinishDate}}</Col> -->
               </Row>
 
               <div class="bady-c">订单计划开始时间：{{li.demandStartDate}}</div>
@@ -42,10 +45,10 @@
           <div class="bill-r">
             <div class="r-list">
               <div v-for="(item,index) in li.dispatchList" :key="index">
-                <!-- status=0,已完成，1正在进行，3暂停 -->
+                <!-- status=0,已完成黑色，14执行中绿色，12未开工浅蓝色，5暂停红色 -->
                 <div
                   class="gong-dan"
-                  :class="item.status==0?'gong-dan0':item.status==1?'gong-dan1':item.status==2?'gong-dan2':'gong-dan3'"
+                  :class="item.status==0?'gong-dan0':item.status==14?'gong-dan1':item.status==12?'gong-dan2':item.status==5?'gong-dan3':'gong-dan4'"
                 >
                   <div>{{item.taskSeq}} {{item.detailName}}</div>
                   <div>人员：{{item.userNames}}</div>
@@ -101,6 +104,9 @@ export default {
       rules: []
     };
   },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
   computed: {
     listData() {
       return this.WorkOrder.filter(u => {
@@ -277,6 +283,17 @@ export default {
                 color: #fe7777;
               }
             }
+            .gong-dan4 {
+              width: 198.5px;
+              height: 200px;
+              background-image: url("../../../assets/images/bill/grey.png");
+              padding: 13px 20px;
+              // float: left;
+              div:nth-child(1),
+              div:nth-child(2) {
+                color: #666666;
+              }
+            }
           }
         }
       }