From 2129f5b77f552a55f448fbc076ffa2a4c31ef537 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 20 十一月 2025 16:54:52 +0800
Subject: [PATCH] 生产入库校验单
---
components/ZLGL/InspectValueTemplate.vue | 5
pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 211 ++++++++++++++++++++++++++++++----------------------
2 files changed, 126 insertions(+), 90 deletions(-)
diff --git a/components/ZLGL/InspectValueTemplate.vue b/components/ZLGL/InspectValueTemplate.vue
index 6be895e..9c073c8 100644
--- a/components/ZLGL/InspectValueTemplate.vue
+++ b/components/ZLGL/InspectValueTemplate.vue
@@ -45,7 +45,7 @@
{{ checkData.HStatus?"鍚堟牸":"涓嶅悎鏍�" }}
</view>
<view>
- <switch style="width: 2em; transform:scale(0.7);" :checked="checkData.HStatus"
+ <switch style="width: 2em; transform:scale(0.7);" :checked="!!checkData.HStatus"
@change="HStatusChange" />
</view>
</view>
@@ -399,6 +399,7 @@
},
async set_SaveValue() {
+ await this.$nextTick();
console.log("InSpect Values: ", this.InSpectValues)
try {
let res = await CommonUtils.doRequest2Sync({
@@ -409,7 +410,7 @@
method: "POST"
})
- if (res) {
+ if (!res) {
return
}
let {
diff --git a/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index d7526ea..c2dc66d 100644
--- a/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -27,16 +27,7 @@
</uni-datetime-picker>
</view>
</view>
- <view class="form-item">
- <view class="left">婧愬崟绫诲瀷</view>
- <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
- <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
- @change="HSourceBillTypeNameChange">
- <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled/>
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
+
<view class="form-item">
<view class="left">婧愬崟鍗曞彿</view>
<view class="right" :class="!hasSourceBill?'':'disabled'">
@@ -113,12 +104,7 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 7)"></uni-icons></view>
</view>
- <view class="form-item">
- <view class="left">鎵瑰彿</view>
- <view class="right">
- <input type="text" value="" />
- </view>
- </view>
+
<view class="form-item">
<view class="left">鍒ゆ柇缁撹</view>
<view class="right none-border">
@@ -143,15 +129,20 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 8)"></uni-icons></view>
</view>
- <view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" v-model="hform.HRemark" value="" />
- </view>
- </view>
+
</view>
<!-- 鍏朵粬淇℃伅 -->
<view class="bill-main-content" v-if="mainTabSelected == 2">
+ <view class="form-item">
+ <view class="left">婧愬崟绫诲瀷</view>
+ <view class="right" style="position: relative" :class="!hasSourceBill?'':'disabled'">
+ <picker mode="selector" :range="HSourceBillTypeNameList" :disabled="hasSourceBill"
+ @change="HSourceBillTypeNameChange">
+ <input type="text" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" v-model="HSourceBillType" disabled/>
+ <view class="picker-overlay"></view>
+ </picker>
+ </view>
+ </view>
<view class="form-item" v-if="false">
<view class="left">鐢熶骇鐝</view>
<view class="right">
@@ -177,6 +168,18 @@
<input type="number" v-model="hform.HProcExchQty" />
</view>
</view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" value="" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">澶囨敞</view>
+ <view class="right">
+ <input type="text" v-model="hform.HRemark" value="" />
+ </view>
+ </view>
</view>
<!-- 鍒跺崟淇℃伅 -->
<view class="bill-main-content" v-if="mainTabSelected == 3">
@@ -309,9 +312,12 @@
<view class="detail" v-if="checkItem.HUnit">
<text>鍗曚綅锛�</text>{{ checkItem.HUnit }}
</view>
- <view class="detail" v-if="checkItem.HQCStd">
- <text>妫�楠屽�硷細</text>{{ checkItem.HQCStd }}
+ <!-- 鍙湁瀹氶噺鍒嗘瀽鎵嶅惎鐢ㄦ楠屽�� -->
+ <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2">
+ <text>妫�楠屽�硷細</text>
+ <input type="text" class="editable-input" @blur="calcHResult(checkItem)" v-model="checkItem.HInspectValQ" />
</view>
+
<view class="detail" v-if="checkItem.HQCNote">
<text>妫�楠岃褰曪細</text>{{ checkItem.HQCNote }}
</view>
@@ -388,7 +394,7 @@
</view>
<view class="detail editable">
<text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="sampleDestory">
+ <view class="editable-input">
<input type="number" v-model="SamplingItem.HSampleDamageQty" />
</view>
</view>
@@ -563,7 +569,7 @@
],
// 涓昏〃灞炴��
hform: {
- HSourceBillType: "3790",
+ HSourceBillType: "3711",
HSourceBillNo: "",
HBillNo: "",
HInterID: "0",
@@ -625,6 +631,21 @@
};
},
methods: {
+ // 妫�楠屽�� 璁＄畻鏄惁鍚堟牸
+ calcHResult(item){
+ // 闈炴娊妫�鏉′欢涓嬪垽鏂粨璁�
+ console.log('item: ',item);
+ if(item.HSampleSchemeID) {
+ return
+ }
+
+ if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){
+ this.checkItems[item.num].HResult = true
+ return
+ }
+
+ this.checkItems[item.num].HResult = false
+ },
// 婧愬崟绫诲瀷閫夋嫨
HSourceBillTypeNameChange(e) {
this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value];
@@ -640,9 +661,9 @@
async getSourceBillInfo(HBarCode) {
console.log('HBarCode: ', HBarCode);
// 鏍规嵁鍗曟嵁绫诲瀷锛岃皟鐢ㄤ笉鍚岀殑涓嬫帹鍑芥暟
- if (this.hform.HSourceBillType == 3790) {
+ if (this.hform.HSourceBillType == 3711) {
// 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
- await this.LoadingInformation_StationInBill(HBarCode);
+ await this.LoadingInformation_ICMOReportBill(HBarCode);
if (
(uni.getStorageSync("OrganizationID") == "7667152" &&
uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") ||
@@ -653,6 +674,19 @@
}
return;
}
+ // if (this.hform.HSourceBillType == 3790) {
+ // // 宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+ // await this.LoadingInformation_StationInBill(HBarCode);
+ // 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(); // 瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+ // }
+ // return;
+ // }
if (this.hform.HSourceBillType == 3793) {
// 宸ュ簭濮斿鎺ユ敹鍗曞垪琛ㄩ妫�
await this.LoadingInformation_StationEntrustOutBill(HBarCode);
@@ -792,6 +826,7 @@
// 鐢熶骇璁㈠崟
try {
let sWhere="and 鍗曟嵁鍙�='"+HBarCode+"'"
+ console.log(sWhere)
let res = await CommonUtils.doRequest2Async({
url: "/LEMS/MES_IF_ICMOBillList_Json",
data: {
@@ -824,6 +859,7 @@
this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
this.hform.HSourceID = data[0].HSourceID;
this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterNumber=data[0].浜у搧浠ｇ爜
this.hform.HMaterName = data[0].浜у搧鍚嶇О;
this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
this.hform.HMainSourceBillType = data[0].鍗曟嵁绫诲瀷;
@@ -832,8 +868,8 @@
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
- //this.hasSourceBill = true
- //this.get_CheckItem();
+ this.hasSourceBill = true
+ this.get_CheckItem();
} catch (err) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -894,62 +930,61 @@
},
//#endregion
- // async LoadingInformation_StationInBill(HBarCode) {
- // // 杩涚珯鎺ユ敹鍗�
- // try {
- // let res = await CommonUtils.doRequest2Async({
- // url: "/QC_FirstPieceCheckBill/get_StationInBill_ByHBillNo",
- // data: {
- // HBillNo: HBarCode,
- // user: getUserInfo()["Czymc"],
- // },
- // });
+ async LoadingInformation_ICMOReportBill(HBarCode) {
+ // 鐢熶骇姹囨姤鍗�
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: "/QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo",
+ data: {
+ HBillNo: HBarCode,
+ user: getUserInfo()["Czymc"],
+ },
+ });
- // let {
- // count,
- // Message,
- // data
- // } = res.data;
+ let {
+ count,
+ Message,
+ data
+ } = res.data;
- // if (count != 1) {
- // CommonUtils.showTips({
- // title: "娓╅Θ鎻愮ず",
- // message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${Message}`,
- // });
- // return;
- // }
- // this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- // this.hform.HProcExchInterID = data[0].HProcExchInterID;
- // this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
- // this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
- // this.hform.HICMOBillNo = data[0].浠诲姟鍗�;
- // this.hform.HICMOInterID = data[0].HICMOInterID;
- // this.hform.HICMOQty = data[0].HICMOQty;
- // this.hform.HSourceName = data[0].鐢熶骇璧勬簮;
- // this.hform.HSourceID = data[0].HSourceID;
- // this.hform.HMaterID = data[0].HMaterID;
- // this.hform.HMaterName = data[0].浜у搧鍚嶇О;
- // this.hform.HMainSourceBillNo = data[0].鍗曟嵁鍙�;
- // this.hform.HMainSourceBillType = data[0].HBillType;
- // this.hform.HMainSourceInterID = data[0].HInterID;
- // this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
- // this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
- // this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
- // this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ if (count != 1) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${Message}`,
+ });
+ return;
+ }
+ //change_inlife
+ this.hform.HMainSourceEntryID=data[0].HEntryID||1;
+ this.hform.HMaterNumber=data[0].HMaterNumber;
+ this.hform.HICMOBillNo = data[0].HICMOBillNo;
+ this.hform.HICMOInterID = data[0].HICMOInterID;
+ this.hform.HICMOQty = data[0].HICMOQty;
+ this.hform.HSourceName = data[0].HSourceName;
+ this.hform.HSourceID = data[0].HSourceID;
+ this.hform.HMaterID = data[0].HMaterID;
+ this.hform.HMaterName = data[0].HMaterName;
+ this.hform.HMainSourceBillNo = data[0].HBillNo;
+ this.hform.HMainSourceBillType = data[0].HBillType;
+ this.hform.HMainSourceInterID = data[0].HInterID;
+ this.hform.HICMOEntryID = data[0].HICMOEntryID || 1;
+ this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
+ this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
+
- // for (let i = 0; i < data.length; i++) {
- // this.addCheckItem(data[i])
- // }
+ for (let i = 0; i < data.length; i++) {
+ this.addCheckItem(data[i])
+ }
- // this.hasSourceBill = true
- // this.get_CheckItem();
- // } catch (err) {
- // CommonUtils.showTips({
- // title: "娓╅Θ鎻愮ず",
- // message: `鑾峰彇杩涚珯鎺ユ敹鍗� 閿欒: ${err}`,
- // });
- // }
- // },
+ this.hasSourceBill = true
+ this.get_CheckItem();
+ } catch (err) {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `鑾峰彇鐢熶骇姹囨姤鍗� 閿欒: ${err}`,
+ });
+ }
+ },
// 妫�楠屽憳鍒濆鍖�
async InitHEmp() {
try {
@@ -1493,7 +1528,7 @@
},
setInspectValModule(checkItem) {
console.log("checkItem: ", checkItem);
- if (!checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
+ if (!checkItem || !checkItem.HAnalysisMethod || !checkItem.HSampleSchemeID) {
return;
}
// 鍖哄垎妫�楠屽�奸〉绛惧拰闈欐�侀〉绛撅紝妫�楠屽�奸〉绛剧殑id浠寮�澶�
@@ -1748,7 +1783,7 @@
console.log("this.checkItems: ", this.checkItems);
let res = await CommonUtils.doRequest2Sync({
- url: "/QC_FirstPieceCheckBill/set_SaveBill",
+ url: "/QC_LastPieceCheckBill/set_SaveBill",
data: {
sMainSub: sMainSub,
},
@@ -1772,7 +1807,7 @@
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
+ url: "/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1785,13 +1820,13 @@
} else {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
- message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${Message}`,
+ message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${Message}`,
});
}
} catch (err) {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
- message: `棣栦欢妫�楠屽崟淇濆瓨閿欒: ${err}`,
+ message: `鐢熶骇鍏ュ簱鏍￠獙鍗曚繚瀛橀敊璇�: ${err}`,
});
}
},
@@ -2192,7 +2227,7 @@
flex-shrink: 0;
}
- .sampleDestory {
+ .editable-input {
border: 1px solid #acacac;
border-radius: 5rpx;
padding: 0 12rpx;
--
Gitblit v1.9.1