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

components/page/userSelect.vue

@@ -216,7 +216,7 @@ export default {
         if (!this.multiple) {
           //单选时返回信息
           if (this.datas && this.datas.length > 0) {
-             var item2 = this.datas.filter(u => u.value == this.value);
+            var item2 = this.datas.filter(u => u.value == this.value);
             if (item2 && item2[0]) {
               items.push(item2[0]);
             }
@@ -228,12 +228,21 @@ export default {
           }
         } else {
           //复选时返回
-          this.value.forEach(v => {
-            var item = this.dic.filter(u => u.value == v);
-            if (item && item[0]) {
-              items.push(item[0]);
-            }
-          });
+          if (this.datas && this.datas.length > 0) {
+            this.value.forEach(v => {
+              var item3 = this.dic.filter(u => u.value == v);
+              if (item3 && item3[0]) {
+                items.push(item3[0]);
+              }
+            });
+          } else {
+            this.value.forEach(v => {
+              var item = this.dic.filter(u => u.value == v);
+              if (item && item[0]) {
+                items.push(item[0]);
+              }
+            });
+          }
         }
       }
 

pages/produce/execute/api.js

@@ -46,5 +46,8 @@ export default {
   getentryusers(params) {
     return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params);
   },
-  
+  //工时分配--总工时待分配
+  getallhours(params) {
+    return Api.post(`${technologyUrl}workhours/allhours`, params);
+  },
 }
\ No newline at end of file

pages/produce/execute/components/orderlist.vue

@@ -81,6 +81,7 @@ export default {
           executeId: item.executeId,
           headid: item.routingHeaderId,
           routid: item.routingDetailId,//工序ID
+          quantity: item.quantity, //派工数量
           dispatchStatus: item.status
         }
       });

pages/produce/execute/taskTime/index.vue

@@ -7,7 +7,7 @@
                 <!-- <Icon type="ios-time" /> -->
                 <div class="gs_bo01">
                     <span class="shi">总工时</span>
-                    <span class="number">250</span>
+                    <span class="number">{{allHours}}</span>
                 </div>
             </div>
             <Divider type="vertical" class="line_slit"/>
@@ -16,20 +16,20 @@
                 <img  src="@/assets/imgicon/execute/time02.png" alt=""/>
                 <div class="gs_bo01">
                     <span class="shi">待分配</span>
-                    <span class="number">200</span>
+                    <span class="number">{{waitHours}}</span>
                 </div>                
             </div>
         </div>
         <div class="gs_card_box">
-            <Card class="gs_card" v-for="i of 8" :key="i">
+            <Card class="gs_card" v-for="(item,index) in cardMan" :key="index">
                 <p slot="title" class="gs_title">
-                    张三
-                    <span class="fr">02816335{{i}}</span>
+                    {{item.userName}}
+                    <span class="fr">{{item.cardNo}}</span>
                 </p>
                 <!-- <p class="gs_p">所属车间：车间A{{i}}</p>
                 <p class="gs_p">所属班组：班组B{{i}}</p> -->
                 <p class="gs_time">
-                    <span class="b_size">100</span>  工时
+                    <span class="b_size">{{item.workHour}}</span>  工时
                 </p>
                 <!-- <p class="gs_p">
                     <span class="b_size">100</span>  分
@@ -70,10 +70,20 @@ export default {
             msg:'确认要删除吗？',
             title:'删除确认',
             addmodal: false,
+            allHours: 240,
+            waitHours: 200,
+            cardMan:[
+                // {
+                //     userName:"张三",
+                //     cardNo:123123,
+                //     workHour:50,
+                // }
+            ]
         }
     },
     created() {
         // this.treeHeight = window.innerHeight - 120;
+        this.laodHorse()
     },
     async fetch({ store, params }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
@@ -87,11 +97,32 @@ export default {
         };
     },
     methods: {
+        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("获取失败。")
+                }
+            })
+        },
         addItem(){
             this.addmodal = true
             let id = this.$route.query.id
-            console.log(id)
-            // Api.getentryusers().then()
+            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("编辑工时...")
@@ -108,7 +139,13 @@ export default {
         cancel(){
             this.addmodal = false
         },
-        addInfo(){
+        addInfo(formdata){
+            console.log(formdata)
+            this.cardMan.push(formdata)
+            // this.cardMan.userName = formdata.userse||formdata.oldUserse
+            // this.cardMan.cardNo = formdata.cardNo
+            // this.cardMan.workHour = formdata.workHour
+            console.log(this.cardMan)
             this.addmodal = false
         }
     },

pages/produce/orderlist.vue

@@ -29,7 +29,7 @@
       <template slot="card" slot-scope="{row}">
         <div
           class="body"
-          @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.status)"
+          @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status)"
         >
           <Row class="title-i">
             <Col :span="10" class="order-code">{{row.productName}}</Col>
@@ -186,6 +186,7 @@ export default {
                         params.row.executeId,
                         params.row.routingHeaderId,
                         params.row.routingDetailId,
+                        params.row.quantity,
                         params.row.status
                       )
                   }
@@ -216,7 +217,7 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-    toExecute(id, orderId, executeId, headid, routingDetailId, status) {
+    toExecute(id, orderId, executeId, headid, routingDetailId,quantity, status) {
       //跳转到对应操作页面  获取id:this.$route.query.id
       this.$router.push({
         path: "/produce/execute",
@@ -226,6 +227,7 @@ export default {
           executeId: executeId, //订单执行表id
           headid: headid, //工艺规程id
           routid: routingDetailId, //工序ID
+          quantity: quantity, //派工数量
           dispatchStatus: status
         }
       });

static/config.js

@@ -21,7 +21,8 @@ window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
 window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
 window.certificateUrl = `http://${address}:10000/qms`; //质量
 window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
-window.apsUrl = `http://${address}:10000/aps`;//aps排产
+// window.apsUrl = `http://${address}:10000/aps`;//aps排产
+window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产
 window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
 window.iconImg = `/imgicon/`;