10539622/2025-03-JS-SDK-PDA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA

Browse Source 
# Conflicts:
#	common/MyRequest.js
#	common/config.js
This commit is contained in:
郭飞 2025-03-27 17:57:56 +08:00
commit 7987c537a0
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pages/StockOut/features/PurchaseReturn/index.vue
View File

@ -498,25 +498,16 @@
}).then((res) => { }).then((res) => {
console.log(res.resultObj) console.log(res.resultObj)
this.opCode = res.resultObj this.opCode = res.resultObj
this.$MyRequest('/bpel/event', { let param = {
header: { opcode: opcode,
MESSAGENAME:'CompleteShipRequestForPurReturn', user: this.userId,
LANGUAGE: 'Chinese', siteName: this.siteName,
EventUser: this.userId boxList: this.boxList,
}, commitDate: this.commitDate,
body: { shipRequestName: this.receiveRequestName
SITENAME: 'SDK', }
RECEIVEREQUESTNAME: this.receiveRequestName, this.$MyRequest('/purchase/CompleteReceiveRequest', {
RECEIVEREQUESTDETAILNAME: '', param
RECEIVEREQUESTDETAILTYPE: '',
MATERIALSPECNAME: '',
ReceiveActNo: '',
CHECKBOX: false,
ACTTYPE: 'STCO',
RECEIVEREQUESTTYPE: '45',
REASONCODE: '',
REASONCODETYPE: ''
}
}).then(res => { }).then(res => {
console.log(res) console.log(res)
this.opCode = ""; this.opCode = "";

8
pages/StockOut/features/ShipRequestReservation/index.vue
View File

@ -650,6 +650,10 @@
user: this.userId user: this.userId
}).then(res => { }).then(res => {
if (res.data.success) { if (res.data.success) {
if (res.data.resultObj.length < 1) {
this.$showMessage("查询不到库存")
return
}
if (indexList.length > 0) { if (indexList.length > 0) {
res.data.resultObj.map((val) => { res.data.resultObj.map((val) => {
if (indexList.some(el => el.MATERIALPACKINGNAME == val if (indexList.some(el => el.MATERIALPACKINGNAME == val
@ -657,7 +661,9 @@
val.IS_CHECK = 'Y' val.IS_CHECK = 'Y'
} }
}) })
} } else {
this.$showMessage(res.data.message)
}
this.BoxInfoList = res.data.resultObj this.BoxInfoList = res.data.resultObj
this.currentPage = 1 this.currentPage = 1
this.getStockOutInvoiceInfo() this.getStockOutInvoiceInfo()

2
pages/login/index.vue
View File

@ -217,7 +217,7 @@ export default {
PLATFORM:"APP" PLATFORM:"APP"
} }
}).then(res => { }).then(res => {
if(res.data.code == 0) { if(res.data.code == 200) {
console.log(222222222) console.log(222222222)
let menuList = res.data.data.menuList let menuList = res.data.data.menuList
// console.log('menuList', menuList) // console.log('menuList', menuList)