Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

yusijie

2026-04-13 b25be565b2d9b856179d207aa5099abd3ae3fa45

 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"]
                            }
                        })