二次sure
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_item is-required">
|
||||
<view class="filter_label_wraper">
|
||||
<span class="filter_label">{{$t('filter.point')}}</span>
|
||||
</view>
|
||||
@@ -82,8 +82,8 @@
|
||||
<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">{{$t('button.full-shaft-return')}}</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">{{$t('button.empty-shaft-return')}}</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="handleConfirm('2')">{{$t('button.full-shaft-return')}}</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="handleConfirm('1')">{{$t('button.empty-shaft-return')}}</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="manCall">{{$t('button.manual-call')}}</button>
|
||||
<!-- <button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button> -->
|
||||
<button class="zd-col-3 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
|
||||
@@ -133,6 +133,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import UpTop from '@/components/upTop.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingVehicleReturn} from '@/utils/getData2.js'
|
||||
import {feedinghandleConfirm} from '@/utils/getData4.js'
|
||||
export default {
|
||||
@@ -334,17 +335,22 @@
|
||||
this.disabled1 = false
|
||||
}
|
||||
},
|
||||
/** 空轴送回 */
|
||||
async _feedingVehicleReturn (type) {
|
||||
this.disabled2 = true
|
||||
async handleConfirm(type) {
|
||||
if (!this.val1) {
|
||||
this.disabled2 = false
|
||||
uni.showToast({
|
||||
title: '点位不能为空',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._feedingVehicleReturn(type)
|
||||
}
|
||||
},
|
||||
/** 空轴送回 */
|
||||
async _feedingVehicleReturn (type) {
|
||||
this.disabled2 = true
|
||||
try {
|
||||
let res = await feedingVehicleReturn(this.val1, type)
|
||||
this.disabled2 = false
|
||||
|
||||
Reference in New Issue
Block a user