物料领用ing

assets/css/base.less

@@ -297,6 +297,9 @@ div::-webkit-scrollbar-corner {
 .mr30 {
   margin-right: 30px;
 }
+.mr40 {
+  margin-right: 40px;
+}
 
 .mtb10 {
   margin: 10px 0;

i18n/locale/zh-CN.js

@@ -1672,7 +1672,10 @@ export default {
     storeTitle: '库位名称',
     stockCode: '物料序号',
     count1:"可申请数",
-    count2:"申请数"
+    count2:"申请数",
+    count3:"已领用数/出库数",
+    count4:"领用",
+    applicationNumber:"申请数"
   },
   //导入中心
   import_center:{

pages/aps/plan/editAccessory.vue

-
 <template>
-  <div class="h100 table-content">
+<div class="h100 table-content1">
     <p class="mb10">
         订单编号：{{mesCodes}}
         <span class="ml20">产品名称：{{productNames}}</span>
@@ -15,65 +14,29 @@
 
     <div class="mb20" v-for="(item,i) in datas" :key="i">
         <p class="fwBold">{{item.routingHeader}}------{{item.routingHeaderCode}}</p>
-      <Table
-        border
-        :columns="cols"
-        :data="item.suport"
-        :ref="'table'+item.routingHeaderId"
-        class="tableCommon"
-        @on-selection-change="selectionChange(i)"
-        @on-select-cancel="selectListCancel"
-        @on-select-all-cancel="selectAllCancel"
-        @on-select="selectList"
-        @on-select-all="selectListAll"
-      >
+        <Table border :columns="cols" :data="item.suport" :ref="'table'+item.routingHeaderId" class="tableCommon" @on-selection-change="selectionChange(i)" @on-select-cancel="selectListCancel" @on-select-all-cancel="selectAllCancel" @on-select="selectList" @on-select-all="selectListAll">
             <template slot-scope="{ row, index }" slot="counts">
-          <InputNumber
-            :max="row.totalCount-row.applicationNumber"
-            :min="0"
-            v-model="row.count"
-            @on-change="inputChange1(i,row,index)"
-            :disabled="row._disabled"
-          />
+                <InputNumber :max="row.totalCount-row.applicationNumber" :min="0" v-model="row.count" @on-change="inputChange1(i,row,index)" :disabled="row._disabled" />
             </template>
             <template slot-scope="{ row, index }" slot="remarks">
-          <Input
-            type="text"
-            v-model="row.remark"
-            @on-change="inputChange1(i,row,index)"
-            :disabled="row._disabled"
-          />
+                <Input type="text" v-model="row.remark" @on-change="inputChange1(i,row,index)" :disabled="row._disabled" />
             </template>
         </Table>
     </div>
 
-    <FooterToolbar v-show="footerToolbar" class="ftball">
+    <FooterToolbar v-show="footerToolbar" class="ftball pt10">
         <!--<div class="tip">已选{{selectItems.length}}项</div>-->
-      <Form :model="orderForm" :label-width="110" ref="formValidate" :rules="ruleValidate">
+        <Form :model="orderForm" :inline="true" :label-width="110" ref="formValidate" :rules="ruleValidate">
             <FormItem label=" " prop="QuotationFinishDate">
-          <DatePicker
-            v-model="orderForm.QuotationFinishDate"
-            type="date"
-            style="color:black"
-            placeholder="请选择齐套日期"
-            @on-change="getTimeQuotationFD"
-          ></DatePicker>
+                <DatePicker v-model="orderForm.QuotationFinishDate" type="date" style="color:black" placeholder="请选择齐套日期" @on-change="getTimeQuotationFD"></DatePicker>
             </FormItem>
+            <FormItem label=""><Button type="primary" class="mr10 ml10" @click="application">申请配套</Button></FormItem>
         </Form>
-      <Button type="primary" class="mr10 ml10" @click="application">申请配套</Button>
+
     </FooterToolbar>
 
     <Modal v-model="modalAccessoryList" :title="title" fullscreen footer-hide>
-      <component
-        :is="detailAcc"
-        :eid="orderId"
-        :mesCode="mesCodes"
-        :productName="productNames"
-        :drawnNumber="drawnNumber"
-        :count="counts"
-        @on-close="cancel"
-        @on-ok="onOk"
-      />
+        <component :is="detailAcc" :eid="orderId" :mesCode="mesCodes" :productName="productNames" :drawnNumber="drawnNumber" :count="counts" @on-close="cancel" @on-ok="onOk" />
     </Modal>
     <Modal v-model="modalAccSet" title="临时设置" footer-hide width="800">
         <Form :model="entity" :label-width="110" ref="formValidateSet" :rules="ruleValidate">
@@ -95,21 +58,12 @@
                 </Col>
                 <Col span="12">
                 <FormItem label="可再申请" prop="count">
-              <InputNumber
-                :max="entity.needCount-entity.applicationNumber"
-                :min="0"
-                v-model="entity.count"
-              />
+                    <InputNumber :max="entity.needCount-entity.applicationNumber" :min="0" v-model="entity.count" />
                 </FormItem>
                 </Col>
                 <Col span="12">
                 <FormItem label="齐套日期" prop="finishDate">
-              <DatePicker
-                v-model="entity.finishDate"
-                type="date"
-                placeholder="请选择齐套日期"
-                @on-change="getTimeFinish"
-              ></DatePicker>
+                    <DatePicker v-model="entity.finishDate" type="date" placeholder="请选择齐套日期" @on-change="getTimeFinish"></DatePicker>
                 </FormItem>
                 </Col>
                 <Col span="24">
@@ -126,8 +80,9 @@
             </Row>
         </Form>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -143,8 +98,7 @@ export default {
             curId: 0,
             editIndex: -1,
             editNum: "",
-      cols: [
-        {
+            cols: [{
                     type: "selection",
                     width: 70,
                     align: "center",
@@ -194,8 +148,7 @@ export default {
                     width: "120",
                     render: (h, params) => {
                         return h(
-              "op",
-              {
+                            "op", {
                                 attrs: {
                                     oprate: "detail",
                                 },
@@ -204,9 +157,9 @@ export default {
                                 },
                             },
                             params.row._disabled &&
-                params.row.totalCount - params.row.applicationNumber > 0
-                ? "临时申请"
-                : ""
+                            params.row.totalCount - params.row.applicationNumber > 0 ?
+                            "临时申请" :
+                            ""
                         );
                     },
                 },
@@ -224,28 +177,22 @@ export default {
             counts: this.count,
             curArr: 0, //标记当前操作工艺规程列表是否为空
             ruleValidate: {
-        QuotationFinishDate: [
-          {
+                QuotationFinishDate: [{
                     required: true,
                     message: "_",
                     trigger: "change",
-          },
-        ],
-        finishDate: [
-          {
+                }, ],
+                finishDate: [{
                     required: true,
                     message: "请选择齐套日期",
                     trigger: "change",
-          },
-        ],
-        count: [
-          {
+                }, ],
+                count: [{
                     required: true,
                     message: "请输入申请数量",
                     type: "number",
                     trigger: "change",
-          },
-        ],
+                }, ],
             },
             tempList: [],
             cRow: null,
@@ -276,12 +223,17 @@ export default {
     mounted() {
         this.load(this.eid);
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     methods: {
         load(v) {
-      Api.matchdetaillist({ id: v }).then((r) => {
+            Api.matchdetaillist({
+                id: v
+            }).then((r) => {
                 if (r.success) {
                     r.result.forEach((e) => {
                         let i = 0;
@@ -414,7 +366,7 @@ export default {
                             count: this.counts,
                             creator: this.$store.state.userInfo.userName,
                             finishDate: this.orderForm.QuotationFinishDate,
-              orderCode:this.mesCode,
+                            orderCode: this.mesCode,
                         },
                         items: temItems,
                     };
@@ -458,7 +410,7 @@ export default {
                             count: this.counts,
                             creator: this.$store.state.userInfo.userName,
                             finishDate: this.entity.finishDate,
-              orderCode:this.mesCode,
+                            orderCode: this.mesCode,
                         },
                         items: temItems,
                     };
@@ -514,4 +466,3 @@ export default {
     },
 };
 </script>
-

pages/produce/execute/MaterialCollec/index.vue

-
 <template>
-    <div class="wu_bg">
-        <div class="star" v-if="!starmodal">
-            <a class="start" @click="starFun" >
-                物料领用</a>
-            </div>
-        </div>
+<div class="h100 table-content1">
+    <p class="mb10 ml40 mr40">
+        订单编号：{{entity.mesCode}}
+        <span class="ml20">产品名称：{{entity.productName}}</span>
+        <span class="ml20">生产数量：{{entity.count}}</span>
+        <span class="ml20">物料状态：</span>
+    </p>
+
+    <div class="mb20 ml40 mr40" v-for="(item,i) in datas" :key="i">
+        <p class="fwBold">{{item.routingHeader}}------{{item.routingHeaderCode}}</p>
+        <Table border :columns="cols" :data="item.suport" :ref="'table'+item.routingHeaderId" class="tableCommon">
+            <template slot-scope="{ row, index }" slot="counts4">
+                <InputNumber :max="row.outStockNumber-row.receiveNumber" :min="0" v-model="row.count4" @on-change="inputChange1(i,row,index)" :disabled="row._disabled" />
+            </template>
+        </Table>
     </div>
+    <FooterToolbar v-show="footerToolbar">
+        <Button type="primary" class="mr10 ">物料领用</Button>
+    </FooterToolbar>
+</div>
 </template>
+
 <script>
+import Api from "../../../aps/plan/api";
 export default {
-    name:'starOrder',
-    data(){
-        return{
-            starmodal: false,
+    name: 'starOrder',
+    data() {
+        return {
+            entity: {},
+            title: "",
+            detailAcc: null,
+            modalAccessoryList: false,
+            modalAccSet: false,
+            disabled: false,
+            deletelModal: false,
+            curId: 0,
+            editIndex: -1,
+            editNum: "",
+            cols: [{
+                    key: "routingDetailNo",
+                    title: this.l("routingDetailNo"),
+                    align: "left",
+                },
+                {
+                    key: "routingDetailName",
+                    title: this.l("routingDetailName"),
+                    align: "left",
+                },
+                {
+                    key: "nameMaterial",
+                    title: this.l("nameMaterial"),
+                    align: "left",
+                },
+                {
+                    key: "materialNumber",
+                    title: this.l("materialNumber"),
+                    align: "left",
+                },
+                {
+                    key: "totalCount",
+                    title: this.l("totalCount"),
+                    align: "left",
+                },
+                {
+                    key: "applicationNumber",
+                    title: this.l("applicationNumber"),
+                    align: "right",
+                    width: 120,
+                },
+                {
+                    key: "",
+                    title: this.l("count3"),
+                    align: "right",
+                    slot: "counts",
+                    width: 150,
+                    render: (h, params) => {
+                        return h(
+                            "div", {},
+                            params.row.receiveNumber + "/" + params.row.outStockNumber
+                        )
+                    }
+                },
+                {
+                    key: "count4",
+                    title: this.l("count4"),
+                    align: "center",
+                    width: 120,
+                    slot: "counts4",
+                },
+                {
+                    key: "remark",
+                    title: this.l("remark"),
+                    align: "left",
                 }
+            ],
+            orderForm: {
+                QuotationFinishDate: "",
+            },
+            datas: [],
+            selectItems: [],
+            footerToolbar: true,
+            orderId: null,
+            mesCode: "",
+            productName: "",
+            drawnNumber: "",
+            count: null,
+            curArr: 0, //标记当前操作工艺规程列表是否为空
+            ruleValidate: {
+                QuotationFinishDate: [{
+                    required: true,
+                    message: "_",
+                    trigger: "change",
+                }, ],
+                finishDate: [{
+                    required: true,
+                    message: "请选择齐套日期",
+                    trigger: "change",
+                }, ],
+                count: [{
+                    required: true,
+                    message: "请输入申请数量",
+                    type: "number",
+                    trigger: "change",
+                }, ],
+            },
+            tempList: [],
+            cRow: null,
+            cArr: [],
+        };
+    },
+    props: {
+        row: Object,
+        gdid: Number,
     },
     created() {
         // this.treeHeight = window.innerHeight - 120;
     },
-    async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {
+        this.loadInfo()
         window.onresize = () => {
             ///浏览器窗口大小变化
             return (() => {
@@ -31,9 +152,69 @@ export default {
         };
     },
     methods: {
-        starFun(){
-            this.$Message.success("开工...")
+        loadInfo() {
+            this.entity = this.row
+            let v = this.row.orderId
+            Api.matchdetaillist({
+                id: v
+            }).then((r) => {
+                if (r.success) {
+                    r.result.forEach((e) => {
+                        let i = 0;
+                        e.suport.forEach((el) => {
+                            el.count = el.totalCount - el.applicationNumber;
+                            if (el.outStockNumber - el.receiveNumber > 0) {
+                                el.count4 = el.outStockNumber - el.receiveNumber
+                                el._disabled = false;
+                            } else {
+                                el.count4 = 0;
+                                el._disabled = true;
+                            }
+                            el._index = i++;
+                        });
+                    });
+                    this.datas = r.result;
+                }
+            });
+        },
+        inputChange1(i, row, index) {
+            //输入数量
+            this.$set(this.datas[i].suport, index, row);
+        },
+        l(key) {
+            let vkey = "support_item" + "." + key;
+            return this.$t(vkey) || key;
+        },
+    },
+    watch: {
+        row(v) {
+            this.entity = this.$u.clone(v);
+            this.productName = this.entity.productName
+        },
+        gdid(v) {
+            if (v > 0) {
+                // this.load(v);
+            }
         },
     },
 }
 </script>
+
+<style lang="less">
+.table-content1 {
+    .table-footer {
+        line-height: 45px;
+        text-align: right;
+    }
+
+    .ivu-footer-toolbar {
+        text-align: right;
+        background: rgba(0, 0, 0, 0.7);
+        color: #fff;
+    }
+
+    .ivu-footer-toolbar-right {
+        float: right;
+    }
+}
+</style>

pages/produce/execute/components/orderlist.vue

-
 <template>
-  <div class="order_list">
+<div class="order_list">
     <div class="card_box">
-      <Card
-        class="card_order"
-        v-for="(item,index) in listTasks"
-        :style="order==item.id?'box-shadow: 0px 0px 15px #333;':''"
-        @click.native="goPage(item)"
-        :key="index"
-        :class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3':
-                (item.status==7?'card_border4':(item.status==-1?'card_border5':''))))"
-      >
+        <Card class="card_order" v-for="(item,index) in listTasks" :style="order==item.id?'box-shadow: 0px 0px 15px #333;':''" @click.native="goPage(item)" :key="index" :class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3':
+                (item.status==7?'card_border4':(item.status==-1?'card_border5':''))))">
             <!-- :class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
         (item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))"-->
             <p slot="title">
@@ -27,8 +19,9 @@
         </Card>
         <p>共 {{listTasks.length}} 个工单</p>
     </div>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "../../api";
 export default {
@@ -86,7 +79,10 @@ export default {
                     headid: item.routingHeaderId,
                     routid: item.routingDetailId, //工序ID
                     quantity: item.quantity, //派工数量
-          dispatchStatus: item.status
+                    dispatchStatus: item.status,
+                    mesCode: item.mesCode,
+                    productName: item.productName,
+                    drawnNumber: item.drawnNumber,
                 }
             });
         }
@@ -104,7 +100,7 @@ export default {
             this.loadTree();
         },
         refresh(v) {
-      this.refresh=v;
+            this.refresh = v;
             this.loadTree();
         }
     }

pages/produce/execute/index.vue

@@ -2,7 +2,7 @@
 @import "./execute.less";
 </style>
 <template>
-  <div class="execute_box">
+<div class="execute_box">
     <!-- <div class="top_title">
             <span class="fl">{{orderTitle}}</span> 
             <div>工单编号: 12001011</div>
@@ -11,25 +11,13 @@
     <a class="gd_list" @click="changeFresh">工单列表</a>
     <a class="gn_area" @click="functionalMode = true">功能区</a>
     <!-- 工单列表 -->
-    <Drawer
-      placement="left"
-      class="gd_box"
-      :closable="false"
-      :inner="true"
-      :transfer="false"
-      v-model="orderlistMode"
-    >
+    <Drawer placement="left" class="gd_box" :closable="false" :inner="true" :transfer="false" v-model="orderlistMode">
         <div slot="header">
             <div class="header">
                 <a class="gd_tt" @click="goToOrder">
                     <Icon type="ios-undo-outline" />工单列表
                 </a>
-          <Dictionary
-            code="taskList.status"
-            class="select_star fr"
-            v-model="odermodel"
-            @on-change="searchOrder"
-          ></Dictionary>
+                <Dictionary code="taskList.status" class="select_star fr" v-model="odermodel" @on-change="searchOrder"></Dictionary>
             </div>
             <div class="select_t" style="height:40px">
                 <Button @click="changeAsc" class="fr" shape="circle" icon="md-calendar">{{ascTitle}}</Button>
@@ -39,22 +27,20 @@
         <orderlist ref="orderlistref" :asc="asc" :statu="statu" :refresh="refresh" :order="inputId" />
     </Drawer>
     <!-- 功能区  -->
-    <Drawer
-      class="gn_box"
-      :closable="false"
-      :inner="true"
-      :transfer="false"
-      v-model="functionalMode"
-    >
+    <Drawer class="gn_box" :closable="false" :inner="true" :transfer="false" v-model="functionalMode">
         <functional @changeTitle="changeTitle" ref="functional" />
     </Drawer>
-  </div>
+</div>
 </template>
+
 <script>
 import functional from "./components/functional";
 import orderlist from "./components/orderlist";
 export default {
-  components: { functional, orderlist },
+    components: {
+        functional,
+        orderlist
+    },
     data() {
         return {
             orderTitle: "进度汇报",
@@ -81,15 +67,21 @@ export default {
         row.id = this.$route.query.id;
         row.orderId = this.$route.query.orderId;
         row.executeId = this.$route.query.executeId;
-row.headid=this.$route.query.headid;
-row.routingdetailId=this.$route.query.routid;
-
+        row.headid = this.$route.query.headid;
+        row.routingdetailId = this.$route.query.routid;
+        row.mesCode = this.$route.query.mesCode;
+        row.productName = this.$route.query.productName;
+        row.drawnNumber = this.$route.query.drawnNumber;
+        row.count = this.$route.query.quantity;
 
         this.row = row;
         this.inputId = this.$route.query.id;
         this.detail = () => import("./starOrder/index");
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {},
@@ -114,8 +106,7 @@ row.routingdetailId=this.$route.query.routid;
                 this.detail = () => import("./starOrder/index");
             } //进度汇报
             if (number == 1) {
-        this.$Message.info("尊敬的用户，您没有该权限！");
-        // this.detail = () => import("./MaterialCollec/index");
+                this.detail = () => import("./MaterialCollec/index");
             } //物料领用
             if (number == 2) {
                 // this.detail = () => import("./productSet/index");

src/assets/css/base.css

@@ -232,6 +232,9 @@ div::-webkit-scrollbar-corner {
 .mr30 {
   margin-right: 30px;
 }
+.mr40 {
+  margin-right: 40px;
+}
 .mtb10 {
   margin: 10px 0;
 }