diff --git a/pages/zw/confirm-quhuo.vue b/pages/zw/confirm-quhuo.vue
index 0892da2..3ec0187 100644
--- a/pages/zw/confirm-quhuo.vue
+++ b/pages/zw/confirm-quhuo.vue
@@ -22,7 +22,7 @@
-
+
托盘编码
@@ -79,7 +79,8 @@
return
}
try {
- let res = await pickUp(this.val1, this.index, this.val2)
+ const val2 = this.index === '2' || this.index === '3' ? this.val2 : null
+ let res = await pickUp(this.val1, this.index, val2)
if (res.code === '200') {
uni.showToast({
title: res.message,
diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue
index 1f9e4b5..ae28619 100644
--- a/pages/zw/manual-returnmater.vue
+++ b/pages/zw/manual-returnmater.vue
@@ -6,111 +6,33 @@
- 起点点位
+ 机台
-
-
-
-
-
-
- 载具编码
-
-
-
+
+
任务类型
-
+
-
-
-
- 物料信息
-
-
-
-
-
-
-
- 物料编码
-
-
-
-
-
-
-
- 物料名称
-
-
-
-
-
-
-
- 物料规格
-
-
-
-
-
-
-
- 物料数量(kg)
-
-
-
-
-
-
-
-
- 供应商
-
-
-
+
-
-
-
-
+
@@ -119,7 +41,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import NumberInput from '@/components/NumberInput.vue'
- import {supplierdroplist, getMaterialSuppByVehicleCode, checkoutbillBackMaterial} from '@/utils/getData4.js'
+ import {getPdaCallEquipment, checkoutbillBackMaterial} from '@/utils/getData4.js'
export default {
components: {
NavBar,
@@ -128,54 +50,44 @@
},
data() {
return {
- val1: '',
- val2: '',
- val3: '',
title: '',
+ options2: [],
+ index2: '',
options4: [{text:'退料', value:'1'}, {text:'退空桶', value: '2'}],
index4: '',
- options5: [],
- index5: '',
- currentData: {},
+ qty: null,
disabled: false
};
},
onLoad (options) {
this.title = options.title
- },
- onShow() {
- },
- created () {
- this._supplierdroplist()
+ this._getPdaCallEquipment()
},
methods: {
- async _supplierdroplist () {
+ async _getPdaCallEquipment () {
try {
- let res = await supplierdroplist()
+ let res = await getPdaCallEquipment()
if (res) {
- this.options5 = res.data
+ this.options2 = res.data
} else {
- this.options5 = []
+ this.options2 = []
}
} catch (e) {
- this.options5 = []
+ this.options2 = []
}
},
- toJump () {
- this._getMaterialSuppByVehicleCode()
+ selectChange2 (e) {
+ if (e) {
+ this.index2 = e
+ }
},
selectChange4 (e) {
this.index4 = e
},
- selectChange5 (e) {
- this.index5 = e
- },
clearUp () {
- this.val1 = ''
- this.val2 = ''
this.index4 = ''
- this.index5 = ''
- this.currentData = {}
+ this.index2 = ''
+ this.qty = null
this.disabled = false
},
async _getMaterialSuppByVehicleCode () {
@@ -194,20 +106,13 @@
},
async _checkoutbillBackMaterial () {
this.disabled = true
- if (this.index4 === '1') {
- if (!this.val1 || !this.val2 || !this.index4 || !this.index5 || !this.currentData.material_code) {
- this.disabled = false
- return
- }
- } else {
- if (!this.val1 || !this.val2 || !this.index4) {
- this.disabled = false
- return
- }
+ if (!this.index2 || (!this.qty && this.index4 === '1') || !this.index4) {
+ this.disabled = false
+ return
}
try {
- let selobj = this.options5.find(item => item.value === this.index5)
- let res = await checkoutbillBackMaterial(this.val1, this.val2, this.index4, this.val3, this.currentData.material_code, this.index5, selobj.text)
+ const qty = this.index4 !== '2' ? this.qty : null
+ let res = await checkoutbillBackMaterial(this.index2, this.index4, qty)
if (res.code === '200') {
uni.showToast({
title: res.message,
diff --git a/utils/getData4.js b/utils/getData4.js
index 04b7678..baaf6de 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -268,9 +268,9 @@ export const checkoutbillcallMaterial = (dcode, scode, mcode, type, spcode, spna
data: {device_code: dcode, struct_code: scode, material_code: mcode, task_type: type, supp_code: spcode, supp_name: spname}
})
// 手工退料
-export const checkoutbillBackMaterial = (dcode, vcode, type, qty, mcode, spcode, spname) => request({
+export const checkoutbillBackMaterial = (code, type, qty) => request({
url:'api/checkoutbill/BackMaterial',
- data: {device_code: dcode, vehicle_code: vcode, task_type: type, qty: qty, material_code: mcode, supp_code: spcode, supp_name: spname}
+ data: {device_code: code, task_type: type, qty: qty}
})
// 获取库位(已弃用)
export const getPdaStruct = (scode) => request({