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">
+    <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,6 +24,7 @@
           >{{ item.boardNumber }}</Option>
         </Select>
       </template>-->
+      <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>
@@ -30,6 +35,8 @@
         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(),
       } 

pages/produce/execute/taskTime/index.vue

@@ -3,17 +3,17 @@
   <div class="gs_set">
     <div class="gs_top">
       <div class="gs_top_box total_time">
-                <img  src="@/assets/imgicon/execute/time01.png" alt=""/>
+        <img src="@/assets/imgicon/execute/time01.png" alt />
         <!-- <Icon type="ios-time" /> -->
         <div class="gs_bo01">
           <span class="shi">总工时</span>
           <span class="number">{{allHours}}</span>
         </div>
       </div>
-            <Divider type="vertical" class="line_slit"/>
+      <Divider type="vertical" class="line_slit" />
       <div class="gs_top_box allocated">
         <!-- <Icon type="md-pie" /> -->
-                <img  src="@/assets/imgicon/execute/time02.png" alt=""/>
+        <img src="@/assets/imgicon/execute/time02.png" alt />
         <div class="gs_bo01">
           <span class="shi">待分配</span>
           <span class="number">{{waitHours}}</span>
@@ -27,7 +27,7 @@
           <!-- <span class="fr">{{item.cardNo}}</span> -->
         </p>
         <!-- <p class="gs_p">所属车间：车间A{{i}}</p>
-                <p class="gs_p">所属班组：班组B{{i}}</p> -->
+        <p class="gs_p">所属班组：班组B{{i}}</p>-->
         <p class="gs_time">
           <span class="b_size">{{item.workHour}}</span> 工时
         </p>
@@ -36,24 +36,22 @@
                 </p>
                 <p class="gs_p">
                     <span class="b_size">100</span>  秒
-                </p> -->
+        </p>-->
         <p class="gs_footer">
           <!-- <a class="gs_edit" @click="editItem">
                         <Icon type="md-create" />
-                        编辑</a> -->
+          编辑</a>-->
           <a class="gs_del" @click="delItem(item.id)">
-                        <Icon type="ios-trash-outline" />
-                        删除</a>
+            <Icon type="ios-trash-outline" />删除
+          </a>
         </p>
       </Card>
-            <a class="gs_card gs_add" @click="addItem">
+      <a class="gs_card gs_add" @click="addItem" v-show="this.allHours!=0">
         <Icon type="ios-add" />
       </a>
     </div>
     <!-- 新增弹框 -->
-        <Modal
-            v-model="addmodal" width='1100' :mask-closable="false"
-            title="添加人员" footer-hide >
+    <Modal v-model="addmodal" width="1100" :mask-closable="false" title="添加人员" footer-hide>
       <addview ref="addview" @on-close="cancel" @on-ok="addInfo"></addview>
     </Modal>
   </div>
@@ -62,28 +60,28 @@
 import addview from "./add";
 import Api from "../api";
 export default {
-    name:'starOrder',
-    components: {addview,},
-    data(){
-        return{
+  name: "starOrder",
+  components: { addview },
+  data() {
+    return {
       starmodal: false,
-            msg:'确认要删除吗？',
-            title:'删除确认',
+      msg: "确认要删除吗？",
+      title: "删除确认",
       addmodal: false,
       allHours: 240,
       waitHours: 200,
-            cardMan:[
+      cardMan: [
         // {
         //     userName:"张三",
         //     cardNo:123123,
         //     workHour:50,
         // }
       ]
-        }
+    };
   },
   created() {
     // this.treeHeight = window.innerHeight - 120;
-        this.laodHorse()
+    this.laodHorse();
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -97,21 +95,21 @@ export default {
     };
   },
   methods: {
-        laodHorse(){
+    laodHorse() {
       let parme = {
         dispatchId: this.$route.query.id,
         routingDetailId: this.$route.query.routid,
         count: this.$route.query.quantity
+      };
+      Api.getallhours(parme).then(res => {
+        if (res.result) {
+          this.allHours = res.result.allHours;
+          this.waitHours = res.result.waitHours;
+          this.$refs.addview.maxHour = this.waitHours;
+        } else {
+          console.log("获取失败。");
         }
-            Api.getallhours(parme).then(res=>{
-                if(res.result){
-                    this.allHours = res.result.allHours
-                    this.waitHours = res.result.waitHours
-                    this.$refs.addview.maxHour = this.waitHours
-                }else{
-                    console.log("获取失败。")
-                }
-            })
+      });
       let parm = {
         conditions: [
           {
@@ -119,56 +117,56 @@ export default {
             fieldValue: this.$route.query.id,
             conditionalType: "Equal"
           }
-                ],
-                }
-            Api.getentrylist(parm).then(rest =>{
-                if(rest.success){
-                    this.cardMan = rest.result
-                }else{
-                    console.log("获取失败。")
+        ]
+      };
+      Api.getentrylist(parm).then(rest => {
+        if (rest.success) {
+          this.cardMan = rest.result;
+        } else {
+          console.log("获取失败。");
         }
-            })
+      });
     },
-        addItem(){
+    addItem() {
       // let aa=this.$refs.addview.$refs.userSelected.getSelectItems()
       // console.log("1",aa)
-            if(this.allHours==0){
-                this.$Message.info("无工时分配...")
-                return
-            }
-            this.addmodal = true
-            let id = this.$route.query.id
-            Api.getentryusers({Id:id}).then(res=>{
-                let result = res.result
-                result.map(u=>{
-                    u.checked = false
-                })
-                this.$refs.addview.listMan = result
-            })
+      // if(this.allHours==0){
+      //     this.$Message.info("无工时分配...")
+      //     return
+      // }
+      this.addmodal = true;
+      let id = this.$route.query.id;
+      Api.getentryusers({ Id: id }).then(res => {
+        let result = res.result;
+        result.map(u => {
+          u.checked = false;
+        });
+        this.$refs.addview.listMan = result;
+      });
     },
-        editItem(){
-            this.$Message.success("编辑工时...")
+    editItem() {
+      this.$Message.success("编辑工时...");
     },
-        delItem(itmid){
+    delItem(itmid) {
       this.$Modal.confirm({
         title: this.title,
         content: "<p>" + this.msg + "</p>",
         onOk: () => {
-                    Api.deletehours(itmid).then(res=>{
-                        if(res.success){
-                            this.laodHorse()
-                            this.$Message.success("工时已删除")
-                        }else{
-                            this.$Message.error("删除失败...")
+          Api.deletehours(itmid).then(res => {
+            if (res.success) {
+              this.laodHorse();
+              this.$Message.success("工时已删除");
+            } else {
+              this.$Message.error("删除失败...");
             }
-                    })
+          });
         }
       });
     },
-        cancel(){
-            this.addmodal = false
+    cancel() {
+      this.addmodal = false;
     },
-        addInfo(formdata){
+    addInfo(formdata) {
       let parme = {
         users: [
           {
@@ -180,12 +178,16 @@ export default {
         dispatchId: this.$route.query.id,
         routingDetailId: this.$route.query.routid,
         count: this.$route.query.quantity
-            }
+      };
       Api.subcreatehours(parme).then(res => {
-                if(res.success){ this.laodHorse() }
-            })
-            this.addmodal = false
+        if (res.success) {
+            this.laodHorse();
+            this.addmodal = false;
+        }else{
+            this.addmodal = true;
         }
-    },
-}
+      });
+    }
+  }
+};
 </script>