工单执行 data

i18n/locale/zh-CN.js

@@ -1664,7 +1664,7 @@ export default {
     nameMaterial: '物料名称',
     materialNumber: '物料编号',
     needCount: '需要数量',
-    totalCount: '需要数量',
+    totalCount: '需求数量',
     outStockNumber: '出库数量',
     orderId: '',
     remark: '备注',

pages/aps/plan/api.js

@@ -56,6 +56,10 @@ export default {
     matchdetaillist(params){//配套审核单列表
         return  Api.get(`${technologyUrl}materiallist/matchdetaillist`, params);
     },
+    //物料领用
+    materialreceiveCreate(params){//配套审核单列表
+        return  Api.post(`${technologyUrl}materialreceive/create`, params);
+    },
     
    
 }
\ No newline at end of file

pages/produce/execute/MaterialCollec/index.vue

@@ -16,7 +16,7 @@
         </Table>
     </div>
     <FooterToolbar v-show="footerToolbar">
-        <Button type="primary" class="mr10 ">物料领用</Button>
+        <Button type="primary" class="mr10" @click="materialCreate">物料领用</Button>
     </FooterToolbar>
 </div>
 </template>
@@ -41,6 +41,7 @@ export default {
                     key: "routingDetailNo",
                     title: this.l("routingDetailNo"),
                     align: "left",
+                    width: 100
                 },
                 {
                     key: "routingDetailName",
@@ -61,6 +62,7 @@ export default {
                     key: "totalCount",
                     title: this.l("totalCount"),
                     align: "left",
+                    width: 150,
                 },
                 {
                     key: "applicationNumber",
@@ -85,7 +87,7 @@ export default {
                     key: "count4",
                     title: this.l("count4"),
                     align: "center",
-                    width: 120,
+                    width: 150,
                     slot: "counts4",
                 },
                 {
@@ -181,6 +183,49 @@ export default {
             //输入数量
             this.$set(this.datas[i].suport, index, row);
         },
+        //物料领用
+        materialCreate() {
+            let temDataOld = this.$u.clone(this.datas)
+            let temData = []
+            temDataOld.forEach(ele => {
+                temData = temData.concat(ele.suport)
+            })
+            //  alert(JSON.stringify(temData))
+            let datas = []
+            temData.forEach(el => {
+                if (el.count4 && el.count4 > 0 && el.count4 != "") {
+                    let temObj = {
+                        routingHeaderId: el.routingHeaderId,
+                        routingDeatilId: el.routingDetailId,
+                        routingDetailName: el.routingDetailName,
+                        routingDetailSeq: el.routingDetailNo,
+                        count: el.count4,
+                        materialId: el.materialId,
+                        materialName: el.nameMaterial,
+                        materialNumber: el.materialNumber,
+                        supportMainId: 0,
+                    }
+                    datas.push(temObj)
+                }
+            })
+            if (datas.length > 0) {
+                let params = {
+                    items: datas,
+                    orderId: this.entity.orderId,
+                    dispatchId: this.entity.id,
+                    creator: this.$store.state.userInfo.userName,
+                    status: 0
+                }
+                Api.materialreceiveCreate(params).then(r => {
+                    if (r.success) {
+                        this.$Message.success("物料领用成功");
+                        this.loadInfo();
+                    }
+                });
+            } else {
+                this.$Message.error("请输入领用物料数量！");
+            }
+        },
         l(key) {
             let vkey = "support_item" + "." + key;
             return this.$t(vkey) || key;

pages/produce/orderlist.vue

-
 <template>
-  <div class="aps-r">
-    <DataGrid
-      :columns="columns"
-      ref="grid"
-      :batch="false"
-      :type="typeInfo"
-      :span="6"
-      :lazy="true"
-      :conditions="easySearch"
-      :action="action"
-      :gutter="40"
-    >
+<div class="aps-r">
+    <DataGrid :columns="columns" ref="grid" :batch="false" :type="typeInfo" :span="6" :lazy="true" :conditions="easySearch" :action="action" :gutter="40">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">
-            <Input
-              placeholder="请输入订单编号/产品名称/图号"
-              v-model="easySearch.keys.value"
-              v-width="260"
-              clearable
-            />
+                    <Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable />
                 </FormItem>
                 <FormItem>
                     <Button type="primary" @click="search">查询</Button>
@@ -34,10 +18,7 @@
             <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
         </template>
         <template slot="card" slot-scope="{row}">
-        <div
-          class="body"
-          @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status)"
-        >
+            <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)">
                 <Row class="title-i">
                     <Col :span="10" class="order-code">
                     <Ellipsis :text="row.productName" :lines="1" tooltip transfer />
@@ -49,13 +30,7 @@
                     <div class="statuBg" :style="tdStyle(row.status)"></div>
                     <div class="boxTitle">
                         <div class="text">
-                  <state
-                    code="taskList.status"
-                    ref="state"
-                    :value="row.status"
-                    type="text"
-                    :color="false"
-                  ></state>
+                            <state code="taskList.status" ref="state" :value="row.status" type="text" :color="false"></state>
                         </div>
                     </div>
                     </Col>
@@ -63,14 +38,7 @@
                 <div class="panel-text">
                     <Row>
                         <Col span="8">
-                <img
-                  :src="getUrl(row.productUrl)"
-                  width="120"
-                  height="120"
-                  :title="row.productUrl"
-                  style="border:#cacbd0 dashed 1px"
-                  onerror="this.src='/imgicon/noPic_product.png';"
-                />
+                        <img :src="getUrl(row.productUrl)" width="120" height="120" :title="row.productUrl" style="border:#cacbd0 dashed 1px" onerror="this.src='/imgicon/noPic_product.png';" />
                         </Col>
                         <Col span="16" class="row">
                         <p>{{l("beginTime")}}：{{row.beginTime}}</p>
@@ -89,34 +57,19 @@
                     <Row class="rowBottom">
                         <Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
                         <Col span="10" class="tr">
-                <Icon
-                  type="md-alert"
-                  size="18"
-                  color="#FFA000"
-                  v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
-                />
-                <span
-                  style="color:#FFA000"
-                  v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
-                >预警</span>&nbsp;&nbsp;
-                <Icon
-                  type="md-timer"
-                  size="18"
-                  color="#FE7777"
-                  v-if="getStatus(row.status)&&compareTime(row.endTime)"
-                />
-                <span
-                  style="color:#FE7777"
-                  v-if="getStatus(row.status)&&compareTime(row.endTime)"
-                >超期</span>
+                        <Icon type="md-alert" size="18" color="#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0" />
+                        <span style="color:#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0">预警</span>&nbsp;&nbsp;
+                        <Icon type="md-timer" size="18" color="#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)" />
+                        <span style="color:#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)">超期</span>
                         </Col>
                     </Row>
                 </div>
             </div>
         </template>
     </DataGrid>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 import Search from "./search";
@@ -136,8 +89,7 @@ export default {
                 //status: { op: "Equal", value: 0 }
             },
             downUrl: fileUrlDown,
-      columns: [
-        {
+            columns: [{
                     title: this.l("mesCode"),
                     key: "mesCode",
                     width: 240,
@@ -190,11 +142,14 @@ export default {
                     width: 140,
                     align: "center",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(
-                "op",
-                {
-                  attrs: { oprate: "edit" },
+                                "op", {
+                                    attrs: {
+                                        oprate: "edit"
+                                    },
                                     on: {
                                         click: () =>
                                             this.toExecute(
@@ -204,7 +159,10 @@ export default {
                                                 params.row.routingHeaderId,
                                                 params.row.routingDetailId,
                                                 params.row.quantity,
-                        params.row.status
+                                                params.row.status,
+                                                params.row.mesCode,
+                                                params.row.productName,
+                                                params.row.drawnNumber
                                             )
                                     }
                                 },
@@ -224,7 +182,10 @@ export default {
         let oldStr = localStorage.getItem("admin");
         let userlist = this.$store.getters.getUser(2);
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {
@@ -241,7 +202,10 @@ export default {
             headid,
             routingDetailId,
             quantity,
-      status
+            status,
+            mesCode,
+            productName,
+            drawnNumber
         ) {
             //跳转到对应操作页面  获取id:this.$route.query.id
             this.$router.push({
@@ -253,7 +217,10 @@ export default {
                     headid: headid, //工艺规程id
                     routid: routingDetailId, //工序ID
                     quantity: quantity, //派工数量
-          dispatchStatus: status
+                    dispatchStatus: status,
+                    mesCode: mesCode,
+                    productName: productName,
+                    drawnNumber: drawnNumber
                 }
             });
         },
@@ -331,6 +298,7 @@ export default {
     }
 };
 </script>
+
 <style lang="less">
 .aps-r {
     // width: 100%;
@@ -338,11 +306,13 @@ export default {
     // overflow: auto;
     // padding: 15px 0 15px 15px;
     height: calc(100vh - 110px);
+
     .body {
         background: white;
         border-radius: 4px 0 4px 4px;
         border: #cacbd0 solid 1px;
         margin-bottom: 30px;
+
         .title-i {
             padding: 0 0 0 8px;
             height: 38px;
@@ -351,27 +321,34 @@ export default {
             font-size: 14px;
             font-weight: bold;
             border-bottom: #cacbd0 dotted 1px;
+
             .btn-click {
                 text-align: right;
+
                 a {
                     color: #fff;
                 }
+
                 a:hover {
                     color: #249e91;
                 }
             }
         }
+
         .panel-text {
             padding: 5px 8px;
+
             .row {
                 color: #666666;
                 padding-left: 10px;
+
                 p {
                     line-height: 30px;
                 }
             }
         }
     }
+
     .body:hover {
         cursor: pointer;
         box-shadow: 0 0 10px #888888;
@@ -385,16 +362,22 @@ export default {
     float: right;
     margin-right: -1px;
 }
+
 .boxTitle {
     color: white;
     float: right;
     margin-top: -42px;
     /* Rotate div */
     transform: rotate(37deg);
-  -ms-transform: rotate(37deg); /* Internet Explorer */
-  -moz-transform: rotate(37deg); /* Firefox */
-  -webkit-transform: rotate(37deg); /* Safari 和 Chrome */
-  -o-transform: rotate(37deg); /* Opera */
+    -ms-transform: rotate(37deg);
+    /* Internet Explorer */
+    -moz-transform: rotate(37deg);
+    /* Firefox */
+    -webkit-transform: rotate(37deg);
+    /* Safari 和 Chrome */
+    -o-transform: rotate(37deg);
+
+    /* Opera */
     .text {
         font-size: 8px;
         font-weight: normal;