From c141b01c990146b4ef41c17a69ad3066d721a91c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 二月 2026 12:26:20 +0800
Subject: [PATCH] 调整 器具/设备 维修相关模块 页面

---
 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue |   74 ++++++++++++++++++++++++++++++------
 1 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index cb66841..33ce3d4 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -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,13 +215,13 @@
                     HExplanation: "",
                     HBillNo: "",
                     HInterID: 0,
-                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-                    HDeptName: "",
-                    HDeptID: 0,
-                    HEmpName: "",
-                    HEmpID: 0,
-                    HManagerName: "",
-                    HManagerID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HDeptName: getUserInfo().HDeptName,
+					HDeptID: getUserInfo().HDeptID,
+                    HEmpName: getUserInfo().HEmpName,
+                    HEmpID: getUserInfo().HEmpID,
+                    HManagerName: getUserInfo().HManagerName,
+                    HManagerID: getUserInfo().HManagerID,
                     HBarName: "",
                     HEquipID: 0,
                     HBarSpec: "",
@@ -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,
                         }
                     })
 
@@ -530,7 +535,7 @@
 
             toScanCode() {
                 MpaasScan.scanCode(cb => {
-                    this.hfrom.HBarCode = cb
+                    this.hform.HBarCode = cb
                     this.GetMessageByBarCode(cb)
                 })
             },
@@ -752,7 +757,7 @@
 
                     if (code == 1) {
                         data = data.h_v_Sb_EquipConkBookBillList_Edit[0]
-                        
+
                         this.enableEdit = false
                     } else {
                         CommonUtils.showTips({
@@ -765,6 +770,46 @@
                     CommonUtils.showTips({
                         title: '娓╅Θ鎻愮ず',
                         message: `鑾峰彇鏁呴殰鐧昏鍗曞け璐�: ${err}`
+                    })
+                }
+            },
+            async GetEquipInfo(HEquipID) {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Gy_EquipFileMain/getSb_EquipList",
+                        data: {
+                            HInterID: HEquipID,
+                            user: getUserInfo()["Czymc"]
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        console.log('data: ',data);
+                        Object.assign(this.hform, {
+                            HDeptID: data[0]["HDeptID"],
+                            HDeptName: data[0]["浣跨敤閮ㄩ棬"],
+                            HEquipID: data[0]["hmainid"],
+                            HBarName: data[0]["璁惧鍚嶇О"],
+                            HBarModel: data[0]["璁惧瑙勬牸"],
+                            HBarSpec: data[0]["璁惧鍨嬪彿"],
+                            HEmpID: getUserInfo()["HEmpID"],
+                            HManagerID: data[0]["HRepairEmpID"]
+                        })
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鏁版嵁澶辫触: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鏁版嵁澶辫触: ${err}`
                     })
                 }
             }
@@ -788,7 +833,10 @@
                 this.getEditData(hmainid)
 
             } else if (this.operationType == 4) {
-                // 娴忚
+                // 鎶ュ伐骞冲彴涓嬫帹
+                let HEquipID = e.HEquipID
+                this.getMaxNum()
+                this.GetEquipInfo(HEquipID)
 
             }
 

--
Gitblit v1.9.1