From fb7fd244e76d456029558f8a764371658c3bdb28 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:01:48 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 9d37654..fceac15 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -81,23 +81,14 @@
<input type="text" disabled :value="hform.HMaterName" />
</view>
</view>
+
+
<view class="form-item">
- <view class="left">婧愬崟鏁伴噺</view>
- <view class="right disabled">
- <input type="number" v-model="hform.HSourceBillQty" />
- </view>
- </view>
- <view class="form-item">
- <view class="left">妫�楠屾暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
+ <view class="left">宸ュ簭</view>
+ <view class="right disabled">
+ <input type="text" disabled :value="hform.HProcName" />
</view>
- </view>
- <view class="form-item">
- <view class="left">涓嶈壇鏁伴噺</view>
- <view class="right">
- {{ totalNum }}
- </view>
+
</view>
<view class="form-item">
<view class="left">妫�楠屽憳</view>
@@ -113,17 +104,42 @@
</view>
</view>
+
+
<view class="form-item">
- <view class="left">宸ュ簭</view>
- <view class="right disabled">
- <input type="text" disabled :value="hform.HProcName" />
- </view>
-
+ <view class="left">婧愬崟鏁伴噺</view>
+ <view class="right disabled">
+ <input type="number" v-model="hform.HSourceBillQty" />
+ </view>
</view>
<view class="form-item">
+ <view class="left">閫佹鏁伴噺</view>
+ <view class="right">
+ <input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">涓嶈壇鏁伴噺</view>
+ <view class="right">
+ {{ totalNum }}
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鍚堟牸鏁伴噺</view>
+ <view class="right">
+ {{ hform.HCheckQty-totalNum }}
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">涓嶈壇鐜�</view>
+ <view class="right">
+ {{ totalNum/(hform.HCheckQty==0?1:hform.HCheckQty) }}
+ </view>
+ </view>
+ <view class="form-item" style="width: 1350rpx;">
<view class="left">澶囨敞</view>
<view class="right">
<input type="text" v-model="hform.HRemark" value="" />
@@ -486,7 +502,7 @@
let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' `
if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
//娴疯瘹鏍规嵁鐗╂枡鍒嗙粍璁剧疆涓嶈壇鍘熷洜
- sWhere += " and 涓嶈壇绫诲瀷 like '%鎴愬搧%' order by 涓嶈壇鍘熷洜浠ｇ爜"
+ sWhere += (" and HDeptID="+this.hform.HDeptID+" order by 涓嶈壇鍘熷洜浠ｇ爜")
}else{
sWhere += " order by 涓嶈壇鍘熷洜浠ｇ爜"
}
@@ -577,7 +593,7 @@
this.hform.HProcID= data[0].HProcID
this.hform.HProcName= data[0].褰撳墠宸ュ簭
this.hform.HDeptID= data[0].HWorkShopID
-
+ this.getGy_BadReasonList();
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -648,6 +664,7 @@
this.hform.HProcName= data[0].褰撳墠宸ュ簭
this.hform.HDeptID= data[0].HWorkShopID
this.$refs['billList'].exit()
+ this.getGy_BadReasonList();
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -1080,7 +1097,7 @@
} else if (this.operationType == 2) {
}
- this.getGy_BadReasonList();
+ //this.getGy_BadReasonList();
await this.InitHSource();
await this.InitHEmp();
await this.InitHGroup();
@@ -1179,6 +1196,7 @@
font-size: 30rpx;
}
}
+
.right-select {
//padding: 8rpx 20rpx;
font-size: 30rpx;
--
Gitblit v1.9.1