From cf3cec959fbeca48882d5a2aee189ef2d62e657b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 03 四月 2026 15:47:25 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/caigouruku/POStockInBill.vue | 13 +-
pages/tiaomamingxi/tiaomamingxi.vue | 6
pages/zhijiediaobo/MoveStockBill.vue | 202 ++++++++++++++++++++++++++++++++++----------------
pages/index/login.vue | 2
4 files changed, 149 insertions(+), 74 deletions(-)
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 882bf55..40dafd9 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/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: '鎻愮ず',
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 324a3fc..8eeddcc 100644
--- a/pages/index/login.vue
+++ b/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/',
diff --git a/pages/tiaomamingxi/tiaomamingxi.vue b/pages/tiaomamingxi/tiaomamingxi.vue
index b77fd2b..1b13cf0 100644
--- a/pages/tiaomamingxi/tiaomamingxi.vue
+++ b/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)
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index 547033f..13f08fb 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/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 {
--
Gitblit v1.9.1