From e6ac1a6d3cc6b5f4b9bdb0ba98a055288934daee Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 19 十一月 2025 16:14:00 +0800
Subject: [PATCH] 首件检验单 添加 检验项目检验值(分析方法为定量分析时有效，绑定字段为HInspectValQ) 抽检绑定字段为HInspectVal
---
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 168 +++++++++++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 74 deletions(-)
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index 597746e..423f253 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -5,7 +5,8 @@
<!-- 涓昏〃椤电 -->
<view class="bill-main-tabs">
<view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">鍩烘湰淇℃伅</view>
- <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍒跺崟淇℃伅</view>
+ <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">鍏朵粬淇℃伅</view>
+ <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">鍒跺崟淇℃伅</view>
</view>
<!-- 涓昏〃鍐呭 -->
<view class="bill-main-contents">
@@ -26,17 +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" />
- <view class="picker-overlay"></view>
- </picker>
- </view>
- </view>
- <view class="form-item">
+<view class="form-item">
<view class="left">婧愬崟鍗曞彿</view>
<view class="right" :class="!hasSourceBill?'':'disabled'">
<input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
@@ -51,25 +42,7 @@
" size="20" @click="toScanCode"></uni-icons>
</view>
</view>
- <view class="form-item">
- <view class="left">鐢熶骇璧勬簮</view>
- <view class="right">
- <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
- @update:modelValue="HSourceChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="left">鐢熶骇鐝</view>
- <view class="right">
- <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
- v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
- </view>
- </view>
- <!-- <view class="form-item">
- <view class="left"></view>
- <view class="right">
- <input type="text"></view>
- </view> -->
+
<view class="form-item">
<view class="left">浠诲姟鍗曞彿</view>
<view class="right disabled">
@@ -79,24 +52,12 @@
@click="showSelectorModule(hform, 5)"></uni-icons></view>
</view>
<view class="form-item">
- <view class="left">浠诲姟鍗曟暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HICMOQty" />
- </view>
- </view>
- <view class="form-item">
<view class="left">娴佽浆鍗″彿</view>
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 6)"></uni-icons></view>
- </view>
- <view class="form-item">
- <view class="left">娴佽浆鍗℃暟閲�</view>
- <view class="right">
- <input type="number" v-model="hform.HProcExchQty" />
- </view>
</view>
<view class="form-item">
<view class="left">浜у搧浠ｇ爜</view>
@@ -129,12 +90,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">
@@ -159,21 +115,74 @@
<view class="icon-wrapper-big"><uni-icons type="search" size="20"
@click="showSelectorModule(hform, 8)"></uni-icons></view>
</view>
+
+ </view>
+ <!-- 鍏朵粬淇℃伅 -->
+ <view class="bill-main-content" v-if="mainTabSelected == 2">
<view class="form-item">
- <view class="left">澶囨敞</view>
- <view class="right">
- <input type="text" value="" />
+ <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" />
+ <view class="picker-overlay"></view>
+ </picker>
</view>
</view>
<view class="form-item">
+ <view class="left">鐢熶骇璧勬簮</view>
+ <view class="right">
+ <uni-combox :candidates="GySourceNameList" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @update:modelValue="HSourceChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="left">鐢熶骇鐝</view>
+ <view class="right">
+ <uni-combox :candidates="GyWorkShiftNameList" placeholder="璇烽�夋嫨鐢熶骇鐝"
+ v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
+ </view>
+ </view> -->
+ <view class="form-item">
<view class="left">寮傚父涓存椂澶勭悊鏂规</view>
<view class="right">
- <input type="text" value="" />
+ <input type="text" v-model="hform.HErrTreatment" value="" />
+ </view>
+ </view>
+ <!-- <view class="form-item">
+ <view class="left">浠诲姟鍗曟暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HICMOQty" />
+ </view>
+ </view> -->
+ <view class="form-item">
+ <view class="left">娴佽浆鍗℃暟閲�</view>
+ <view class="right">
+ <input type="number" v-model="hform.HProcExchQty" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="left">鎵瑰彿</view>
+ <view class="right">
+ <input type="text" v-model="hform.HBatchNo" />
+ </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="bill-main-content" v-if="mainTabSelected == 3">
<view class="form-item">
<view class="left">鍒跺崟浜�</view>
<view class="right disabled">
@@ -304,8 +313,11 @@
<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 }}
@@ -383,7 +395,7 @@
</view>
<view class="detail editable">
<text>鏍锋湰鐮村潖鏁帮細</text>
- <view class="sampleDestory">
+ <view class="editable-input">
<input type="number" v-model="SamplingItem.HSampleDamageQty" />
</view>
</view>
@@ -623,6 +635,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];
@@ -1099,7 +1126,7 @@
this.$refs.listPopup.showPopup();
},
getAnalysisMethodDisplay(val) {
- console.log("AnalysisMethodVal: ", val);
+ console.log("AnalysisMethod: ", val);
if (val) {
return this.arrayAnalysisMethod.find((e) => e.value == val).name;
}
@@ -1632,12 +1659,12 @@
},
checkSubmitValidate() {
- if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
- CommonUtils.showTips({
- message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
- });
- return false;
- }
+ // if (this.hform.HICMOQty == "" || this.hform.HICMOQty <= 0) {
+ // CommonUtils.showTips({
+ // message: "浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�",
+ // });
+ // return false;
+ // }
if (this.hform.HFirstCheckEmp == 0) {
CommonUtils.showTips({
@@ -1757,7 +1784,7 @@
if (res.confirm) {
console.log("鐢ㄦ埛鐐瑰嚮纭畾");
uni.redirectTo({
- url: "/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=1",
+ url: "/pages/ZLGL/shoujianjianyan/form?operationType=1",
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
@@ -1880,9 +1907,6 @@
return '鍏朵粬妫�楠�'
}
}(),
-
-
-
});
for (let i = 0; i < data.length; i++) {
@@ -1928,9 +1952,7 @@
HStrictness: data[i].涓ユ牸搴�,
HInspectResultToSee: data[i].妫�楠岀粨鏋�
});
-
}
-
this.hasSourceBill = true
} else {
@@ -1952,9 +1974,7 @@
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
- } else if (this.operationType == 2) {
-
- } else if (this.operationType == 3) {
+ } else if (this.operationType == 2) {} else if (this.operationType == 3) {
await this.RoadBillMain();
}
@@ -2177,7 +2197,7 @@
flex-shrink: 0;
}
- .sampleDestory {
+ .editable-input {
border: 1px solid #acacac;
border-radius: 5rpx;
padding: 0 12rpx;
--
Gitblit v1.9.1