root/hht-fujia-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gai

Browse Source
This commit is contained in:
caill
2025-07-29 18:02:24 +08:00
parent 10fc6693e2
commit 3342dc1e57
5 changed files with 50 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pages/manage/dwgx.vue
View File

@@ -30,7 +30,7 @@
<th>序号</th>
<th>物料编码</th>
<th>物料名称</th>
<th>批次</th>
<th>载具号</th>
<th>数量</th>
<th>单位</th>
</tr>
@@ -40,7 +40,7 @@
<td>{{i+1}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.pcsn}}</td>
<td>{{e.storagevehicle_code}}</td>
<td>{{e.qty}}</td>
<td>{{e.unit_code}}</td>
</tr>
@@ -51,8 +51,8 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || val2}" :disabled="disabled" @tap="_schPointBinding">绑定</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || val2}" :disabled="disabled" @tap="_schPointDissect">清载具</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || !dataList.length}" :disabled="disabled" @tap="_schPointBinding">绑定</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || !dataList.length}" :disabled="disabled" @tap="_schPointDissect">清载具</button>
</view>
</view>
</template>
@@ -98,50 +98,40 @@
},
async _schPointBinding () {
this.disabled = true
if (!this.val1 || !this.val2) {
if (!this.val1 || !this.val2 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await schPointBinding(this.val1, this.val2)
let res = await schPointBinding(this.val1, this.val2, this.dataList)
if (res.status === '200') {
uni.showToast({
title: res.message,
icon: 'none'
})
this.toEmpty()
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
}
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
async _schPointDissect () {
this.disabled = true
if (!this.val1 || !this.val2) {
if (!this.val1 || !this.val2 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await schPointDissect(this.val1, this.val2)
let res = await schPointDissect(this.val1, this.val2, this.dataList)
if (res.status === '200') {
uni.showToast({
title: res.message,
icon: 'none'
})
this.toEmpty()
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
}
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}

27
pages/manage/sgyk.vue
View File

@@ -36,9 +36,9 @@
<thead>
<tr>
<th>序号</th>
<th>载具号</th>
<th>物料编码</th>
<th>物料名称</th>
<th>载具号</th>
<th>数量</th>
<th>单位</th>
</tr>
@@ -46,9 +46,9 @@
<tbody>
<tr v-for="(e, i) in dataList" :key="i">
<td>{{i+1}}</td>
<td>{{e.storagevehicle_code}}</td>
<td>{{e.material_code}}</td>
<td>{{e.material_name}}</td>
<td>{{e.storagevehicle_code}}</td>
<td>{{e.qty}}</td>
<td>{{e.unit_code}}</td>
</tr>
@@ -59,7 +59,7 @@
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_movestorMove">确认</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !val3 || !dataList.length}" :disabled="disabled" @tap="_movestorMove">确认</button>
</view>
</view>
</template>
@@ -107,25 +107,20 @@
},
async _movestorMove () {
this.disabled = true
if (!this.val1 || !this.val2 || !this.val3) {
if (!this.val3 || !this.dataList.length) {
this.disabled = false
return
}
try {
let res = await movestorMove(this.val1, this.val2, this.val3)
let res = await movestorMove(this.val1, this.val2, this.val3, this.dataList)
if (res.status === '200') {
uni.showToast({
title: res.message,
icon: 'none'
})
this._movestorQuerydtl()
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
this.toEmpty()
}
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}

30
pages/manage/zygl.vue
View File

@@ -101,18 +101,13 @@
try {
let res = await schTaskAgainTask(this.pkId)
if (res.status === '200') {
uni.showToast({
title: res.message,
icon: 'none'
})
this._schTaskQueryTask()
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
}
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
@@ -126,18 +121,13 @@
try {
let res = await forceConfirm(this.pkId)
if (res.status === '200') {
uni.showToast({
title: res.message,
icon: 'none'
})
this._schTaskQueryTask()
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
this.disabled = false
}
this.disabled = false
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}

12
utils/getData.js
View File

@@ -75,9 +75,9 @@ export const movestorQuerydtl = (code, vcode) => request({
url:'api/pda/movestor/querydtl',
data: {struct_code: code, vehicle_code: vcode}
})
export const movestorMove = (code, vcode, mcode) => request({
export const movestorMove = (code, vcode, mcode, data) => request({
url:'api/pda/movestor/move',
data: {struct_code: code, vehicle_code: vcode, move_struct_code: mcode}
data: {struct_code: code, vehicle_code: vcode, move_struct_code: mcode, data: data}
})
// 作业管理
@@ -99,11 +99,11 @@ export const schPointGetPoint = (code, vcode) => request({
url:'/api/pda/schPoint/getPoint',
data: {struct_code: code, vehicle_code: vcode}
})
export const schPointBinding = (code, vcode) => request({
export const schPointBinding = (code, vcode, data) => request({
url:'api/pda/schPoint/binding',
data: {struct_code: code, vehicle_code: vcode}
data: {struct_code: code, vehicle_code: vcode, data: data}
})
export const schPointDissect = (code, vcode) => request({
export const schPointDissect = (code, vcode, data) => request({
url:'/api/pda/schPoint/dissect',
data: {struct_code: code, vehicle_code: vcode}
data: {struct_code: code, vehicle_code: vcode, data: data}
})

10
utils/request.js
View File

@@ -59,13 +59,13 @@ const request = (params) => {
reject('request:fail')
} else if (res[1] && res[1].statusCode === 400) {
uni.showModal({
content: res[1].data.message,
content: res[1].errMsg,
showCancel: false
})
reject(res[1].data.message)
reject(res[1].errMsg)
} else if (res[1] && res[1].statusCode === 401) {
uni.showModal({
content: res[1].data.message,
content: res[1].errMsg,
showCancel: false
})
store.dispatch('delUserInfo', '')
@@ -114,10 +114,10 @@ const request = (params) => {
// }
}else {
uni.showModal({
content: res[1].data.message,
content: res[1].errMsg,
showCancel: false
})
reject(res[1].data.message)
reject(res[1].errMsg)
}
})
.catch(err => { // 错误