gai
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
<th>序号</th>
|
<th>序号</th>
|
||||||
<th>物料编码</th>
|
<th>物料编码</th>
|
||||||
<th>物料名称</th>
|
<th>物料名称</th>
|
||||||
<th>批次</th>
|
<th>载具号</th>
|
||||||
<th>数量</th>
|
<th>数量</th>
|
||||||
<th>单位</th>
|
<th>单位</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<td>{{i+1}}</td>
|
<td>{{i+1}}</td>
|
||||||
<td>{{e.material_code}}</td>
|
<td>{{e.material_code}}</td>
|
||||||
<td>{{e.material_name}}</td>
|
<td>{{e.material_name}}</td>
|
||||||
<td>{{e.pcsn}}</td>
|
<td>{{e.storagevehicle_code}}</td>
|
||||||
<td>{{e.qty}}</td>
|
<td>{{e.qty}}</td>
|
||||||
<td>{{e.unit_code}}</td>
|
<td>{{e.unit_code}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -51,8 +51,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="zd-row submit-bar">
|
<view class="zd-row submit-bar">
|
||||||
<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
|
<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 || !dataList.length}" :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="_schPointDissect">清载具</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
@@ -98,50 +98,40 @@
|
|||||||
},
|
},
|
||||||
async _schPointBinding () {
|
async _schPointBinding () {
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
if (!this.val1 || !this.val2) {
|
if (!this.val1 || !this.val2 || !this.dataList.length) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await schPointBinding(this.val1, this.val2)
|
let res = await schPointBinding(this.val1, this.val2, this.dataList)
|
||||||
if (res.status === '200') {
|
if (res.status === '200') {
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this.toEmpty()
|
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) {
|
} catch (e) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async _schPointDissect () {
|
async _schPointDissect () {
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
if (!this.val1 || !this.val2) {
|
if (!this.val1 || !this.val2 || !this.dataList.length) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
let res = await schPointDissect(this.val1, this.val2)
|
let res = await schPointDissect(this.val1, this.val2, this.dataList)
|
||||||
if (res.status === '200') {
|
if (res.status === '200') {
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this.toEmpty()
|
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) {
|
} catch (e) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,9 +36,9 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>序号</th>
|
<th>序号</th>
|
||||||
<th>载具号</th>
|
|
||||||
<th>物料编码</th>
|
<th>物料编码</th>
|
||||||
<th>物料名称</th>
|
<th>物料名称</th>
|
||||||
|
<th>载具号</th>
|
||||||
<th>数量</th>
|
<th>数量</th>
|
||||||
<th>单位</th>
|
<th>单位</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -46,9 +46,9 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
<tr v-for="(e, i) in dataList" :key="i">
|
<tr v-for="(e, i) in dataList" :key="i">
|
||||||
<td>{{i+1}}</td>
|
<td>{{i+1}}</td>
|
||||||
<td>{{e.storagevehicle_code}}</td>
|
|
||||||
<td>{{e.material_code}}</td>
|
<td>{{e.material_code}}</td>
|
||||||
<td>{{e.material_name}}</td>
|
<td>{{e.material_name}}</td>
|
||||||
|
<td>{{e.storagevehicle_code}}</td>
|
||||||
<td>{{e.qty}}</td>
|
<td>{{e.qty}}</td>
|
||||||
<td>{{e.unit_code}}</td>
|
<td>{{e.unit_code}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="zd-row submit-bar">
|
<view class="zd-row submit-bar">
|
||||||
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
|
<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>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
@@ -107,25 +107,20 @@
|
|||||||
},
|
},
|
||||||
async _movestorMove () {
|
async _movestorMove () {
|
||||||
this.disabled = true
|
this.disabled = true
|
||||||
if (!this.val1 || !this.val2 || !this.val3) {
|
if (!this.val3 || !this.dataList.length) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
try {
|
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') {
|
if (res.status === '200') {
|
||||||
uni.showToast({
|
this.toEmpty()
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this._movestorQuerydtl()
|
|
||||||
} else {
|
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this.disabled = false
|
|
||||||
}
|
}
|
||||||
|
this.disabled = false
|
||||||
|
uni.showToast({
|
||||||
|
title: res.message,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,18 +101,13 @@
|
|||||||
try {
|
try {
|
||||||
let res = await schTaskAgainTask(this.pkId)
|
let res = await schTaskAgainTask(this.pkId)
|
||||||
if (res.status === '200') {
|
if (res.status === '200') {
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this._schTaskQueryTask()
|
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) {
|
} catch (e) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
}
|
}
|
||||||
@@ -126,18 +121,13 @@
|
|||||||
try {
|
try {
|
||||||
let res = await forceConfirm(this.pkId)
|
let res = await forceConfirm(this.pkId)
|
||||||
if (res.status === '200') {
|
if (res.status === '200') {
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
this._schTaskQueryTask()
|
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) {
|
} catch (e) {
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,9 +75,9 @@ export const movestorQuerydtl = (code, vcode) => request({
|
|||||||
url:'api/pda/movestor/querydtl',
|
url:'api/pda/movestor/querydtl',
|
||||||
data: {struct_code: code, vehicle_code: vcode}
|
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',
|
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',
|
url:'/api/pda/schPoint/getPoint',
|
||||||
data: {struct_code: code, vehicle_code: vcode}
|
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',
|
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',
|
url:'/api/pda/schPoint/dissect',
|
||||||
data: {struct_code: code, vehicle_code: vcode}
|
data: {struct_code: code, vehicle_code: vcode, data: data}
|
||||||
})
|
})
|
||||||
@@ -59,13 +59,13 @@ const request = (params) => {
|
|||||||
reject('request:fail')
|
reject('request:fail')
|
||||||
} else if (res[1] && res[1].statusCode === 400) {
|
} else if (res[1] && res[1].statusCode === 400) {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
content: res[1].data.message,
|
content: res[1].errMsg,
|
||||||
showCancel: false
|
showCancel: false
|
||||||
})
|
})
|
||||||
reject(res[1].data.message)
|
reject(res[1].errMsg)
|
||||||
} else if (res[1] && res[1].statusCode === 401) {
|
} else if (res[1] && res[1].statusCode === 401) {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
content: res[1].data.message,
|
content: res[1].errMsg,
|
||||||
showCancel: false
|
showCancel: false
|
||||||
})
|
})
|
||||||
store.dispatch('delUserInfo', '')
|
store.dispatch('delUserInfo', '')
|
||||||
@@ -114,10 +114,10 @@ const request = (params) => {
|
|||||||
// }
|
// }
|
||||||
}else {
|
}else {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
content: res[1].data.message,
|
content: res[1].errMsg,
|
||||||
showCancel: false
|
showCancel: false
|
||||||
})
|
})
|
||||||
reject(res[1].data.message)
|
reject(res[1].errMsg)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(err => { // 错误
|
.catch(err => { // 错误
|
||||||
|
|||||||
Reference in New Issue
Block a user