From bbfe4dd2532bbd41c7f9d26285c7f0aae84ccb54 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 14:59:06 +0800
Subject: [PATCH] #
---
pages/phyz/order/orderCar.vue | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
index 15adeaf..459272e 100644
--- a/pages/phyz/order/orderCar.vue
+++ b/pages/phyz/order/orderCar.vue
@@ -50,8 +50,8 @@
<view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
</view>
<view class="btn">
- <view class="btn-left" @click="agvStartClose()">鍙栨秷</view>
- <view class="btn-right" @click="agvStartConfirm()">鍏ュ簱</view>
+ <button class="btn-left" @click="agvStartClose()">鍙栨秷</button>
+ <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">鍏ュ簱</button>
</view>
</view>
</uni-popup>
@@ -60,14 +60,16 @@
</template>
<script>
+ // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
export default {
data() {
return {
orderCarList: [],
count: 0,
index: 0,
- barcode: '100997',
- agvDevp: 'DI_01F2',
+ barcode: '',
+ agvDevp: '',
+ agvStartDis: false
}
},
onShow() {
@@ -134,31 +136,28 @@
return;
}
}
- let combMat = {
- orderNo:'',
- barcode: '',
- locNo: '',
- combMats: []
- }
+ let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
let combMats = []
for (let item of _this.orderCarList) {
combMat.orderNo = item.orderNo
combMat.barcode = _this.barcode
combMat.locNo = _this.agvDevp
combMat.combMats = []
- let combMat = {csocode: '',isoseq: '',matnr: '',batch: '',anfme: '',maktx: '',specs: ''}
- combMat.combMats.push(item)
- combMats.push(combMat)
+ let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs,processSts: item.processSts}
+ combMat.combMats.push(combM)
+ combMats.push({...combMat})
}
this.comb(combMats)
},
comb(combMats) {
let _this = this;
+ this.agvStartDis = true
uni.request({
url: _this.baseUrl + '/agvMobile/start/pakin/auth',
data: JSON.stringify({
barcode: _this.barcode,
+ containerCode: _this.barcode,
devNo: _this.agvDevp,
combParams: combMats
}),
@@ -168,10 +167,24 @@
},
success(result) {
var res = result.data
+ _this.agvStartDis = false
if (res.code === 200) {
+ _this.orderCarList = []
+ _this.$refs.agvStart.close()
+ uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
+ setTimeout(()=> {
+ _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
+ uni.navigateBack({})
+ },1000)
} else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
+ },
+ fail(res) {
+ _this.agvStartDis = false
}
});
},
--
Gitblit v1.9.1