From 365f416b3f558555f2141632086bc28d2cad069f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 20 四月 2026 13:36:37 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
index 58f6838..51adcc4 100644
--- a/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
+++ b/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -41,12 +41,7 @@
</radio-group>
</view>
</view>
- <view class="form-item">
- <view class="title">楠屾敹鍐呭:</view>
- <view class="right">
- <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
- </view>
- </view>
+
<!-- 缁翠慨璁板綍锛堟簮鍗曪級 -->
<view class="form-item">
<view class="title required">缁翠慨璁板綍:</view>
@@ -89,17 +84,23 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title">楠屾敹椤圭洰:</view>
- <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairCheckID">
- </zxz-uni-data-select>
- </view>
- <view class="form-item">
<view class="title required">璐熻矗浜�:</view>
<zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
dataValue="HItemID" v-model="hform.HManagerID">
</zxz-uni-data-select>
</view>
+ <view class="form-item">
+ <view class="title required">楠屾敹椤圭洰:</view>
+ <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="缁翠慨楠屾敹椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairCheckID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">楠屾敹鍐呭:</view>
+ <view class="right">
+ <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="璇疯緭鍏ラ獙鏀跺唴瀹�" />
+ </view>
+ </view>
<view class="form-item">
<view class="title">璁惧鍚嶇О:</view>
<view class="righton">
@@ -118,6 +119,12 @@
<input v-model="hform.HBarModel" disabled />
</view>
</view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </view>
+ </view>
</view>
</template>
<!-- 鍏朵粬淇℃伅 -->
@@ -187,7 +194,7 @@
<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
+ <BillListPopupEquipConkBookBillVue ref="billList" :HEquipID="hform.HEquipID" :HBillType="hform.HBillType" :HSourceBillType="'璁惧缁翠慨璁板綍鍗�'"
:HStockOrgID="hform.HStockOrgID">
</BillListPopupEquipConkBookBillVue>
</view>
@@ -249,6 +256,7 @@
"HEquipID": 0,
"HBarSpec": "",
"HBarModel": "",
+ "HRemark": "",
"HMaker": getUserInfo()["Czymc"],
"HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
"HUpDater": "",
@@ -260,6 +268,7 @@
"lngBillKey": "",
"lngBillSubKey": "",
// 鏂板锛氱淮淇褰曪紙婧愬崟锛夌浉鍏冲瓧娈�
+ "HMainSourceBillType":"",
"HMainSourceBillNo": "",
"HMainSourceInterID": 0,
"HMainSourceEntryID": 0,
@@ -326,6 +335,7 @@
this.hform.HMainSourceBillNo = data[0]["鍗曟嵁鍙�"];
this.hform.HMainSourceInterID = data[0]["hmainid"];
this.hform.HMainSourceEntryID = data[0]["hsubid"];
+ this.hform.HMainSourceBillType="3910"
// 濡傛灉婧愬崟鏈夎澶囦俊鎭紝鍙互鑷姩濉厖
if (data[0].HEquipID) {
@@ -390,36 +400,37 @@
// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
ValidCheck() {
- if (this.hform.HEquipID == 0) {
+ if (this.hform.HEquipID == 0 || this.hform.HEquipID === undefined) {
return {
Message: "鏈綍鍏ヨ澶囦俊鎭紝璇峰厛褰曞叆璁惧淇℃伅!",
state: false
}
}
- if (this.hform.HDeptID == 0) {
+ if (this.hform.HDeptID == 0 || this.hform.HDeptID === undefined) {
return {
Message: "閮ㄩ棬涓嶅緱涓虹┖!",
state: false
}
}
- if (this.hform.HEmpID == 0) {
+ if (this.hform.HEmpID == 0 || this.hform.HEmpID === undefined) {
return {
Message: "楠屾敹浜轰笉寰椾负绌�!",
state: false
}
}
- if (this.hform.HRepairCheckID == 0) {
+ if (this.hform.HManagerID == 0 || this.hform.HManagerID === undefined) {
+ return {
+ Message: "璐熻矗浜轰笉寰椾负绌�!",
+ state: false
+ }
+ }
+ if (this.hform.HRepairCheckID == 0 || this.hform.HRepairCheckID === undefined) {
return {
- Message: "楠岃瘉椤圭洰涓嶅緱涓虹┖!",
+ Message: "楠屾敹椤圭洰涓嶅緱涓虹┖!",
state: false
}
}
- if (this.hform.HManagerID == 0) {
- return {
- Message: "璐熻矗浜轰笉寰椾负绌�!",
- state: false
- }
- }
+
// 鏂板锛氱淮淇褰曟牎楠�
if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
return {
@@ -723,11 +734,6 @@
if(count == 1) {
this.hform.HRepairCheckID = this.HRepairCheckList.find(item => data[0]["琛ㄤ綋缁翠慨椤圭洰"] == item["缁翠慨楠屾敹椤圭洰"])?.hitemid
this.HDetailList[0].HRepairCheckContent = data[0].缁翠慨鍐呭
- }else {
- CommonUtils.showTips({
- title: "娓╅Θ鎻愮ず",
- message: `鑾峰彇娲惧伐鍗曞け璐�: ${Message}`
- })
}
}catch(err) {
CommonUtils.showTips({
@@ -766,6 +772,7 @@
this.hform.HMainSourceInterID = data[0]["HEquipRepairCheckBillInterID"];
this.hform.HMainSourceEntryID = data[0]["HEquipRepairCheckBillEntryID"];
this.hform.HManagerID = data[0]["HManagerID"];
+ this.hform.HMainSourceBillType="3907"
this.hform.HEmpID = data[0]["HEmpID"];
this.getSendWorkBill(HSendWorkID)
} else {
--
Gitblit v1.9.1