root/hht-tongbo-two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分切暂存下料、分切下料修改

Browse Source
This commit is contained in:
caill
2024-07-06 10:26:41 +08:00
parent 7d2d0a556c
commit b7a1af978a
4 changed files with 91 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pages/SecondPhase/slitting/CacheCut.vue
View File

@@ -4,9 +4,16 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">分切暂存位</view>
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label">点位</view>
<view class="filter_input_wraper">
<!-- <uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select> -->
<uni-data-select v-model="index" :searchInput="true" :localdata="newoptions" @change="selectChange" @handleChange="handleChange" @showSelector="showSelector"></uni-data-select>
</view>
</view>
</view>
@@ -20,6 +27,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import {queryProductArea} from '@/utils/getData2.js'
import {getCutCacheAgvPoints, sendSubVolumeToNBJ} from '@/utils/getData3.js'
export default {
components: {
@@ -29,19 +37,57 @@
return {
options: [],
index: '',
newoptions: [],
options2: [],
index2: '',
disabled: false
};
},
created () {
this._getCutCacheAgvPoints()
this._queryProductArea()
},
methods: {
selectChange2(e) {
this.index2 = e
if (e) {
this._getCutCacheAgvPoints(e)
} else {
this.index = ''
}
},
/** 生产区域下拉框查询 */
async _queryProductArea () {
let res = await queryProductArea()
this.options2 = [...res.data]
},
selectChange (e) {
this.index = e
},
async _getCutCacheAgvPoints () {
let res = await getCutCacheAgvPoints()
/** 模糊匹配 */
selectMatchItem (lists, keyWord) {
let resArr = []
lists.filter((item) => {
if (item.text.indexOf(keyWord) > -1) {
resArr.push(item)
}
})
return resArr
},
handleChange (e) {
if (e){
this.index = ''
this.newoptions = this.selectMatchItem(this.options, e)
} else {
this.newoptions = this.options
}
},
showSelector () {
this.newoptions = this.options
},
async _getCutCacheAgvPoints (e) {
let res = await getCutCacheAgvPoints(e)
this.options = [...res]
this.newoptions = [...res]
},
async _sendSubVolumeToNBJ () {
this.disabled = true
@@ -62,6 +108,8 @@
},
clearUp () {
this.index = ''
this.index2 = ''
this.options = []
}
}
}

32
pages/SecondPhase/slitting/SlittingCutting.vue
View File

@@ -4,7 +4,13 @@
<view class="zd_content">
<view class="zd_wrapper">
<view class="filter_item">
<view class="filter_label">分切机</view>
<view class="filter_label">区域</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
</view>
</view>
<view class="filter_item">
<view class="filter_label">设备</view>
<view class="filter_input_wraper">
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
</view>
@@ -21,6 +27,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryProductArea} from '@/utils/getData2.js'
import {slitterDevices, downRolls} from '@/utils/getData3.js'
export default {
components: {
@@ -31,15 +38,30 @@
return {
options: [],
index: '',
options2: [],
index2: '',
disabled: false
};
},
created () {
this._slitterDevices()
this._queryProductArea()
},
methods: {
async _slitterDevices () {
let res = await slitterDevices()
selectChange2(e) {
this.index2 = e
if (e) {
this._slitterDevices(e)
} else {
this.index = ''
}
},
/** 生产区域下拉框查询 */
async _queryProductArea () {
let res = await queryProductArea()
this.options2 = [...res.data]
},
async _slitterDevices (e) {
let res = await slitterDevices(e)
this.options = [...res]
},
selectChange (e) {
@@ -64,6 +86,8 @@
},
clearUp () {
this.index = ''
this.index2 = ''
this.options = []
}
}
}

8
utils/getData3.js
View File

@@ -126,9 +126,9 @@ export const twoPdaReback = (type, no, code, pcode) => request({
* 分切下料
*/
// 获取分切设备
export const slitterDevices = () => request({
export const slitterDevices = (area) => request({
url:'api/pda/slitter/slitterDevices',
data: {}
data: {area: area}
})
// 确定
export const downRolls = (code) => request({
@@ -165,9 +165,9 @@ export const operateIvt = (type, vcode, num, qty, code) => request({
/**
* 分切暂存下料
*/
export const getCutCacheAgvPoints = () => request({
export const getCutCacheAgvPoints = (area) => request({
url:'api/pda/slitter/getCutCacheAgvPoints',
data: {}
data: {area: area}
})
export const sendSubVolumeToNBJ = (code) => request({
url:'api/pda/slitter/sendSubVolumeToNBJ',

6
utils/mork2.js
View File

@@ -165,3 +165,9 @@ export const getCutCacheAgvPoints = () => {
let res = [{"text":"B2_FQZC01","value":"B2分切缓存位01"},{"text":"B2_FQZC02","value":"B2分切缓存位02"},{"text":"B2_FQZC03","value":"B2分切缓存位03"},{"text":"B2_FQZC04","value":"B2分切缓存位04"},{"text":"B2_FQZC05","value":"B2分切缓存位05"},{"text":"B2_FQZC06","value":"B2分切缓存位06"},{"text":"B2_FQZC07","value":"B2分切缓存位07"},{"text":"B2_FQZC08","value":"B2分切缓存位08"},{"text":"B2_FQZC09","value":"B2分切缓存位09"},{"text":"B2_FQZC10","value":"B2分切缓存位10"}]
return res
}
export const queryProductArea = () => {
let res = {
data: [{text: '物料一', value: '001'}, {text: '物料a', value: '002'}, {text: '物料b', value: '003'}]
}
return res
}