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

pages/aps/complete/index.vue

@@ -31,6 +31,7 @@
             </Col>
           </Row>
           <div class="fa">产品名称：{{li.productName}}</div>
+          <div class="time-s">产品数量：{{li.quantity}}</div>
           <div class="time-s">
             <span>工序：{{li.drawnNumber}}</span>
           </div>
@@ -38,7 +39,7 @@
         </div>
       </div>
     </div>
-    <div class="aps-r">
+    <div class="aps-r" v-show="showSet">
       <div class="r-title">排产设置盘</div>
       <Form :model="formItem" :label-width="100">
         <FormItem label="工时">
@@ -114,7 +115,7 @@
         </FormItem>
         <FormItem>
           <Button style="margin-left: 8px" @click="closeOk">取消</Button>
-          <Button type="primary" @click="lowerHair" v-if="showXia">下发</Button>
+          <Button type="primary" @click="lowerHair">下发</Button>
         </FormItem>
       </Form>
     </div>
@@ -135,7 +136,7 @@ export default {
   data() {
     return {
       list: [],
-      showXia: true,
+
       status: "0", //全部排产-1，0为未排产；2为已排查；
       formItem: {
         radio: "0",
@@ -144,7 +145,8 @@ export default {
         endTime: "",
         remark: "",
         departmentTitle: "",
-        shopId: ""
+        shopId: "",
+        showSet: false
         // userName: ""
       },
       //   listGroup: [
@@ -192,11 +194,6 @@ export default {
     changeStatus(name) {
       this.status = name;
       this.orderlist(this.status);
-      if (this.status == 0) {
-        this.showXia = true;
-      } else {
-        this.showXia = false;
-      }
     },
     //排产池列表
     orderlist(a) {
@@ -216,11 +213,17 @@ export default {
     checkData(li) {
       if (li.checked) {
         this.orderIds.push(li.id);
+        if (this.status == 0) {
+          this.showSet = true;
+        }
       } else {
         if (this.orderIds) {
           this.orderIds.forEach((e, i) => {
             if (this.orderIds[i] == li.id) {
               this.orderIds.splice(i, 1);
+              if (this.orderIds.length == 0) {
+                this.showSet = false;
+              }
             }
           });
         }
@@ -251,6 +254,7 @@ export default {
             this.$Message.success("下发成功");
             this.orderlist(this.status);
             this.orderIds = [];
+             this.showSet = false;
           } else {
             this.$Message.success("下发失败");
             this.formItem = {};

pages/aps/stream/index.vue

@@ -268,6 +268,7 @@ export default {
       this.indexId = index;
       this.detailId = item.detailId;
       this.active = index;
+      this.$refs.setObj.formItem={}
       // this.group.orderId = item.orderId;
       // this.group.routingHeaderId = item.routingHeaderId;
       // this.$refs.setObj.formItem = {};

pages/aps/stream/set.vue

@@ -90,6 +90,7 @@ export default {
           {
             required: true,
             message: "请选择人员",
+            type: "array",
             trigger: "change"
           }
         ],
@@ -109,23 +110,15 @@ export default {
 
   methods: {
     //确定
-    Determine(name) {
-      if (this.formItem.time == "") {
-        this.$Message.error("工时不能为空");
-        return false;
-      } else if (this.mode == 1) {
-        if (!this.formItem.userIds) {
-          this.$Message.error("人员不能为空");
-          return false;
+    Determine() {
+      this.$refs["formItem"].validate(valid => {
+        if (valid) {
+          this.formItem.detailId = this.detailId;
+          this.$emit("on-DetermineOk", this.formItem, this.indexId);
+        } else {
+          this.$Message.error("Fail!");
         }
-      } else if (this.mode == 2) {
-        if (!this.formItem.shopId) {
-          this.$Message.error("班组不能为空");
-          return false;
-        }
-      }
-      this.formItem.detailId = this.detailId;
-      this.$emit("on-DetermineOk", this.formItem, this.indexId);
+      });
     },
     closeOk() {
       this.$emit("closeOk");

pages/technology/index.vue

@@ -6,6 +6,10 @@
   .con {
     padding: 5px 5px 0px 10px;
   }
+  .con_bord{
+    // margin: 15px 32px;
+    box-shadow: #c7c7c7 1px 2px 7px 3px;
+  }
   background: rgba(245,246,250,1);
 }
 .fullWindow {
@@ -37,7 +41,7 @@
         <Icon type="ios-arrow-forward" size="24" />
       </a>
     </div>
-    <Content class="con">
+    <Content class="con" :class="!showMenu?'con_bord':''">
         <DataGrid :columns="columns" ref="grid" :action="action" class="card_box">
           <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>