diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue index 561f7998..9e50205b 100644 --- a/klp-ui/src/views/wms/product/index.vue +++ b/klp-ui/src/views/wms/product/index.vue @@ -85,17 +85,17 @@ - + - + @@ -199,15 +199,15 @@ export default { form: {}, // 表单校验 rules: { - productCode: [ - { required: true, message: "产品编号不能为空", trigger: "blur" } - ], + // productCode: [ + // { required: true, message: "产品编号不能为空", trigger: "blur" } + // ], productName: [ { required: true, message: "产品名称不能为空", trigger: "blur" } ], - owner: [ - { required: true, message: "负责人不能为空", trigger: "blur" } - ], + // owner: [ + // { required: true, message: "负责人不能为空", trigger: "blur" } + // ], }, bomDialogVisible: false, bomId: undefined, @@ -319,8 +319,13 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.buttonLoading = true; + if (this.form.productId != null) { - updateProduct(this.form).then(response => { + updateProduct({ + ...this.form, + productCode: this.form.material + this.form.zincLayer + new Date().getTime(), + + }).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue index f8f72146..7415ff20 100644 --- a/klp-ui/src/views/wms/rawMaterial/index.vue +++ b/klp-ui/src/views/wms/rawMaterial/index.vue @@ -128,9 +128,9 @@ - + @@ -233,9 +233,9 @@ export default { form: {}, // 表单校验 rules: { - rawMaterialCode: [ - { required: true, message: "原材料编号不能为空", trigger: "blur" } - ], + // rawMaterialCode: [ + // { required: true, message: "原材料编号不能为空", trigger: "blur" } + // ], rawMaterialName: [ { required: true, message: "原材料名称不能为空", trigger: "blur" } ], @@ -367,7 +367,10 @@ export default { if (valid) { this.buttonLoading = true; if (this.form.rawMaterialId != null) { - updateRawMaterial(this.form).then(response => { + updateRawMaterial({ + ...this.form, + productCode: this.form.material + this.form.zincLayer + new Date().getTime(), + }).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue index 16c742e6..f6896390 100644 --- a/klp-ui/src/views/wms/report/delivery.vue +++ b/klp-ui/src/views/wms/report/delivery.vue @@ -75,6 +75,13 @@ + + + + + diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 15db5f69..53e6aece 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -74,6 +74,12 @@ + + + + @@ -119,7 +125,7 @@ export default { queryParams: { pageNum: 1, pageSize: 9999, - status: 1, + // status: 1, startTime: startTime, endTime: endTime, selectType: 'product', diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index a227bab7..cc921346 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -73,6 +73,12 @@ + + + +