From 04e9e6fabb880d892b34cddc4dad7e033e8e7d6e Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 18 十一月 2025 15:00:39 +0800
Subject: [PATCH] 1.生产报工优化、质量管理优化
---
pages/scgl/scbg2.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pages/scgl/scbg2.vue b/pages/scgl/scbg2.vue
index 1390a91..3d389a8 100644
--- a/pages/scgl/scbg2.vue
+++ b/pages/scgl/scbg2.vue
@@ -491,10 +491,12 @@
// this.operSheetList = res.data
this.operSheetList = res.data.map(({
usercode,
- username
+ username,
+ payrate
}) => ({
code: usercode,
- name: username
+ name: username,
+ payrate: payrate
}))
this.operColumns = [this.operSheetList.map(i => i.name)]
this.userSelectArrAll = this.operSheetList
@@ -592,9 +594,9 @@
if (this.reckway === '涓汉' && this.operSheetValue === "") {
return uni.$u.toast('鎶ュ伐浜哄憳涓嶈兘涓虹┖锛�')
}
- if (this.eqpSheetValue === "") {
- return uni.$u.toast('璁惧鍚嶇О涓嶈兘涓虹┖锛�')
- }
+ // if (this.eqpSheetValue === "") {
+ // return uni.$u.toast('璁惧鍚嶇О涓嶈兘涓虹┖锛�')
+ // }
if (this.reportqty === "") {
return uni.$u.toast('鎶ュ伐鏁伴噺涓嶈兘涓虹┖锛�')
}
@@ -669,7 +671,8 @@
stepcode: this.topContent[0].stepcode,
stepprice: this.topContent[0].stepprice,
- eqpcode: this.eqpSheetList.find(i => i.name === this.eqpSheetValue).code,
+ eqpcode: this.eqpSheetValue ? this.eqpSheetList.find(i => i.name === this.eqpSheetValue).code :
+ '',
reckway: this.reckway === '鐝粍' ? 'group' : 'person',
@@ -677,6 +680,8 @@
.userGroupSheetValue).code : '', // 鐝粍缂栫爜
reportuser: this.reckway === '鐝粍' ? reportuser.join(',') : this.userSelectArrAll.find(i => i
.name === this.operSheetValue).code,
+ payrate: this.reckway === '鐝粍' ? reportuser.join(',') : this.userSelectArrAll.find(i => i
+ .name === this.operSheetValue).payrate,
taskqty: this.topContent[0].planqty,
startqty: parseFloat(this.reportqty),
reportqty: parseFloat(this.reportqty),
--
Gitblit v1.9.3