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
---
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index 514418d..fea4951 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -217,7 +217,7 @@
HInterID: 0,
HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
- HDeptID: getUserInfo().HDeptID,
+ HDeptID: getUserInfo().HDeptID,
HEmpName: getUserInfo().HEmpName,
HEmpID: getUserInfo().HEmpID,
HManagerName: getUserInfo().HManagerName,
@@ -261,10 +261,11 @@
async getConkType() {
try {
let res = await CommonUtils.doRequest2Async({
- url: "/Gy_ConkType/List_PDA",
+ url: '/Gy_ConkType/List_PDA2',
data: {
- sWhere: ``,
- user: getUserInfo()['Czymc']
+ sWhere: '',
+ user: getUserInfo()['Czymc'],
+ mode: 'Equip'
}
})
@@ -344,7 +345,7 @@
}
if (this.hform.HManagerID == 0) {
return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
+ Message: "楠屾敹浜轰笉寰椾负绌�!",
state: false
}
}
@@ -500,11 +501,11 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
- let sWhere= " where 1=1 "
- if(this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�'){
+ let sWhere = " where 1=1 "
+ if (this.hform.HDeptName && uni.getStorageSync("Organization") == '瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�') {
sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
}
-
+
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
@@ -789,7 +790,7 @@
count
} = res.data
if (count == 1) {
- console.log('data: ',data);
+ console.log('data: ', data);
Object.assign(this.hform, {
HDeptID: data[0]["HDeptID"],
HDeptName: data[0]["浣跨敤閮ㄩ棬"],
--
Gitblit v1.9.1