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

pages/order/bill/index.vue

@@ -7,10 +7,10 @@
           search
           placeholder="请输入订单编号"
           clearable
-          style="width:280px;margin:10px 5px;"
+          style="width: 280px; margin: 10px 5px"
         />
       </Col>
-      <Col span="20" style="margin-top:15px">
+      <Col span="20" style="margin-top: 15px">
         <a @click="clickSeach">高级搜索</a>
       </Col>
     </Row>
@@ -19,43 +19,70 @@
       <h4 class="title2">工单信息</h4>
     </div>
     <div class="bill-conten">
-      <div class="bill-body" v-for="(li,index) in listData" :key="index" >
+      <div class="bill-body" v-for="(li, index) in listData" :key="index">
         <div class="body">
           <div class="bill-l" @click="itemClick">
             <div class="l-list">
               <Row class="title-i">
-                <Col :span="12">{{li.mesCode}}</Col>
-                <Col :span="12" style="text-align: right;padding-right:10px">{{li.productName}}</Col>
+                <Col :span="12">{{ li.mesCode }}</Col>
+                <Col
+                  :span="12"
+                  style="text-align: right; padding-right: 10px"
+                  >{{ li.productName }}</Col
+                >
               </Row>
               <Row class="bady-c">
                 <Col :span="24">
                   订单状态：
-                  <State code="plan.order.status" :value="parseInt(li.status)" />
+                  <State
+                    code="plan.order.status"
+                    :value="parseInt(li.status)"
+                  />
                 </Col>
-                <!-- <Col :span="16">工艺规程：{{li.actualFinishDate}}</Col> -->
+                <!-- <Col :span="15"
+                  >工艺：{{ li.routingHeaderCode }}/{{
+                    li.routingHeaderName
+                  }}</Col
+                > -->
               </Row>
+              <div class="bady-c">
+                工艺：{{ li.routingHeaderCode }}/{{ li.routingHeaderName }}
+              </div>
+              <div class="bady-c">
+                订单计划开始时间：{{ li.demandStartDate }}
+              </div>
+              <div class="bady-c">
+                订单计划结束时间：{{ li.demandFinishDate }}
+              </div>
 
-              <div class="bady-c">订单计划开始时间：{{li.demandStartDate}}</div>
-              <div class="bady-c">订单计划结束时间：{{li.demandFinishDate}}</div>
-
-              <div class="bady-c">实际开始时间：{{li.actualStartDate}}</div>
-              <div class="bady-c">实际结束时间：{{li.actualFinishDate}}</div>
+              <div class="bady-c">实际开始时间：{{ li.actualStartDate }}</div>
+              <div class="bady-c">实际结束时间：{{ li.actualFinishDate }}</div>
             </div>
           </div>
           <div class="bill-r">
             <div class="r-list">
-              <div v-for="(item,index) in li.dispatchList" :key="index">
+              <div v-for="(item, index) in li.dispatchList" :key="index">
                 <!-- status=0,已完成黑色，14执行中绿色，12未开工浅蓝色，5暂停红色 -->
                 <div
                   class="gong-dan"
-                  :class="item.status==0?'gong-dan0':item.status==14?'gong-dan1':item.status==12?'gong-dan2':item.status==5?'gong-dan3':'gong-dan4'"
+                  :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>
-                  <div>{{li.demandStartDate}}</div>
-                  <div>{{li.demandFinishDate}}</div>
-                  <div>{{li.actualStartDate}}</div>
-                  <div>{{li.actualFinishDate}}</div>
+                  <div>{{ item.taskSeq }} {{ item.detailName }}</div>
+                  <div>人员：{{ item.userNames }}</div>
+                  <div>{{ li.demandStartDate }}</div>
+                  <div>{{ li.demandFinishDate }}</div>
+                  <div>{{ li.actualStartDate }}</div>
+                  <div>{{ li.actualFinishDate }}</div>
                 </div>
               </div>
             </div>
@@ -101,7 +128,7 @@ export default {
       entity: {},
       WorkOrder: [],
 
-      rules: []
+      rules: [],
     };
   },
   async fetch({ store, params }) {
@@ -109,10 +136,10 @@ export default {
   },
   computed: {
     listData() {
-      return this.WorkOrder.filter(u => {
+      return this.WorkOrder.filter((u) => {
         return u.mesCode.indexOf(this.keys) > -1;
       });
-    }
+    },
   },
   mounted() {
     this.getMessage();
@@ -123,14 +150,14 @@ export default {
         {
           conditionalType: "Equal",
           fieldName: "",
-          fieldValue: ""
-        }
+          fieldValue: "",
+        },
       ];
       this.$api
         .post(`${PlanUrl}/orderaudit/pagedaccountmesorders`, {
-          conditions: conditions
+          conditions: conditions,
         })
-        .then(res => {
+        .then((res) => {
           if (res.success) {
             this.WorkOrder = res.result.items;
           }
@@ -148,8 +175,8 @@ export default {
     },
     cancel() {
       this.modal = false;
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" >
@@ -191,16 +218,16 @@ export default {
             border-radius: 4px;
             margin: 0 auto;
             .title-i {
-              height: 36px;
-              line-height: 36px;
+              height: 32px;
+              line-height: 32px;
               padding-left: 10px;
               border-bottom: 1px dashed #a7b8cc;
               font-weight: bold;
               color: rgba(38, 128, 235, 1);
             }
             .bady-c {
-              height: 31px;
-              line-height: 31px;
+              height: 27px;
+              line-height: 27px;
               padding-left: 10px;
             }
           }
@@ -227,7 +254,7 @@ export default {
                 font-weight: bold;
               }
               div:nth-child(2) {
-                color:@table-color;
+                color: @table-color;
                 font-size: 14px;
               }
               div:nth-child(3),
@@ -247,7 +274,7 @@ export default {
               // float: left;
               div:nth-child(1),
               div:nth-child(2) {
-                color:@table-color;
+                color: @table-color;
               }
             }
             .gong-dan1 {