联调修改

This commit is contained in:
蔡玲
2024-09-13 15:31:19 +08:00
parent ecd0ab12d8
commit 390c223a01
11 changed files with 185 additions and 137 deletions

View File

@@ -3,7 +3,7 @@
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-row">
<view class="zd-col-7">
<span class="filter_label">点位</span>
</view>
@@ -13,6 +13,16 @@
/>
</view>
</view>
</view>
<view class="zd-row mgb20">
<button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_needEmptyVehicle">呼叫空辊</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_necessaryEmptyVehicle">空辊回库</button>
</view>
<view class="zd-row mgb20">
<button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_confirmBlanking('1')">允许进入</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_confirmBlanking('2')">允许离开</button>
</view>
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">流转单号</span>
@@ -33,11 +43,8 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-3 button-default" @tap="clearUp">清空</button>
<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_needEmptyVehicle">呼叫空辊</button>
<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_necessaryEmptyVehicle">空辊回库</button>
<button class="zd-col-5 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_confirmBlanking">准备就绪</button>
<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
</view>
</view>
</template>
@@ -125,14 +132,14 @@
this.disabled = false
}
},
async _confirmBlanking () {
async _confirmBlanking (type) {
this.disabled = true
if (!this.val1) {
this.disabled = false
return
}
try {
let res = await confirmBlanking(this.val1)
let res = await confirmBlanking(this.val1, type)
this.clearUp()
uni.showToast({
title: res.message,
@@ -147,6 +154,4 @@
</script>
<style lang="stylus" scoped>
.button-primary
font-size: 28rpx;
</style>