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

pages/produce/execute/datafilling/index.vue

 
 <template>
   <div class="data-filling">
-    <div class="data-title">
-      <span class="ml20">产品号</span>
-      <ProductNumberSelect
-        v-model="product_ID"
-        :eid="row.orderId"
-        ref="codes"
-        @on-change="change"
-        class="select-produt-name"
-      />
+    <div class="data-title flex">
+      <div class="fg">
+        <span class="ml20">产品号</span>
+        <ProductNumberSelect
+          v-model="product_ID"
+          :eid="row.orderId"
+          ref="codes"
+          @on-change="change"
+          :multiple="false"
+          class="select-produt-name"
+        />
+      </div>
+
       <!-- <template v-if="datasearch.isMain!=1">
         <span class="ml20">汇报板次</span>
         <Select @on-change="boardonchange" v-model="board_ID" class="w200">
@@ -20,7 +24,8 @@
           >{{ item.boardNumber }}</Option>
         </Select>
       </template>-->
-      <Button type="primary" @click="QcCardChecker(1)" class="title_btn ml10">自检</Button>
+      <div class="tr">
+         <Button type="primary" @click="QcCardChecker(1)" class="title_btn ml10">自检</Button>
       <Button type="primary" :disabled="ishavhj" @click="QcCardChecker(2)" class="title_btn ml10">互检</Button>
       <Button type="primary" :disabled="ishavzj" @click="SendCheck()" class="title_btn ml10">送检</Button>
       <Button
@@ -29,6 +34,8 @@
         @click="SendCheckRecord()"
         class="title_btn ml10"
       >送检记录</Button>
+      </div>
+     
     </div>
     <div class="table-i">
       <Table border :columns="columns12" :data="recorddata">
@@ -413,7 +420,7 @@ export default {
       });
     },
     change(v) {
-      this.datasearch.productcode = v.join(",");
+      this.datasearch.productcode = v;
       this.loaddata();
     },
     showrecordData(params, fill_in_user_type, isedit) {

pages/produce/execute/judgment/index.vue

@@ -114,7 +114,7 @@
         </Form>
       </div>
     </div>
-    <div class="futer flex fc-ev" v-if="ranglist.length>0||fanlist.length>0||feilist.length>0">
+    <div class="futer flex fc-ev" v-if="hegelist.length>0||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>
        <!-- :disabled="hegelist.length!=0&&fanlist.length!=0&&ranglist.length!=0" -->
@@ -220,7 +220,8 @@ export default {
           }
           if(u.productStatus==4){
             this.fanlist.push(u)
-          }if(u.productStatus==0){
+          }
+          if(u.productStatus==0){
             this.cardlist.push(u)
           }
           });
@@ -332,19 +333,19 @@ export default {
     okModal() {
       let unmb = this.num;
       if (unmb == 1) {
-        this.cansolhege();
+        this.cansolRang();
         this.suModal = false;
       }
       if (unmb == 2) {
-        this.cansolfei();
+        this.cansolfan();
         this.suModal = false;
       }
       if (unmb == 3) {
-        this.cansolRang();
+        this.cansolfei();
         this.suModal = false;
       }
-      if (unmb == 4) {
-        this.cansolfan();
+      if (unmb == 0) {
+        this.cansolhege();
         this.suModal = false;
       }
     },
@@ -545,6 +546,7 @@ export default {
                 }
             }
         }
+          // console.log(lists)
         let parmes={
             dispatchId: this.$route.query.id,
             orderId: this.$route.query.orderId,
@@ -585,6 +587,7 @@ export default {
             if(res.success){
               // this.$refs.orderSendReview.info.orderInfo.code = res.result.code
               this.entity.code = res.result.code
+              this.entity.idlist = res.result.id
             }else{
               console.log("获取编号失败")
             }
@@ -600,10 +603,12 @@ export default {
     // 确定送审
     orderSendOk() {
       // console.log("old->",this.entity)
+      let orderids = []
+      orderids.push(this.entity.idlist)
       console.log("new->",this.entity)
       let parmese ={
         schemaId: "c2e09c9b-02a9-4188-97a6-cdb68d50a64a",
-        idList: this.entity.orderIds,
+        idList: orderids,
         code: this.entity.code,
         operatorIdList: this.$refs.orderSendReview.returnDataList(),
       }