接口
This commit is contained in:
204
pages/ftdlDTY/agv-manage.vue
Normal file
204
pages/ftdlDTY/agv-manage.vue
Normal file
@@ -0,0 +1,204 @@
|
||||
<template>
|
||||
<view class="zd_container">
|
||||
<!-- agv管制 -->
|
||||
<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> -->
|
||||
<span class="filter_label">{{$t('filter.carno')}}</span>
|
||||
</view>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th>序号</th>
|
||||
<th>车号</th>
|
||||
<th>状态</th>
|
||||
<th>是否有任务</th> -->
|
||||
<th>{{$t('grid.number')}}</th>
|
||||
<th>{{$t('filter.carno')}}</th>
|
||||
<th>{{$t('grid.status')}}</th>
|
||||
<th>{{$t('grid.has-task')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.create_name === pkId}">
|
||||
<td>{{i+1}}</td>
|
||||
<td>{{e.agv_no}}</td>
|
||||
<td>{{e.status}}</td>
|
||||
<td>{{e.hasTask}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_pause">进入</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_resume">退出</button> -->
|
||||
<button class="zd-col-7 button-primary" @tap="searchList">{{$t('button.search')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.pause')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled2" @tap="handleConfirm2">{{$t('button.recover')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {getAgvNos, selectRegionInfo, pause, resume} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
SearchBox
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
options: [],
|
||||
index: '',
|
||||
pkId: '',
|
||||
pkObj: {},
|
||||
dataList: [],
|
||||
reload: false,
|
||||
status: 'more',
|
||||
contentText: {
|
||||
contentdown: '查看更多',
|
||||
contentrefresh: '加载中',
|
||||
contentnomore: '没有更多'
|
||||
},
|
||||
totalCount: 0,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
disabled: false,
|
||||
disabled2: false
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
},
|
||||
created () {
|
||||
this._getAgvNos()
|
||||
},
|
||||
methods: {
|
||||
async _getAgvNos () {
|
||||
try {
|
||||
let res = await getAgvNos()
|
||||
if (res) {
|
||||
this.options = res.data
|
||||
} else {
|
||||
this.options =[]
|
||||
}
|
||||
} catch (e) {
|
||||
this.options = []
|
||||
}
|
||||
},
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
this.searchList()
|
||||
},
|
||||
clearUp () {
|
||||
this.index = ''
|
||||
this.pkId = ''
|
||||
this.dataList = []
|
||||
this.disabled = false
|
||||
this.disabled2 = false
|
||||
},
|
||||
searchList () {
|
||||
this.dataList = []
|
||||
this.pageNum = 1
|
||||
this._selectRegionInfo()
|
||||
},
|
||||
async _selectRegionInfo () {
|
||||
let res = await selectRegionInfo(this.index)
|
||||
if (res.code === '200') {
|
||||
this.dataList = res.data
|
||||
// this.totalCount = res.totalElements
|
||||
// if (res.totalElements > 0) {
|
||||
// const dataMap = res.content
|
||||
// this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
|
||||
// this.reload = false
|
||||
// } else {
|
||||
// this.dataList = []
|
||||
// }
|
||||
// if (this.totalCount == this.dataList.length) {
|
||||
// this.reload = false
|
||||
// this.status = 'noMore'
|
||||
// }
|
||||
}
|
||||
},
|
||||
onReachBottom () {
|
||||
if (this.totalCount > this.dataList.length) {
|
||||
this.status = 'loading'
|
||||
setTimeout(() => {
|
||||
this.pageNum++
|
||||
this._selectRegionInfo()
|
||||
}, 1000)
|
||||
} else { //停止加载
|
||||
this.status = 'noMore'
|
||||
}
|
||||
},
|
||||
toCheck (e) {
|
||||
this.pkId = e.create_name === this.pkId ? '' : e.create_name
|
||||
this.pkObj = this.pkId === e.create_name ? e : {}
|
||||
},
|
||||
async handleConfirm() {
|
||||
if (!this.index) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._pause()
|
||||
}
|
||||
},
|
||||
async _pause () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await pause(this.index, '1')
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
this.clearUp()
|
||||
this.disabled = false
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async handleConfirm2() {
|
||||
if (!this.index) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._resume()
|
||||
}
|
||||
},
|
||||
async _resume () {
|
||||
this.disabled2 = true
|
||||
try {
|
||||
let res = await resume(this.index, '2')
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
this.clearUp()
|
||||
this.disabled2 = false
|
||||
} catch (e) {
|
||||
this.disabled2 = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="zd_container">
|
||||
<!-- 进出区域登记 -->
|
||||
<!-- 区域管制 -->
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
@@ -44,11 +44,11 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_inArea">进入</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_outArea">退出</button> -->
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_chargeArea">进入</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_releaseArea">退出</button> -->
|
||||
<button class="zd-col-7 button-primary" @tap="searchList">{{$t('button.search')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.enter')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="handleConfirm2">{{$t('button.quit')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.control')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled2" @tap="handleConfirm2">{{$t('button.deregulate')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -57,7 +57,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {getChargeRegions, selectRegionInfo, inArea, outArea} from '@/utils/getData4.js'
|
||||
import {getRegions, selectRegionInfo, chargeArea, releaseArea} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -89,12 +89,12 @@
|
||||
this.title = options.title
|
||||
},
|
||||
created () {
|
||||
this._getChargeRegions()
|
||||
this._getRegions()
|
||||
},
|
||||
methods: {
|
||||
async _getChargeRegions () {
|
||||
async _getRegions () {
|
||||
try {
|
||||
let res = await getChargeRegions()
|
||||
let res = await getRegions()
|
||||
if (res) {
|
||||
this.options = res.data
|
||||
} else {
|
||||
@@ -159,13 +159,13 @@
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._inArea()
|
||||
this._chargeArea()
|
||||
}
|
||||
},
|
||||
async _inArea () {
|
||||
async _chargeArea () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await inArea(this.index)
|
||||
let res = await chargeArea(this.index, '1')
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
@@ -177,18 +177,18 @@
|
||||
}
|
||||
},
|
||||
async handleConfirm2() {
|
||||
if (!this.pkId) {
|
||||
if (!this.index) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._outArea()
|
||||
this._releaseArea()
|
||||
}
|
||||
},
|
||||
async _outArea () {
|
||||
async _releaseArea () {
|
||||
this.disabled2 = true
|
||||
try {
|
||||
let res = await outArea(this.pkObj)
|
||||
let res = await releaseArea(this.index, '2')
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
@@ -24,12 +24,6 @@
|
||||
<uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row">
|
||||
<button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
|
||||
<button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
|
||||
<button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
|
||||
<button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
@@ -65,8 +59,10 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">确认下料</button> -->
|
||||
<button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_blanking">{{$t('button.confirm-down-material')}}</button>
|
||||
<!-- <button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_productBlanking">{{$t('button.confirm-down-material')}}</button> -->
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.scxl')}}</button>
|
||||
<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.zjps')}}</button>
|
||||
<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm('3')">{{$t('button.zjxl')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -75,7 +71,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {getNextRegions, selectMaterials, blanking} from '@/utils/getData4.js'
|
||||
import {getNextRegionsByPoint, selectMaterials, productBlanking} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -98,26 +94,26 @@
|
||||
this.title = options.title
|
||||
},
|
||||
onShow() {
|
||||
if (this.$store.getters.publicObj !== '') {
|
||||
this.currentData = this.$store.getters.publicObj
|
||||
this.pkId = ''
|
||||
this.dataList.map((item) => {
|
||||
if (this.pkObj.mid === item.mid) {
|
||||
item.material_name = this.currentData.material_name
|
||||
item.material_code = this.currentData.material_code
|
||||
item.measure_unit_id = this.currentData.measure_unit_id
|
||||
}
|
||||
})
|
||||
this.$store.dispatch('setPublicObj', '')
|
||||
}
|
||||
// if (this.$store.getters.publicObj !== '') {
|
||||
// this.currentData = this.$store.getters.publicObj
|
||||
// this.pkId = ''
|
||||
// this.dataList.map((item) => {
|
||||
// if (this.pkObj.mid === item.mid) {
|
||||
// item.material_name = this.currentData.material_name
|
||||
// item.material_code = this.currentData.material_code
|
||||
// item.measure_unit_id = this.currentData.measure_unit_id
|
||||
// }
|
||||
// })
|
||||
// this.$store.dispatch('setPublicObj', '')
|
||||
// }
|
||||
},
|
||||
created () {
|
||||
this._getNextRegions()
|
||||
this._getNextRegionsByPoint()
|
||||
},
|
||||
methods: {
|
||||
async _getNextRegions () {
|
||||
async _getNextRegionsByPoint () {
|
||||
try {
|
||||
let res = await getNextRegions()
|
||||
let res = await getNextRegionsByPoint(this.val1)
|
||||
if (res) {
|
||||
this.options = res.data
|
||||
} else {
|
||||
@@ -127,6 +123,22 @@
|
||||
this.options = []
|
||||
}
|
||||
},
|
||||
async _selectMaterials () {
|
||||
let res = await selectMaterials(this.val1)
|
||||
this.dataList = res.data
|
||||
// this.totalCount = res.totalElements
|
||||
// if (res.totalElements > 0) {
|
||||
// const dataMap = res.data
|
||||
// this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
|
||||
// this.reload = false
|
||||
// } else {
|
||||
// this.dataList = []
|
||||
// }
|
||||
// if (this.totalCount == this.dataList.length) {
|
||||
// this.reload = false
|
||||
// this.status = 'noMore'
|
||||
// }
|
||||
},
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
},
|
||||
@@ -157,96 +169,6 @@
|
||||
url: '/pages/ftdlDTY/mater-list0?title=查询物料'
|
||||
})
|
||||
},
|
||||
toScanAdd () {
|
||||
uni.scanCode({
|
||||
success: (res) => {
|
||||
// console.log('扫码成功:', res.result);
|
||||
if (res.result.includes(';')) {
|
||||
const parts = res.result.split(';')
|
||||
if (parts.length !== 5) {
|
||||
uni.showToast({
|
||||
title: '二维码格式不正确,请扫描符合格式的二维码',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
let currObj = {
|
||||
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
|
||||
container_code: parts[0],
|
||||
material_code: parts[1],
|
||||
material_name: parts[2],
|
||||
qty: parts[3],
|
||||
measure_unit_id: parts[4],
|
||||
}
|
||||
// 检查是否已存在相同卷号
|
||||
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
|
||||
if (exists) {
|
||||
uni.showToast({
|
||||
title: '已存在',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
this.dataList.push(currObj)
|
||||
} else {
|
||||
let currObj = {
|
||||
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
|
||||
container_code: res.result,
|
||||
material_code: '',
|
||||
material_name: '',
|
||||
qty: '',
|
||||
measure_unit_id: ''
|
||||
}
|
||||
// 检查是否已存在相同卷号
|
||||
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
|
||||
if (exists) {
|
||||
uni.showToast({
|
||||
title: '已存在',
|
||||
icon: 'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
this.dataList.push(currObj)
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log('扫码失败:', err)
|
||||
// uni.showToast({
|
||||
// title: err + '扫码失败',
|
||||
// icon: 'none'
|
||||
// })
|
||||
}
|
||||
})
|
||||
},
|
||||
toAdd () {
|
||||
let currObj = {
|
||||
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
|
||||
container_code: '',
|
||||
material_code: '编码',
|
||||
material_name: '名称',
|
||||
qty: '1',
|
||||
measure_unit_id: '单位'
|
||||
}
|
||||
this.dataList.push(currObj)
|
||||
},
|
||||
toDel () {
|
||||
if (!this.pkId) {
|
||||
return
|
||||
}
|
||||
this.dataList = this.dataList.filter(item => item.mid !== this.pkObj.mid)
|
||||
},
|
||||
toCopy () {
|
||||
if (!this.pkId) {
|
||||
return
|
||||
}
|
||||
// let original = this.dataList.find(item => item.mid === this.pkObj.mid)
|
||||
const copy = JSON.parse(JSON.stringify(this.pkObj))
|
||||
// 更新mid为新生成的唯一值
|
||||
copy.mid = 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9)
|
||||
// 添加到原数组
|
||||
this.dataList.push(copy)
|
||||
this.pkId = ''
|
||||
},
|
||||
clearUp () {
|
||||
this.val1 = ''
|
||||
this.index = ''
|
||||
@@ -256,19 +178,19 @@
|
||||
this.currentData = {}
|
||||
this.disabled = false
|
||||
},
|
||||
async handleConfirm() {
|
||||
async handleConfirm(type) {
|
||||
if (!this.val1 || !this.dataList.length || !this.index) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._blanking()
|
||||
this._productBlanking(type)
|
||||
}
|
||||
},
|
||||
async _blanking () {
|
||||
async _productBlanking (type) {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await blanking(this.val1, this.dataList, this.index)
|
||||
let res = await productBlanking(this.val1, this.dataList, this.index, type)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
|
||||
@@ -16,6 +16,15 @@
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<!-- <span class="filter_label">列</span> -->
|
||||
<span class="filter_label">{{$t('filter.col')}}</span>
|
||||
</view>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<uni-data-select v-model="index" :localdata="options" placeholder="" @change="selectChange"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
@@ -52,12 +61,12 @@
|
||||
<!-- <uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/> -->
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button>
|
||||
<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空点位</button>
|
||||
<button class="zd-col-7 button-primary" @tap="searchList">查询</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_comfirmGetting">确认取货</button> -->
|
||||
<button class="zd-col-8 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_cleanCol">清空列</button> -->
|
||||
<button class="zd-col-8 button-default" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_cleanPoint">{{$t('button.clear-point')}}</button>
|
||||
<button class="zd-col-7 button-primary" @tap="searchList">{{$t('button.search')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm-quhuo')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="handleConfirm">{{$t('button.clear-col')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -66,7 +75,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {getMaterialInfoByPoint, comfirmGetting} from '@/utils/getData4.js'
|
||||
import {getColsByPoint, getMaterialInfoByPoint, cleanPoint, cleanCol} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -76,6 +85,8 @@
|
||||
return {
|
||||
title: '',
|
||||
val1: '',
|
||||
options: [],
|
||||
index: '',
|
||||
dataList: [],
|
||||
reload: false,
|
||||
status: 'more',
|
||||
@@ -87,20 +98,38 @@
|
||||
totalCount: 0,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
disabled: false
|
||||
disabled: false,
|
||||
disabled2: false,
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
},
|
||||
methods: {
|
||||
async _getColsByPoint () {
|
||||
try {
|
||||
let res = await getColsByPoint(this.val1)
|
||||
if (res) {
|
||||
this.options = res.data
|
||||
} else {
|
||||
this.options =[]
|
||||
}
|
||||
} catch (e) {
|
||||
this.options = []
|
||||
}
|
||||
},
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
},
|
||||
clearUp () {
|
||||
this.val1 = ''
|
||||
this.index = ''
|
||||
this.dataList = []
|
||||
this.disabled = false
|
||||
},
|
||||
handleChange (e) {
|
||||
if (e) {
|
||||
this._getColsByPoint()
|
||||
this.searchList()
|
||||
}
|
||||
},
|
||||
@@ -109,6 +138,25 @@
|
||||
this.pageNum = 1
|
||||
this._getMaterialInfoByPoint()
|
||||
},
|
||||
async _cleanPoint () {
|
||||
this.disabled2 = true
|
||||
if (!this.val1) {
|
||||
this.disabled2 = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await cleanPoint(this.val1)
|
||||
if (res) {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
this.val1 = ''
|
||||
} catch (e) {
|
||||
this.disabled2 = false
|
||||
}
|
||||
},
|
||||
async _getMaterialInfoByPoint () {
|
||||
let res = await getMaterialInfoByPoint(this.val1)
|
||||
if (res.code === '200') {
|
||||
@@ -139,18 +187,18 @@
|
||||
}
|
||||
},
|
||||
async handleConfirm() {
|
||||
if (!this.val1) {
|
||||
if (!this.index) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._comfirmGetting()
|
||||
this._cleanCol()
|
||||
}
|
||||
},
|
||||
async _comfirmGetting () {
|
||||
async _cleanCol () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await comfirmGetting(this.val1, this.dataList)
|
||||
let res = await cleanCol(this.index)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row">
|
||||
<button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button>
|
||||
<button class="zd-col-5 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
|
||||
<button class="zd-col-5 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
|
||||
<button class="zd-col-6 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
|
||||
<!-- <button class="zd-col-6 button-primary ftsize1" @tap="toScanAdd">{{$t('button.scan-add')}}</button> -->
|
||||
<button class="zd-col-7 button-primary ftsize1" @tap="toAdd">{{$t('button.add-row')}}</button>
|
||||
<button class="zd-col-7 button-primary ftsize1" @tap="toDel">{{$t('button.del-row')}}</button>
|
||||
<button class="zd-col-7 button-primary ftsize1" @tap="toCopy">{{$t('button.copy-row')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
@@ -58,11 +58,9 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_materialBinding">物料绑定</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_vehicleBinding">空载具绑定</button> -->
|
||||
<button class="zd-col-8 button-primary" @tap="searchList">{{$t('button.search')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm">{{$t('button.material-bind')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="handleConfirm2">{{$t('button.empty-vehicle-bind')}}</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_materialBinding">物料绑定</button> -->
|
||||
<button class="zd-col-11 button-primary" @tap="searchList">{{$t('button.search')}}</button>
|
||||
<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm">{{$t('button.material-bind')}}</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -71,7 +69,7 @@
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import { confirmAction } from '@/utils/utils.js'
|
||||
import {selectMaterialByPointCode, materialBinding, vehicleBinding} from '@/utils/getData4.js'
|
||||
import {selectMaterialByPointCode, materialBinding} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -301,29 +299,6 @@
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async handleConfirm2() {
|
||||
if (!this.val1) {
|
||||
return
|
||||
}
|
||||
const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?")
|
||||
if (isConfirmed) {
|
||||
this._vehicleBinding()
|
||||
}
|
||||
},
|
||||
async _vehicleBinding() {
|
||||
this.disabled2 = true
|
||||
try {
|
||||
let res = await vehicleBinding(this.val1)
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
this.clearUp()
|
||||
this.disabled2 = false
|
||||
} catch (e) {
|
||||
this.disabled2 = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,13 +48,13 @@
|
||||
// {title: '库位管理', path: 'RF03', sonTree: [{title: '人工取货', path: '/pages/ftdlDTY/man-get-goods'}, {title: '人工放货', path: '/pages/ftdlDTY/man-load-goods'}, {title: '库存锁定/解锁', path: '/pages/ftdlDTY/kc-manage'}]},
|
||||
// {title: '产线管理', path: 'RF04', sonTree: [{title: '产线叫料', path: '/pages/ftdlDTY/line-call-mater'}, {title: '产线下料', path: '/pages/ftdlDTY/line-down-mater'}]},
|
||||
// {title: '任务管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/ftdlDTY/work-manage'}, {title: '定点作业', path: '/pages/ftdlDTY/fixedpoint-work'}]},
|
||||
// {title: '进出区域登记', path: 'RF01', sonTree: [{title: '进出区域登记', path: '/pages/ftdlDTY/inout-area-mark'}]}
|
||||
// {title: '区域管制', path: 'RF01', sonTree: [{title: '区域管制', path: '/pages/ftdlDTY/area-manage'}]}
|
||||
// ],
|
||||
menuList: [
|
||||
{title: this.$t('menu.kw-management'), path: 'RF03', sonTree: [{title: this.$t('menu.man-get-goods'), path: '/pages/ftdlDTY/man-get-goods'}, {title: this.$t('menu.man-load-goods'), path: '/pages/ftdlDTY/man-load-goods'}, {title: this.$t('menu.kc-manage'), path: '/pages/ftdlDTY/kc-manage'}]},
|
||||
{title: this.$t('menu.line-management'), path: 'RF04', sonTree: [{title: this.$t('menu.line-call-mater'), path: '/pages/ftdlDTY/line-call-mater'}, {title: this.$t('menu.line-down-mater'), path: '/pages/ftdlDTY/line-down-mater'}]},
|
||||
{title: this.$t('menu.task-management'), path: 'RF07', sonTree: [{title: this.$t('menu.work-manage'), path: '/pages/ftdlDTY/work-manage'}, {title: this.$t('menu.fixedpoint-work'), path: '/pages/ftdlDTY/fixedpoint-work'}]},
|
||||
{title: this.$t('menu.inout-area-mark'), path: 'RF01', sonTree: [{title: this.$t('menu.inout-area-mark'), path: '/pages/ftdlDTY/inout-area-mark'}]}
|
||||
{title: this.$t('menu.area-manage'), path: 'RF01', sonTree: [{title: this.$t('menu.area-manage'), path: '/pages/ftdlDTY/area-manage'}]}
|
||||
],
|
||||
// menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
|
||||
show: false,
|
||||
|
||||
@@ -48,13 +48,13 @@
|
||||
// {title: '库位管理', path: 'RF03', sonTree: [{title: '人工取货', path: '/pages/ftdlDTY/man-get-goods'}, {title: '人工放货', path: '/pages/ftdlDTY/man-load-goods'}, {title: '库存锁定/解锁', path: '/pages/ftdlDTY/kc-manage'}]},
|
||||
// {title: '产线管理', path: 'RF04', sonTree: [{title: '产线叫料', path: '/pages/ftdlDTY/line-call-mater'}, {title: '产线下料', path: '/pages/ftdlDTY/line-down-mater'}]},
|
||||
// {title: '任务管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/ftdlDTY/work-manage'}, {title: '定点作业', path: '/pages/ftdlDTY/fixedpoint-work'}]},
|
||||
// {title: '进出区域登记', path: 'RF01', sonTree: [{title: '进出区域登记', path: '/pages/ftdlDTY/inout-area-mark'}]}
|
||||
// {title: '区域管制', path: 'RF01', sonTree: [{title: '区域管制', path: '/pages/ftdlDTY/area-manage'}]}
|
||||
// ],
|
||||
menuList: [
|
||||
{title: this.$t('menu.kw-management'), path: 'RF03', sonTree: [{title: this.$t('menu.man-get-goods'), path: '/pages/ftdlDTY/man-get-goods'}, {title: this.$t('menu.man-load-goods'), path: '/pages/ftdlDTY/man-load-goods'}, {title: this.$t('menu.kc-manage'), path: '/pages/ftdlDTY/kc-manage'}]},
|
||||
{title: this.$t('menu.line-management'), path: 'RF04', sonTree: [{title: this.$t('menu.line-call-mater'), path: '/pages/ftdlDTY/line-call-mater'}, {title: this.$t('menu.line-down-mater'), path: '/pages/ftdlDTY/line-down-mater'}]},
|
||||
{title: this.$t('menu.task-management'), path: 'RF07', sonTree: [{title: this.$t('menu.work-manage'), path: '/pages/ftdlDTY/work-manage'}, {title: this.$t('menu.fixedpoint-work'), path: '/pages/ftdlDTY/fixedpoint-work'}]},
|
||||
{title: this.$t('menu.inout-area-mark'), path: 'RF01', sonTree: [{title: this.$t('menu.inout-area-mark'), path: '/pages/ftdlDTY/inout-area-mark'}]}
|
||||
{title: this.$t('menu.area-manage'), path: 'RF01', sonTree: [{title: this.$t('menu.area-manage'), path: '/pages/ftdlDTY/area-manage'}, {title: this.$t('menu.agv-manage'), path: '/pages/ftdlDTY/agv-manage'}]}
|
||||
],
|
||||
// menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
|
||||
show: false,
|
||||
|
||||
Reference in New Issue
Block a user