From 14097136183a66f6d9c8283b6fa2cc045741c702 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 2 +-
src/views/basic/gyEmployee/gyEmployee.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index 5329a60..844fbee 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -1158,10 +1158,10 @@
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 鑱屽憳浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
}
if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ this.sWhere += " and 鑱屽憳鍚嶇О like '%" + this.queryParams.HName + "%'";
}
if (this.queryParams.HOrgID) {
this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index d8caad1..99c74a4 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -477,7 +477,7 @@
//濡傛灉鏄嚜鍔ㄧ櫥褰曪紝鍒欏彧鑳芥煡鐪嬩緵搴斿晢鑷繁鐨勬潯鐮併��
if (sessionStorage["HAutoLogin"] == "1") {
- this.sWhere += " and 渚涘簲鍟� = ''" + sessionStorage["HUserName"] + "''";
+ this.sWhere += " and HSupID = ''" + sessionStorage["HUserName"] + "''";
}
this.getList()
--
Gitblit v1.9.1