From 6761e4f06daef8e5cb71fb8f3fde9ca9a353bb2c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 22 七月 2025 16:46:51 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/shebeidangan/form.vue |   47 +++++++++++++++++++++--------------------------
 1 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/pages/shebeidangan/form.vue b/pages/shebeidangan/form.vue
index 07cb828..6c7c55b 100644
--- a/pages/shebeidangan/form.vue
+++ b/pages/shebeidangan/form.vue
@@ -108,7 +108,7 @@
 			<view class="tab_area"></view>
 			
 			<view class="form-item">
-				<view class="title"><text>*</text>瀵瑰簲ERP鐗╂枡:</view>
+				<view class="title">瀵瑰簲ERP鐗╂枡:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨瀵瑰簲ERP鐗╂枡" v-model="hform.HName" @input="HMaterNumberChange"></uni-combox>
 				</view>
@@ -309,25 +309,25 @@
 					HEquipDotCheckRuleInterName:'',
 					HEquipDotCheckRuleInterID:0,
 					HSourceName:'',
-					HSourceID:'',
+					HSourceID:0,
 					
 					HMaterNumber:'',
-					HMaterID:'',
+					HMaterID:0,
 					HEquipFileTypeName:'',
-					HEquipFileTypeID:'',
+					HEquipFileTypeID:0,
 					HUnitName:'',
-					HUnitID:'',
+					HUnitID:0,
 					HSellSupName:'',
-					HSellSupID:'',
+					HSellSupID:0,
 					
 					HDeptName:'',
-					HDeptID:'',
+					HDeptID:0,
 					HUseEmpName:'',
-					HUseEmpID:'',
+					HUseEmpID:0,
 					HRepairEmpName:'',
-					HRepairEmpID:'',
+					HRepairEmpID:0,
 					HMakeSupName:'',
-					HMakeSupID:'',
+					HMakeSupID:0,
 					
 					HOutComDate:'',
 					HAddress:'',
@@ -822,29 +822,29 @@
 								HModel2:data.璁惧鍨嬪彿,
 								
 								HEquipMaintainRuleInterName:data.榛樿淇濆吇瑙勭▼,
-								HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID,
+								HEquipMaintainRuleInterID:data.HEquipMaintainRuleInterID||0,
 								HEquipDotCheckRuleInterName:data.榛樿鐐规瑙勭▼,
-								HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID,
+								HEquipDotCheckRuleInterID:data.HEquipDotCheckRuleInterID||0,
 								HSourceName:data.HSourceName,
-								HSourceID:data.HSourceID,
+								HSourceID:data.HSourceID||0,
 								
 								HMaterNumber:data.鐗╂枡鍚嶇О,
-								HMaterID:data.HMaterID,
+								HMaterID:data.HMaterID||0,
 								HEquipFileTypeName:data.璁惧绫诲瀷,
-								HEquipFileTypeID:data.HEquipFileTypeID,
+								HEquipFileTypeID:data.HEquipFileTypeID||0,
 								HUnitName:data.鍗曚綅,
-								HUnitID:data.HUnitID,
+								HUnitID:data.HUnitID||0,
 								HSellSupName:data.渚涘簲鍟�,
-								HSellSupID:data.HSellSupID,
+								HSellSupID:data.HSellSupID||0,
 								
 								HDeptName:data.浣跨敤閮ㄩ棬,
-								HDeptID:data.HDeptID,
+								HDeptID:data.HDeptID||0,
 								HUseEmpName:data.浣跨敤璐熻矗浜�,
-								HUseEmpID:data.HUseEmpID,
+								HUseEmpID:data.HUseEmpID||0,
 								HRepairEmpName:data.缁存姢璐熻矗浜�,
-								HRepairEmpID:data.HRepairEmpID,
+								HRepairEmpID:data.HRepairEmpID||0,
 								HMakeSupName:data.鍒堕�犲晢,
-								HMakeSupID:data.HMakeSupID,
+								HMakeSupID:data.HMakeSupID||0,
 								
 								HOutComDate:data.璁惧鍑哄巶鏃ユ湡.substr(0,10),
 								HAddress:data.瀹夎鍦扮偣,
@@ -945,11 +945,6 @@
             	}else if(!this.hform.HEquipFileNumber){
             		uni.showToast({
             			title:'璇疯緭鍏ヨ澶囦唬鐮�',
-            			icon:'none'
-            		})
-            	}else if(!this.hform.HMaterID){
-            		uni.showToast({
-            			title:'璇烽�夋嫨瀵瑰簲ERP鐗╂枡',
             			icon:'none'
             		})
             	}else if(!this.hform.HEquipFileTypeID){

--
Gitblit v1.9.1