From 1394c626cd9753d4ac3ff397927b9513e54ada46 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 一月 2026 13:36:38 +0800
Subject: [PATCH] 巡检 首检 末检代码修改
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 33 +++++++++-------
manifest.json | 4 +-
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | 35 ++++++++++-------
pages/index/login.vue | 4 +-
pages/ZLGL/shoujianjianyan/firstCheckBill.vue | 4 +
5 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/manifest.json b/manifest.json
index 3073b58..2a3638f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.60",
- "versionCode" : 260,
+ "versionName" : "2.0.61",
+ "versionCode" : 261,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index dbc28dd..32e2cf0 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -51,7 +51,7 @@
<view class="right disabled">
<input type="text" :value="hform.HICMOBillNo" disabled />
</view>
-
+
</view>
<view class="form-item">
@@ -59,7 +59,7 @@
<view class="right disabled">
<input type="text" :value="hform.HProcExchBillNo" disabled />
</view>
-
+
</view>
<view class="form-item">
<view class="left">鍙栨牱鍗曞彿</view>
@@ -74,8 +74,7 @@
<input type="text" disabled :value="hform.HMaterNumber" />
</view>
<view class="icon-wrapper-big">
-
- :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons>
+ <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons>
</view>
</view>
<view class="form-item">
@@ -1178,7 +1177,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
-
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -1959,7 +1958,8 @@
try {
console.log('this.$refs: ', this.$refs);
// 妫�鏌ユ槸鍚︽湁鏈垏鎹㈢殑妫�楠屽�兼ā鍧�(鏄惁鍖呭惈set_SaveValue鏂规硶),濡傛灉鏈夛紝鍒欒繍琛屼竴娆′繚瀛樻楠屽�肩殑鏂规硶锛屾牴鎹楠屽�兼槸鍚︿繚瀛樻垚鍔熷啀鎵ц涓嬩竴姝�
- if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length >
+ if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules
+ .length >
0) {
// 鍔犺浇鏈夋楠屽�兼ā鍧�
await this.$refs.InspectValueModules[0].set_SaveValue();
@@ -1982,7 +1982,7 @@
checkItemsArray.push(checkItem);
}
console.log('checkItemsArray: ', checkItemsArray);
-
+
console.log("this.checkItems: ", this.checkItems);
let res = await CommonUtils.doRequest2Sync({
@@ -2014,9 +2014,9 @@
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
}
},
});
@@ -2256,6 +2256,11 @@
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
+
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "宸ュ簭鍑虹珯姹囨姤鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "3791"; // 瀵瑰簲鐨勫��
+ }
} else if (this.operationType == 2) {
//鏈夋簮鍗曚笅鎺�
await this.getMaxBillNo();
@@ -2264,6 +2269,7 @@
if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
+ this.hform.HSourceBillNo = e.HBillNo;
}
this.hform.HTakeSampleCheckBillNo = e.HBillNo;
this.hform.HTakeSampleCheckBillID = e.linterid;
@@ -2273,10 +2279,7 @@
} else if (this.operationType == 3) {
await this.RoadBillMain();
}
- if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
- this.HSourceBillType = "宸ュ簭鍑虹珯姹囨姤鍗�"; // 鏄剧ず鍚嶇О
- this.hform.HSourceBillType = "3791"; // 瀵瑰簲鐨勫��
- }
+
await this.InitHSource();
await this.InitHWorkShift();
await this.InitHEmp();
@@ -2415,7 +2418,7 @@
}
.btn-c {
- background-color: #FFA500;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
index bf5b74c..d94b470 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1249,6 +1249,7 @@
this.hform.HQCSchemeName = data[0].妫�楠屾柟妗堝悕绉�;
this.hform.HQCSchemeID = data[0].妫�楠屾柟妗圛D;
this.hform.HProcName = data[0].褰撳墠宸ュ簭;
+ this.hform.HCheckQty = data[0].鍙栨牱鏁伴噺
this.hasSourceBill = true
this.get_CheckItem();
} catch (err) {
@@ -2275,7 +2276,8 @@
if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
- }
+ this.hform.HSourceBillNo = e.HBillNo
+ }
this.hform.HTakeSampleCheckBillNo=e.HBillNo;
this.hform.HTakeSampleCheckBillID=e.linterid;
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
index 943a9b2..d8765c3 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -79,7 +79,7 @@
</view>
</view>
<view class="form-item">
-
+
<view class="left required">妫�楠屾暟閲�</view>
<view class="right">
<input type="number" v-model="hform.HCheckQty" />
@@ -957,7 +957,7 @@
let res = await CommonUtils.doRequest2Async({
url: "/Gy_Employee/list",
data: {
- sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' `,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -1771,9 +1771,9 @@
});
} else if (res.cancel) {
console.log("鐢ㄦ埛鐐瑰嚮鍙栨秷");
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 50)
}
},
});
@@ -1823,7 +1823,7 @@
return;
}
this.hform.HProcExchBillNo = data[0].娴佽浆鍗″彿;
- this.hform.HSourceBillNo = data[0].娴佽浆鍗″彿;
+ // this.hform.HSourceBillNo = data[0].娴佽浆鍗″彿;
this.hform.HProcExchInterID = data[0].HProcExchInterID;
this.hform.HProcExchEntryID = data[0].HProcExchEntryID;
this.hform.HProcExchQty = data[0].娴佽浆鍗℃暟閲� || 0;
@@ -2015,32 +2015,37 @@
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
await this.getMaxBillNo();
+
+ if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+ this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
+ this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
+ }
} else if (this.operationType == 2) {
//鏈夋簮鍗曚笅鎺�
await this.getMaxBillNo();
if (e.HSouceBillType == "7521") {
+ await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
+ await this.$nextTick()
if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
this.HSourceBillType = "鍙栨牱鍗�"; // 鏄剧ず鍚嶇О
this.hform.HSourceBillType = "7521"; // 瀵瑰簲鐨勫��
+ this.hform.HSourceBillNo = e.HBillNo
}
+
this.hform.HTakeSampleCheckBillNo = e.HBillNo;
this.hform.HTakeSampleCheckBillID = e.linterid;
//鍙栨牱鍗曟煡璇㈡暟鎹�
- await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
}
} else if (this.operationType == 3) {
await this.RoadBillMain();
}
-
+
await this.InitHSource();
await this.InitHWorkShift();
await this.InitHEmp();
-
- if (uni.getStorageSync('Organization') == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
- this.HSourceBillType = "宸ュ簭娴佽浆鍗�"; // 鏄剧ず鍚嶇О
- this.hform.HSourceBillType = "3772"; // 瀵瑰簲鐨勫��
- }
+
+
},
};
@@ -2176,8 +2181,8 @@
}
.btn-c {
- // background-color: #acacac;
- background-color: #FFA500;
+ // background-color: #acacac;
+ background-color: #FFA500;
color: #fff;
// position: absolute;
// right: 120rpx;
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a39a661..4abe13a 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -110,7 +110,7 @@
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
"闄堥晲鍝叉湰鍦版祴璇�": 'http://192.168.0.121:81/API/',
- "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.0.103:81/API/',
+ "闄堥晲鍝叉湰鍦版祴璇�2": 'http://192.168.89.27:81/API/',
"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
"浣欐�濇澃鏈湴娴嬭瘯": 'http://localhost:8082/LuBaoAPI/',
// 灏忓崼鍐呭缃�
@@ -127,7 +127,7 @@
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
},
- serverUrlName: uni.getStorageSync('serverUrlName') || '娴欐睙鏅轰簯杩堟��',
+ serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍗庤垷鍖呰',
arrayOrganization: [],
Organization: '',
--
Gitblit v1.9.1