From bbae990ed1f4574fa954753faeae159052d03fba Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 16:14:06 +0800
Subject: [PATCH] 待我审核增加销售订单，采购订单
---
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 286 ++++++++++++++++++--------------------------------------
1 files changed, 92 insertions(+), 194 deletions(-)
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 3df60d0..2b82411 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>
@@ -349,6 +355,7 @@
HCheckQty: 0,
//婧愬崟淇℃伅
HSourceBillQty: 0,
+ HSourceBillNo:'',
HSourceBillType: "3772",
//娴佽浆鍗′俊鎭�
HICMOBillNo: "",
@@ -461,12 +468,18 @@
toScanCode() {
MpaasScan.scanCode((res) => {
if (res) {
- this.getSourceBillInfo(HBarCode);
+ this.getSourceBillInfo(res);
}
});
},
async getGy_BadReasonList() {
- let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' order by 涓嶈壇鍘熷洜浠ｇ爜`
+ let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(瀹℃牳浜�,'') != '' `
+ if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
+ //娴疯瘹鏍规嵁鐗╂枡鍒嗙粍璁剧疆涓嶈壇鍘熷洜
+ sWhere += " and 涓嶈壇绫诲瀷 like '%鎴愬搧%' order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }else{
+ sWhere += " order by 涓嶈壇鍘熷洜浠ｇ爜"
+ }
let res = await CommonUtils.doRequest2Async({
url: "/Gy_BadReason/list",
data: {
@@ -523,12 +536,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].娴佽浆鍗℃暟閲�
@@ -583,13 +603,21 @@
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]['浜у搧鍚嶇О']
this.hform.HMaterNumber = data[0]['浜у搧浠ｇ爜']
//婧愬崟淇℃伅
this.hform.HMainSourceBillNo = data[0]['HBillNo']
- this.hform.HSourceBillNo = data[0]['HBillNo']
+ this.hform.HSourceBillNo = data[0]['鍗曟嵁鍙�']
this.hform.HMainSourceInterID = data[0].HInterID
this.hform.HMainSourceEntryID = data[0].HEntryID
this.hform.HSourceBillQty = data[0].娴佽浆鍗℃暟閲�
@@ -709,7 +737,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 绂佺敤鏍囪 = '' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -744,7 +772,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Source/list",
data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
user: getUserInfo()["Czymc"],
},
});
@@ -776,7 +804,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Group/list",
data: {
- sWhere: `and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
+ sWhere: `and 绂佺敤鏍囪 != 'Y' and 缁勭粐 = '${uni.getStorageSync("Organization")}'`,
user: getUserInfo()["Czymc"],
},
});
@@ -862,6 +890,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
}
@@ -893,8 +924,9 @@
if(!item.num){
this.$set(item, 'num', 1);
}else{
- this.$set(item, 'num', item.num++);
+ this.$set(item, 'num', item.num+1);
}
+ console.log(item.num)
//this.$set(item, 'num', newValue);
this.getHisReportList();
this.hasCheckQty=true;
@@ -944,6 +976,13 @@
// if (!this.checkSubmitValidate()) {
// return;
// }
+ if(this.HisReportList.length<=0){
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `璇疯緭鍏ユ楠屼俊鎭痐,
+ });
+ return
+ }
try {
console.log('this.$refs: ', this.$refs);
@@ -1006,181 +1045,40 @@
goBack() {
uni.navigateBack();
},
- async RoadBillMain() {
- try {
- let res = await CommonUtils.doRequest2Async({
- url: "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
- data: {
- sWhere: ` and hmainid=${this.hform.HInterID}`,
- user: getUserInfo()["Czymc"],
- },
- });
-
- let {
- data,
- count,
- Message
- } = res.data;
-
- if (count == 1) {
- console.log("RoadBillMain: : ", data);
- Object.assign(this.hform, {
- HInterID: data[0].hmainid,
- HBillNo: data[0].鍗曟嵁鍙�,
- HDate: dayjs(data[0].鏃ユ湡).format("YYYY-MM-DD"),
- HSourceID: data[0].HSourceID,
- HSourceName: data[0].鐢熶骇璧勬簮鍚嶇О,
- HICMOBillNo: data[0].浠诲姟鍗曞彿,
- HICMOQty: data[0].浠诲姟鍗曟暟閲�,
- HICMOInterID: data[0].HICMOInterID,
- HICMOEntryID: data[0].HICMOEntryID || 1,
- HMaterID: data[0].HMaterID,
- HMaterName: data[0].鐗╂枡鍚嶇О,
- HMaterNumber: data[0].鐗╂枡浠ｇ爜,
- HProcID: data[0].HProcID,
- HProcName: data[0].HProcName,
- HProcExchQty: data[0].HProcExchQty || 0,
- HProcExchBillNo: data[0].HProcExchBillNo,
- HProcExchInterID: data[0].HProcExchInterID,
- HProcExchEntryID: data[0].HProcExchEntryID || 0,
- HFirstCheckEmp: data[0].HFirstCheckEmp,
- HFirstCheckEmpName: data[0].璐ㄦ鍛樺悕绉�,
- HQCSchemeID: data[0].妫�楠屾柟妗圛D,
- HQCSchemeName: data[0].妫�楠屾柟妗堝悕绉�,
- HRemark: data[0].琛ㄥご澶囨敞,
- HMaker: data[0].鍒跺崟浜�,
- HMakeDate: data[0].鍒跺崟鏃ユ湡,
- HChecker: data[0].瀹℃牳浜�,
- HCheckDate: data[0].瀹℃牳鏃ユ湡,
- HCloseMan: data[0].鍏抽棴浜�,
- HCloseDate: data[0].鍏抽棴鏃ユ湡,
- HUpDateDate: data[0].淇敼鏃ユ湡,
- HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSampleSchemeID: data[0].HSampleSchemeID,
- HSampleSchemeName: data[0].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[0].鏍锋湰閲�,
- HSampleQty2: data[0].鏍锋湰閲�,
- HSampleDamageQty: data[0].鏍锋湰鐮村潖鏁�,
- HSamplingType: data[0].鎶芥牱绫诲瀷,
- HAcceptQty: data[0].鍏佽鏁�,
- HInspectionLevel: data[0].妫�楠屾按骞�,
- HRejectQty: data[0].鎷掔粷鏁�,
- HStrictness: data[0].涓ユ牸搴�,
- HSampleUnRightQty: data[0].鏍锋湰涓嶅悎鏍兼暟 || 0,
- HSampleUnRightQty2: data[0].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[0].AQL,
- HUnitID: data[0].HUnitID,
- HUnit: data[0].鍗曚綅,
- HInspectValB: data[0].妫�娴嬪�煎熀纭�璧勬枡,
- HInspectVal: data[0].妫�娴嬪��,
- HTargetValB: data[0].鐩爣鍊煎熀纭�璧勬枡,
- HTargetVal: data[0].鐩爣鍊�,
- HUpLimit: data[0].涓婇檺鍊�,
- HDownLimit: data[0].涓嬮檺鍊�,
- HUpOffSet: data[0].涓婂亸宸�,
- HDownOffSet: data[0].涓嬪亸宸�,
- HEntryID: data[0].hsubid,
- HQCCheckItemName: data[0].妫�楠岄」鐩悕绉�,
- HQCCheckItemID: data[0].HQCCheckItemID,
- HShiftsID: data[0].HShiftsID,
- HShiftsName: data[0].鐝鍚嶇О,
- HErrTreatment: data[0].寮傚父涓存椂澶勭悊鏂规,
- HBatchNo: data[0].鎵瑰彿,
- HCheckerResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
- HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
- HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function() {
- if (data[0].HAnalysisMethod == 1) {
- return '瀹氭�ф楠�'
- } else if (data[0].HAnalysisMethod == 2) {
- return '瀹氶噺妫�楠�'
- } else {
- return '鍏朵粬妫�楠�'
- }
- }(),
-
-
-
- });
-
- for (let i = 0; i < data.length; i++) {
- this.addCheckItem({
- HQCCheckItemID: data[i].HQCCheckItemID,
- HQCCheckItemNumber: data[i].妫�楠岄」鐩唬鐮�,
- HQCCheckItemName: data[i].妫�楠岄」鐩悕绉�,
- HInspectInstruMentID: data[i].HInspectInstruMentID,
- HInspectInstruMentNumber: data[i].妫�楠屼华鍣ㄤ唬鐮�,
- HInspectInstruMentName: data[i].妫�楠屼华鍣ㄥ悕绉�,
- HQCStd: data[i].妫�楠屾爣鍑�,
- HUnit: data[i].鍗曚綅鍚嶇О,
- HQCNote: data[i].妫�楠岃褰�,
- HResult: data[i].缁撹 == "鍚堟牸" ? 1 : 0,
- HMax: data[i].鏈�澶у��,
- HMin: data[i].鏈�灏忓��,
- HAvg: data[i].骞冲潎鍊�,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HAnalysisMethod: data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ?
- 1 : data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ?
- 2 : 3,
- HKeyInspect: data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
- HSampleSchemeID: data[i].HSampleSchemeID,
- HUnitID: data[i].HUnitID,
- HInspectVal: data[i].妫�娴嬪��,
- HTargetVal: data[i].鐩爣鍊�,
- HUpLimit: data[i].涓婇檺鍊�,
- HDownLimit: data[i].涓嬮檺鍊�,
- HUpOffSet: data[i].涓婂亸宸�,
- HDownOffSet: data[i].涓嬪亸宸�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HSampleSchemeName: data[i].鎶芥牱鏂规鍚嶇О,
- HSampleQty: data[i].鏍锋湰閲�,
- HSampleDamageQty: data[i].鏍锋湰鐮村潖鏁�,
- HAcceptQty: data[i].鍏佽鏁�,
- HInspectionLevel: 0,
- HRejectQty: data[i].鎷掔粷鏁�,
- HStrictness: 0,
- HSampleUnRightQty: data[i].鏍锋湰涓嶅悎鏍兼暟,
- HAQL: data[i].AQL,
- HSamplingType: 0,
- HSamplingType: data[i].鎶芥牱绫诲瀷,
- HStrictness: data[i].涓ユ牸搴�,
- HInspectResultToSee: data[i].妫�楠岀粨鏋�
- });
-
- }
-
-
- this.hasSourceBill = true
- } else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${Message}`,
- });
- }
- } catch (err) {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鍔犺浇鍗曟嵁澶辫触: ${err}`,
- });
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
}
},
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
+
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
} else if (this.operationType == 2) {
- } else if (this.operationType == 3) {
- await this.RoadBillMain();
- }
+ }
this.getGy_BadReasonList();
await this.InitHSource();
await this.InitHEmp();
await this.InitHGroup();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
--
Gitblit v1.9.1