From 4d5ea536e7722382ded9fb5e9757f7c1024ddaea Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Sat, 8 Feb 2025 16:35:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=94=80=E5=94=AE=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E3=80=81=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E3=80=81?=
=?UTF-8?q?=E8=BD=AC=E7=A7=BB=E8=B0=83=E6=8B=A8=E3=80=81=E8=A3=85=E7=AE=B1?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81SN=E7=A0=81=E3=80=81=E5=A4=96?=
=?UTF-8?q?=E5=8D=8F=E5=8F=91=E6=96=99=E3=80=81=E5=A4=96=E5=8D=8F=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E3=80=81=E5=B7=A5=E8=89=BA=E6=B5=81=E7=A8=8B=E5=92=8C?=
=?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/pro/proroute/product.vue | 7 +-
src/views/mes/pro/workorder/bom/bom.vue | 2 +-
.../mes/qc/qctemplate/templateproduct.vue | 7 +-
src/views/mes/wm/outsourceissue/line.vue | 7 +-
src/views/mes/wm/outsourcerecpt/line.vue | 7 +-
src/views/mes/wm/package/line.vue | 11 +-
src/views/mes/wm/productsalse/line.vue | 7 +-
src/views/mes/wm/rtsalse/line.vue | 7 +-
src/views/mes/wm/sn/index.vue | 3 +-
src/views/mes/wm/transfer/line.vue | 217 +++++++++---------
10 files changed, 142 insertions(+), 133 deletions(-)
diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index abb5b8f..cf6859e 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -82,7 +82,7 @@
-
+
-
-
+
+
@@ -283,6 +283,7 @@ export default {
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
// 取消按钮
diff --git a/src/views/mes/pro/workorder/bom/bom.vue b/src/views/mes/pro/workorder/bom/bom.vue
index b85f3f7..8ee2bcc 100644
--- a/src/views/mes/pro/workorder/bom/bom.vue
+++ b/src/views/mes/pro/workorder/bom/bom.vue
@@ -19,7 +19,7 @@
-
+
diff --git a/src/views/mes/qc/qctemplate/templateproduct.vue b/src/views/mes/qc/qctemplate/templateproduct.vue
index 21d3fbb..c0195ab 100644
--- a/src/views/mes/qc/qctemplate/templateproduct.vue
+++ b/src/views/mes/qc/qctemplate/templateproduct.vue
@@ -42,7 +42,7 @@
-
+
@@ -126,8 +126,8 @@
-
-
+
+
@@ -351,6 +351,7 @@ export default {
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
}
diff --git a/src/views/mes/wm/outsourceissue/line.vue b/src/views/mes/wm/outsourceissue/line.vue
index 2f1e739..7c232e8 100644
--- a/src/views/mes/wm/outsourceissue/line.vue
+++ b/src/views/mes/wm/outsourceissue/line.vue
@@ -41,7 +41,7 @@
-
+
@@ -110,8 +110,8 @@
-
-
+
+
@@ -366,6 +366,7 @@ export default {
this.form.areaName = obj.areaName;
this.form.quantityIssued = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
+ this.form.unitName = obj.unitName
}
},
}
diff --git a/src/views/mes/wm/outsourcerecpt/line.vue b/src/views/mes/wm/outsourcerecpt/line.vue
index f851a70..537a7ca 100644
--- a/src/views/mes/wm/outsourcerecpt/line.vue
+++ b/src/views/mes/wm/outsourcerecpt/line.vue
@@ -41,7 +41,7 @@
-
+
@@ -104,8 +104,8 @@
-
-
+
+
@@ -427,6 +427,7 @@ export default {
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
//IQC检验单选择
diff --git a/src/views/mes/wm/package/line.vue b/src/views/mes/wm/package/line.vue
index df7088e..c50daec 100644
--- a/src/views/mes/wm/package/line.vue
+++ b/src/views/mes/wm/package/line.vue
@@ -31,10 +31,10 @@
-
+
-
+
{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}
@@ -59,7 +59,7 @@
-
+
-
-
+
+
@@ -290,6 +290,7 @@ export default {
this.form.itemName = row.productName;
this.form.specification = row.specification;
this.form.unitOfMeasure = row.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
/** 新增按钮操作 */
diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue
index 820fd6e..92871e5 100644
--- a/src/views/mes/wm/productsalse/line.vue
+++ b/src/views/mes/wm/productsalse/line.vue
@@ -41,7 +41,7 @@
-
+
@@ -94,8 +94,8 @@
-
-
+
+
@@ -421,6 +421,7 @@ export default {
this.form.areaName = obj.areaName;
this.form.quantitySalse = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
+ this.form.unitName = obj.unitName
}
},
//OQC检验单选择
diff --git a/src/views/mes/wm/rtsalse/line.vue b/src/views/mes/wm/rtsalse/line.vue
index 54ea759..f74d7cc 100644
--- a/src/views/mes/wm/rtsalse/line.vue
+++ b/src/views/mes/wm/rtsalse/line.vue
@@ -30,7 +30,7 @@
-
+
@@ -88,8 +88,8 @@
-
-
+
+
@@ -266,6 +266,7 @@ export default {
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
// 取消按钮
diff --git a/src/views/mes/wm/sn/index.vue b/src/views/mes/wm/sn/index.vue
index 441283e..ce1f46f 100644
--- a/src/views/mes/wm/sn/index.vue
+++ b/src/views/mes/wm/sn/index.vue
@@ -68,7 +68,7 @@
-
+
@@ -308,6 +308,7 @@ export default {
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitName = obj.unitName
}
},
}
diff --git a/src/views/mes/wm/transfer/line.vue b/src/views/mes/wm/transfer/line.vue
index 7da205b..143d9b6 100644
--- a/src/views/mes/wm/transfer/line.vue
+++ b/src/views/mes/wm/transfer/line.vue
@@ -12,7 +12,7 @@
v-hasPermi="['mes:wm:transfer:add']"
>新增
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -64,7 +64,7 @@
-
+
-
+
@@ -91,8 +91,8 @@
-
-
+
+
@@ -132,7 +132,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleToWarehouseChanged"
- >
+ >
@@ -206,40 +206,40 @@ export default {
pageNum: 1,
pageSize: 10,
transferId: this.transferId,
- materialStockId: null,
- itemId: null,
- itemCode: null,
- itemName: null,
- specification: null,
- unitOfMeasure: null,
- quantityTransfer: null,
- quantityMax: null,
- workorderId: null,
- workorderCode: null,
- batchCode: null,
- fromWarehouseId:null,
- fromWarehouseCode: null,
- fromWarehouseName: null,
- fromLocationId: null,
- fromLocationCode: null,
- fromLocationName: null,
- fromAreaId: null,
- fromAreaCode: null,
- fromAreaName: null,
- toWarehouseId: null,
- toWarehouseCode: null,
- toWarehouseName: null,
- toLocationId: null,
- toLocationCode: null,
- toLocationName: null,
- toAreaId: null,
- toAreaCode: null,
- toAreaName: null,
- expireDate: null,
- vendorId: null,
- vendorCode: null,
- vendorName: null,
- vendorNick: null,
+ materialStockId: null,
+ itemId: null,
+ itemCode: null,
+ itemName: null,
+ specification: null,
+ unitOfMeasure: null,
+ quantityTransfer: null,
+ quantityMax: null,
+ workorderId: null,
+ workorderCode: null,
+ batchCode: null,
+ fromWarehouseId:null,
+ fromWarehouseCode: null,
+ fromWarehouseName: null,
+ fromLocationId: null,
+ fromLocationCode: null,
+ fromLocationName: null,
+ fromAreaId: null,
+ fromAreaCode: null,
+ fromAreaName: null,
+ toWarehouseId: null,
+ toWarehouseCode: null,
+ toWarehouseName: null,
+ toLocationId: null,
+ toLocationCode: null,
+ toLocationName: null,
+ toAreaId: null,
+ toAreaCode: null,
+ toAreaName: null,
+ expireDate: null,
+ vendorId: null,
+ vendorCode: null,
+ vendorName: null,
+ vendorNick: null,
},
// 表单参数
form: {},
@@ -247,10 +247,10 @@ export default {
rules: {
itemCode: [
{ required: true, message: "请选择移出的物资", trigger: "blur" }
- ],
+ ],
toWarehouseId: [
{ required: true, message: "请指定移入仓库", trigger: "blur" }
- ],
+ ],
quantityTransfer: [
{ required: true, message: "转移数量不能为空", trigger: "blur" }
], }
@@ -271,16 +271,16 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{
w.children.map(l =>{
- let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
+ let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr);
});
-
- let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
- w.children = JSON.parse(wstr);
+
+ let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
+ w.children = JSON.parse(wstr);
});
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@@ -295,50 +295,50 @@ export default {
// 表单重置
reset() {
this.form = {
- lineId: null,
- transferId: this.transferId,
- materialStockId: null,
- itemId: null,
- itemCode: null,
- itemName: null,
- specification: null,
- unitOfMeasure: null,
- quantityTransfer: null,
- workorderId: null,
- workorderCode: null,
- batchCode: null,
- fromWarehouseId: this.fromWarehouseId,
- fromWarehouseCode: null,
- fromWarehouseName: null,
- fromLocationId: null,
- fromLocationCode: null,
- fromLocationName: null,
- fromAreaId: null,
- fromAreaCode: null,
- fromAreaName: null,
- toWarehouseId: this.toWarehouseId,
- toWarehouseCode: null,
- toWarehouseName: null,
- toLocationId: null,
- toLocationCode: null,
- toLocationName: null,
- toAreaId: null,
- toAreaCode: null,
- toAreaName: null,
- expireDate: null,
- vendorId: null,
- vendorCode: null,
- vendorName: null,
- vendorNick: null,
- remark: null,
- attr1: null,
- attr2: null,
- attr3: null,
- attr4: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null
+ lineId: null,
+ transferId: this.transferId,
+ materialStockId: null,
+ itemId: null,
+ itemCode: null,
+ itemName: null,
+ specification: null,
+ unitOfMeasure: null,
+ quantityTransfer: null,
+ workorderId: null,
+ workorderCode: null,
+ batchCode: null,
+ fromWarehouseId: this.fromWarehouseId,
+ fromWarehouseCode: null,
+ fromWarehouseName: null,
+ fromLocationId: null,
+ fromLocationCode: null,
+ fromLocationName: null,
+ fromAreaId: null,
+ fromAreaCode: null,
+ fromAreaName: null,
+ toWarehouseId: this.toWarehouseId,
+ toWarehouseCode: null,
+ toWarehouseName: null,
+ toLocationId: null,
+ toLocationCode: null,
+ toLocationName: null,
+ toAreaId: null,
+ toAreaCode: null,
+ toAreaName: null,
+ expireDate: null,
+ vendorId: null,
+ vendorCode: null,
+ vendorName: null,
+ vendorNick: null,
+ remark: null,
+ attr1: null,
+ attr2: null,
+ attr3: null,
+ attr4: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null
};
this.resetForm("form");
},
@@ -371,8 +371,8 @@ export default {
getTransferline(lineId).then(response => {
this.form = response.data;
this.fromWarehouse = response.data.fromWarehouseName+" / "+response.data.fromLocationName+" / "+response.data.fromAreaName;
- this.warehouseInfo[0] = response.data.toWarehouseId;
- this.warehouseInfo[1] = response.data.toLocationId;
+ this.warehouseInfo[0] = response.data.toWarehouseId;
+ this.warehouseInfo[1] = response.data.toLocationId;
this.warehouseInfo[2] = response.data.toAreaId;
this.open = true;
this.title = "修改转移单行";
@@ -380,9 +380,9 @@ export default {
},
/** 提交按钮 */
submitForm() {
- debugger;
+ debugger;
this.$refs["form"].validate(valid => {
- if (valid) {
+ if (valid) {
if (this.form.lineId != null) {
updateTransferline(this.form).then(response => {
@@ -423,7 +423,7 @@ export default {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
- this.form.unitOfMeasure = obj.unitOfMeasure;
+ this.form.unitOfMeasure = obj.unitOfMeasure;
this.form.batchCode = obj.batchCode;
this.form.quantityTransfer = obj.quantityOnhand;
this.form.quantityMax = obj.quantityOnhand;
@@ -440,12 +440,13 @@ export default {
this.form.vendorCode = obj.vendorCode;
this.form.vendorName = obj.vendorName;
this.form.workorderId = obj.workorderId;
- this.form.workorderCode = obj.workorderCode;
+ this.form.workorderCode = obj.workorderCode;
this.fromWarehouse = obj.warehouseName +" / "+ obj.locationName +" / "+ obj.areaName;
+ this.form.unitName = obj.unitName
}
},
//选择默认的仓库、库区、库位
- handleToWarehouseChanged(obj){
+ handleToWarehouseChanged(obj){
if(obj !=null){
this.form.toWarehouseId = obj[0];
this.form.toLocationId = obj[1];