From abd2e1dd7dfdf1ad50cce74c4e72edfd94fecf85 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 15 十二月 2025 12:56:48 +0800
Subject: [PATCH] 1
---
pages/caigouruku/POStockInBill.vue | 100 ++++++++----
manifest.json | 41 ++--
pages/zhijiediaobo/MoveStockBill.vue | 285 ----------------------------------
3 files changed, 94 insertions(+), 332 deletions(-)
diff --git a/manifest.json b/manifest.json
index 69a6d37..7ba04c6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.31",
- "versionCode" : 231,
+ "versionName" : "2.0.35",
+ "versionCode" : 235,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
@@ -61,33 +61,33 @@
},
"icons" : {
"android" : {
- "hdpi" : "",
- "xhdpi" : "",
- "xxhdpi" : "",
- "xxxhdpi" : ""
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
- "appstore" : "",
+ "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
- "app" : "",
- "app@2x" : "",
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
- "proapp@2x" : "",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
- "spotlight" : "",
+ "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
- "app@2x" : "",
- "app@3x" : "",
- "notification@2x" : "",
- "notification@3x" : "",
- "settings@2x" : "",
- "settings@3x" : "",
- "spotlight@2x" : "",
- "spotlight@3x" : ""
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
}
@@ -162,5 +162,6 @@
"landscape-secondary",
//鑷劧鏂瑰悜
"default"
- ]
+ ],
+ "locale" : "zh-Hans"
}
diff --git a/pages/caigouruku/POStockInBill.vue b/pages/caigouruku/POStockInBill.vue
index 1408678..2d9c6be 100644
--- a/pages/caigouruku/POStockInBill.vue
+++ b/pages/caigouruku/POStockInBill.vue
@@ -437,7 +437,7 @@
console.log('浠撲綅鐮�: ', e);
let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉＄爜缂栧彿'] == e)
console.log('index: ', index);
- // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
+ // 涓嶅厛缃┖鐨勮瘽锛屾暟鎹啀娆℃壂鎻忕浉鍚岀殑浠撲綅鐮� 涓嶄細瑙﹀彂缁勪欢鍐呯殑鍒锋柊
this.hform.HStockPlaceID = 0
this.hform.HStockPlaceName = ''
await this.$nextTick()
@@ -663,35 +663,35 @@
})
},
});
-
- uni.request({
- url: this.serverUrl + '/Gy_StockPlace/list',
- data: {
- sWhere: "",
- user: uni.getStorageSync('HUserName'),
- Organization: uni.getStorageSync('Organization')
- },
- success: (res) => {
- if (res.data.count == 1) {
- this.HStockPlaceNameList = res.data.data
- for (var i = 0; i < res.data.data.length; i++) {
- this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
- }
- } else {
- uni.showToast({
- title: '浠撲綅鏁版嵁璇锋眰澶辫触',
- icon: 'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- })
- },
- });
+ // 浠撲綅鐨勮幏鍙栨帹杩熷埌 閫夋嫨浠撳簱鍚� 浠撲綅澶т簬1000鏉℃椂锛屾鏂规硶鑾峰彇琛ュ叏
+ // uni.request({
+ // url: this.serverUrl + '/Gy_StockPlace/list',
+ // data: {
+ // sWhere: "",
+ // user: uni.getStorageSync('HUserName'),
+ // Organization: uni.getStorageSync('Organization')
+ // },
+ // success: (res) => {
+ // if (res.data.count == 1) {
+ // this.HStockPlaceNameList = res.data.data
+ // for (var i = 0; i < res.data.data.length; i++) {
+ // this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ // }
+ // } else {
+ // uni.showToast({
+ // title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ // icon: 'none'
+ // })
+ // }
+ // },
+ // fail: (res) => {
+ // console.log(res);
+ // uni.showToast({
+ // title: '鎺ュ彛璇锋眰澶辫触',
+ // icon: 'none'
+ // })
+ // },
+ // });
// this.getHYDList()
},
@@ -784,6 +784,7 @@
if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
this.showHStockPlaceName = true
+ this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
} else {
this.hform.HStockPlaceName = ''
this.showHStockPlaceName = false
@@ -791,9 +792,40 @@
}
}
},
+ // 鑾峰彇浠撲綅
+ async getStockPlaceRemote(HSPGroupID) {
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Gy_StockPlace/list',
+ data: {
+ sWhere: ` and HSPGroupID = ${HSPGroupID}`,
+ user: uni.getStorageSync('HUserName'),
+ Organization: uni.getStorageSync('Organization')
+ },
+ })
+
+ if (res.data.count == 1) {
+ this.HStockPlaceNameList = res.data.data
+ for (var i = 0; i < res.data.data.length; i++) {
+ this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+ }
+ } else {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+
+ } catch (err) {
+ uni.showToast({
+ title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+ icon: 'none'
+ })
+ }
+ },
//閫夋嫨浠撲綅
HStockPlaceNameChange(e) {
- console.log('e: ',e);
+ console.log('e: ', e);
let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
if (index != -1) {
@@ -1724,9 +1756,9 @@
}
});
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: res.data.Message
})
}
} catch (err) {
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index 43ad36f..e62edf9 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -1323,12 +1323,14 @@
},
//閫夋嫨婧愬崟绫诲瀷
HMainSourceBillTypeChange(e) {
- this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
- let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+ this.HMainSourceBillType = e.detail.value
+ let index = this.arrayHMainSourceBillType.findIndex(elem => elem == this.HMainSourceBillType)
if (index != -1) {
this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
// this.getHYDList()
}
+
+ console.log(this.HMainSourceBillType, this.hform.HMainSourceBillType)
},
//鑾峰彇渚涘簲鍟嗘暟鎹�
@@ -1723,43 +1725,6 @@
this.hform.HMainSourceBillType = data.hSourceBillTypeField
this.showHMainSourceBillType = false
}
- // if (data.hSourceBillTypeField == "1402") {
- // this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
- // this.hform.HMainSourceBillType = 1402
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1243") {
- // this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
- // this.hform.HMainSourceBillType = 1243
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1214") {
- // this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
- // this.hform.HMainSourceBillType = 1214
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "3720") {
- // this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
- // this.hform.HMainSourceBillType = 3720
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1604") {
- // this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
- // this.hform.HMainSourceBillType = 1604
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1214") {
- // this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
- // this.hform.HMainSourceBillType = 1214
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "3721") {
- // this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
- // this.hform.HMainSourceBillType = 3721
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1242") {
- // this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- // this.hform.HMainSourceBillType = 1242
- // this.showHMainSourceBillType = false
- // } else {
- // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // this.hform.HMainSourceBillType = -1
- // this.showHMainSourceBillType = false
- // }
if (data.hMulSourceFlagField == 0) {
this.showHSourceBillNo = false
}
@@ -1788,19 +1753,6 @@
this.hform.HMainSourceBillType = data.hSourceBillTypeField
this.showHMainSourceBillType = false
}
- // if (data.hSourceBillTypeField == "1103") {
- // this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
- // this.hform.HMainSourceBillType = 1103
- // this.showHMainSourceBillType = false
- // } else if (data.hSourceBillTypeField == "1102") {
- // this.HMainSourceBillType = '閲囪喘璁㈠崟'
- // this.hform.HMainSourceBillType = 1102
- // this.showHMainSourceBillType = false
- // } else {
- // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // this.hform.HMainSourceBillType = -1
- // this.showHMainSourceBillType = false
- // }
if (data.hMulSourceFlagField == 0) {
this.showHSourceBillNo = false
}
@@ -1846,198 +1798,6 @@
})
}
-
-
- // uni.request({
- // url: this.serverUrl + '/WEBSController/get_BarCode_MoveStock_New_Json',
- // data: {
- // sBarCode: sBarCode,
- // HInterID: this.hform.HInterID,
- // HBillType: this.hform.HBillType,
- // HBillNo: this.hform.HBillNo,
- // HMaker: this.hform.HMaker,
- // HWhID: sHWHID,
- // HSPID: sHSPID,
- // HSCWHID: sHSCWHID,
- // HSCSPID: sHOUTSPID,
- // HQty: sHQty,
- // // HRedBlueFlag: this.hform.HRedBlueFlag,
- // SourceFlag: HSourceFlag,
- // HSourceBillNo: sSourceBillNo,
- // HSourceBillType: sSourceBillType,
- // HStockInOrgID: this.hform.HStockOrgID,
- // HStockOutOrgID: this.hform.HStockOutOrgID,
- // HScanStyle: "",
- // HCustom1: "",
- // HCustom2: ""
- // },
- // success: (res) => {
- // console.log('鎵爜杩斿洖', res.data);
- // this.hform.HBarCode = ''
- // if (res.data.count == 1) {
- // this.playSound(1)
- // var data = res.data.data
- // if (data.hBarTypeField == '浠撳簱鏉＄爜') {
- // this.hform.HWHName = data.hWhNameField
- // this.hform.HWHID = data.hWhIDField
- // this.hform.HStockPlaceName = ''
- // this.hform.HStockPlaceID = 0
- // if (data.hSPFlagField == 0) {
- // this.showHStockPlaceName = false
- // } else {
- // this.showHStockPlaceName = true
- // }
- // } else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
- // this.hform.HWHName = data.hWhNameField
- // this.hform.HWHID = data.hWhIDField
- // this.hform.HStockPlaceName = data.hSPNameField
- // this.hform.HStockPlaceID = data.hSPIDField
- // } else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
- // this.hform.HDeptName = data.hDeptNameField
- // this.hform.HDeptID = data.hDeptIDField
- // this.tabs = 1
- // } else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
- // this.hform.HSupName = data.hSupNameField
- // this.hform.HSupID = data.hSupIDField
- // if (data.hDeptIDField != 0) {
- // this.hform.HDeptID = data.hDeptIDField
- // this.hform.HDeptName = data.hDeptNameField
- // }
- // this.hform.HSourceBillNo = data.hSourceBillNoField
- // //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- // this.hform.HMainSourceBillType = data.hSourceBillTypeField
- //
- // let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
- // .hSourceBillTypeField)
- // if (index != -1) {
- // this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
- // this.hform.HMainSourceBillType = data.hSourceBillTypeField
- // this.showHMainSourceBillType = false
- // }
- // // if (data.hSourceBillTypeField == "1402") {
- // // this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
- // // this.hform.HMainSourceBillType = 1402
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1243") {
- // // this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
- // // this.hform.HMainSourceBillType = 1243
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1214") {
- // // this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
- // // this.hform.HMainSourceBillType = 1214
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "3720") {
- // // this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
- // // this.hform.HMainSourceBillType = 3720
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1604") {
- // // this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
- // // this.hform.HMainSourceBillType = 1604
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1214") {
- // // this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
- // // this.hform.HMainSourceBillType = 1214
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "3721") {
- // // this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
- // // this.hform.HMainSourceBillType = 3721
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1242") {
- // // this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- // // this.hform.HMainSourceBillType = 1242
- // // this.showHMainSourceBillType = false
- // // } else {
- // // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // // this.hform.HMainSourceBillType = -1
- // // this.showHMainSourceBillType = false
- // // }
- // if (data.hMulSourceFlagField == 0) {
- // this.showHSourceBillNo = false
- // }
- // //瀹㈡埛涓嶅彲缂栬緫
- // this.showHSupName = false
- // this.tabs = 2
- // } else { //鐗╂枡鏉＄爜
- // this.tabs = 2
- // if (!this.hform.HSourceBillNo) {
- // this.hform.HSupName = data.hSupNameField
- // this.hform.HSupID = data.hSupIDField
- // this.hform.HSourceBillNo = data.hSourceBillNoField
- // if (data.hDeptIDField != 0) {
- // this.hform.HDeptID = data.hDeptIDField
- // this.hform.HDeptName = data.hDeptNameField
- // }
- // console.log(data)
- // //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- // this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
- //
- // let index = this.arrayHMainSourceBillValue.findIndex(e => e ==
- // data
- // .hSourceBillTypeField)
- // if (index != -1) {
- // this.HMainSourceBillType = this.arrayHMainSourceBillType[
- // index]
- // this.hform.HMainSourceBillType = data.hSourceBillTypeField
- // this.showHMainSourceBillType = false
- // }
- // // if (data.hSourceBillTypeField == "1103") {
- // // this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
- // // this.hform.HMainSourceBillType = 1103
- // // this.showHMainSourceBillType = false
- // // } else if (data.hSourceBillTypeField == "1102") {
- // // this.HMainSourceBillType = '閲囪喘璁㈠崟'
- // // this.hform.HMainSourceBillType = 1102
- // // this.showHMainSourceBillType = false
- // // } else {
- // // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // // this.hform.HMainSourceBillType = -1
- // // this.showHMainSourceBillType = false
- // // }
- // if (data.hMulSourceFlagField == 0) {
- // this.showHSourceBillNo = false
- // }
- // //渚涘簲鍟嗕笉鍙紪杈�
- // this.showHSupName = false
- // }
- // }
- // //鏄剧ず琛ㄤ綋鏄庣粏
- // this.DisBillEntryList()
- // //娓呯┖鏁伴噺
- // this.hform.HQty = ''
- // //鍏夋爣瀵瑰噯
- // this.barCodeFocus = false
- // this.$nextTick(() => {
- // this.barCodeFocus = true
- // this.hform.HBarCode = ""
- // })
- // } else {
- // this.playSound(0)
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- // this.barCodeFocus = false
- // this.$nextTick(() => {
- // this.barCodeFocus = true
- // this.hform.HBarCode = ""
- // })
- // }
- // },
- // fail: (res) => {
- // this.playSound(0)
- // this.barCodeFocus = true
- // console.log(res);
- // uni.showToast({
- // title: '鎺ュ彛璇锋眰澶辫触',
- // icon: 'none'
- // })
- // this.barCodeFocus = false
- // this.$nextTick(() => {
- // this.barCodeFocus = true
- // this.hform.HBarCode = ""
- // })
- // },
- // });
}
},
//鐗╂枡淇℃伅
@@ -2186,47 +1946,16 @@
this.hform.HMainSourceBillType = data.HSourceBillType
this.hform.HSourceBillNo = data.HSourceBillNo
+
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.HSourceBillType)
if (index != -1) {
this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
- this.hform.HMainSourceBillType = data.HSourceBillType
- if (this.HMainSourceBillType != -1) {
+ this.HMainSourceBillTypeChange({detail: {value: this.arrayHMainSourceBillType[index]}})
+ if (index != -1) {
this.showHSupName = false
}
}
- // if (data.HSourceBillType == 1402) {
- // this.hform.HMainSourceBillType = 1402
- // this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 1243) {
- // this.hform.HMainSourceBillType = 1243
- // this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 3720) {
- // this.hform.HMainSourceBillType = 3720
- // this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 1604) {
- // this.hform.HMainSourceBillType = 1604
- // this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 1214) {
- // this.hform.HMainSourceBillType = 1214
- // this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 3721) {
- // this.hform.HMainSourceBillType = 3721
- // this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
- // this.showHSupName = false
- // } else if (data.HSourceBillType == 1242) {
- // this.hform.HMainSourceBillType = 1242
- // this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
- // this.showHSupName = false
- // } else {
- // this.hform.HMainSourceBillType = -1
- // this.HMainSourceBillType = '鎵嬪伐褰曞叆'
- // }
this.showHMainSourceBillType = false
//闈炲婧愬崟妯″紡
--
Gitblit v1.9.1