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

修改

Browse Source
This commit is contained in:
caill
2025-11-05 09:31:22 +08:00
parent 2fcd78360e
commit 0bcbc2b449
3 changed files with 33 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pages/zw/confirm-quhuo.vue
View File

@@ -22,7 +22,7 @@
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
<view class="zd-row border-bottom" v-if="index === '3'">
<view class="zd-row border-bottom" v-if="index === '2' || index === '3'">
<view class="zd-col-7">
<span class="filter_label">托盘编码</span>
</view>
@@ -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,

151
pages/zw/manual-returnmater.vue
View File

@@ -6,111 +6,33 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">起点点位</span>
<span class="filter_label">机台</span>
</view>
<view class="zd-col-17">
<search-box v-model="val1"/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">载具编码</span>
</view>
<view class="zd-col-17">
<search-box v-model="val2"/>
<view class="zd-col-17 filter_select">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">任务类型</span>
</view>
<view class="zd-col-24 filter_select">
<view class="zd-col-17 filter_select">
<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
</view>
</view>
<view v-if="index4 === '1'">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料信息</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料编码</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_code" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料规格</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料数量(kg)</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.qty" disabled>
</view>
</view>
<!-- <view class="zd-row border-bottom">
<view v-show="index4 !== '2'" class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料数量(kg)</span>
</view>
<view class="zd-col-17">
<NumberInput
v-model="val3"
mode="integer"
/>
</view>
</view> -->
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">供应商</span>
</view>
<view class="zd-col-17 filter_select">
<uni-data-select v-model="index5" :localdata="options5" @change="selectChange5"></uni-data-select>
<input type="text" class="filter_input" v-model="qty">
</view>
</view>
<!-- <view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">供应商编码</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.supp_code" disabled>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label filter_input_disabled">供应商名称</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.supp_name" disabled>
</view>
</view> -->
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button v-show="index4 === '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4 || !index5 || !currentData.material_code}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
<button v-show="index4 !== '1'" class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index4}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !index2 || (!qty && index4 === '1') || !index4}" :disabled="disabled" @tap="_checkoutbillBackMaterial">确认</button>
</view>
</view>
</template>
@@ -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,

4
utils/getData4.js
View File

@@ -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({