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

pages/produce/execute/datafilling/index.vue

@@ -256,7 +256,7 @@ export default {
       columns12: [
         { title: "序号", type: "index", width: "70", align: "center" },
         { title: "参数名称", key: "check_params" },
-        { title: "检验标记", key: "check_type" },
+        { title: "检验类型", key: "check_type" },
         { title: "汇报类型", key: "fillintype" },
         { title: "标准指标", key: "standard" },
         { title: "生产要求", key: "production_requirement", tooltip: true },

pages/produce/execute/execute.less

@@ -374,7 +374,7 @@
     }
 }
 .wu_bg{
-    height: calc(100vh - 100px);
+    height: calc(100vh - 115px);
     .mass_box{
         padding: 0 50px;
     }
@@ -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/index.vue

@@ -94,18 +94,21 @@ export default {
         this.detail = () => import("./starOrder/index");
       } //进度汇报
       if (number == 1) {
-        this.detail = () => import("./MaterialCollec/index");
+         this.$Message.info("尊敬的用户，您没有该权限！")
+        // this.detail = () => import("./MaterialCollec/index");
       } //物料领用
       if (number == 2) {
-        this.detail = () => import("./productSet/index");
+        // this.detail = () => import("./productSet/index");
+        this.$Message.info("尊敬的用户，您没有该权限！")
       } //产品装配
       if (number == 3) {
         this.detail = () => import("./taskTime/index");
       } //工时分配
       if (number == 4) {
-        this.detail = () => import("./preparation/index");
+          this.$Message.info("尊敬的用户，您没有该权限！")
+        // this.detail = () => import("./preparation/index");
       } //生产准备
-      if (number == 5) {
+      if (number == 5) {           
         this.detail = () => import("./ProcessCheck/index");
       } //工艺查看
       if (number == 6) {
@@ -118,7 +121,8 @@ export default {
         this.detail = () => import("./datafilling/index");
       } //数据填报
       if (number == 9) {
-        this.detail = () => import("./testdata/index");
+           this.$Message.info("尊敬的用户，您没有该权限！")
+        // this.detail = () => import("./testdata/index");
       } //测试数据
     }
   },

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>
@@ -332,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;
       }
     },
@@ -424,47 +423,132 @@ export default {
     },
     // 提交
     submit() {
-        console.log(this.ranglist)
-        // this.feilist.cause =  this.orderForm.question;
-        // this.feilist.reporter = this.orderForm.useroption; 
-        let hegeops = {
-            prodcutIds: [],
-            productStatus: this.hegelist[0].productStatus||''
-        };
-        let rangops = {
-            prodcutIds: [],
-            productStatus: this.ranglist[0].productStatus||''
-        };
-        let fanxops = {
+      let hegeops={};
+      let rangops={};
+      let fanxops={};
+      let feipops={};
+      let cardseops={};
+      let lists =  []; 
+      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.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.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(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(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(pass04){
+            feipops = {
+              prodcutIds: [],
+              productStatus: this.feilist[0].productStatus,
+              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];
+                  }
+                }
+            }
+        }
         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){
           this.$Message.success("提交成功!");
@@ -473,18 +557,44 @@ 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("送审...")
+          this.submit()//提交状态改变
+          let parmeseData = this.entity// console.log(parmeseData) this.$Message.success("送审")
           this.ModalOrder = true;
-          this.$refs.orderSendReview.intData(this.entity);
+          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;
+      //   });
     },
     // 取消 返回工单列表
     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

@@ -93,10 +93,16 @@ export default {
     }
   },
   methods: {
+    alertFun(parmeseData){
+      console.warn(parmeseData)
+      this.info.orderInfo = parmeseData
+      alert("加载数据")
+    },
     intData(data) {
-      //打开modal层时给订单list赋值
+      console.warn(data)
+      //打开modal层时给orderInfo赋值
       if(data){
-        this.info.Unqualified = data
+        this.info.orderInfo = data
       }
     },
     returnDataList() {

pages/technology/search.vue

@@ -2,7 +2,7 @@
   <Form ref="form" :model="condition" :label-width="100">
     <Row>
       <Col :span="12" v-if="condition.id.show">
-        <FormItem :label="编号" prop="id">
+        <FormItem label="编号" prop="id">
           <Input v-model="condition.id.value"></Input>
         </FormItem>
       </Col>