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

pages/produce/orderlist.vue

 <template>
-<div class="aps-r">
-    <DataGrid :columns="columns" ref="grid" :batch="false" :type="typeInfo" :span="6" :lazy="true" :conditions="easySearch" :action="action" :gutter="40">
+  <div class="aps-r">
+    <DataGrid
+      :columns="columns"
+      ref="grid"
+      :batch="false"
+      :type="typeInfo"
+      :span="6"
+      :lazy="true"
+      :conditions="easySearch"
+      :action="action"
+      :gutter="40"
+    >
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
-                    <Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable />
+            <Input
+              placeholder="请输入订单编号/产品名称/图号"
+              v-model="easySearch.keys.value"
+              v-width="260"
+              clearable
+            />
           </FormItem>
           <!--
                 <FormItem>
@@ -20,10 +35,31 @@
         <Search />
       </template>
       <template slot="buttons">
-            <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
+        <Button
+          :icon="iconInfo"
+          shape="circle"
+          :title="titleInfo"
+          @click="changeShwo"
+        ></Button>
       </template>
-        <template slot="card" slot-scope="{row}">
-            <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)">
+      <template slot="card" slot-scope="{ row }">
+        <div
+          class="body"
+          @click="
+            toExecute(
+              row.id,
+              row.orderId,
+              row.executeId,
+              row.routingHeaderId,
+              row.routingDetailId,
+              row.quantity,
+              row.status,
+              row.mesCode,
+              row.productName,
+              row.drawnNumber
+            )
+          "
+        >
           <Row class="title-i">
             <Col :span="10" class="order-code">
               <Ellipsis :text="row.productName" :lines="1" tooltip transfer />
@@ -35,7 +71,13 @@
               <div class="statuBg" :style="tdStyle(row.status)"></div>
               <div class="boxTitle">
                 <div class="text">
-                            <state code="taskList.status" ref="state" :value="row.status" type="text" :color="false"></state>
+                  <state
+                    code="taskList.status"
+                    ref="state"
+                    :value="row.status"
+                    type="text"
+                    :color="false"
+                  ></state>
                 </div>
               </div>
             </Col>
@@ -44,8 +86,13 @@
             <Row>
               <Col span="8">
                 <div class="img-i">
-                            <img :src="downUrl +row.productUrl" v-if="row.productUrl" />
-                            <img src="@/assets/imgicon/chan_Pin.png" v-else width="100%" height="100%" />
+                  <img :src="downUrl + row.productUrl" v-if="row.productUrl" />
+                  <img
+                    src="@/assets/imgicon/chan_Pin.png"
+                    v-else
+                    width="100%"
+                    height="100%"
+                  />
                 </div>
                 <!-- <img
                   :src="getUrl(row.productUrl)"
@@ -57,33 +104,73 @@
                 />-->
               </Col>
               <Col span="16" class="row">
-                        <p>{{l("beginTime")}}：{{row.beginTime}}</p>
+                <p>{{ l("beginTime") }}：{{ row.beginTime }}</p>
                 <p>
-                            <span v-if="getStatus(row.status)">{{l("planEndTime")}}：</span>
-                            <span v-else>{{l("endTime")}}：</span>
-                            {{row.endTime}}
+                  <span v-if="getStatus(row.status)"
+                    >{{ l("planEndTime") }}：</span
+                  >
+                  <span v-else>{{ l("endTime") }}：</span>
+                  {{ row.endTime }}
                 </p>
-                        <p v-if="getStatus(row.status)&&getTimes(row.endTime)>0">
+                <p v-if="getStatus(row.status) && getTimes(row.endTime) > 0">
                   剩余时间：
-                            <OutputTime :value="getTimes(row.endTime)" style="display:inline"></OutputTime>
+                  <OutputTime
+                    :value="getTimes(row.endTime)"
+                    style="display: inline"
+                  ></OutputTime>
                 </p>
-                        <p>{{l("quantity")}}：{{row.quantity}}</p>
+
+                <Row>
+                  <Col span="12">
+                    <p>{{ l("quantity") }}：{{ row.quantity }}</p></Col
+                  >
+                  <Col span="12"
+                    ><p>工序号：{{ row.taskSeq }}</p></Col
+                  >
+                </Row>
+                <p>工序名称：{{ row.taskName }}</p>
               </Col>
             </Row>
             <Row class="rowBottom">
-                        <Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
+              <Col span="14">{{ l("drawnNumber") }}：{{ row.drawnNumber }}</Col>
               <Col span="10" class="tr">
-                        <Icon type="md-alert" size="18" color="#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0" />
-                        <span style="color:#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0">预警</span>&nbsp;&nbsp;
-                        <Icon type="md-timer" size="18" color="#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)" />
-                        <span style="color:#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)">超期</span>
+                <Icon
+                  type="md-alert"
+                  size="18"
+                  color="#FFA000"
+                  v-if="
+                    getStatus(row.status) &&
+                    getTimes(row.endTime) < 86400 &&
+                    getTimes(row.endTime) > 0
+                  "
+                />
+                <span
+                  style="color: #ffa000"
+                  v-if="
+                    getStatus(row.status) &&
+                    getTimes(row.endTime) < 86400 &&
+                    getTimes(row.endTime) > 0
+                  "
+                  >预警</span
+                >&nbsp;&nbsp;
+                <Icon
+                  type="md-timer"
+                  size="18"
+                  color="#FE7777"
+                  v-if="getStatus(row.status) && compareTime(row.endTime)"
+                />
+                <span
+                  style="color: #fe7777"
+                  v-if="getStatus(row.status) && compareTime(row.endTime)"
+                  >超期</span
+                >
               </Col>
             </Row>
           </div>
         </div>
       </template>
     </DataGrid>
-</div>
+  </div>
 </template>
 
 <script>
@@ -104,11 +191,12 @@ export default {
         },
         DispatchStatus: {
           op: "In",
-                    value: [12, 14, 5, 7, -1]
-                }
+          value: [12, 14, 5, 7, -1],
+        },
       },
       downUrl: fileUrlDown,
-            columns: [{
+      columns: [
+        {
           title: this.l("Id"),
           key: "id",
           width: 80,
@@ -168,12 +256,14 @@ export default {
           align: "center",
           render: (h, params) => {
             return h(
-                            "div", {
+              "div",
+              {
                 class: "action",
               },
               [
                 h(
-                                    "op", {
+                  "op",
+                  {
                     attrs: {
                       oprate: "edit",
                     },
@@ -210,10 +300,7 @@ export default {
     let oldStr = localStorage.getItem("admin");
     let userlist = this.$store.getters.getUser(2);
   },
-    async fetch({
-        store,
-        params
-    }) {
+  async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   mounted() {