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_EquipConkBook/Sb_EquipConkBookBill.vue | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
index cb66841..fea4951 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,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: '',
@@ -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,10 +501,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 +536,7 @@
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hfrom.HBarCode = cb
+ this.hform.HBarCode = cb
this.GetMessageByBarCode(cb)
})
},
@@ -752,7 +758,7 @@
if (code == 1) {
data = data.h_v_Sb_EquipConkBookBillList_Edit[0]
-
+
this.enableEdit = false
} else {
CommonUtils.showTips({
@@ -765,6 +771,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 +834,10 @@
this.getEditData(hmainid)
} else if (this.operationType == 4) {
- // 娴忚
+ // 鎶ュ伐骞冲彴涓嬫帹
+ let HEquipID = e.HEquipID
+ this.getMaxNum()
+ this.GetEquipInfo(HEquipID)
}
--
Gitblit v1.9.1