呼叫取样修改
This commit is contained in:
@@ -27,10 +27,9 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="zd-row submit-bar">
|
<view class="zd-row submit-bar">
|
||||||
<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
|
<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
|
||||||
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
|
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
|
||||||
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('1')">放货确认</button>
|
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_resumeMoveWasteFoilv3('2')">结束</button>
|
||||||
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('2')">取货确认</button>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
@@ -38,7 +37,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import NavBar from '@/components/NavBar.vue'
|
import NavBar from '@/components/NavBar.vue'
|
||||||
import SearchBox from '@/components/SearchBox.vue'
|
import SearchBox from '@/components/SearchBox.vue'
|
||||||
import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
|
import {callAgvToSampling, callAgvToSamplingVerify, resumeMoveWasteFoilv3} from '@/utils/getData2.js'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
NavBar,
|
NavBar,
|
||||||
@@ -94,6 +93,23 @@
|
|||||||
this.val1 = ''
|
this.val1 = ''
|
||||||
this.val2 = ''
|
this.val2 = ''
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
|
},
|
||||||
|
async _resumeMoveWasteFoilv3 (type) {
|
||||||
|
this.disabled = true
|
||||||
|
if (!this.val1 || !this.val2) {
|
||||||
|
this.disabled1 = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
let res = await resumeMoveWasteFoilv3(type, this.val1, this.val2)
|
||||||
|
this.clearUp()
|
||||||
|
uni.showToast({
|
||||||
|
title: res.message,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
this.disabled = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,9 +27,10 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="zd-row submit-bar">
|
<view class="zd-row submit-bar">
|
||||||
<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
|
<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
|
||||||
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
|
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
|
||||||
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_resumeMoveWasteFoilv3('2')">结束</button>
|
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('1')">放货确认</button>
|
||||||
|
<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('2')">取货确认</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
@@ -37,7 +38,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import NavBar from '@/components/NavBar.vue'
|
import NavBar from '@/components/NavBar.vue'
|
||||||
import SearchBox from '@/components/SearchBox.vue'
|
import SearchBox from '@/components/SearchBox.vue'
|
||||||
import {callAgvToSampling, callAgvToSamplingVerify, resumeMoveWasteFoilv3} from '@/utils/getData2.js'
|
import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
NavBar,
|
NavBar,
|
||||||
@@ -93,23 +94,6 @@
|
|||||||
this.val1 = ''
|
this.val1 = ''
|
||||||
this.val2 = ''
|
this.val2 = ''
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
},
|
|
||||||
async _resumeMoveWasteFoilv3 (type) {
|
|
||||||
this.disabled = true
|
|
||||||
if (!this.val1 || !this.val2) {
|
|
||||||
this.disabled1 = false
|
|
||||||
return
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
let res = await resumeMoveWasteFoilv3(type, this.val1, this.val2)
|
|
||||||
this.clearUp()
|
|
||||||
uni.showToast({
|
|
||||||
title: res.message,
|
|
||||||
icon: 'none'
|
|
||||||
})
|
|
||||||
} catch (e) {
|
|
||||||
this.disabled = false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user