From c2cbffaa0771016076fe4d03070f9eedfaeab414 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 20 十一月 2025 13:35:44 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 177 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 1dc15a9..dcc3c95 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -5,7 +5,7 @@
<!-- 涓昏〃椤电 -->
<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>
<!-- 涓昏〃鍐呭 -->
@@ -27,21 +27,12 @@
</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="left">婧愬崟鍗曞彿</view>
<view class="right" :class="!hasSourceBill?'':'disabled'">
- <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�" v-model="hform.HSourceBillNo"
- @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
+ <input type="text" :disabled="hasSourceBill" placeholder="璇疯緭鍏ユ垨鎵弿婧愬崟鍙�"
+ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
</view>
<view class="icon-wrapper-big">
<uni-icons class="right-icon" type="scan" style="
@@ -52,20 +43,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 disabled">
@@ -113,12 +91,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,41 +116,72 @@
<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" v-model="hform.HRemark" value="" />
- </view>
- </view>
+ <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="bill-main-content" v-if="mainTabSelected == 2">
- <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" 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">
+ <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" 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 == 3">
<view class="form-item">
@@ -497,7 +501,7 @@
mainTabSelected: 1,
subTabSelected: 1,
-
+
// 婧愬崟鐘舵�佹帶鍒�
hasSourceBill: false,
@@ -777,7 +781,7 @@
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
this.hform.HBatchNo = data[0].鎵瑰彿;
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -928,11 +932,11 @@
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
-
- for(let i =0; i<data.length;i++) {
+
+ for (let i = 0; i < data.length; i++) {
this.addCheckItem(data[i])
}
-
+
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -1626,7 +1630,7 @@
console.log("e: ", e);
let key = e.num;
e.HStatus = e.HStatus ? 1 : 0
- if(e.HResult2 == ''){
+ if (e.HResult2 == '') {
e.HResult2 = this.checkItems[key].HResult
}
Object.assign(this.checkItems[key], e);
@@ -1707,9 +1711,10 @@
return;
}
try {
- console.log('this.$refs: ',this.$refs);
+ console.log('this.$refs: ', this.$refs);
// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > 0) {
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length > 0) {
// 鍔犺浇鏈夋楠屽�兼ā鍧�
await this.$refs.InspectValueModules[0].set_SaveValue();
this.InspectValues[0] = this.$refs.InspectValueModules[0].InSpectValues;
@@ -1726,11 +1731,11 @@
}
let checkItemsArray = [];
for (var key in this.checkItems) {
- let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
+ let checkItem = JSON.parse(JSON.stringify(this.checkItems[key]))
delete checkItem.data
checkItemsArray.push(checkItem);
}
- console.log('checkItemsArray: ',checkItemsArray);
+ console.log('checkItemsArray: ', checkItemsArray);
let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
checkItemsArray
)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
@@ -1875,17 +1880,17 @@
HLastResult: data[0].鍒ゅ畾缁撹 == "鍚堟牸" ? true : false,
HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
- HAnalysisMethod: function(){
- if(data[0].HAnalysisMethod == 1) {
+ HAnalysisMethod: function() {
+ if (data[0].HAnalysisMethod == 1) {
return '瀹氭�ф楠�'
- }else if(data[0].HAnalysisMethod == 2) {
+ } else if (data[0].HAnalysisMethod == 2) {
return '瀹氶噺妫�楠�'
- }else {
- return '鍏朵粬妫�楠�'
+ } else {
+ return '鍏朵粬妫�楠�'
}
}(),
-
-
+
+
});
@@ -1932,10 +1937,10 @@
HStrictness: data[i].涓ユ牸搴�,
HInspectResultToSee: data[i].妫�楠岀粨鏋�
});
-
+
}
-
-
+
+
this.hasSourceBill = true
} else {
CommonUtils.showTips({
@@ -1957,7 +1962,7 @@
if (this.operationType == 1) {
await this.getMaxBillNo();
} else if (this.operationType == 2) {
-
+
} else if (this.operationType == 3) {
await this.RoadBillMain();
}
--
Gitblit v1.9.1