chenhaozhe
2026-03-16 bd9a4b7d3b8979297124f9a68f5a1e40bd2cec96
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
2个文件已修改
43 ■■■■■ 已修改文件
pages/gongxuOut/Cj_StationOutBill_Standard.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/jishikucunchaxun/table.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/Cj_StationOutBill_Standard.vue
@@ -663,9 +663,9 @@
                }
                
            }
            this.getHMaterList()
            this.getHProcList()
            this.getHSupList()
            //this.getHMaterList()
            //this.getHProcList()
            //this.getHSupList()
            this.getHSourceList()
            this.getHGroupList()
            this.getHEmpList()
@@ -1059,7 +1059,7 @@
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                title: "班组获取失败"+res.data.Message,
                                icon: 'none'
                            })
                        }
@@ -1163,13 +1163,13 @@
                uni.request({
                    url: this.serverUrl + '/api/newBill/getWorkCenterList',
                    data: {
                        sWhere: ''
                        sWhere: ' and HUSEORGID = '+uni.getStorageSync('OrganizationID')
                    },
                    success: (res) => {
                        if (res.data.code == 1) {
                            this.HCenterNameList = res.data.data.Gy_Source
                            for (var i = 0; i < res.data.data.Gy_Source.length; i++) {
                                this.arrayHCenterName[i] = res.data.data.Gy_Source[i].工作中心
                            this.HCenterNameList = res.data.data.Gy_WorkCenter
                            for (var i = 0; i < res.data.data.Gy_WorkCenter.length; i++) {
                                this.arrayHCenterName[i] = res.data.data.Gy_WorkCenter[i].工作中心
                            }
                            this.$forceUpdate();
                        } else {
@@ -1712,7 +1712,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                })
            },
            submit() {
@@ -1788,7 +1788,7 @@
                                    })
                                    setTimeout(() => {
                                        uni.redirectTo({
                                            url: '/pages/gongxuOut/Cj_StationOutBillList'
                                            url: '/pages/gongxuOut/Cj_StationOutBill_StandardList'
                                        })
                                    }, 1000)
                                } else {
@@ -1800,7 +1800,7 @@
                                                console.log('用户点击确定');
                                                this.getNextProc()
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                // })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
@@ -1808,16 +1808,16 @@
                                                //     uni.navigateBack();
                                                // }, 50)
                                                uni.redirectTo({
                                                    url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                                })
                                            }
                                        }
                                    });
                                }
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                CommonUtils.showTips({
                                    title: '温馨提示',
                                    message: res.data.Message
                                })
                            }
                        },
@@ -1974,13 +1974,13 @@
                                    icon: 'none'
                                })
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1'
                                })
                            }else{
                                this.hform.HProcNo=nextProcess["工序号"];
                                const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
                                uni.redirectTo({
                                    url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
                                    url: '/pages/gongxuOut/Cj_StationOutBill_Standard?OperationType=1&HBarCode='+HNextBarCode
                                })
                            }
                        }else{
pages/jishikucunchaxun/table.vue
@@ -51,6 +51,15 @@
                        <view class="detail" v-if="item['物料名称']">
                            <text>物料名称:</text>{{item['物料名称']}}
                        </view>
                        <view class="detail" v-if="item['数量']">
                            <text>物料条码剩余数量:</text>{{item['数量']}}
                        </view>
                        <view class="detail" v-if="item['条码库存数量']">
                            <text>条码库存总数量:</text>{{item['条码库存数量']}}
                        </view>
                        <view class="detail" v-if="item['金蝶库存数量']">
                            <text>金蝶库存数量:</text>{{item['金蝶库存数量']}}
                        </view>
                        <view class="detail" v-if="item['规格型号']">
                            <text>规格型号:</text>{{item['规格型号']}}
                        </view>