From 1fe4825573349c47e566f2cf0cdfe51ac7ff9c68 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 06 一月 2026 10:06:47 +0800
Subject: [PATCH] 1.页面优化
---
pages/scgl/scbg2.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/pages/scgl/scbg2.vue b/pages/scgl/scbg2.vue
index 1390a91..9f3ea86 100644
--- a/pages/scgl/scbg2.vue
+++ b/pages/scgl/scbg2.vue
@@ -3,15 +3,15 @@
<page-nav title="鐢熶骇鎶ュ伐"></page-nav>
- <view v-show="topContent.length===0">
+ <!-- <view v-show="topContent.length===0">
<div class="sacnBody">
<div class="scanImg" @click="topScanClick"></div>
<div class="scanText">璇锋壂鎻忎换鍔℃潯鐮�</div>
</div>
- </view>
+ </view> -->
<view v-show="topContent.length!==0">
- <view class="mainContent" :style="{maxHeight:'1260rpx',overflow: 'scroll'}">
+ <view class="mainContent" :style="{maxHeight:'72vh',overflow: 'scroll'}">
<!-- 鎶ュ伐淇℃伅 -->
<u-gap height="5" bgColor="#eff0f1"></u-gap>
@@ -320,6 +320,7 @@
onLoad(option) {
if (option.orderstep) {
this.fromType = '1'
+ this.currentpage = option.currentpage
this.getMesOrderStepStart(option.orderstep)
} else {
this.fromType = '2'
@@ -428,6 +429,8 @@
userSheetShow: false,
fromType: '1', //鏉ユ簮浜庡摢閲� 鏄〉闈�1杩樻槸2
+
+ currentpage: 1,
}
},
created() {
@@ -491,10 +494,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
@@ -533,6 +538,7 @@
},
userCheckboxChange(val) {
this.userCheckBoxValue = val.join(',')
+ this.operSheetValue = this.userCheckBoxValue
},
//鑾峰彇寮�宸ヤ俊鎭�
@@ -584,17 +590,15 @@
},
async submit() {
- // 涓嬪崍鍐欑敓浜ф姤宸ユ彁浜�
-
if (this.reckway === '鐝粍' && this.userGroupSheetValue === "") {
return uni.$u.toast('鐢熶骇鐝粍涓嶈兘涓虹┖锛�')
}
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 +673,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 +682,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),
@@ -732,7 +739,8 @@
if (this.fromType === '1') {
let pages = getCurrentPages(); // 椤甸潰闆嗗悎
let beforePage = pages[pages.length - 2]; //涓婁竴涓〉闈�
- beforePage.$vm.getProductionScheduleKanban()
+ // beforePage.$vm.getProductionScheduleKanban()
+ beforePage.$vm.getProductOrderSearch(this.currentpage)
uni.navigateBack()
}
--
Gitblit v1.9.3