From 7a20f97b9285d7fa60f2ded3c60b9fc29affac84 Mon Sep 17 00:00:00 2001 From: lcode <18046109718@163.com> Date: Sat, 16 Nov 2024 17:47:58 +0800 Subject: [PATCH] =?UTF-8?q?20241116=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../procurement/purchaseReceipt/index.vue | 1 - .../procurement/purchaseReceipt/savePage.vue | 7 - .../purchaseReceipt/selectPage.vue | 8 - .../materialsSelect.vue | 47 ++-- .../extrusionProductionSchedule/module.js | 16 +- .../extrusionProductionSchedule/savePage.vue | 17 +- .../processMaterialRequisition/index.vue | 3 +- .../processMaterialRequisition/savePage.vue | 8 - .../processMaterialReturn/index.vue | 3 +- .../processMaterialReturn/savePage.vue | 14 - .../processMaterialWarehouse/savePage.vue | 2 + .../processReport/index.vue | 28 +- .../processReport/info.vue | 51 +++- .../processReport/module.js | 121 ++++++--- .../processReport/save.vue | 11 + .../processReport/savePage.vue | 36 ++- .../productionPlan/index.vue | 4 +- .../productionPlan/module.js | 1 + .../mini/salesManagement/salesOrder/index.vue | 254 +++++++++++------- .../salesOrder/materialsSelect.vue | 9 +- .../salesManagement/salesOrder/savePage.vue | 21 +- .../salesManagement/salesReturn/module.js | 1 + 22 files changed, 417 insertions(+), 246 deletions(-) diff --git a/manage/src/views/mini/procurement/purchaseReceipt/index.vue b/manage/src/views/mini/procurement/purchaseReceipt/index.vue index 46babe2..7ee78a4 100644 --- a/manage/src/views/mini/procurement/purchaseReceipt/index.vue +++ b/manage/src/views/mini/procurement/purchaseReceipt/index.vue @@ -70,7 +70,6 @@ - diff --git a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/module.js b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/module.js index 57ab13f..71fdfc3 100644 --- a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/module.js +++ b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/module.js @@ -117,19 +117,19 @@ export default { "title": "选计划排产订单", "panelWidth": "1000px", "api": "productionSchedule.list", - "params": { "status": 1 }, + "params": { "status": 1, "orderStatus": 1 }, "column": [ { label: "", prop: "id", width: "200", hide: true }, { label: "计划单号", prop: "documentNumber", width: "200" }, { label: "销售单号", prop: "salesOrderCode", width: "200" }, - { "label": "客户名称", "prop": "customerName", "width": "200" }, + { label: "客户名称", prop: "customerName", width: "200" }, { label: "销售日期", prop: "salesDate", width: "200", }, - { "label": "销售员", "prop": "salespersonName", "width": "200" }, - { "label": "价格", "prop": "price", "width": "200" }, + { label: "销售员", prop: "salespersonName", width: "200" }, + { label: "价格", prop: "price", width: "200" }, { label: "定价日期", prop: "pricingDate", @@ -140,9 +140,10 @@ export default { prop: "deliveryDate", width: "200", }, - { "label": "税率", "prop": "taxRate", "width": "200" }, - { "label": "加工费", "prop": "processingFee", "width": "200" }, - { "label": "备注", "prop": "remarks", "width": "200" }, + { label: "税率", prop: "taxRate", width: "200" }, + { label: "加工费", prop: "processingFee", width: "200" }, + { label: "备注", prop: "remarks", width: "200" }, + { label: "订单号", prop: "orderNo", width: "200" }, { label: "物料编号", prop: "materialCode", width: "200" }, { label: "型材型号", prop: "profileModel", width: "200" }, { label: "物料名称", prop: "materialName", width: "200" }, @@ -150,7 +151,6 @@ export default { { label: "壁厚", prop: "thickness", width: "200" }, { label: "米重 (kg/m)", prop: "weight", width: "200" }, { label: "支/扎", prop: "piecesBundle", width: "200" }, - { label: "物料/产品分类", prop: "materialCategoryName", width: "200" }, { label: "包装方式", prop: "packagingMethod", width: "200" }, ], }, diff --git a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/savePage.vue b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/savePage.vue index 9e2fe54..bfba120 100644 --- a/manage/src/views/mini/productionManagement/extrusionProductionSchedule/savePage.vue +++ b/manage/src/views/mini/productionManagement/extrusionProductionSchedule/savePage.vue @@ -80,7 +80,6 @@ v-model="scoped.row.productionPieces" :step="1" :min="1" - :max="Number(scoped.row.plannedPieces) - Number(scoped.row.productionedPieces)" :precision="0" :controls="true" @@ -138,14 +137,12 @@ export default { selection: [], dialog: { product: false, + selectPage: false, }, supplier: {}, path: this.$route.query.path, detailId: this.$route.query.id, mode: "add", - dialog: { - selectPage: false, - }, visible: false, orderInfo: {} }; @@ -175,6 +172,7 @@ export default { handler(newVal) { if (!newVal) return; newVal.forEach((item) => { + /* 支数 */ item["pieces"] = parseFloat( Number(item["piecesBundle"]) * Number(item["returnQuantity"]) @@ -193,8 +191,8 @@ export default { item["theoreticalWeight"] = parseFloat( ( Number(item["weight"]) * - Number(item["defaultLength"]) * - Number(item["returnQuantity"]) + Number(item["orderLength"]) * + Number(item["plannedPieces"]) ).toFixed(2) ); @@ -250,7 +248,7 @@ export default { this.listData = this.listData.filter( (item1) => !this.selection.some( - (item2) => item2.materialCode === item1.materialCode + (item2) => item2.orderNo === item1.orderNo ) ); this.selection = []; @@ -265,8 +263,11 @@ export default { item[key] = _this.initComputed[key]; } } + + item["productionLength"] = item["orderLength"] + item["productionPieces"] = item["plannedPieces"] }); - console.log("2", this, this.listData) + this.listData = [...data]; }, async queryInventoryQuantity(row) { diff --git a/manage/src/views/mini/productionManagement/processMaterialRequisition/index.vue b/manage/src/views/mini/productionManagement/processMaterialRequisition/index.vue index d98aa1c..ffa223c 100644 --- a/manage/src/views/mini/productionManagement/processMaterialRequisition/index.vue +++ b/manage/src/views/mini/productionManagement/processMaterialRequisition/index.vue @@ -37,8 +37,7 @@ diff --git a/manage/src/views/mini/salesManagement/salesOrder/savePage.vue b/manage/src/views/mini/salesManagement/salesOrder/savePage.vue index dfdeea3..9cba655 100644 --- a/manage/src/views/mini/salesManagement/salesOrder/savePage.vue +++ b/manage/src/views/mini/salesManagement/salesOrder/savePage.vue @@ -181,13 +181,11 @@ export default { }, 'form.customerId': { handler(value, old) { - console.log('form.customerId', value) const formItems = module.pageForm.form.formItems const fields = formItems.filter(item => { return item.name == 'customerId' })[0] const items = fields.options.items - console.log(fields) if (!!items) { const curObj = items.filter(item => { return item.value == value @@ -201,7 +199,6 @@ export default { }, listData: { handler(newVal) { - console.log(this.form) newVal.forEach((item) => { /* 理论支重 */ item["theoreticalWeightPerPiece"] = parseFloat( @@ -240,7 +237,6 @@ export default { ); /* 含税单价 */ - console.log("item", item) item["priceWithTax"] = parseFloat( (Number(item["unitPrice"]) + parseFloat( @@ -310,17 +306,29 @@ export default { }); }, delete_materials() { + this.listData = this.listData.filter( (item1) => !this.selection.some( - (item2) => item2.materialCode === item1.materialCode + (item2) => item2.curIndex === item1.curIndex ) ); + + let curIndex = 0; + this.listData.forEach((item) => { + curIndex = curIndex + 1 + item['curIndex'] = curIndex; + }); + this.selection = []; }, handleSuccess(data) { const _this = this; + let curIndex = this.listData.length data.forEach((item) => { + curIndex = curIndex + 1 + item['curIndex'] = curIndex; + for (let key in _this.initComputed) { if (!item[key]) { item[key] = _this.initComputed[key]; @@ -328,6 +336,7 @@ export default { } }); this.listData = [...data, ...this.listData]; + console.log("this.listData", this.listData) }, async queryInventoryQuantity(row) { // 查看现有库存 @@ -343,7 +352,6 @@ export default { back() { // useTabs.closeNext((tags) => { // //回调返回所有标签的数组，这里其实是需要判断是否含有'/usercenter'，含有再操作的，这里为了演示就直接打开了。 - // console.log(tags); // this.$router.push(this.path); // this.$route.is = true; // }); @@ -361,7 +369,6 @@ export default { materials: this.listData, orderInfo: this.form, }; - console.log(params); var res = null; if (this.mode == "edit") { diff --git a/manage/src/views/mini/salesManagement/salesReturn/module.js b/manage/src/views/mini/salesManagement/salesReturn/module.js index ee9f3db..565c585 100644 --- a/manage/src/views/mini/salesManagement/salesReturn/module.js +++ b/manage/src/views/mini/salesManagement/salesReturn/module.js @@ -166,6 +166,7 @@ export default { }, column2: [ { label: "", prop: "id", width: "200", hide: true }, + { label: "订单号", prop: "orderNo", width: "200" }, { label: "物料编码", prop: "materialCode", width: "200" }, { label: "物料名称", prop: "materialName", width: "200" }, { label: "订单长度 (M)", prop: "orderLength", width: "200" },