From 28328db7ef0b0270e9e94b6a11b32cb5f9bdac88 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 06 二月 2026 13:44:07 +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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index 1128ab7..514418d 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -78,7 +78,7 @@
<!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
</view>
<view class="form-item">
- <view class="title required">璐熻矗浜�:</view>
+ <view class="title required">楠屾敹浜�:</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HManagerID">
@@ -207,7 +207,7 @@
hform: {
HBarCode: "",
- HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
HConkTypeName: "",
HConkTypeID: 0,
HConkReasonName: "",
@@ -215,7 +215,7 @@
HExplanation: "",
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
HDeptName: getUserInfo().HDeptName,
HDeptID: getUserInfo().HDeptID,
HEmpName: getUserInfo().HEmpName,
@@ -230,7 +230,7 @@
HChecker: '',
HCloseMan: '',
HUpDater: '',
- HMakeDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
HCheckDate: '',
HCloseDate: '',
HUpDateDate: '',
@@ -500,10 +500,15 @@
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
try {
+ 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: {
- sWhere: " where 1=1",
+ sWhere: sWhere,
}
})
--
Gitblit v1.9.1