From 423c1948a631cff298e6348cc55626f5149c111a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 26 二月 2026 13:10:19 +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 | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index e33628e..908e4de 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -321,8 +321,8 @@
hform: {
HBarCode: "",
- HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
HQty: 0,
HErrNote: "",
HBigSafeNote: "",
@@ -331,9 +331,9 @@
HShiftsID: 0,
HBillNo: "",
HInterID: 0,
- HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- HDeptName: "",
- HDeptID: 0,
+ HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ 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 {
@@ -532,7 +533,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -623,7 +624,8 @@
"HDotCheckItemClassName": "",
"HDotCheckItemMethodID": 0,
"HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ //"HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
@@ -670,7 +672,7 @@
return {
"HDotCheckItemID": item.HDotCheckItemID,
"HDotCheckCode": item.鐐规椤圭洰浠ｇ爜,
- "HDotCheckItem": item.鐐规椤圭洰,
+ "HDotCheckItem": item.鐐规椤圭洰鍚嶇О,
"HDotCheckPart": item.鐐规閮ㄤ綅,
"HClaim": item.鍏蜂綋瑕佹眰,
"HManagerID": item.璐熻矗浜篒D,
@@ -683,10 +685,10 @@
"HDotCheckItemClassName": "",
"HDotCheckItemMethodID": 0,
"HDotCheckItemMethodName": "",
- "HDotCheckResult": item.榛樿缁撹 == 1 ? true : false
+ "HDotCheckResult": item.榛樿鐐规缁撴灉 == 'OK' ? true : false
}
})
-
+ this.tabs = 1
} else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
--
Gitblit v1.9.1