From baf9350d1041b7b869cab61294dd4472d0a6ef85 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Wed, 18 Dec 2024 15:57:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=A4=87?=
=?UTF-8?q?=E6=B3=A8=E8=BF=87=E9=95=BFBUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/cal/plan/index.vue | 13 ++-
src/views/mes/cal/team/index.vue | 11 ++-
src/views/mes/dv/checkplan/index.vue | 25 ++---
src/views/mes/dv/machinery/index.vue | 5 +-
src/views/mes/dv/machinerytype/index.vue | 3 +
src/views/mes/dv/repair/index.vue | 21 +++--
src/views/mes/md/client/index.vue | 9 +-
src/views/mes/md/mditem/index.vue | 5 +-
src/views/mes/md/unitmeasure/index.vue | 7 +-
src/views/mes/md/vendor/index.vue | 25 ++---
src/views/mes/md/workshop/index.vue | 3 +
src/views/mes/md/workstation/index.vue | 3 +
src/views/mes/pro/feedback/index.vue | 15 +--
src/views/mes/pro/procard/index.vue | 18 ++--
src/views/mes/pro/process/index.vue | 9 +-
src/views/mes/pro/proroute/index.vue | 11 ++-
src/views/mes/pro/workorder/index.vue | 3 +
src/views/mes/qc/ipqc/index.vue | 22 +++--
src/views/mes/qc/iqc/iqc.vue | 19 ++--
src/views/mes/qc/oqc/index.vue | 31 +++---
src/views/mes/qc/qcindex/index.vue | 13 ++-
src/views/mes/qc/qctemplate/index.vue | 11 ++-
src/views/mes/tm/tool/index.vue | 3 +
src/views/mes/tm/tooltype/index.vue | 13 ++-
src/views/mes/wm/barcode/index.vue | 37 ++++----
src/views/mes/wm/issue/index.vue | 63 +++++++------
src/views/mes/wm/itemrecpt/index.vue | 51 +++++-----
src/views/mes/wm/outsourceissue/index.vue | 109 +++++++++++-----------
src/views/mes/wm/outsourcerecpt/index.vue | 32 ++++---
src/views/mes/wm/package/index.vue | 11 ++-
src/views/mes/wm/productrecpt/index.vue | 25 ++---
src/views/mes/wm/productsalse/index.vue | 33 ++++---
src/views/mes/wm/rtissue/index.vue | 51 +++++-----
src/views/mes/wm/rtsalse/index.vue | 37 ++++----
src/views/mes/wm/rtvendor/index.vue | 21 +++--
src/views/mes/wm/transfer/index.vue | 83 ++++++++--------
src/views/mes/wm/warehouse/index.vue | 15 +--
src/views/print/printerconfig/index.vue | 4 +-
src/views/print/printtemplate/list.vue | 12 ++-
39 files changed, 501 insertions(+), 381 deletions(-)
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index 2fc18f3..62a7674 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -85,10 +85,10 @@
-
+
-
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
@@ -335,6 +335,9 @@ export default {
endDate: [
{ required: true, message: "结束日期不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -427,7 +430,7 @@ export default {
});
},
/** 提交按钮 */
- submitForm() {
+ submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.planId != null) {
diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue
index 53de664..0b02126 100644
--- a/src/views/mes/cal/team/index.vue
+++ b/src/views/mes/cal/team/index.vue
@@ -83,7 +83,7 @@
-
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'" >
@@ -166,7 +166,7 @@
-
+
项目组成员
@@ -231,6 +231,9 @@ export default {
],
calendarType:[
{ required: true, message: "清选择班组类型", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue
index a0fb0d3..bd485c7 100644
--- a/src/views/mes/dv/checkplan/index.vue
+++ b/src/views/mes/dv/checkplan/index.vue
@@ -99,7 +99,7 @@
v-hasPermi="['mes:dv:checkplan:query']"
>{{scope.row.planCode}}
-
+
@@ -116,12 +116,12 @@
{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}
-
+
{{scope.row.cycleCount}}
-
+
@@ -156,7 +156,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -262,9 +262,9 @@
-
-
-
+
+
+
@@ -319,7 +319,7 @@ export default {
planCode: null,
planName: null,
startDate: null,
- endDate: null,
+ endDate: null,
cycleType: null,
cycleCount: null,
status: null
@@ -343,6 +343,9 @@ export default {
cycleCount: [
{ required: true, message: "请输入点检次数", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -457,7 +460,7 @@ export default {
handleFinish(){
if(this.form.planId != null && this.form.status =='PREPARE'){
this.form.status='FINISHED';
- updateCheckplan(this.form).then(response => {
+ updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已启用");
this.open = false;
this.getList();
@@ -469,7 +472,7 @@ export default {
handleDeFinish(){
if(this.form.planId != null && this.form.status =='FINISHED'){
this.form.status='PREPARE';
- updateCheckplan(this.form).then(response => {
+ updateCheckplan(this.form).then(response => {
this.$modal.msgSuccess("已停用");
this.open = false;
this.getList();
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index 7bd7c9b..44233f8 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -244,7 +244,7 @@
-
+
@@ -395,6 +395,9 @@ export default {
],
machineryTypeId: [
{ required: true, message: "设备分类不能为空", trigger: "blur" },
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 1c4d4ad..71652b4 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -166,6 +166,9 @@ export default {
enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index cbe6e5e..71e5153 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -179,7 +179,7 @@
-
+
@@ -207,7 +207,7 @@
@@ -264,17 +264,17 @@
-
+
维修内容
-
+
-
+
+
-
+
@@ -487,6 +487,9 @@ export default {
enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -510,7 +513,7 @@ export default {
},
// 表单重置
reset() {
- this.form = {
+ this.form = {
vendorId: null,
vendorCode: null,
vendorName: null,
@@ -667,10 +670,10 @@ export default {
getBarcodeUrl(){
this.barcodeParams.bussinessId = this.form.vendorId;
this.barcodeParams.bussinessCode = this.form.vendorCode;
- getBarcodeUrl(this.barcodeParams).then( response =>{
+ getBarcodeUrl(this.barcodeParams).then( response =>{
if(response.data != null){
this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM
- }
+ }
});
},
//自动生成编码
@@ -682,7 +685,7 @@ export default {
});
}else{
this.form.vendorCode = null;
- }
+ }
}
}
};
@@ -701,4 +704,4 @@ export default {
justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */
}
-
\ No newline at end of file
+
diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue
index 9ea5468..63650ee 100644
--- a/src/views/mes/md/workshop/index.vue
+++ b/src/views/mes/md/workshop/index.vue
@@ -253,6 +253,9 @@ export default {
enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index 6fc36df..5eb3e0d 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -409,6 +409,9 @@ export default {
],
processId: [
{ required: true, message: "请选择所属工序", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index d75427e..fd303d9 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -121,7 +121,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
{
this.$modal.msgSuccess("新增成功");
this.open=false;
- this.getList();
+ this.getList();
});
}
}
@@ -621,7 +624,7 @@ export default {
this.$refs.userSelect.showFlag = true;
},
//人员选择返回
- onUserSelected(row){
+ onUserSelected(row){
this.form.nickName = row.nickName;
this.form.userName = row.userName;
},
@@ -630,7 +633,7 @@ export default {
this.$refs.user2Select.showFlag = true;
},
//人员选择返回
- onUser2Selected(row){
+ onUser2Selected(row){
this.form.recordUser = row.userName;
this.form.recordNick = row.nickName;
},
diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue
index ddbf9d8..fe6cb3a 100644
--- a/src/views/mes/pro/procard/index.vue
+++ b/src/views/mes/pro/procard/index.vue
@@ -74,7 +74,7 @@
-
+
-
+
-
-
+
+
@@ -175,7 +175,7 @@
- 工序
+ 工序
@@ -225,6 +225,12 @@ export default {
cardCode: null, workorderId: null, workorderCode: null, workorderName: null, batchCode: null, itemId: null, itemCode: null, itemName: null, specification: null, unitOfMeasure: null, barcodeUrl: null, quantityTransfered: null, status: null, attr1: null, attr2: null, attr3: null, attr4: null, },
// 表单参数
form: {},
+ // 表单校验
+ rules: {
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
+ }
};
},
created() {
@@ -337,7 +343,7 @@ export default {
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
- if(row != undefined && row != null){
+ if(row != undefined && row != null){
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index ecc9649..c62d36b 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -114,7 +114,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -243,6 +243,9 @@ export default {
enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -270,7 +273,7 @@ export default {
processId: null,
processCode: null,
processName: null,
- attention: null,
+ attention: null,
enableFlag: 'Y',
remark: null,
createBy: null,
diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue
index bc08c9a..b3091d8 100644
--- a/src/views/mes/pro/proroute/index.vue
+++ b/src/views/mes/pro/proroute/index.vue
@@ -115,7 +115,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -181,9 +181,9 @@
-
+
-
+
@@ -252,6 +252,9 @@ export default {
enableFlag: [
{ required: true, message: "是否启用不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index a6045b0..01b4440 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -514,6 +514,9 @@ export default {
requestDate: [
{ required: true, message: "需求日期不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index 14f39b4..48a9327 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -115,7 +115,7 @@
v-hasPermi="['mes:qc:ipqc:query']"
>{{scope.row.ipqcCode}}
-
+
@@ -143,7 +143,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -217,9 +217,9 @@
-
+
-
+
@@ -310,7 +310,7 @@
-
+
@@ -330,7 +330,7 @@
-
+
@@ -476,7 +476,7 @@ export default {
workstationCode: [
{ required: true, message: "请选择工作站", trigger: "blur" }
],
-
+
quantityCheck: [
{ required: true, message: "检测数量不能为空", trigger: "blur" }
],
@@ -487,8 +487,10 @@ export default {
quantityQualified: [
{ required: true, message: "合格品数量不能为空", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
-
}
};
},
diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue
index 0954221..0074b69 100644
--- a/src/views/mes/qc/iqc/iqc.vue
+++ b/src/views/mes/qc/iqc/iqc.vue
@@ -197,7 +197,7 @@
size="mini"
type="text"
icon="el-icon-delete"
-
+
@click="viewReport"
>
查看报表
@@ -205,7 +205,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
@@ -251,7 +251,7 @@
-
+
@@ -383,7 +383,7 @@
-
+
@@ -486,7 +486,7 @@ export default {
iqcName: [
{ required: true, message: "来料检验单名称不能为空", trigger: "blur" }
],
-
+
vendorCode: [
{ required: true, message: "供应商不能为空", trigger: "blur" }
],
@@ -501,6 +501,9 @@ export default {
],
inspectDate:[
{ required: true, message: "清选择检验日期", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -680,7 +683,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;
}
},
handleSelectVendor(){
@@ -710,7 +713,7 @@ export default {
var reportName = "Test";
getReport2(reportName).then(res=>{
debugger;
- let blob = new Blob([res],{type:'application/pdf'});
+ let blob = new Blob([res],{type:'application/pdf'});
let href = URL.createObjectURL(blob);
console.log(href);
window.open(`/pdf/web/viewer.html?file=${encodeURIComponent(href)}`);
diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue
index 00b1fb9..e381db3 100644
--- a/src/views/mes/qc/oqc/index.vue
+++ b/src/views/mes/qc/oqc/index.vue
@@ -104,7 +104,7 @@
-
+
{{scope.row.oqcCode}}
-
+
-
+
-
+
-
+
-
+
@@ -170,7 +170,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >
@@ -203,7 +203,7 @@
-
+
@@ -213,14 +213,14 @@
-
+
-
+
@@ -357,7 +357,7 @@
-
+
@@ -458,7 +458,7 @@ export default {
],
clientCode: [
{ required: true, message: "客户不能为空", trigger: "blur" }
- ],
+ ],
itemCode: [
{ required: true, message: "产品不能为空", trigger: "blur" }
],
@@ -474,6 +474,9 @@ export default {
inspectDate: [
{ required: true, message: "请选择检测日期", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -644,7 +647,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;
}
},
handleSelectClient(){
diff --git a/src/views/mes/qc/qcindex/index.vue b/src/views/mes/qc/qcindex/index.vue
index f534618..ba9fb0d 100644
--- a/src/views/mes/qc/qcindex/index.vue
+++ b/src/views/mes/qc/qcindex/index.vue
@@ -26,7 +26,7 @@
:value="dict.value"
/>
-
+
搜索
重置
@@ -113,7 +113,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -183,7 +183,7 @@
图片/照片
文件
-
+
@@ -267,7 +267,7 @@ export default {
{ required: true, message: "请选择检测项值类型", trigger: "change" }
],
qcResultSpc: [
- { required: true, message: "请选择检测项值类型", trigger: "blur",
+ { required: true, message: "请选择检测项值类型", trigger: "blur",
validator: (rule, value, callback) => {
if (this.form.qcResultType === 'FILE' && !value) {
callback(new Error('文件类型不能为空'));
@@ -279,6 +279,9 @@ export default {
}
}
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
diff --git a/src/views/mes/qc/qctemplate/index.vue b/src/views/mes/qc/qctemplate/index.vue
index 2345e29..cbf1b92 100644
--- a/src/views/mes/qc/qctemplate/index.vue
+++ b/src/views/mes/qc/qctemplate/index.vue
@@ -97,7 +97,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -159,7 +159,7 @@
-
+
-
+
@@ -129,7 +129,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
@@ -196,13 +196,13 @@
-
+
-
+
-
+
-
+
@@ -128,7 +128,7 @@
-
+
-
+
+ >
-->
+ >
@@ -263,7 +263,7 @@
-
+
@@ -280,7 +280,7 @@
-
+
@@ -312,13 +312,13 @@
-
+
@@ -396,6 +396,9 @@ export default {
barcodeContent: [
{ required: true, message: "产品物料ID不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -537,7 +540,7 @@ export default {
},
//选择仓库、库区、库位
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -546,12 +549,12 @@ export default {
this.warehouseOptions.map(w =>{
debugger;
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');
@@ -596,7 +599,7 @@ export default {
}
},
/**
- * 选择库存
+ * 选择库存
*/
handleMaterialStockSelect(){
this.$refs.stockSelect.showFlag = true;
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 7945278..7fd6a10 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -106,10 +106,10 @@
>{{scope.row.issueCode}}
-
-
-
-
+
+
+
+
@@ -120,7 +120,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -211,27 +211,27 @@
-
+
-
+
-
+
-
+
-
+
@@ -240,13 +240,13 @@
- 物料信息
+ 物料信息
-
+
@@ -332,6 +332,9 @@ export default {
],
workorderCode: [
{ required: true, message: "请指定生产工单", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -351,7 +354,7 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -359,12 +362,12 @@ export default {
}
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');
@@ -414,7 +417,7 @@ export default {
updateBy: null,
updateTime: null
};
- this.autoGenFlag = false;
+ this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -447,9 +450,9 @@ export default {
getIssueheader(issueId).then(response => {
debugger;
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改生产领料单";
this.optType = "edit";
@@ -461,9 +464,9 @@ export default {
const issueIds = row.issueId
getIssueheader(issueIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看领料单信息";
this.optType = "view";
@@ -516,7 +519,7 @@ export default {
}, `issueheader_${new Date().getTime()}.xlsx`)
},
//选择默认的仓库、库区、库位
- handleWarehouseChanged(obj){
+ handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
@@ -540,7 +543,7 @@ export default {
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
- if(row != undefined && row != null){
+ if(row != undefined && row != null){
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 32b068c..047c56d 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -94,7 +94,7 @@
-
+
-
+
{{ parseTime(scope.row.recptDate, '{y}-{m}-{d}') }}
@@ -116,7 +116,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -180,7 +180,7 @@
-
+
-
+
@@ -228,13 +228,13 @@
- 物料信息
+ 物料信息
@@ -323,6 +323,9 @@ export default {
],
vendorName: [
{ required: true, message: "请选择对应的供应商", trigger: "blur"}
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -342,7 +345,7 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -350,12 +353,12 @@ export default {
}
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');
@@ -399,7 +402,7 @@ export default {
updateBy: null,
updateTime: null
};
- this.autoGenFlag = false;
+ this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -432,9 +435,9 @@ export default {
const recptIds = row.recptId
getItemrecpt(recptIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看入库单信息";
this.optType = "view";
@@ -445,16 +448,16 @@ export default {
this.reset();
const recptId = row.recptId || this.ids
getItemrecpt(recptId).then(response => {
- this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.form = response.data;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改物料入库单";
this.optType = "edit";
});
},
-
+
//执行入库
handleExecute(row){
const recptIds = row.recptId || this.ids;
@@ -581,4 +584,4 @@ export default {
flex: 0 1 54%;
order: 1;
}
-
\ No newline at end of file
+
diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue
index 608e2a3..e1d4454 100644
--- a/src/views/mes/wm/outsourceissue/index.vue
+++ b/src/views/mes/wm/outsourceissue/index.vue
@@ -98,7 +98,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -178,7 +178,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
- >
+ >
@@ -194,7 +194,7 @@
-
+
@@ -212,11 +212,11 @@
-
+
-
+
@@ -225,13 +225,13 @@
- 物料信息
+ 物料信息
-
+
@@ -283,9 +283,9 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
- issueCode: null,
- issueName: null,
- workorderId: null,
+ issueCode: null,
+ issueName: null,
+ workorderId: null,
workorderCode: null, vendorId: null, vendorCode: null, vendorName: null, vendorNick: null, warehouseId: null, warehouseCode: null, warehouseName: null, locationId: null, locationCode: null, locationName: null, areaId: null, areaCode: null, areaName: null, issueDate: null, status: null, },
// 表单参数
form: {},
@@ -293,12 +293,15 @@ export default {
rules: {
issueCode: [
{ required: true, message: "发料单编号不能为空", trigger: "blur" }
- ],
+ ],
issueName: [
{ required: true, message: "发料单名称不能为空", trigger: "blur" }
],
workorderCode: [
{ required: true, message: "请选择外协工单", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -318,7 +321,7 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -326,12 +329,12 @@ export default {
}
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');
@@ -346,37 +349,37 @@ export default {
// 表单重置
reset() {
this.form = {
- issueId: null,
- issueCode: null,
- issueName: null,
- workorderId: null,
- workorderCode: null,
- vendorId: null,
- vendorCode: null,
- vendorName: null,
- vendorNick: null,
- warehouseId: null,
- warehouseCode: null,
- warehouseName: null,
- locationId: null,
- locationCode: null,
- locationName: null,
- areaId: null,
- areaCode: null,
- areaName: null,
- issueDate: new Date(),
- status: "PREPARE",
- remark: null,
- attr1: null,
- attr2: null,
- attr3: null,
- attr4: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null
+ issueId: null,
+ issueCode: null,
+ issueName: null,
+ workorderId: null,
+ workorderCode: null,
+ vendorId: null,
+ vendorCode: null,
+ vendorName: null,
+ vendorNick: null,
+ warehouseId: null,
+ warehouseCode: null,
+ warehouseName: null,
+ locationId: null,
+ locationCode: null,
+ locationName: null,
+ areaId: null,
+ areaCode: null,
+ areaName: null,
+ issueDate: new Date(),
+ status: "PREPARE",
+ remark: null,
+ attr1: null,
+ attr2: null,
+ attr3: null,
+ attr4: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null
};
- this.autoGenFlag = false;
+ this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -449,9 +452,9 @@ export default {
const issueIds = row.issueId
getOutsourceissue(issueIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看外协发料单信息";
this.optType = "view";
diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue
index 352d39f..f14fc62 100644
--- a/src/views/mes/wm/outsourcerecpt/index.vue
+++ b/src/views/mes/wm/outsourcerecpt/index.vue
@@ -102,7 +102,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -166,7 +166,7 @@
-
+
+ >
-
+
@@ -231,13 +231,13 @@
- 物料信息
+ 物料信息
@@ -303,7 +303,11 @@ export default {
],
workorderCode: [
{ required: true, message: "请选择外协工单", trigger: "blur" }
- ], }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
+ }
};
},
created() {
@@ -344,10 +348,10 @@ export default {
locationId: null,
locationCode: null,
locationName: null,
- areaId: null, areaCode: null, areaName: null, recptDate: new Date(),
+ areaId: null, areaCode: null, areaName: null, recptDate: new Date(),
status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null
};
- this.autoGenFlag = false;
+ this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -420,9 +424,9 @@ export default {
const recptIds = row.recptId
getOutsourcerecpt(recptIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看外协入库单信息";
this.optType = "view";
diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue
index 34cd3dd..1c3b45c 100644
--- a/src/views/mes/wm/package/index.vue
+++ b/src/views/mes/wm/package/index.vue
@@ -62,7 +62,7 @@
-
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -353,6 +353,9 @@ export default {
packageDate: [
{ required: true, message: "装箱日期不能为空", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -553,4 +556,4 @@ export default {
height: 200px;
}
-
\ No newline at end of file
+
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 1a6030c..8e33fdc 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -131,7 +131,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -188,7 +188,7 @@
-
+
@@ -197,13 +197,13 @@
- 物料信息
+ 物料信息
@@ -284,6 +284,9 @@ export default {
workorderCode: [
{ required: true, message: "请选择生产工单", trigger: "blur" }
],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+ ]
}
};
},
@@ -302,16 +305,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');
@@ -459,7 +462,7 @@ export default {
}
},
//选择默认的仓库、库区、库位
- handleWarehouseChanged(obj){
+ handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue
index 51cfde4..0c6f569 100644
--- a/src/views/mes/wm/productsalse/index.vue
+++ b/src/views/mes/wm/productsalse/index.vue
@@ -99,7 +99,7 @@
-
+
{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}
@@ -136,11 +136,11 @@
v-if="scope.row.status == 'PREPARE'"
v-hasPermi="['mes:wm:productsalse:edit']"
>执行出库
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -223,10 +223,10 @@
-
+
- 物料信息
+ 物料信息
@@ -320,6 +320,9 @@ export default {
],
salseDate: [
{ required: true, message: "请选择出库日期", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -340,16 +343,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');
@@ -357,7 +360,7 @@ export default {
});
},
//选择默认的仓库、库区、库位
- handleWarehouseChanged(obj){
+ handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
@@ -428,9 +431,9 @@ export default {
const salseId = row.salseId
getProductsalse(salseId).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看出库单信息";
this.optType = "view";
diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue
index 2b0ca16..2e4935c 100644
--- a/src/views/mes/wm/rtissue/index.vue
+++ b/src/views/mes/wm/rtissue/index.vue
@@ -92,7 +92,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -170,7 +170,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
- >
+ >
@@ -190,16 +190,16 @@
-
+
- 物料信息
+ 物料信息
@@ -276,6 +276,9 @@ export default {
],
workorderCode: [
{ required: true, message: "请选择要退料的生产工单", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -295,7 +298,7 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -303,12 +306,12 @@ export default {
}
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');
@@ -349,7 +352,7 @@ export default {
updateBy: null,
updateTime: null
};
- this.autoGenFlag = false;
+ this.autoGenFlag = false;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -381,9 +384,9 @@ export default {
const rtIds = row.rtId
getItemrecpt(rtIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看生产退料单信息";
this.optType = "view";
@@ -395,9 +398,9 @@ export default {
const rtId = row.rtId || this.ids
getRtissue(rtId).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改生产退料单头";
this.optType = "edit";
@@ -409,9 +412,9 @@ export default {
const rtId = row.rtId
getRtissue(rtId).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看退料单信息";
this.optType = "view";
@@ -464,7 +467,7 @@ export default {
}, `rtissue_${new Date().getTime()}.xlsx`)
},
//选择默认的仓库、库区、库位
- handleWarehouseChanged(obj){
+ handleWarehouseChanged(obj){
if(obj !=null){
this.form.warehouseId = obj[0];
this.form.locationId = obj[1];
diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue
index 22081ed..d93de4a 100644
--- a/src/views/mes/wm/rtsalse/index.vue
+++ b/src/views/mes/wm/rtsalse/index.vue
@@ -47,7 +47,7 @@
/>
-
+
搜索
重置
@@ -146,7 +146,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -216,7 +216,7 @@
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
- >
+ >
@@ -248,13 +248,13 @@
- 产品信息
+ 产品信息
@@ -349,6 +349,9 @@ export default {
],
rtReason: [
{ required: true, message: "请填写退货原因", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
@@ -368,7 +371,7 @@ export default {
});
},
getWarehouseList(){
- getTreeList().then( response =>{
+ getTreeList().then( response =>{
if(response.data){
this.warehouseOptions = response.data.filter((el) =>{
return el.warehouseCode.indexOf('VIR') == -1;
@@ -376,12 +379,12 @@ export default {
}
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');
@@ -478,9 +481,9 @@ export default {
const rtIds = row.rtId
getRtsalse(rtIds).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "查看销售退货单信息";
this.optType = "view";
@@ -502,9 +505,9 @@ export default {
const rtId = row.rtId || this.ids
getRtsalse(rtId).then(response => {
this.form = response.data;
- this.warehouseInfo[0] = response.data.warehouseId;
- this.warehouseInfo[1] = response.data.locationId;
- this.warehouseInfo[2] = response.data.areaId;
+ this.warehouseInfo[0] = response.data.warehouseId;
+ this.warehouseInfo[1] = response.data.locationId;
+ this.warehouseInfo[2] = response.data.areaId;
this.open = true;
this.title = "修改销售退货单";
this.optType = "add";
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 94a0734..0a862dc 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -86,7 +86,7 @@
-
+
{{scope.row.rtCode}}
-
+
-
+
-
+
{{ parseTime(scope.row.rtDate, '{y}-{m}-{d}') }}
@@ -109,7 +109,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -224,13 +224,13 @@
- 物料信息
+ 物料信息
@@ -298,6 +298,9 @@ export default {
],
rtDate: [
{ required: true, message: "退货日期不能为空", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
]
}
};
diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue
index c8a7d27..cb4c5ea 100644
--- a/src/views/mes/wm/transfer/index.vue
+++ b/src/views/mes/wm/transfer/index.vue
@@ -120,7 +120,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
- v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'INNER')"
+ v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'INNER')"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行转移
@@ -128,7 +128,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
- v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'OUTER')"
+ v-if="(scope.row.status =='PREPARE' && scope.row.transferType == 'OUTER')"
@click="handleTransOut(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行移出
@@ -136,7 +136,7 @@
size="mini"
type="text"
icon="el-icon-video-play"
- v-if="(scope.row.status =='CONFIRMED' && scope.row.transferType == 'OUTER')"
+ v-if="(scope.row.status =='CONFIRMED' && scope.row.transferType == 'OUTER')"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:transfer:edit']"
>执行移入
@@ -159,7 +159,7 @@
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -272,13 +272,13 @@
- 物料信息
+ 物料信息
@@ -287,7 +287,7 @@