From eab1260c8fd6da58125d6d6233a99aacf4ce9208 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 14 一月 2026 12:42:54 +0800
Subject: [PATCH] 末件检验单错误名字修改，检验模块添加数量控制
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 18 +++++
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 30 ++++++---
pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue | 2
pages.json | 4
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 80 +++++++++++++++++---------
pages/index/tab2.vue | 2
pages/index/tab4.vue | 2
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 14 ++++
8 files changed, 106 insertions(+), 46 deletions(-)
diff --git a/pages.json b/pages.json
index 6c8cb0b..296104a 100644
--- a/pages.json
+++ b/pages.json
@@ -1326,7 +1326,7 @@
}
},
{
- "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "path": "pages/ZLGL/mojianjianyan/ProcessCheckBillList",
"style": {
"navigationBarTitleText": "鏈欢妫�楠屽崟缁存姢"
}
@@ -1344,7 +1344,7 @@
}
},
{
- "path": "pages/ZLGL/mojianjianyan/lastPieceCheckBill",
+ "path": "pages/ZLGL/mojianjianyan/ProcessCheckBill",
"style": {
"navigationBarTitleText": "鏈欢妫�楠屽崟"
}
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 049ddb9..bc0c727 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -7,6 +7,7 @@
<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
<view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鎵弿淇℃伅</view>
<view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
+ <view :class="mainTabSelected == 4 ? 'selected' : ''" @tap="mainTabSelected = 4">鍏朵粬淇℃伅</view>
</view>
<!-- 涓昏〃鍐呭 -->
<view class="bill-main-contents">
@@ -92,19 +93,7 @@
<input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
</view>
</view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝粍</view>
- <view class="right-select">
- <zxz-uni-data-select
- v-model="hform.HGroupID"
- dataKey="鐝粍鍚嶇О"
- dataValue="HItemID"
- :filterable="true"
- :localdata="HGroupList"
- :clear="false"
- ></zxz-uni-data-select>
- </view>
- </view>
+
<view class="form-item">
<view class="left">妫�楠屽憳</view>
<view class="right-select">
@@ -127,19 +116,7 @@
</view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right-select">
- <zxz-uni-data-select
- v-model="hform.HSourceID"
- dataKey="鐢熶骇璧勬簮鍚嶇О"
- dataValue="HItemID"
- :filterable="true"
- :localdata="HSourceList"
- :clear="false"
- ></zxz-uni-data-select>
- </view>
- </view>
+
<view class="form-item">
<view class="left">澶囨敞</view>
@@ -225,6 +202,35 @@
<view class="left">浣滃簾鏃ユ湡</view>
<view class="right disabled">
<input type="text" :value="hform.HDeleteDate" disabled />
+ </view>
+ </view>
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 4">
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝粍</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HGroupID"
+ dataKey="鐝粍鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HGroupList"
+ :clear="false"
+ ></zxz-uni-data-select>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right-select">
+ <zxz-uni-data-select
+ v-model="hform.HSourceID"
+ dataKey="鐢熶骇璧勬簮鍚嶇О"
+ dataValue="HItemID"
+ :filterable="true"
+ :localdata="HSourceList"
+ :clear="false"
+ ></zxz-uni-data-select>
</view>
</view>
</view>
@@ -529,12 +535,19 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
//婧愬崟淇℃伅
- this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HMainSourceBillNo = data[0]['鍗曟嵁鍙�']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HSourceBillQty = data[0].娴佽浆鍗℃暟閲�
@@ -589,6 +602,14 @@
count
} = res.data
if (count == 1) {
+ //濡傛灉婧愬崟鏁伴噺瓒呭嚭鎻愮ず
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
console.log('鑾峰彇婧愬崟锛�', data)
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
@@ -868,6 +889,9 @@
,HMakeDate:this.hform.HMakeDate
,HReportType:1
,HSourceBillType:this.hform.HSourceBillType
+ ,HSourceBillNo:this.hform.HSourceBillNo
+ ,HSourceInterID:this.hform.HMainSourceInterID
+ ,HSourceEntryID:this.hform.HMainSourceEntryID
,HBadReasonHQty:1
,HQty:this.hform.HCheckQty
}
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 6ef0cb2..883975e 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -780,6 +780,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
console.log('鑾峰彇婧愬崟锛�', data)
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['HMaterName']
@@ -881,6 +888,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['HMaterName']
this.hform.HMaterNumber = data[0]['HMaterNumber']
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
similarity index 99%
rename from pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
rename to pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index f2ac772..2ed3280 100644
--- a/pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -708,6 +708,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -762,6 +769,13 @@
} = res.data
if (count == 1) {
console.log('鑾峰彇婧愬崟锛�', data)
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -1933,7 +1947,7 @@
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/form?operationType=1",
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1958,7 +1972,7 @@
},
addNew() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList?operationType=1",
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
});
},
goBack() {
diff --git a/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
similarity index 99%
rename from pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
rename to pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
index e8571d7..23a4e45 100644
--- a/pages/ZLGL/mojianjianyan/lastPieceCheckBillList.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
@@ -193,7 +193,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1"
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
})
},
async cmdSearch() {
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index b2fde55..eb54c98 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -175,13 +175,13 @@
<input type="text" v-model="hform.HErrTreatment" value="" />
</view>
</view>
- <view class="form-item" v-if="false">
+ <view class="form-item" >
<view class="left">浠诲姟鍗曟暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HICMOQty" />
</view>
</view>
- <view class="form-item" v-if="false">
+ <view class="form-item">
<view class="left">娴佽浆鍗℃暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HProcExchQty" />
@@ -794,6 +794,13 @@
count
} = res.data
if (count == 1) {
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -807,6 +814,7 @@
this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
this.hform.HSourceBillQty = data[0].HSourceBillQty
this.hasSourceBill = true
+ this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
this.get_CheckItem();
this.$refs['billList'].exit()
} else {
@@ -816,14 +824,7 @@
})
}
- if (
- (uni.getStorageSync("OrganizationID") == "7667152" &&
- uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
- (uni.getStorageSync("OrganizationID") == "100199" &&
- uni.getStorageSync("Organization") == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")
- ) {
- await this.GetCheckItemID(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
- }
+
} catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -894,7 +895,13 @@
} = res.data
if (count == 1) {
console.log('data: ', data);
-
+ if(data[0]['HBack']==1){
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: data[0]['HBackRemark']
+ })
+ return;
+ }
this.hform.HMaterID = data[0]['HMaterID']
this.hform.HMaterName = data[0]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
@@ -907,6 +914,7 @@
this.hform.HProcID = data[0]['HProcID']
this.hform.HProcName = data[0]['褰撳墠宸ュ簭']
this.hform.HSourceBillQty = data[0].HSourceBillQty
+ this.hform.HProcExchQty = data[0]['娴佽浆鍗℃暟閲�']
this.hasSourceBill = true
this.get_CheckItem();
} else {
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index c02c270..18011ea 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -358,7 +358,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟鍒楄〃",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBillList",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBillList",
"id": 43,
"hidden": false
},
diff --git a/pages/index/tab4.vue b/pages/index/tab4.vue
index 85dbe89..f5e689b 100644
--- a/pages/index/tab4.vue
+++ b/pages/index/tab4.vue
@@ -64,7 +64,7 @@
{
"img": "../../static/icon/icon8.png",
"text": "鏈欢妫�楠屽崟",
- "url": "/pages/ZLGL/mojianjianyan/lastPieceCheckBill?operationType=1",
+ "url": "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1",
"id": 3,
"hidden": false
},
--
Gitblit v1.9.1