质量判定

pages/produce/execute/execute.less

@@ -391,7 +391,7 @@
     }
     .mass_box{
         h2{ height: 40px;}
-        .weizhix{ color: #4d5055;}
+        // .weizhix{ color: #4d5055;}
         .rangb{ color: #515A6E;}
         .hege{ color: #2680EB;}
         .fanxiu{ color: #FFA000;}
@@ -416,6 +416,7 @@
             margin: 15px 0;
             .btn_play{
                 margin: 0 0 20px 0;
+                color: #4d5055;
             }
             .list01{
                 min-height: 50px;

pages/produce/execute/judgment/index.vue

@@ -2,12 +2,11 @@
 <template>
   <div class="wu_bg">
     <div class="mass_box">
-      <h2 class="weizhix">未执行（{{cardlist.length}}）</h2>
       <div class="mass_list">
-        <p class="btn_play">
+        <h2 class="btn_play">未完工（{{cardlist.length}}）
           <Button class="button" type="primary" @click="allcheck">全选</Button>
           <Button class="button" type="primary" @click="rechecked">反选</Button>
-        </p>
+        </h2>
         <div class="list01">
           <Tag
             type="dot" :checkable="true"
@@ -121,8 +120,8 @@
        <!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" -->
       <Button class="button" size="large" @click="toOrder">取消</Button>
     </div>
-    <!-- 订单送审 -->
-    <Modal v-model="ModalOrder" title="订单送审" :mask-closable="false" :scrollable="true" fullscreen>
+    <!-- 不合格品送审 -->
+    <Modal v-model="ModalOrder" title="不合格品送审" :mask-closable="false" :scrollable="true" fullscreen>
       <OrderSendReview ref="orderSendReview"></OrderSendReview>
       <div slot="footer">
         <Button @click="ModalOrder = false">取消</Button>
@@ -424,46 +423,48 @@ export default {
     },
     // 提交
     submit() {
-        console.log(this.ranglist)
-        // this.feilist.cause =  this.orderForm.question;
-        // this.feilist.reporter = this.orderForm.useroption; 
-        let hegeops = {
+      let hegeops={}
+      let rangops={}
+      let fanxops={}
+      let feipops={}
+      let lists =  []; 
+        if(this.hegelist.length>0){ 
+          hegeops = {
             prodcutIds: [],
-            productStatus: this.hegelist[0].productStatus||''
-        };
-        let rangops = {
+            productStatus: this.hegelist[0].productStatus
+          };
+          this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
+        }
+        if(this.ranglist.length>0){
+          rangops = {
             prodcutIds: [],
             productStatus: this.ranglist[0].productStatus||''
-        };
-        let fanxops = {
+          };
+          this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+        }
+        if(this.fanlist.length>0){
+          fanxops = {
             prodcutIds: [],
-            productStatus: this.fanlist[0].productStatus||''
-        };
-        // let prodcutIds = [],productStatus=this.hegelist[0].productStatus;
-        this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
-        this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
-        this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
-        let lists =  [hegeops,rangops,fanxops];
+            productStatus: this.fanlist[0].productStatus
+          };
+          this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+        }
+        if(this.feilist.length>0){
+          feipops = {
+              prodcutIds: [],
+              productStatus: this.feilist[0].productStatus,
+              cause: this.orderForm.question,
+              reporter: this.orderForm.useroption,
+          };
+          this.feilist.map(uf=>{feipops.prodcutIds.push(uf.id)})
+        }
+          lists =  [hegeops,rangops,fanxops];
+        console.log(lists)
         let parmes={
             dispatchId: this.$route.query.id,
             orderId: this.$route.query.orderId,
             list: lists
-            // [
-                // this.feilist,
-                // this.hegelist,
-                // this.ranglist,
-                // this.fanlist,
-                    // {
-                    // "productStatus": 0,
-                    // "prodcutIds": [
-                    //     0
-                    // ],
-                    // "cause": "string",
-                    // "reporter": "string"
-                    // }
-                // ]
-        };        
-        // let executeId = this.$route.query.executeId;
+        };
         console.log(parmes)
       Api.submitData(parmes).then(res=>{
         if(res.success){
@@ -475,11 +476,24 @@ export default {
     },
     // 送审
     sendOrder() {
+      let orderse = []
+      this.feilist.map(item=>{
+        orderse.push(item.prefix+'.'+item.code)
+      })
+      let strOder = orderse.join(",")
+      console.log(strOder)
+      this.entity.cause =  this.orderForm.question;
+      this.entity.reporter = this.orderForm.useroption; 
+      this.entity.strOder = strOder; 
+      console.log(this.entity)
       this.$refs["formValidate"].validate(valid => {
         if (valid) {
-          // this.$Message.success("送审...")
+          let parmeseData = this.entity
+          console.log(parmeseData)
+          this.$Message.success("送审")
           this.ModalOrder = true;
-          this.$refs.orderSendReview.intData(this.entity);
+          this.$refs.orderSendReview.alertFun(parmeseData);
+          // this.$refs.orderSendReview.intData(this.entity);
         }
       });
     },

pages/produce/execute/judgment/orderSendReview.vue

 <template>
   <div style="width:80%;margin:0 auto" :style="{ height: divHeight }">
+    1111
     <OrderInfos v-if="info.status" :info="info"></OrderInfos>
     <!-- 批量送审展示列表 -->
     <!-- <Table  :info1="info1"
@@ -93,10 +94,15 @@ export default {
     }
   },
   methods: {
+    alertFun(parmeseData){
+      console.warn(parmeseData)
+      alert("加载数据")
+    },
     intData(data) {
-      //打开modal层时给订单list赋值
+      console.warn(data)
+      //打开modal层时给orderInfo赋值
       if(data){
-        this.info.Unqualified = data
+        this.info.orderInfo = data
       }
     },
     returnDataList() {