From 74137199c83172e5825a8db4422b2fbbf355390f Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Fri, 27 Dec 2024 17:25:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=9F=E4=BA=A7=E6=8E=92?=
=?UTF-8?q?=E4=BA=A7=E4=B8=AD=E6=8E=92=E4=BA=A7=E6=95=B0=E9=87=8F=E8=BF=87?=
=?UTF-8?q?=E5=A4=A7=E6=8A=A5=E9=94=99=E3=80=82=E5=88=B0=E8=B4=A7=E9=80=9A?=
=?UTF-8?q?=E7=9F=A5=E5=8D=95=E8=BE=93=E5=85=A5=E6=A1=86=E9=A2=9C=E8=89=B2?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E5=8D=95=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/pro/schedule/proTask.vue | 33 ++++++++++---------
src/views/mes/wm/arrivalnotice/index.vue | 41 ++++++++++++++++--------
src/views/mes/wm/arrivalnotice/line.vue | 22 ++++++++-----
3 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index bc7ed19..87a7ea8 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -47,11 +47,11 @@
-
+
-
+
@@ -111,11 +111,11 @@
-
+
-
+
@@ -229,7 +229,8 @@ export default {
{ required: true, message: "工作站不能为空", trigger: "blur" }
],
quantity: [
- { required: true, message: "排产数量不能为空", trigger: "blur" }
+ { required: true, message: "排产数量不能为空", trigger: "blur" },
+ { max: 14, message: "字段过长", trigger: "blur" }
],
startTime: [
{ required: true, message: "请选择开始生产日期",trigger: "blur"}
@@ -266,23 +267,23 @@ export default {
if(this.form.startTime !=null && this.form.duration !=null){
let parts = this.form.startTime.split(' ');
let startDate = new Date(parts[0]);
- startDate = startDate.getFullYear() + '-'
- + (startDate.getMonth()+1) + '-'
+ startDate = startDate.getFullYear() + '-'
+ + (startDate.getMonth()+1) + '-'
+ startDate.getDate() + ' '
- + parts[1].split(':')[0] + ':'
- + '00' + ':'
+ + parts[1].split(':')[0] + ':'
+ + '00' + ':'
+ '00';
this.form.startTime = startDate;
- startDate = Date.parse(new Date(startDate))/1000;
+ startDate = Date.parse(new Date(startDate))/1000;
startDate += (3600)* 8 * this.form.duration; //这里以8小时为一个单位
- let endDate = new Date(parseInt(startDate) * 1000);
- this.form.endTime =endDate.getFullYear() + '-'
- + (endDate.getMonth()+1) + '-'
+ let endDate = new Date(parseInt(startDate) * 1000);
+ this.form.endTime =endDate.getFullYear() + '-'
+ + (endDate.getMonth()+1) + '-'
+ endDate.getDate() + ' '
- + endDate.getHours() + ':'
- + endDate.getMinutes() + ':'
+ + endDate.getHours() + ':'
+ + endDate.getMinutes() + ':'
+ endDate.getSeconds();
-
+
}
},
diff --git a/src/views/mes/wm/arrivalnotice/index.vue b/src/views/mes/wm/arrivalnotice/index.vue
index 0f7fce1..b1901b1 100644
--- a/src/views/mes/wm/arrivalnotice/index.vue
+++ b/src/views/mes/wm/arrivalnotice/index.vue
@@ -113,7 +113,7 @@
-
+
-
+
+ @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
@@ -181,7 +181,7 @@
-
+
@@ -213,14 +213,14 @@
- 物料信息
+ 物料信息
@@ -268,17 +268,31 @@ export default {
// 表单校验
rules: {
noticeCode: [
- { required: true, message: "入库单编号不能为空", trigger: "blur" }
- ],
+ { required: true, message: "入库单编号不能为空", trigger: "blur" },
+ { max: 64, message: "字段过长", trigger: "blur" }
+ ],
noticeName: [
- { required: true, message: "入库单名称不能为空", trigger: "blur" }
- ],
+ { required: true, message: "入库单名称不能为空", trigger: "blur" },
+ { max: 100, message: "字段过长", trigger: "blur" }
+ ],
+ poCode: [
+ { max: 64, message: "字段过长", trigger: "blur" }
+ ],
vendorName: [
{ required: true, message: "请选择供应商", trigger: "blur" }
- ],
+ ],
arrivalDate: [
{ required: true, message: "请选择到货日期", trigger: "blur" }
- ],
+ ],
+ contact: [
+ { max: 32, message: "字段过长", trigger: "blur" }
+ ],
+ tel: [
+ { max: 60, message: "字段过长", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: "字段过长", trigger: "blur" }
+ ]
}
};
},
@@ -405,6 +419,7 @@ export default {
},
//供应商选择
handleSelectVendor(){
+ this.resetForm("form");
this.$refs.vendorSelect.showFlag = true;
},
//供应商选择弹出框
diff --git a/src/views/mes/wm/arrivalnotice/line.vue b/src/views/mes/wm/arrivalnotice/line.vue
index ef77e52..9acd4a8 100644
--- a/src/views/mes/wm/arrivalnotice/line.vue
+++ b/src/views/mes/wm/arrivalnotice/line.vue
@@ -70,7 +70,7 @@
-
+
-
+
@@ -195,11 +195,17 @@ export default {
form: {},
// 表单校验
rules: {
- itemId: [
- { required: true, message: "产品物料ID不能为空", trigger: "blur" }
- ], quantityArrival: [
- { required: true, message: "到货数量不能为空", trigger: "blur" }
- ], }
+ itemCode: [
+ { required: true, message: "产品物料编码不能为空", trigger: "blur" }
+ ],
+ quantityArrival: [
+ { required: true, message: "到货数量不能为空", trigger: "blur" },
+ { max: 12, message: "字段过长", trigger: "blur" }
+ ],
+ remark: [
+ { max: 250, message: "字段过长", trigger: "blur" }
+ ]
+ }
};
},
created() {
@@ -305,7 +311,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;
}
},
//IQC检验单选择