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

chenhaozhe

2026-04-03 cf3cec959fbeca48882d5a2aee189ef2d62e657b

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

 pages/caigouruku/POStockInBill.vue

@@ -177,9 +177,9 @@

            <view v-if="tabs == 2">
                <view class="list" v-for="(item,index) in Materlist" :key="index">
                    <uni-card :title="item.物料名称" style="margin: 10px;" @tap="delMater(item, $event)">
                    <uni-card :title="item.物料名称" style="margcmdSearchin: 10px;" @tap="delMater(item,$event)">
                        <!-- 物料代码作为可点击链接 -->
                        <view class="card-header" @tap.stop="gotoInventoryQuery(item.物料代码)">
                        <view class="card-header" @tap.stop="gotoInventoryQuery(item.物料代码,$event)">
                            <text class="link-text">{{$t(`${HModName}.物料代码`)}}：{{item.物料代码}}</text>
                        </view>

@@ -1603,10 +1603,11 @@
            delMater(item) {
                if (event && event.target.classList && event.target.classList.contains('link-text')) {
                    return; // 如果是链接点击，不执行删除
                }
                uni.navigateTo({
                        url:'../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item.HMaterID + '&HBillType=' + this.hform.HBillType
                    })
                }else{
                    uni.navigateTo({
                            url:'../tiaomamingxi/tiaomamingxi?HInterID=' + this.hform.HInterID + '&HMaterID=' + item.HMaterID + '&HBillType=' + this.hform.HBillType
                        })
                }

                // uni.showModal({
                //     title: '提示',

 pages/index/login.vue

@@ -114,7 +114,7 @@
                    "陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
                    "张瑞广本地测试": 'http://localhost:8082/API/',
                    "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
                    "杨权鑫本地测试": 'http://192.168.3.107:8082/API/',
                    "杨权鑫本地测试": 'http://192.168.0.180:8082/API/',
                    "王仪本地测试": 'http://192.168.0.74:8080/API/',
                    // 小卫内外网
                    "苏州卫智科技-外网": 'http://221.224.60.42:8082/API_WW/',

 pages/tiaomamingxi/tiaomamingxi.vue

@@ -354,9 +354,9 @@
            console.log("赋值后：", this.HInterID, this.HMaterID, this.HBillType);
            await this.$nextTick();
            this.GetMater()
            this.$nextTick(() => {
                this.cmdSearch()
            })
            // this.$nextTick(() => {
            //     this.cmdSearch()
            // })
        },
        onReady() {
            let query = uni.createSelectorQuery().in(this)

 pages/zhijiediaobo/MoveStockBill.vue

@@ -706,41 +706,77 @@
                }
            },
            async HStockPlaceOutNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HOutStockPlaceID = 0
                this.hform.HOutStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
				
                // 扫描仓位码
                console.log('Code: ', e);
                // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
				
                    if (res.data.count == 1) {
				
                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        this.hform.HSCWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
				
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
				
                // // 扫描仓位码
                // console.log('仓位码: ', e);
                // // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                // this.hform.HOutStockPlaceID = 0
                // this.hform.HOutStockPlaceName = ''
                // try {
                //     let res = await CommonUtils.doRequest2Async({
                //         url: '/Gy_StockPlace/list',
                //         data: {
                //             sWhere: ` and 条码编号 = '${e}'`,
                //             user: uni.getStorageSync('HUserName'),
                //             Organization: uni.getStorageSync('Organization')
                //         },
                //     })

                    if (res.data.count == 1) {
                //     if (res.data.count == 1) {

                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        // this.hform.HSCWHName = res.data.data[0].所属仓库
                        this.HSCWHNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                //         this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                //         this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                //         this.hform.HSCWHID = res.data.data[0].HWHID
                //         // this.hform.HSCWHName = res.data.data[0].所属仓库
                //         this.HSCWHNameChange(res.data.data[0].所属仓库)
                //     } else {
                //         uni.showToast({
                //             title: '仓位数据请求失败',
                //             icon: 'none'
                //         })
                //     }

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
                // } catch (err) {
                //     uni.showToast({
                //         title: '仓位数据请求失败',
                //         icon: 'none'
                //     })
                // }
            },
            async HWHNameInScan(e) {
                return;
@@ -757,41 +793,79 @@
                }
            },
            async HStockPlaceNameInScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
				
                // 扫描仓位码
                console.log('Code: ', e);
                // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
				
                    if (res.data.count == 1) {
				
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
				
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
				
      //           // 扫描仓位码
      //           console.log('仓位码: ', e);
      //           // 不先置空的话，数据再次扫描相同的仓位码 不会触发组件内的刷新
      //           this.hform.HStockPlaceID = 0
      //           this.hform.HStockPlaceName = ''
      //           try {
      //               let res = await CommonUtils.doRequest2Async({
      //                   url: '/Gy_StockPlace/list',
      //                   data: {
      //                       sWhere: ` and 条码编号 = '${e}'`,
      //                       user: uni.getStorageSync('HUserName'),
      //                       Organization: uni.getStorageSync('Organization')
      //                   },
      //               })

                    if (res.data.count == 1) {
      //               if (res.data.count == 1) {

                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        // this.hform.HWHName = res.data.data[0].所属仓库
                        this.HWHInNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
      //                   this.hform.HStockPlaceID = res.data.data[0].HMainID
      //                   this.HStockPlaceInNameChange(res.data.data[0].仓位名称)
      //                   this.hform.HWHID = res.data.data[0].HWHID
      //                   // this.hform.HWHName = res.data.data[0].所属仓库
      //                   this.HWHInNameChange(res.data.data[0].所属仓库)
						
						
      //               } else {
      //                   uni.showToast({
      //                       title: '仓位数据请求失败',
      //                       icon: 'none'
      //                   })
      //               }

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
      //           } catch (err) {
      //               uni.showToast({
      //                   title: '仓位数据请求失败',
      //                   icon: 'none'
      //               })
      //           }
            },
            async qrCodeDisplay() {
                try {