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

pages/produce/execute/api.js

@@ -9,6 +9,10 @@ export default {
   submitData(params) {
     return Api.post(`${PlanUrl}/orderexecutequalityrecord/checkdispatchproduct`, params);
   },
+  // 质量判定获取不合格品送审编号
+  getshenliNo(params) {
+    return Api.post(`${PlanUrl}/orderexecutebadproduct/create`, params);
+  },
   //工单联合信息
   orderanddispatchinfos(params) {
     return Api.get(`${PlanUrl}/orderexecutenew/orderanddispatchinfos`, params);

pages/produce/execute/judgment/index.vue

@@ -86,7 +86,7 @@
         <div class="list02">
           <Tag
             type="dot" class="tag_card02"
-            v-for="(item,index) in feilist" :key="index"
+            v-for="(item,index) in feilist" :key="item.id"
             :name="item.id" :checkable="false"
             closable @on-close="feiClose"
           >{{item.prefix}}.{{ item.code}}</Tag>
@@ -116,7 +116,7 @@
     </div>
     <div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0">
       <Button class="button" size="large" type="primary" @click="sendOrder" v-if="feilist.length>0" >送审</Button>
-      <Button class="button" size="large" type="primary" @click="submit" v-else>提交</Button>
+      <Button class="button" size="large" type="primary" @click="submit" v-else>保存</Button>
        <!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" -->
       <Button class="button" size="large" @click="toOrder">取消</Button>
     </div>
@@ -174,15 +174,16 @@ export default {
       ranglist: [],
       fanlist: [],
       feilist: [],
+      titleCode: '',//送审单号
       problemList: [
-        { problem: "问题描述01" },
-        { problem: "问题描述02" },
-        { problem: "问题描述03" }
+        { problem: "问题描述01",id:1 },
+        { problem: "问题描述02",id:2 },
+        { problem: "问题描述03",id:3 }
       ],
       blameList: [
-        { user: "责任人01" },
-        { user: "责任人02" },
-        { user: "责任人03" }
+        { user: "责任人01",id:1 },
+        { user: "责任人02",id:2 },
+        { user: "责任人03",id:3 }
       ]
     };
   },
@@ -551,50 +552,74 @@ export default {
         };
       Api.submitData(parmes).then(res=>{
         if(res.success){
-          this.$Message.success("提交成功!");
+          this.$Message.success("保存成功!");
         }else{
-          this.$Message.success("提交失败~");
+          this.$Message.success("保存失败~");
         }
       })
     },
     // 打开送审
     sendOrder() {
       let orderse = []
+      let orderIds = []
       this.feilist.map(item=>{
         orderse.push(item.prefix+'.'+item.code)
+        orderIds.push(item.id)
       })
-      let strOder = orderse.join(",")// console.log(strOder)
+      let strOder = orderse.join(",")
       this.entity.cause =  this.orderForm.question;
       this.entity.reporter = this.orderForm.useroption; 
-      this.entity.strOder = strOder; // console.log(this.entity)
+      this.entity.strOder = strOder; 
+      this.entity.orderIds = orderIds; 
       this.$refs["formValidate"].validate(valid => {
         if (valid) {
           this.submit()//提交状态改变
-          let parmeseData = this.entity// console.log(parmeseData) this.$Message.success("送审")
+          let parme = {
+                reason: this.entity.cause,
+                personLiableId: this.entity.reporter,
+                dispatchId: this.$route.query.id,
+                orderId: this.$route.query.orderId,
+                productIds: this.entity.orderIds,
+              }
+          Api.getshenliNo(parme).then(res=>{
+            if(res.success){
+              // this.$refs.orderSendReview.info.orderInfo.code = res.result.code
+              this.entity.code = res.result.code
+            }else{
+              console.log("获取编号失败")
+            }
+          })
+          let parmeseData = this.entity//  this.$Message.success("送审")
+            console.info(parmeseData)
           this.ModalOrder = true;
           this.$refs.orderSendReview.alertFun(parmeseData);
+          
         }
       });
     },
     // 确定送审
     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;
-      //   });
+      // console.log("old->",this.entity)
+      console.log("new->",this.entity)
+      let parmese ={
+        schemaId: "c2e09c9b-02a9-4188-97a6-cdb68d50a64a",
+        idList: this.entity.orderIds,
+        code: this.entity.code,
+        operatorIdList: this.$refs.orderSendReview.returnDataList(),
+      } 
+      
+      this.$http.order
+        .batchOrderStart(parmese)
+        .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,15 +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.status}}</Filed>
+      <Filed :span="12" :name="l('status')">
+        <state code="plan.order.status" ref="state" :value="info.orderInfo.status" type="text" ></state>
+      </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="派工数量">{{info.orderInfo.dispatchQuantity}}</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.seqName}}</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="12" name="送审编号">{{info.orderInfo.code}}</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>
@@ -46,6 +49,12 @@ export default {
       key = 'order_list' + '.' + key
       return this.$t(key)
     }
+  },
+  watch:{
+    info(n,o){
+        console.log(n)
+        console.log(o)
+    }
   }
 }
 </script>
\ No newline at end of file

pages/produce/execute/judgment/orderSendReview.vue

@@ -15,6 +15,7 @@
 </template>
 
 <script>
+// import Api from "../api";
 import OrderInfos from './orderInfos'
 import Process from '@/components/orderOperator/process'
 export default {
@@ -80,7 +81,7 @@ export default {
     }
   },
   created() {
-    var theight = window.innerHeight - 630 + 'px'
+    var theight = window.innerHeight - 650 + 'px'
     this.divHeight = theight
   },
   mounted() {
@@ -88,7 +89,7 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.divHeight = window.screenHeight - 630 + 'px'
+        this.divHeight = window.screenHeight - 650 + 'px'
       })()
     }
   },
@@ -96,7 +97,23 @@ export default {
     alertFun(parmeseData){
       console.warn(parmeseData)
       this.info.orderInfo = parmeseData
-      alert("加载数据")
+      // let parme = {
+      //           reason: parmeseData.cause,
+      //           personLiableId: parmeseData.reporter,
+      //           dispatchId: this.$route.query.id,
+      //           orderId: this.$route.query.orderId,
+      //           productIds: parmeseData.orderIds,
+      //         }
+      //     Api.getshenliNo(parme).then(res=>{
+      //       if(res.success){
+      //         this.info.orderInfo.push(code = res.resoult.code)
+              // parmeseData.code = res.resoult.code
+              // this.$refs.orderSendReview.info.orderInfo.code = res.resoult.code
+              // this.entity.code = res.resoult.code
+          //   }else{
+          //     console.log("获取编号失败")
+          //   }
+          // })
     },
     intData(data) {
       console.warn(data)

pages/produce/execute/taskTime/add.vue

@@ -173,7 +173,7 @@ export default {
     },
     // 选择新增人员
     changeUser(data){
-        console.log(data)
+        // console.log(data)
         let alloterInfo = this.$refs.userSelected.getSelectItems();
         if(data&&data!=undefined){
             this.userflag = true
@@ -185,7 +185,7 @@ export default {
         //   this.$Message.error("请选择人员！");
         //   return;
         // }
-        console.log(alloterInfo)
+        // console.log(alloterInfo)
         if(alloterInfo.length>0){
           this.entity.cardNo = alloterInfo[0].cardNo
           this.entity.userName = alloterInfo[0].userName

pages/produce/search.vue

@@ -66,7 +66,7 @@ export default {
         quantity: { op: "Equal", value: null, show: false },
         routingHeaderId: { op: "Equal", value: null, show: false },
         routingDetailId: { op: "Equal", value: null, show: false },
-        status: { op: "Equal", value: null, show: false },
+        status: { op: "Equal", value: null, show: true },
         beginTime: { op: "Range", value: null, show: false },
         endTime: { op: "Range", value: null, show: false },
       }