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

dytyqx

2026-03-31 313b4b614e23f528fab0cadc94a2da7b9153dc06

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

# Conflicts:
#	manifest.json

 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue

@@ -191,7 +191,7 @@
                    HProcID: 0,
                    HQty: '',
                    HSampleDamageQty: 0,
                    TestType: 'first',
                    TestType: '首检',
                    HBadNote: '',
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
@@ -615,11 +615,11 @@
                        if (code == 1) {
                            this.HBarCode = ''
                            let data1 = data.h_v_Sc_ProcessExchangeBillList
                            this.hform = Object.assign(this.hform, {
                            Object.assign(this.hform, {
                                "HMaterID": data1[0].HMaterID, //产品ID
                                "HMaterCode": data1[0].产品代码, //产品代码
                                "HMaterName": data1[0].产品, //产品名称
                                "HMaterSpec": data1[0].规格型号, //产品规格
                                "HMaterSpec": data1[0].规格型号.replace(/["]/g, "'"), //产品规格
                                "HUnitID": data1[0].HUnitID, //计量单位id
                                "HUnitName": data1[0].单位, //计量单位
                                "HMainSourceBillNo": data1[0].单据号, //源单单号
@@ -633,8 +633,9 @@
                                "HICMOBillNo": data1[0].任务单号, //生产订单
                                "HDeptID": data1[0].HWorkShopID, //车间ID
                                "HDeptName": data1[0].生产车间, //车间

                                "HSampleDamageQty": data1[0]["HSampleDamageQty"] || 0
                            })
                            
                            if (data1 && data1.length === 1) {
                                // 获取工序ID
                                let procId = data1[0].HProcID
@@ -664,19 +665,22 @@
                })
            },
            submit() {
                console.log('this.hform: ',this.hform);
                if (this.hform.HProcID == 0) {
                    return uni.showToast({
                        icon: 'none',
                        title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '工序没有选择' : this.$t('QC_TakeSampleCheckBill.noProcess')
                    })
                }
                if (this.hform.HQty == '') {
                if (this.hform.HQty === '') {
                    return uni.showToast({
                        icon: 'none',
                        title: this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty') == 'QC_TakeSampleCheckBill.sampleQtyEmpty' ? '取样数量不能为空' : this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty')
                    })
                }
                if (this.hform.HSampleDamageQty == '') {
                console.log('this.hform.HSampleDamageQty: ',this.hform.HSampleDamageQty);
                console.log('this.hform.HSampleDamageQty: ',this.hform.HSampleDamageQty == '');
                if (this.hform.HSampleDamageQty === "") {
                    return uni.showToast({
                        icon: 'none',
                        title: this.$t('QC_TakeSampleCheckBill.damageQtyEmpty') == 'QC_TakeSampleCheckBill.damageQtyEmpty' ? '破坏性实验数量不能为空' : this.$t('QC_TakeSampleCheckBill.damageQtyEmpty')

 pages/gongxuOut/Cj_StationOutBill.vue

@@ -663,9 +663,9 @@
                }
                
            }
            this.getHMaterList()
            this.getHProcList()
            this.getHSupList()
            //this.getHMaterList()
            //this.getHProcList()
            //this.getHSupList()
            this.getHSourceList()
            this.getHGroupList()
            this.getHEmpList()
@@ -991,12 +991,7 @@
                                this.arrayHSourceName[i] = res.data.data.Gy_Source[i].生产资源
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -1057,12 +1052,7 @@
                                this.arrayHGroupName[i] = res.data.data[i].班组
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -1097,11 +1087,6 @@
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {

 pages/shengchanlingliao/PPickingCheckBill.vue

@@ -93,7 +93,7 @@
                </label>
            </view>
            <view v-if="tabs == 2">
                <view class="list" v-for="(item,index) in Materlist" :key="index" @tap.stop="delMater(item)">
                <view class="list" v-for="(item,index) in Materlist" :key="index" @tap="delMater(item)" @click="delMater(item)">
                    <uni-card :title="item.物料名称" :extra="'数量:'+item.数量" style="margin: 10px;">
                        <view class="card-detail">
                            <view class="detail">

 pages/weiwaigxIn/Cj_StationEntrustInBill.vue

@@ -427,7 +427,7 @@
                this.getNewData()
            }
            // this.getHMaterList()
            this.getHProcList()
            //this.getHProcList()
            this.getHSupList()
            this.getHEmpList()
            
@@ -650,11 +650,6 @@
                                this.arrayHSupName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        }else{
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        }
                    },
                    fail: (res) => {

 pages/weiwaigxOut/Cj_StationEntrustOutBill.vue

@@ -783,12 +783,7 @@
                                this.arrayHSupName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -823,12 +818,7 @@
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);