From b25be565b2d9b856179d207aa5099abd3ae3fa45 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 13 四月 2026 17:33:22 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index 4444445..7549121 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -14,56 +14,56 @@
}">
<view class="form-item">
<view class="title">婧愬崟绫诲瀷:</view>
- <zxz-uni-data-select class="right" :localdata="[{value: '3772', key: '宸ュ簭娴佽浆鍗�'}]" dataKey="key"
+ <zxz-uni-data-select class="righton" disabled :localdata="[{value: '3772', key: '宸ュ簭娴佽浆鍗�'}]" dataKey="key"
dataValue="value" v-model="hform.HMainSourceBillType">
</zxz-uni-data-select>
</view>
<view class="form-item">
<view class="title">婧愬崟鍗曞彿:</view>
- <view class="right">
- <input type="text" v-model="hform.HMainSourceBillNo" />
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HMainSourceBillNo" />
</view>
</view>
<view class="form-item">
<view class="title">娴佽浆鍗″彿:</view>
- <view class="right">
- <input type="text" v-model="hform.HProcExchBillNo" />
+ <view class="righton">
+ <input type="text" disabled v-model="hform.HProcExchBillNo" />
</view>
</view>
<view class="form-item">
<view class="title">鐢熶骇璁㈠崟鍙�:</view>
- <view class="right">
- <input v-model="hform.HICMOBillNo" />
+ <view class="righton">
+ <input disabled v-model="hform.HICMOBillNo" />
</view>
</view>
<view class="form-item">
<view class="title">宸ュ簭鍙�:</view>
- <view class="right">
- <input v-model="hform.HProcNo" />
+ <view class="righton">
+ <input disabled v-model="hform.HProcNo" />
</view>
</view>
<view class="form-item">
<view class="title">鐗╂枡浠ｇ爜:</view>
- <view class="right">
- <input v-model="hform.HMaterNumber" />
+ <view class="righton">
+ <input disabled v-model="hform.HMaterNumber" />
</view>
</view>
<view class="form-item">
<view class="title">鐗╂枡鍚嶇О:</view>
- <view class="right">
- <input v-model="hform.HMaterName" />
+ <view class="righton">
+ <input disabled v-model="hform.HMaterName" />
</view>
</view>
<view class="form-item">
<view class="title">瑙勬牸鍨嬪彿:</view>
- <view class="right">
- <input v-model="hform.HMaterModel" />
+ <view class="righton">
+ <input disabled v-model="hform.HMaterModel" />
</view>
</view>
<view class="form-item">
<view class="title">宸ュ簭:</view>
- <view class="right">
- <input v-model="hform.HProcName" />
+ <view class="righton">
+ <input disabled v-model="hform.HProcName" />
</view>
</view>
<view class="form-item">
@@ -86,8 +86,8 @@
</view>
<view class="form-item">
<view class="title">鐢熶骇璧勬簮:</view>
- <view class="right">
- <input v-model="hform.HSourceName" />
+ <view class="righton">
+ <input disabled v-model="hform.HSourceName" />
</view>
</view>
<view class="form-item">
@@ -1040,8 +1040,15 @@
"HMax": item["涓婇檺鍊�"],
"HMin": item["涓嬮檺鍊�"],
"HRemark": item["閲囬泦鏉ユ簮"],
- "HResult": (item["鏁伴噰鍊�"] <= item["涓婇檺鍊�"] && item["鏁伴噰鍊�"] >= item["涓嬮檺鍊�"]) ?
- "OK" : "NG",
+ HResult: (() => {
+ const val = Number(item["鏁伴噰鍊�"])
+ const min = Number(item["涓嬮檺鍊�"])
+ const max = Number(item["涓婇檺鍊�"])
+ if (isNaN(val) || isNaN(min) || isNaN(max)) {
+ return ""
+ }
+ return val >= min && val <= max ? "OK" : "NG"
+ })(),
"HIsRequired": item["HIsRequired"]
}
})
--
Gitblit v1.9.1