From 1fe4825573349c47e566f2cf0cdfe51ac7ff9c68 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 06 一月 2026 10:06:47 +0800
Subject: [PATCH] 1.页面优化
---
pages/zlgl/wgjy1.vue | 1
pages/zlgl/xjjy.vue | 19 ++++++---
pages/zlgl/sjjy.vue | 21 +++++++---
pages/zlgl/wgjy.vue | 19 ++++++---
pages/scgl/scbg.vue | 26 +++++++++---
pages/zlgl/sjjy1.vue | 1
pages/znfx/chda.vue | 2
pages/scgl/scbg2.vue | 2 -
pages/zlgl/xjjy1.vue | 1
9 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index febdd71..ce5f508 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -46,7 +46,8 @@
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
<scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ v-if='item.children.length!==0'
+ :value='parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty)+"/"+parseFloat(item.orderqty)'
:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
v-for="(item,index) in collapseArr" :key="item.ordercode+index">
@@ -59,7 +60,8 @@
<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
<!-- @click="progressClick(item.ordercode)" -->
<!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat(((parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty))*100/item.orderqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
@@ -99,18 +101,22 @@
<!-- <u--text class="u-collapse-content"> -->
<u-steps :current="-1" inactiveColor='#0659FF' direction="column">
<view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+ @click="gotoPage(item.ordercode,it.code,it)" style="display: flex;align-items: center;">
<!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
<u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
<view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat((parseFloat(it.goodqty)+parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)*100/it.planqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
<view style="width: 30%;text-align: right;">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(it.goodqty)}}
+ </view>
+ <view style="color: #ff0000;">
+ +{{parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)}}
</view>
<view>
/{{ parseFloat(it.planqty)}}
@@ -215,9 +221,9 @@
<!-- 鎮诞鐞� -->
- <view @click="scan2">
+ <!-- <view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
- </view>
+ </view> -->
<scan-code></scan-code>
@@ -346,7 +352,13 @@
init() {
uni.stopPullDownRefresh();
},
- gotoPage(p1, p2) {
+ gotoPage(p1, p2, it) {
+
+ if (parseFloat(it.goodqty) + parseFloat(it.ngqty) + parseFloat(it.laborbadqty) + parseFloat(it
+ .materielbadqty) === parseFloat(it.planqty)) {
+ return uni.$u.toast('褰撳墠宸ュ簭鏃犲彲鎶ユ暟閲忥紒')
+ }
+
let orderstep = null
if (p1) {
diff --git a/pages/scgl/scbg2.vue b/pages/scgl/scbg2.vue
index bdaa388..9f3ea86 100644
--- a/pages/scgl/scbg2.vue
+++ b/pages/scgl/scbg2.vue
@@ -590,8 +590,6 @@
},
async submit() {
- // 涓嬪崍鍐欑敓浜ф姤宸ユ彁浜�
-
if (this.reckway === '鐝粍' && this.userGroupSheetValue === "") {
return uni.$u.toast('鐢熶骇鐝粍涓嶈兘涓虹┖锛�')
}
diff --git a/pages/zlgl/sjjy.vue b/pages/zlgl/sjjy.vue
index aa8b7c7..8d8a87f 100644
--- a/pages/zlgl/sjjy.vue
+++ b/pages/zlgl/sjjy.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <page-nav title="棣栦欢妫�楠�"></page-nav>
+ <page-nav title="棣栨妫�楠�"></page-nav>
<view class="flex_center" style="margin: 20rpx;">
@@ -46,7 +46,8 @@
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
<scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ v-if='item.children.length!==0'
+ :value='parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty)+"/"+parseFloat(item.orderqty)'
:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
v-for="(item,index) in collapseArr" :key="item.ordercode+index">
@@ -59,7 +60,8 @@
<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
<!-- @click="progressClick(item.ordercode)" -->
<!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat(((parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty))*100/item.orderqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
@@ -99,18 +101,22 @@
<!-- <u--text class="u-collapse-content"> -->
<u-steps :current="-1" inactiveColor='#0659FF' direction="column">
<view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+ @click="gotoPage(item.ordercode,it.code,it)" style="display: flex;align-items: center;">
<!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
<u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
<view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat((parseFloat(it.goodqty)+parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)*100/it.planqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
<view style="width: 30%;text-align: right;">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(it.goodqty)}}
+ </view>
+ <view style="color: #ff0000;">
+ +{{parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)}}
</view>
<view>
/{{ parseFloat(it.planqty)}}
@@ -126,6 +132,7 @@
</u-collapse-item>
</scroll-view>
</u-collapse>
+
@@ -215,9 +222,9 @@
<!-- 鎮诞鐞� -->
- <view @click="scan2">
+ <!-- <view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
- </view>
+ </view> -->
<scan-code></scan-code>
diff --git a/pages/zlgl/sjjy1.vue b/pages/zlgl/sjjy1.vue
index 0c61af4..a181b81 100644
--- a/pages/zlgl/sjjy1.vue
+++ b/pages/zlgl/sjjy1.vue
@@ -305,6 +305,7 @@
this.operSheetShow = true
},
async operPickerConfirm(val) {
+ this.checkNumber = 1
this.processObj.checkstandname = val.value[0]
this.operSheetShow = false
diff --git a/pages/zlgl/wgjy.vue b/pages/zlgl/wgjy.vue
index d106eaf..ce0298b 100644
--- a/pages/zlgl/wgjy.vue
+++ b/pages/zlgl/wgjy.vue
@@ -46,7 +46,8 @@
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
<scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ v-if='item.children.length!==0'
+ :value='parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty)+"/"+parseFloat(item.orderqty)'
:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
v-for="(item,index) in collapseArr" :key="item.ordercode+index">
@@ -59,7 +60,8 @@
<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
<!-- @click="progressClick(item.ordercode)" -->
<!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat(((parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty))*100/item.orderqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
@@ -99,18 +101,22 @@
<!-- <u--text class="u-collapse-content"> -->
<u-steps :current="-1" inactiveColor='#0659FF' direction="column">
<view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+ @click="gotoPage(item.ordercode,it.code,it)" style="display: flex;align-items: center;">
<!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
<u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
<view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat((parseFloat(it.goodqty)+parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)*100/it.planqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
<view style="width: 30%;text-align: right;">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(it.goodqty)}}
+ </view>
+ <view style="color: #ff0000;">
+ +{{parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)}}
</view>
<view>
/{{ parseFloat(it.planqty)}}
@@ -126,6 +132,7 @@
</u-collapse-item>
</scroll-view>
</u-collapse>
+
@@ -215,9 +222,9 @@
<!-- 鎮诞鐞� -->
- <view @click="scan2">
+ <!-- <view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
- </view>
+ </view> -->
<scan-code></scan-code>
diff --git a/pages/zlgl/wgjy1.vue b/pages/zlgl/wgjy1.vue
index fae38be..ba81bbb 100644
--- a/pages/zlgl/wgjy1.vue
+++ b/pages/zlgl/wgjy1.vue
@@ -296,6 +296,7 @@
this.operSheetShow = true
},
async operPickerConfirm(val) {
+ this.checkNumber = 1
this.processObj.checkstandname = val.value[0]
this.operSheetShow = false
diff --git a/pages/zlgl/xjjy.vue b/pages/zlgl/xjjy.vue
index deb243a..7dbfa50 100644
--- a/pages/zlgl/xjjy.vue
+++ b/pages/zlgl/xjjy.vue
@@ -46,7 +46,8 @@
<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
<scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
- v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+ v-if='item.children.length!==0'
+ :value='parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty)+"/"+parseFloat(item.orderqty)'
:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
v-for="(item,index) in collapseArr" :key="item.ordercode+index">
@@ -59,7 +60,8 @@
<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
<!-- @click="progressClick(item.ordercode)" -->
<!-- {{item.partname}}{{item.partspec}} -->
- <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat(((parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty))*100/item.orderqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
@@ -99,18 +101,22 @@
<!-- <u--text class="u-collapse-content"> -->
<u-steps :current="-1" inactiveColor='#0659FF' direction="column">
<view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
- @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+ @click="gotoPage(item.ordercode,it.code,it)" style="display: flex;align-items: center;">
<!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
<u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
<view class="" style="width: 100px;">
- <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+ <u-line-progress
+ :percentage="parseFloat((parseFloat(it.goodqty)+parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)*100/it.planqty).toFixed(2))"
inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
</view>
<view style="width: 30%;text-align: right;">
<view class="" style="display: flex;justify-content: flex-end;">
<view style="color: #0659ff;">
{{parseFloat(it.goodqty)}}
+ </view>
+ <view style="color: #ff0000;">
+ +{{parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)}}
</view>
<view>
/{{ parseFloat(it.planqty)}}
@@ -126,6 +132,7 @@
</u-collapse-item>
</scroll-view>
</u-collapse>
+
@@ -215,9 +222,9 @@
<!-- 鎮诞鐞� -->
- <view @click="scan2">
+ <!-- <view @click="scan2">
<drag-ball :x='300' :y="600"></drag-ball>
- </view>
+ </view> -->
<scan-code></scan-code>
diff --git a/pages/zlgl/xjjy1.vue b/pages/zlgl/xjjy1.vue
index 25f6c0a..050782b 100644
--- a/pages/zlgl/xjjy1.vue
+++ b/pages/zlgl/xjjy1.vue
@@ -294,6 +294,7 @@
this.operSheetShow = true
},
async operPickerConfirm(val) {
+ this.checkNumber = 1
this.processObj.checkstandname = val.value[0]
this.operSheetShow = false
diff --git a/pages/znfx/chda.vue b/pages/znfx/chda.vue
index 78e0365..6fdfa3e 100644
--- a/pages/znfx/chda.vue
+++ b/pages/znfx/chda.vue
@@ -26,7 +26,7 @@
<u-alert :title="alertTitle" type="info"></u-alert>
- <view style="max-height: 540px;overflow: auto;">
+ <view style="max-height: 62vh;overflow: auto;">
<u-checkbox-group v-model="checkboxValue" iconPlacement="right" placement="column" @change="checkboxChange">
<u-checkbox :key="item.code.trim()+'/'+item.name" :label="item.code.trim()+'/'+item.name"
:labelSize='16' :size='16' :borderBottom='true' v-for="item in collapseArr"
--
Gitblit v1.9.3