This commit is contained in:
2025-07-18 16:46:03 +08:00
parent 4a5e15593a
commit c499f84018
3 changed files with 20 additions and 8 deletions

View File

@@ -2,8 +2,8 @@
"name" : "欧伦", "name" : "欧伦",
"appid" : "__UNI__DE2F207", "appid" : "__UNI__DE2F207",
"description" : "欧伦WMS手持系统", "description" : "欧伦WMS手持系统",
"versionName" : "1.1.0", "versionName" : "1.1.1",
"versionCode" : 110, "versionCode" : 111,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

View File

@@ -74,7 +74,18 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7" style="width: 45%;"> <view class="zd-col-7" style="width: 45%;">
<span class="filter_label">回空载具点</span> <span class="filter_label">回空载具</span>
</view>
<view class="zd-col-24">
<search-box
v-model="val2"
@handleChange="handleChange"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7" style="width: 45%;">
<span class="filter_label">回空载具终点</span>
</view> </view>
<view class="zd-col-24 filter_select"> <view class="zd-col-24 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> <uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
@@ -84,7 +95,7 @@
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button> <button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': !(this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.index)))}" :disabled="disabled" @tap="_confirm('1')">确认</button> <button class="zd-col-16 button-primary" :class="{'button-info': !(this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.val2 && this.index)))}" :disabled="disabled" @tap="_confirm('1')">确认</button>
</view> </view>
</view> </view>
</template> </template>
@@ -101,6 +112,7 @@
data() { data() {
return { return {
val1: '', val1: '',
val2: '',
options: [], options: [],
index: '', index: '',
currentData: {}, currentData: {},
@@ -171,7 +183,7 @@
// this.disabled = false // this.disabled = false
// return // return
// } // }
if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.index))) { if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.val2 && this.index))) {
// console.log(1) // console.log(1)
} else { } else {
this.disabled = false this.disabled = false
@@ -179,7 +191,7 @@
} }
let checkflag = this.isChecked === false ? '0' : '1' let checkflag = this.isChecked === false ? '0' : '1'
try { try {
let res = await confirm(this.currentData.group_id, this.val1, type, checkflag, this.index) let res = await confirm(this.currentData.group_id, this.val1, this.val2, type, checkflag, this.index)
if (res.code === '200') { if (res.code === '200') {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,

View File

@@ -107,9 +107,9 @@ export const iosOutgetVehicleMaterial = (search) => request({
data: {search: search} data: {search: search}
}) })
// 出库确认 // 出库确认
export const confirm = (gid, scode, type, isAutoReturn, siteCode) => request({ export const confirm = (gid, scode, startCode, type, isAutoReturn, siteCode) => request({
url:'api/pda/iosOut/confirm', url:'api/pda/iosOut/confirm',
data: {group_id: gid, storagevehicle_code: scode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode} data: {group_id: gid, storagevehicle_code: scode, startCode: startCode, type: type, isAutoReturn: isAutoReturn, siteCode: siteCode}
}) })
// 货架绑定/解绑 // 货架绑定/解绑
export const bindOrUnbind = (siteCode, shelfCode, mode) => request({ export const bindOrUnbind = (siteCode, shelfCode, mode) => request({