From fbe87c8d043cb038d384df7721bc071676a0c24c Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 03 三月 2026 14:38:49 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
components/ZLGL/BadReasonPopup.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/components/ZLGL/BadReasonPopup.vue b/components/ZLGL/BadReasonPopup.vue
index 9468334..a804ba6 100644
--- a/components/ZLGL/BadReasonPopup.vue
+++ b/components/ZLGL/BadReasonPopup.vue
@@ -94,6 +94,13 @@
HStockOrgID: {
type: [String, Number],
},
+ HMaterID:
+ {
+ type: [String, Number],
+ },
+ HBillType:{
+ type: [String, Number],
+ },
},
mounted() {},
methods: {
@@ -134,14 +141,20 @@
},
getsWhere() {
let sWhere =
- ` and 绂佺敤鏍囪 !='Y' and ISNULL(瀹℃牳浜�,'')!='' and HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`
+ ` and a.HStopFlag =0 and ISNULL(a.HCheckEmp,'')!='' and a.HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`
+ // ` and 绂佺敤鏍囪 !='Y' and ISNULL(瀹℃牳浜�,'')!='' and a.HUSEORGID = '${ uni.getStorageSync("OrganizationID")}'`
+
if (this.HCode) {
- swhere += ` and 涓嶈壇鍘熷洜浠ｇ爜 like '%${this.HCode}%'`
+ // swhere += ` and 涓嶈壇鍘熷洜浠ｇ爜 like '%${this.HCode}%'`
+ swhere += ` and a.HNumber like '%${this.HCode}%'`
}
if (this.HName) {
- swhere += ` and 涓嶈壇鍘熷洜鍚嶇О like '%${this.HName}%'`
+ // swhere += ` and 涓嶈壇鍘熷洜鍚嶇О like '%${this.HName}%'`
+ swhere += ` and a.HName like '%${this.HName}%'`
}
+
+ console.log("sWhere",sWhere)
return sWhere
},
getBillList() {
@@ -150,9 +163,12 @@
this.page = 0
this.curPage = 1
CommonUtils.doRequest(
- "/Gy_BadReason/list", {
+ "/Gy_BadReason/list_1", {
sWhere: this.getsWhere(),
- user: getUserInfo()['Czymc']
+ user: getUserInfo()['Czymc'],
+ HMaterID:this.HMaterID,
+ HBillType:this.HBillType,
+ OrgID:uni.getStorageSync("OrganizationID")
},
(res) => {
let {
--
Gitblit v1.9.1