judgment

pages/produce/execute/execute.less

@@ -374,7 +374,7 @@
     }
 }
 .wu_bg{
-    height: calc(100vh - 100px);
+    height: calc(100vh - 115px);
     .mass_box{
         padding: 0 50px;
     }

pages/produce/execute/judgment/index.vue

@@ -331,19 +331,19 @@ export default {
     okModal() {
       let unmb = this.num;
       if (unmb == 1) {
-        this.cansolRang();
+        this.cansolhege();
         this.suModal = false;
       }
       if (unmb == 2) {
-        this.cansolfan();
+        this.cansolfei();
         this.suModal = false;
       }
       if (unmb == 3) {
-        this.cansolfei();
+        this.cansolRang();
         this.suModal = false;
       }
-      if (unmb == 0) {
-        this.cansolhege();
+      if (unmb == 4) {
+        this.cansolfan();
         this.suModal = false;
       }
     },
@@ -423,49 +423,132 @@ export default {
     },
     // 提交
     submit() {
-      let hegeops={}
-      let rangops={}
-      let fanxops={}
-      let feipops={}
+      let hegeops={};
+      let rangops={};
+      let fanxops={};
+      let feipops={};
+      let cardseops={};
       let lists =  []; 
-        if(this.hegelist.length>0){ 
+      let pass01 =  this.hegelist.length>0;
+      let pass02 =  this.ranglist.length>0;
+      let pass03 =  this.fanlist.length>0;
+      let pass04 =  this.feilist.length>0;
+      cardseops = {
+        prodcutIds: [],
+        productStatus: this.cardlist[0].productStatus
+      }
+      this.cardlist.map(ch=>{cardseops.prodcutIds.push(ch.id)})
+        if(pass01){
           hegeops = {
             prodcutIds: [],
             productStatus: this.hegelist[0].productStatus
           };
           this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
+          lists =  [cardseops,hegeops];
+          if(pass02){
+            rangops = {
+              prodcutIds: [],
+              productStatus: this.ranglist[0].productStatus
+            };
+            this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+            lists =  [cardseops,hegeops,rangops];
+            if(pass03){
+              fanxops = {
+                prodcutIds: [],
+                productStatus: this.fanlist[0].productStatus
+              };
+              this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+              lists =  [cardseops,hegeops,rangops,fanxops];
+            }
+          }
         }
-        if(this.ranglist.length>0){
-          rangops = {
-            prodcutIds: [],
-            productStatus: this.ranglist[0].productStatus||''
-          };
-          this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+        if(pass02){
+            rangops = {
+              prodcutIds: [],
+              productStatus: this.ranglist[0].productStatus
+            };
+            this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+            lists =  [cardseops,rangops];
+            if(pass01){ 
+              hegeops = {
+                prodcutIds: [],
+                productStatus: this.hegelist[0].productStatus
+              };
+              this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
+              lists =  [cardseops,hegeops,rangops];
+                if(pass03){
+                  fanxops = {
+                    prodcutIds: [],
+                    productStatus: this.fanlist[0].productStatus
+                  };
+                  this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+                  lists =  [cardseops,hegeops,rangops,fanxops];
+                }
+            }
         }
-        if(this.fanlist.length>0){
-          fanxops = {
-            prodcutIds: [],
-            productStatus: this.fanlist[0].productStatus
-          };
-          this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+        if(pass03){
+            fanxops = {
+              prodcutIds: [],
+              productStatus: this.fanlist[0].productStatus
+            };
+            this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+            lists =  [cardseops,fanxops];
+            if(pass01){ 
+              hegeops = {
+                prodcutIds: [],
+                productStatus: this.hegelist[0].productStatus
+              };
+              this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
+              lists =  [cardseops,hegeops,fanxops];
+                if(pass02){
+                  rangops = {
+                    prodcutIds: [],
+                    productStatus: this.ranglist[0].productStatus
+                  };
+                  this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+                  lists =  [cardseops,hegeops,rangops,fanxops];
+                }
+            }
         }
-        if(this.feilist.length>0){
-          feipops = {
+        if(pass04){
+            feipops = {
               prodcutIds: [],
               productStatus: this.feilist[0].productStatus,
-              cause: this.orderForm.question,
-              reporter: this.orderForm.useroption,
-          };
-          this.feilist.map(uf=>{feipops.prodcutIds.push(uf.id)})
+              cause:  this.orderForm.question,
+              reporter: this.orderForm.useroption
+            };
+            this.feilist.map(un=>{feipops.prodcutIds.push(un.id)})
+            lists =  [cardseops,feipops];
+            if(pass01){
+              hegeops = {
+                prodcutIds: [],
+                productStatus: this.hegelist[0].productStatus
+              };
+              this.hegelist.map(uh=>{hegeops.prodcutIds.push(uh.id)})
+              lists =  [cardseops,hegeops,feipops];
+                if(pass02){
+                  rangops = {
+                    prodcutIds: [],
+                    productStatus: this.ranglist[0].productStatus
+                  };
+                  this.ranglist.map(ur=>{rangops.prodcutIds.push(ur.id)})
+                  lists =  [cardseops,hegeops,rangops,feipops];
+                  if(pass03){
+                    fanxops = {
+                      prodcutIds: [],
+                      productStatus: this.fanlist[0].productStatus
+                    };
+                    this.fanlist.map(uf=>{fanxops.prodcutIds.push(uf.id)})
+                    lists =  [cardseops,hegeops,rangops,fanxops,feipops];
+                  }
+                }
+            }
         }
-          lists =  [hegeops,rangops,fanxops];
-        console.log(lists)
         let parmes={
             dispatchId: this.$route.query.id,
             orderId: this.$route.query.orderId,
             list: lists
         };
-        console.log(parmes)
       Api.submitData(parmes).then(res=>{
         if(res.success){
           this.$Message.success("提交成功!");
@@ -474,31 +557,44 @@ export default {
         }
       })
     },
-    // 送审
+    // 打开送审
     sendOrder() {
       let orderse = []
       this.feilist.map(item=>{
         orderse.push(item.prefix+'.'+item.code)
       })
-      let strOder = orderse.join(",")
-      console.log(strOder)
+      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.entity.strOder = strOder; // console.log(this.entity)
       this.$refs["formValidate"].validate(valid => {
         if (valid) {
-          let parmeseData = this.entity
-          console.log(parmeseData)
-          this.$Message.success("送审")
+          this.submit()//提交状态改变
+          let parmeseData = this.entity// console.log(parmeseData) this.$Message.success("送审")
           this.ModalOrder = true;
           this.$refs.orderSendReview.alertFun(parmeseData);
-          // this.$refs.orderSendReview.intData(this.entity);
         }
       });
     },
+    // 确定送审
     orderSendOk() {
       ahis.$Message.success("送审中...");
+      // let operatorIdList = this.$refs.orderSendReview.returnDataList();
+      // let itemCode = this.formdata.unqualified_order_code;
+      // this.dataListRetrunNew.code = itemCode;
+      // this.dataListRetrunNew.operatorIdList = operatorIdList;
+      // this.$http.order
+      //   .batchOrderStart(this.dataListRetrunNew)
+      //   .then(response => {
+      //     if (response.success) {
+      //       this.loadchangelist();
+      //       this.$Message.info("送审成功!");
+      //       this.dataListRetrunNew.idList = [];
+      //     } else {
+      //       this.$Message.error("送审失败!");
+      //     }
+      //     this.modalInfo = false;
+      //   });
     },
     // 取消 返回工单列表
     toOrder() {

pages/produce/execute/judgment/orderInfos.vue

@@ -3,24 +3,18 @@
     <Row>
       <Filed :span="12" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
       <Filed :span="12" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
-      <Filed :span="12" :name="l('status')">{{info.orderInfo.projectNumber}}</Filed>
+      <Filed :span="12" :name="l('status')">{{info.orderInfo.status}}</Filed>
       <Filed :span="12" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
       <Filed :span="12" name="批次号">{{info.orderInfo.batchNumber}}</Filed>
       <!-- <Filed :span="8" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed> -->
       <Filed :span="12" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
       <Filed :span="12" name="节点日期">{{info.orderInfo.demandFinishDate}}</Filed>
-      <Filed :span="12" name="不合格产品数量">{{info.orderInfo.demandFinishDate}}</Filed>
-      <Filed :span="12" name="问题原因">{{info.orderInfo.demandFinishDate}}</Filed>
-      <Filed :span="12" name="责任归属">{{info.orderInfo.demandFinishDate}}</Filed>
-      <Filed :span="24" name="不合格产品号">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="12" name="问题原因">{{info.orderInfo.cause}}</Filed>
+      <Filed :span="12" name="责任归属">{{info.orderInfo.reporter}}</Filed>
+      <Filed :span="12" name="不合格产品号">{{info.orderInfo.demandFinishDate}}</Filed>
+      <Filed :span="24" name="不合格产品">{{info.orderInfo.strOder}}</Filed>
       <!-- <Filed :span="8" :name="l('stage')">
         <state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state>
-      </Filed>
-      <Filed :span="8" :name="l('taskType')">
-        <state code="plan.order.taskType" :value="info.orderInfo.taskType+''" type="text"></state>
-      </Filed>
-      <Filed :span="8" :name="l('materialId')">
-        <state code="plan.order.material" :value="info.orderInfo.materialId+''" type="text"></state>
       </Filed> -->
     </Row>
   </div>

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"
@@ -96,6 +95,7 @@ export default {
   methods: {
     alertFun(parmeseData){
       console.warn(parmeseData)
+      this.info.orderInfo = parmeseData
       alert("加载数据")
     },
     intData(data) {