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_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index e6f35c6..d38816b 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -36,7 +36,7 @@
<view class="form-item">
<view class="title">缁翠慨鍐呭:</view>
<view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ラ獙璇佸唴瀹�" />
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
</view>
</view>
<!-- 婧愬崟绫诲瀷 -->
@@ -57,7 +57,7 @@
<!-- 婧愬崟鍗曞彿 -->
<view class="form-item">
- <view class="title required">婧愬崟鍗曞彿:</view>
+ <view class="title">婧愬崟鍗曞彿:</view>
<view :class="enableSourceBillEdit?'right':'righton'">
<input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
@confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)"
@@ -306,7 +306,7 @@
HDeleteMan: '',
HDeleteDate: '',
// 鏂板鐨勬簮鍗曠浉鍏冲瓧娈�
- HMainSourceBillType: '璁惧缁翠慨鐧昏鍗�', // 榛樿涓鸿澶囩淮淇櫥璁板崟
+ HMainSourceBillType: '-1', // 榛樿涓鸿澶囩淮淇櫥璁板崟
HMainSourceBillNo: '',
HMainSourceInterID: 0,
HMainSourceEntryID: 0,
@@ -706,10 +706,14 @@
// 鑾峰彇鑱屽憳鏁版嵁
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,
}
})
@@ -857,8 +861,12 @@
let oMain = JSON.stringify(this.hform);
this.HDetailList[0].HManagerID = this.hform.HManagerID
this.HDetailList[0].HRepairID = this.hform.HRepairID
+ let oprType = this.operationType
+ if(oprType == 4){
+ oprType = 1
+ }
let sSubStr = JSON.stringify(this.HDetailList);
- let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
+ let sMainSub = oMain + ';' + sSubStr + `;-1;${oprType}` + ';' + getUserInfo()[
'Czymc'];
let res = await CommonUtils.doRequest2Sync({
url: "/Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill",
@@ -934,6 +942,8 @@
this.hform.HBarName = data1.璁惧鍚嶇О
this.hform.HBarModel = data1.璁惧鍨嬪彿
this.hform.HBarSpec = data1.璁惧瑙勬牸
+ this.hform.HRepairContent = data1.鏁呴殰鎻忚堪
+
}
else {
CommonUtils.showTips({
--
Gitblit v1.9.1