diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue index 6678316..9e9a395 100644 --- a/src/views/mes/dv/checkplan/index.vue +++ b/src/views/mes/dv/checkplan/index.vue @@ -329,10 +329,12 @@ export default { // 表单校验 rules: { planCode: [ - { required: true, message: "计划编码不能为空", trigger: "blur" } + { required: true, message: "计划编码不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], planName: [ - { required: true, message: "计划名称不能为空", trigger: "blur" } + { required: true, message: "计划名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], planType:[ { required: true, message: "计划类型不能为空", trigger: "blur" } diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue index 71652b4..684937b 100644 --- a/src/views/mes/dv/machinerytype/index.vue +++ b/src/views/mes/dv/machinerytype/index.vue @@ -161,7 +161,8 @@ export default { { required: true, message: "父类型不能为空", trigger: "blur" } ], machineryTypeName: [ - { required: true, message: "设备类型名称不能为空", trigger: "blur" } + { required: true, message: "设备类型名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], enableFlag: [ { required: true, message: "是否启用不能为空", trigger: "blur" } diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue index 71e5153..9d55297 100644 --- a/src/views/mes/dv/repair/index.vue +++ b/src/views/mes/dv/repair/index.vue @@ -339,7 +339,11 @@ export default { // 表单校验 rules: { repairCode: [ - { required: true, message: "维修单编号不能为空", trigger: "blur" } + { required: true, message: "维修单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } + ], + repairName: [ + { max: 100, message: "字段过长", trigger: "blur" } ], machineryId: [ { required: true, message: "设备ID不能为空", trigger: "blur" } diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue index ac642d7..5bc9c16 100644 --- a/src/views/mes/pro/process/index.vue +++ b/src/views/mes/pro/process/index.vue @@ -242,10 +242,15 @@ export default { // 表单校验 rules: { processCode: [ - { required: true, message: "工序编码不能为空", trigger: "blur" } + { required: true, message: "工序编码不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], processName: [ - { required: true, message: "工序名称不能为空", trigger: "blur" } + { required: true, message: "工序名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } + ], + attention: [ + { max: 500, message: "字段过长", trigger: "blur" } ], enableFlag: [ { required: true, message: "是否启用不能为空", trigger: "blur" } diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue index f4cbe9b..c68f2c8 100644 --- a/src/views/mes/pro/proroute/index.vue +++ b/src/views/mes/pro/proroute/index.vue @@ -244,10 +244,12 @@ export default { // 表单校验 rules: { routeCode: [ - { required: true, message: "工艺路线编号不能为空", trigger: "blur" } + { required: true, message: "工艺路线编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], routeName: [ - { required: true, message: "工艺路线名称不能为空", trigger: "blur" } + { required: true, message: "工艺路线名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], enableFlag: [ { required: true, message: "是否启用不能为空", trigger: "blur" } diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue index a5c2618..abb5b8f 100644 --- a/src/views/mes/pro/proroute/product.vue +++ b/src/views/mes/pro/proroute/product.vue @@ -238,6 +238,9 @@ export default { rules: { itemId: [ { required: true, message: "产品物料不能为空", trigger: "blur" } + ], + remark: [ + { max: 250, message: "字段过长", trigger: "blur" } ] } }; diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue index 41ecf43..e89b2cb 100644 --- a/src/views/mes/pro/proroute/routeprocess.vue +++ b/src/views/mes/pro/proroute/routeprocess.vue @@ -83,7 +83,7 @@ - + - + - + @@ -150,7 +150,7 @@
是:整个工单的生产进度将根据当前工序的生产报工数量进行更新
- 每个工艺流程只能有一个关键工序 + 每个工艺流程只能有一个关键工序
是:当前工序报工时需要进行质检确认
- 质检合格数量作为最终生产数量 + 质检合格数量作为最终生产数量
{ if (valid) { - // if (this.form.toolTypeId != null) { - // updateTooltype(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - // } else { - // addTooltype(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - // } + if (this.form.toolTypeId != null) { + updateTooltype(this.form).then(response => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + }); + } else { + addTooltype(this.form).then(response => { + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + }); + } } }); }, diff --git a/src/views/mes/wm/barcode/index.vue b/src/views/mes/wm/barcode/index.vue index 64a0d10..eedd8b7 100644 --- a/src/views/mes/wm/barcode/index.vue +++ b/src/views/mes/wm/barcode/index.vue @@ -292,8 +292,8 @@ - - + + @@ -394,7 +394,8 @@ export default { { required: true, message: "条码类型不能为空", trigger: "change" } ], barcodeContent: [ - { required: true, message: "产品物料ID不能为空", trigger: "blur" } + { required: true, message: "产品物料ID不能为空", trigger: "blur" }, + { max: 100, message: '字符过长', trigger: 'blur' } ], remark: [ { max: 250, message: '长度必须小于250个字符', trigger: 'blur' } diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index c773e74..ceb4b57 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -313,10 +313,12 @@ export default { // 表单校验 rules: { recptCode: [ - { required: true, message: "入库单编号不能为空", trigger: "blur" } + { required: true, message: "入库单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], recptName: [ - { required: true, message: "入库单名称不能为空", trigger: "blur" } + { required: true, message: "入库单名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], recptDate: [ { required: true, message: "入库时间不能为空", trigger: "blur"} diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue index 48ffa41..12bc6dc 100644 --- a/src/views/mes/wm/itemrecpt/line.vue +++ b/src/views/mes/wm/itemrecpt/line.vue @@ -225,6 +225,9 @@ export default { ], itemCode: [ { required: true, message: "物料编码不能为空", trigger: "blur" } + ], + remark: [ + { max: 250, message: '长度必须小于250个字符', trigger: 'blur' } ] } }; diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue index e1d4454..0bceabf 100644 --- a/src/views/mes/wm/outsourceissue/index.vue +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -292,10 +292,12 @@ export default { // 表单校验 rules: { issueCode: [ - { required: true, message: "发料单编号不能为空", trigger: "blur" } + { required: true, message: "发料单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], issueName: [ - { required: true, message: "发料单名称不能为空", trigger: "blur" } + { required: true, message: "发料单名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], workorderCode: [ { required: true, message: "请选择外协工单", trigger: "blur" } diff --git a/src/views/mes/wm/outsourceissue/line.vue b/src/views/mes/wm/outsourceissue/line.vue index 25c92e1..2f1e739 100644 --- a/src/views/mes/wm/outsourceissue/line.vue +++ b/src/views/mes/wm/outsourceissue/line.vue @@ -69,7 +69,7 @@ - + - + + > @@ -251,7 +251,7 @@ export default { areaCode: null, areaName: null, expireDate: null, - }, + }, // 表单参数 form: {}, // 表单校验 @@ -264,6 +264,9 @@ export default { ], warehouseId:[ { required: true, message: "请选择入库的仓库" } + ], + remark: [ + { max: 250, message: "字段过长", trigger: "blur" } ] } }; @@ -283,7 +286,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; @@ -292,12 +295,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'); @@ -306,7 +309,7 @@ export default { }); }, //选择仓库、库区、库位 - handleWarehouseChanged(obj){ + handleWarehouseChanged(obj){ if(obj !=null){ this.form.warehouseId = obj[0]; this.form.locationId = obj[1]; @@ -321,34 +324,34 @@ export default { // 表单重置 reset() { this.form = { - lineId: null, - recptId: this.recptId, - itemId: null, - itemCode: null, - itemName: null, - specification: null, - unitOfMeasure: null, - quantityRecived: null, - batchCode: null, - warehouseId: this.warehouseId, - warehouseCode: null, - warehouseName: null, - locationId: this.locationId, - locationCode: null, - locationName: null, - areaId: this.areaId, - areaCode: null, - areaName: null, - expireDate: null, - iqcCheck: 'N', - iqcId: null, - iqcCode: null, - remark: null, + lineId: null, + recptId: this.recptId, + itemId: null, + itemCode: null, + itemName: null, + specification: null, + unitOfMeasure: null, + quantityRecived: null, + batchCode: null, + warehouseId: this.warehouseId, + warehouseCode: null, + warehouseName: null, + locationId: this.locationId, + locationCode: null, + locationName: null, + areaId: this.areaId, + areaCode: null, + areaName: null, + expireDate: null, + iqcCheck: 'N', + iqcId: null, + iqcCode: null, + remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; - - + + this.resetForm("form"); - + }, /** 搜索按钮操作 */ handleQuery() { @@ -423,7 +426,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检验单选择 diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue index 1c3b45c..d9efe43 100644 --- a/src/views/mes/wm/package/index.vue +++ b/src/views/mes/wm/package/index.vue @@ -344,6 +344,33 @@ export default { form: {}, // 表单校验 rules: { + packageCode: [ + { max: 64, message: "字段过长", trigger: "blur" } + ], + soCode: [ + { max: 64, message: "字段过长", trigger: "blur" } + ], + invoiceCode: [ + { max: 100, message: "字段过长", trigger: "blur" } + ], + packageLength: [ + { max: 12, message: "字段过长", trigger: "blur" } + ], + packageWidth: [ + { max: 12, message: "字段过长", trigger: "blur" } + ], + packageHeight: [ + { max: 12, message: "字段过长", trigger: "blur" } + ], + netWeight: [ + { max: 12, message: "字段过长", trigger: "blur" } + ], + crossWeight: [ + { max: 12, message: "字段过长", trigger: "blur" } + ], + inspectorName: [ + { max: 32, message: "字段过长", trigger: "blur" } + ], parentId: [ { required: true, message: "父箱ID不能为空", trigger: "blur" } ], diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index 890f4f4..98b0798 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -276,7 +276,11 @@ export default { // 表单校验 rules: { recptCode: [ - { required: true, message: "入库单编号不能为空", trigger: "blur" } + { required: true, message: "入库单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } + ], + recptName: [ + { max: 100, message: "字段过长", trigger: "blur" } ], recptDate: [ { required: true, message: "请选择入库日期", trigger: "blur" } diff --git a/src/views/mes/wm/productrecpt/line.vue b/src/views/mes/wm/productrecpt/line.vue index c4949fd..1b61865 100644 --- a/src/views/mes/wm/productrecpt/line.vue +++ b/src/views/mes/wm/productrecpt/line.vue @@ -227,6 +227,9 @@ export default { ], itemCode: [ { required: true, message: "产品物料编码不能为空", trigger: "blur" } + ], + remark: [ + { max: 250, message: "字段过长", trigger: "blur" } ] } }; diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue index 0c6f569..e35f8f2 100644 --- a/src/views/mes/wm/productsalse/index.vue +++ b/src/views/mes/wm/productsalse/index.vue @@ -310,10 +310,12 @@ export default { // 表单校验 rules: { salseCode: [ - { required: true, message: "出库单编号不能为空", trigger: "blur" } + { required: true, message: "出库单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], salseName: [ - { required: true, message: "出库单名称不能为空", trigger: "blur" } + { required: true, message: "出库单名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], clientCode: [ { required: true, message: "请指定客户", trigger: "blur" } diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue index b43549f..c6bbe56 100644 --- a/src/views/mes/wm/productsalse/line.vue +++ b/src/views/mes/wm/productsalse/line.vue @@ -67,7 +67,7 @@ - + - +
@@ -263,6 +263,9 @@ export default { quantitySalse: [ { required: true, message: "出库数量不能为空", trigger: "blur" } ], + remark: [ + { max: 250, message: "字段过长", trigger: "blur" } + ] } }; }, @@ -404,7 +407,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.workorderId = obj.workorderId; this.form.workorderCode = obj.workorderCode; diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue index 90e6d0e..22d6d47 100644 --- a/src/views/mes/wm/rtvendor/index.vue +++ b/src/views/mes/wm/rtvendor/index.vue @@ -288,10 +288,15 @@ export default { // 表单校验 rules: { rtCode: [ - { required: true, message: "退货单编号不能为空", trigger: "blur" } + { required: true, message: "退货单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], rtName: [ - { 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" } diff --git a/src/views/mes/wm/rtvendor/line.vue b/src/views/mes/wm/rtvendor/line.vue index a92dbf2..e6128c1 100644 --- a/src/views/mes/wm/rtvendor/line.vue +++ b/src/views/mes/wm/rtvendor/line.vue @@ -212,6 +212,9 @@ export default { quantityRted: [ { required: true, message: "退货数量不能为空", trigger: "blur" } ], + remark: [ + { max: 250, message: "字段过长", trigger: "blur" } + ] } }; }, diff --git a/src/views/mes/wm/sn/index.vue b/src/views/mes/wm/sn/index.vue index f4c0156..441283e 100644 --- a/src/views/mes/wm/sn/index.vue +++ b/src/views/mes/wm/sn/index.vue @@ -195,9 +195,14 @@ export default { rules: { snNum: [ { required: true, message: "请输入需要生成的SN码数量", trigger: "blur" } - ], itemCode: [ + ], + itemCode: [ { required: true, message: "产品物料不能为空", trigger: "blur" } - ], } + ], + batchCode: [ + { max: 100, message: "字段过长", trigger: "blur" } + ], + } }; }, created() { diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue index cb4c5ea..4887980 100644 --- a/src/views/mes/wm/transfer/index.vue +++ b/src/views/mes/wm/transfer/index.vue @@ -328,10 +328,12 @@ export default { // 表单校验 rules: { transferCode: [ - { required: true, message: "转移单编号不能为空", trigger: "blur" } + { required: true, message: "转移单编号不能为空", trigger: "blur" }, + { max: 64, message: "字段过长", trigger: "blur" } ], transferName: [ - { required: true, message: "转移单名称不能为空", trigger: "blur" } + { required: true, message: "转移单名称不能为空", trigger: "blur" }, + { max: 100, message: "字段过长", trigger: "blur" } ], transferType: [ { required: true, message: "转移单类型不能为空", trigger: "blur" }