add:收卷辊库\检测取样\废箔处理

This commit is contained in:
2024-09-04 10:54:41 +08:00
parent cc7d859691
commit 0e030c7fb4
11 changed files with 385 additions and 279 deletions

View File

@@ -5,7 +5,7 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">当前点位</span>
<span class="filter_label">起点</span>
</view>
<view class="zd-col-19">
<search-box
@@ -15,7 +15,7 @@
</view>
<view class="zd-row">
<view class="zd-col-5">
<span class="filter_label">载具号</span>
<span class="filter_label">终点</span>
</view>
<view class="zd-col-19">
<search-box
@@ -27,8 +27,10 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldRack">确认</button>
<button class="zd-col-4 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-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>
</template>
@@ -36,7 +38,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {handheldRack} from '@/utils/getData2.js'
import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -54,14 +56,31 @@
this.title = options.title
},
methods: {
async _handheldRack () {
async _callAgvToSampling () {
this.disabled = true
if (!this.val1 || !this.val2) {
this.disabled1 = false
return
}
try {
let res = await handheldRack(this.val1, this.val2)
let res = await callAgvToSampling(this.val1, this.val2)
this.clearUp()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
async _callAgvToSamplingVerify (type) {
this.disabled = true
if (!this.val1 || !this.val2) {
this.disabled1 = false
return
}
try {
let res = await callAgvToSamplingVerify(type, this.val1, this.val2)
this.clearUp()
uni.showToast({
title: res.message,

View File

@@ -1,87 +0,0 @@
<template>
<view class="zd_container">
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">当前点位</span>
</view>
<view class="zd-col-19">
<search-box
v-model="val1"
/>
</view>
</view>
<view class="zd-row">
<view class="zd-col-5">
<span class="filter_label">载具号</span>
</view>
<view class="zd-col-19">
<link-scan ref="scanChild" @getScanlist="getScanlist"/>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import LinkScan from '@/components/LinkScan.vue'
import {handheldCageFrame} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox,
LinkScan
},
data() {
return {
title: '',
val1: '',
val2: '',
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
methods: {
getScanlist (e) {
this.val2 = e.join()
},
async _handheldCageFrame () {
this.disabled = true
if (!this.val1 || !this.val2) {
this.disabled = false
return
}
try {
let res = await handheldCageFrame(this.val1, this.val2)
this.clearUp()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
clearUp () {
this.val1 = ''
this.val2 = ''
this.$refs.scanChild.toDel()
this.disabled = false
}
}
}
</script>
<style lang="stylus">
</style>

View File

@@ -0,0 +1,116 @@
<template>
<view class="zd_container">
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">点位</span>
</view>
<view class="zd-col-17">
<search-box
v-model="val1"
/>
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">收卷辊码</span>
</view>
<view class="zd-col-17">
<search-box
v-model="val2"
/>
</view>
</view>
<view class="zd-row">
<view class="zd-col-7">
<span class="filter_label">收卷辊规格</span>
</view>
<view class="zd-col-17 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_onlySendRollTruss">入辊</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_onlyCallRollTruss">出辊</button>
</view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {onlySendRollTruss, onlyCallRollTruss} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
va1: '',
val2: '',
options: [],
index: '',
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
methods: {
selectChange (e) {
this.index = e
},
async _onlySendRollTruss () {
this.disabled = true
if (!this.val1 || !this.val2 || !this.index) {
this.disabled = false
return
}
try {
let res = await handhonlySendRollTrusseldLock(this.val1, this.val2, this.index)
this.clearUp()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
async _onlyCallRollTruss () {
this.disabled = true
if (!this.val1 || !this.index) {
this.disabled = false
return
}
try {
let res = await onlyCallRollTruss(this.val1, this.index)
this.clearUp()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
clearUp () {
this.val1 = ''
this.val2 = ''
this.index = ''
this.disabled = false
}
}
}
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
</style>

View File

@@ -5,18 +5,21 @@
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">区域</span>
<span class="filter_label">点位</span>
</view>
<view class="zd-col-19 filter_select">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<view class="zd-col-19">
<search-box
v-model="val1"
/>
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
<button class="zd-col-8 button-primary" :class="{'button-info': index === ''}" :disabled="disabled" @tap="_handheldLock('1')">锁定</button>
<button class="zd-col-8 button-primary" :class="{'button-info': index === ''}" :disabled="disabled" @tap="_handheldLock('0')">释放</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_startMoveWasteFoilv2">开始</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('1')">确认</button>
<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('2')">结束</button>
</view>
</view>
</template>
@@ -24,43 +27,50 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {regionList, handheldLock} from '@/utils/getData2.js'
import LinkScan from '@/components/LinkScan.vue'
import {startMoveWasteFoilv2, resumeMoveWasteFoilv2} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
SearchBox,
LinkScan
},
data() {
return {
title: '',
options: [],
index: '',
val1: '',
disabled: false
};
},
onLoad (options) {
this.title = options.title
this._regionList()
},
methods: {
async _regionList () {
let res = await regionList()
this.options = [...res.content]
this.options.map(el => {
this.$set(el, 'text', el.label)
})
},
selectChange (e) {
this.index = e
},
async _handheldLock (type) {
async _startMoveWasteFoilv2 () {
this.disabled = true
if (this.index === '') {
if (!this.val1) {
this.disabled = false
return
}
try {
let res = await handheldLock(this.index, type)
let res = await startMoveWasteFoilv2(this.val1)
this.clearUp()
uni.showToast({
title: res.message,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
},
async _resumeMoveWasteFoilv2 (type) {
this.disabled = true
if (!this.val1) {
this.disabled = false
return
}
try {
let res = await resumeMoveWasteFoilv2(type, this.val1)
this.clearUp()
uni.showToast({
title: res.message,
@@ -71,7 +81,7 @@
}
},
clearUp () {
this.index = ''
this.val1 = ''
this.disabled = false
}
}
@@ -79,5 +89,4 @@
</script>
<style lang="stylus">
@import '../../common/style/mixin.styl';
</style>