From cf9c9afb38e1749b55ca6c3f58539b3cd7ff8019 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 23 Jul 2024 17:51:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/order/index.vue | 4 +-- src/views/plan/workorder/index.vue | 26 ++++++++++--------- .../quality/qcIncome/checkProjectType.vue | 8 ++++++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 3bc9171..0482e07 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -116,14 +116,14 @@ >导出 - + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index ad68014..f72479c 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -251,7 +251,7 @@
@@ -285,11 +285,11 @@ + width="130"> + - + - + +
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index e1ffbc3..8540428 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -18,6 +18,7 @@ + + + + + + From 139fabc2861d89d087e44a6cdd4fba378f26ba78 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 25 Jul 2024 18:07:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/unitPriceReport.js | 15 +- src/views/mes/unitpriceReport/index.vue | 272 +++++++++++++++++------- 2 files changed, 211 insertions(+), 76 deletions(-) diff --git a/src/api/mes/unitPriceReport.js b/src/api/mes/unitPriceReport.js index b465c2f..847ccf5 100644 --- a/src/api/mes/unitPriceReport.js +++ b/src/api/mes/unitPriceReport.js @@ -8,11 +8,18 @@ export function listUnitPriceReport(query) { params: query }); } +// export function getReport(id) { +// return request({ +// url: '/mes/unitPriceReport/' + id, +// method: 'get' +// }); +// } +// 查询【计件工资】详细 export function getReport(id) { - return request({ - url: '/mes/unitPriceReport/' + id, - method: 'get' - }); + return request({ + url: '/mes/unitPriceReport/' + id, + method: 'get' + }); } // 修改计件工资统计 export function updateUnitPriceReport(data) { diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue index b025e1c..498d4e9 100644 --- a/src/views/mes/unitpriceReport/index.vue +++ b/src/views/mes/unitpriceReport/index.vue @@ -50,7 +50,7 @@ @keyup.enter.native="handleQuery" /> - + + + + + + + + + + + + 修改 + + + - + + - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -147,41 +159,103 @@ + - - + + + + + + + + + + + + + + + + + + + + - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200,7 +274,7 @@ - +
确 定 @@ -270,8 +344,56 @@ export default { timeout: null, productCode:'', tableData: [], - MesUnitPriceInfo: [] + MesUnitPriceInfo: [], + // 表单校验 + // rules: { + // attr2: [ + // { required: true, message: "工时不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // attr1: [ + // { required: true, message: "生产数量不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // bd: [ + // { required: true, message: "保底不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // zg: [ + // { required: true, message: "转岗不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // fg: [ + // { required: true, message: "返工费用不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // sc: [ + // { required: true, message: "试产不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // sj: [ + // { required: true, message: "试机不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // tsfy: [ + // { required: true, message: "特殊费用不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // ybbt: [ + // { required: true, message: "夜班补贴不能为空", trigger: "blur" }, + // { validator: validateNumberOrDecimal, trigger: "blur" } + // ], + // } }; + // 自定义验证函数，确保输入的是数字或小数 + // const validateNumberOrDecimal = (rule, value, callback) => { + // const regex = /^(\d+(\.\d{1,2})?)?$/; + // if (!regex.test(value)) { + // callback(new Error('请输入有效的数字')); + // } else { + // callback(); + // } + // }; }, created() { this.getList(); @@ -333,7 +455,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.picId) + this.ids = selection.map(item => item.id) this.single = selection.length !== 1 this.multiple = !selection.length }, @@ -343,17 +465,30 @@ export default { this.open = true; this.title = "添加计件薪酬信息"; }, + /** 修改按钮操作 */ + // handleUpdate(row) { + // console.log(row) + // this.reset(); + // const picId = row.id || this.ids + // getReport(picId).then(response => { + // this.form = response.data.MesUnitpriceReport; + // this.open = true; + // this.MesUnitPriceInfo=response.data.MesUnitPriceInfo; + // }); + // }, + /** 修改按钮操作 */ handleUpdate(row) { - console.log(row) this.reset(); - const picId = row.id || this.ids - getReport(picId).then(response => { - this.form = response.data.MesUnitpriceReport; + const id = row.id || this.ids + console.log(id) + getReport(id).then(response => { + this.form = response.data; this.open = true; - this.MesUnitPriceInfo=response.data.MesUnitPriceInfo; + this.title = "修改【产量/工时】"; }); }, + handleChildprocessChange(value){ console.log(value) // 当子工序选择发生变化时，更新子工序编码 @@ -375,13 +510,6 @@ export default { this.getList(); }); } - // else { - // addUnitPrice(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - // } } }); },