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

pages/aps/complete/index.vue

@@ -2,11 +2,11 @@
   <div class="scheduling">
     <div class="aps-l">
       <Row class="row-p">
-        <Col :span="6" class="chan-chi">排产池</Col>
-        <Col :span="18" class="l-ringht">
+        <Col :span="10" class="chan-chi">整机排产-排产池</Col>
+        <Col :span="14" class="l-ringht">
           <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
             <Radio label="0">未排产</Radio>
-            <Radio label="2">已排查</Radio>
+            <!-- <Radio label="2">已排查</Radio> -->
             <!-- <Radio label="-1">全部</Radio> -->
           </RadioGroup>
         </Col>
@@ -34,7 +34,7 @@
           <div class="time-s">
             <span>工序：{{li.drawnNumber}}</span>
           </div>
-          <div class="time-s">{{li.demandFinishDate}} — {{li.demandStartDate}}</div>
+          <div class="time-s">{{li.demandFinishDate}} ~ {{li.demandStartDate}}</div>
         </div>
       </div>
     </div>
@@ -205,6 +205,8 @@ export default {
         if (r.success) {
           r.result.map(e => {
             e.checked = false;
+            e.demandFinishDate = e.demandFinishDate.substr(0,10)
+            e.demandStartDate = e.demandStartDate.substr(0,10)
           });
           this.list = r.result;
         }
@@ -371,6 +373,7 @@ export default {
         font-size: 14px;
         font-weight: bold;
         margin-top: 3px;
+        height: 24px;
       }
       .l-ringht {
         text-align: right;

pages/aps/stream/index.vue

@@ -2,11 +2,11 @@
   <div class="scheduling">
     <div class="aps-l">
       <Row class="row-p">
-        <Col :span="6" class="chan-chi">排产池</Col>
-        <Col :span="18" class="l-ringht">
+        <Col :span="9" class="chan-chi">流水排产-排产池</Col>
+        <Col :span="15" class="l-ringht">
           <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
             <Radio label="0">未排产</Radio>
-            <Radio label="2">已排查</Radio>
+            <!-- <Radio label="2">已排查</Radio> -->
             <!-- <Radio label="-1">全部</Radio> -->
           </RadioGroup>
         </Col>
@@ -190,6 +190,8 @@ export default {
         if (r.result) {
           r.result.map(u => {
             u.aps = 0;
+            u.demandFinishDate = u.demandFinishDate.substr(0,10)
+            u.demandStartDate = u.demandStartDate.substr(0,10)
           });
           this.list = r.result;
           // if (r.result[0]) {
@@ -414,6 +416,7 @@ export default {
         font-size: 14px;
         font-weight: bold;
         margin-top: 3px;
+        height: 24px;
       }
       .l-ringht {
         text-align: right;

pages/qc/dataTrace/components/reviewCount.vue

@@ -7,7 +7,7 @@
                         基本信息
                     </MenuItem>
                     <MenuItem name="2" replace>
-                        主工艺
+                        工艺信息
                     </MenuItem>
                     <!-- <MenuItem name="3" replace>
                         专业工艺

pages/resourceManagement/deviceType/index.vue

@@ -147,7 +147,7 @@ export default {
                 {
                   attrs: {
                     oprate: "detail",
-                    class: "edit",
+                    // class: "edit",
                     title: "编辑" 
                   },
                   on: {