From 975e5fdae1f4ce0a4bd7cb1c1544a025540618aa Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 一月 2026 15:02:56 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index e33628e..f90d3c3 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -332,8 +332,8 @@
HBillNo: "",
HInterID: 0,
HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HDeptName: "",
- HDeptID: 0,
+ HDeptName: getUserInfo().HDeptName,
+ HDeptID: getUserInfo().HDeptID,
HRemark: "",
HBarName: "",
HEquipID: 0,
@@ -472,10 +472,11 @@
async getShiftList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: '/Web/GetGy_ShiftsList_Json',
+ url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
data: {
- Shifts: "",
- }
+ sWhere: ` and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != '' and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync("Organization")}'`,
+ HMaker: getUserInfo()["Czymc"],
+ },
})
let {
@@ -670,7 +671,7 @@
return {
"HDotCheckItemID": item.HDotCheckItemID,
"HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
+ "HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
"HDotCheckPart": item.鐐规閮ㄤ綅,
"HClaim": item.鍏蜂綋瑕佹眰,
"HManagerID": item.璐熻矗浜篒D,
--
Gitblit v1.9.1