装货修改
This commit is contained in:
@@ -524,6 +524,13 @@
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "pages/hdyy/wrcdj/wrczh-matersave",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "pages/hdyy/wrcdj/wrc-unload",
|
||||
"style" :
|
||||
|
||||
@@ -3,45 +3,33 @@
|
||||
<!-- 无人车装货 -->
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-6">
|
||||
<span class="filter_label">装货区</span>
|
||||
</view>
|
||||
<view class="zd-col-18 filter_select">
|
||||
<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
|
||||
<!-- <th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th> -->
|
||||
<th>序号</th>
|
||||
<th>点位编码</th>
|
||||
<th>点位名称</th>
|
||||
<th>点位状态</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<th>批号</th>
|
||||
<th>数量</th>
|
||||
<th>计量单位</th>
|
||||
<th>AGV任务</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(e, i) in dataList" :key="i">
|
||||
<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
|
||||
<!-- <td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td> -->
|
||||
<td>{{i+1}}</td>
|
||||
<td>{{e.point_code}}</td>
|
||||
<td>{{e.point_name}}</td>
|
||||
<td>{{['', '空位', '有箱有料'][Number(e.point_status)]}}</td>
|
||||
<td>{{e.material_code}}</td>
|
||||
<td>{{e.material_name}}</td>
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.qty}}</td>
|
||||
<td>{{e.unit_name}}</td>
|
||||
<td>{{e.task_code}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -49,10 +37,10 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_queryDrawConfirm">呼叫无人车</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_queryDrawConfirm">装货</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !checkedArr.length}" :disabled="disabled" @tap="_queryDrawConfirm">装货完成</button>
|
||||
<button class="zd-col-4 button-default" @tap="toEmpty">清空</button>
|
||||
<button class="zd-col-7 button-primary" :disabled="disabled" @tap="_callCar">呼叫无人车</button>
|
||||
<button class="zd-col-6 button-primary" @tap="toZh">装货</button>
|
||||
<button class="zd-col-6 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_installConfirm">装货完成</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -60,7 +48,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {queryPointRegion, queryPointDrawDtl, queryDrawConfirm} from '@/utils/getData3.js'
|
||||
import {callCar, install, installConfirm} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -69,45 +57,23 @@
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
options1: [],
|
||||
index1: '',
|
||||
allCheck: false,
|
||||
checkedArr: [],
|
||||
dataList: [],
|
||||
dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
|
||||
// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}],
|
||||
disabled: false
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
},
|
||||
onShow () {
|
||||
if (this.$store.getters.publicArr.length) {
|
||||
this.dataList = this.$store.getters.publicArr
|
||||
this.$store.dispatch('setPublicArr', '')
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/** 下拉框*/
|
||||
async _queryPointRegion () {
|
||||
try {
|
||||
let res = await queryPointRegion()
|
||||
if (res && res.data) {
|
||||
this.options1 = [...res.data]
|
||||
} else {
|
||||
this.options1 = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.options1 = []
|
||||
}
|
||||
},
|
||||
/** 下拉框*/
|
||||
async _queryPointRegion2 () {
|
||||
try {
|
||||
let res = await queryPointRegion()
|
||||
if (res && res.data) {
|
||||
this.options2 = [...res.data]
|
||||
} else {
|
||||
this.options2 = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.options2 = []
|
||||
}
|
||||
},
|
||||
toEmpty () {
|
||||
this.dataList = []
|
||||
this.checkedArr = []
|
||||
@@ -125,55 +91,52 @@
|
||||
this.checkedArr = this.dataList.filter(el => el.checked === true)
|
||||
this.allCheck = this.checkedArr.length === this.dataList.length
|
||||
},
|
||||
handleChange (e) {
|
||||
if (e) {
|
||||
this._queryPointDrawDtl()
|
||||
}
|
||||
},
|
||||
handleBlur (e) {
|
||||
if (e.qty) {
|
||||
if (e.qty < 0) {
|
||||
e.qty = 0
|
||||
} else {
|
||||
e.qty = e.qty.replace(/[^0-9]/g, '')
|
||||
e.qty = e.qty.replace(/^0+/, '') || '0'
|
||||
if (e.qty > e.initialQty) {
|
||||
e.qty = e.initialQty
|
||||
}
|
||||
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
|
||||
}
|
||||
} else {
|
||||
// uni.showToast({
|
||||
// title: '数量必填',
|
||||
// icon: 'none'
|
||||
// })
|
||||
}
|
||||
},
|
||||
async _queryPointDrawDtl () {
|
||||
try {
|
||||
let res = await queryPointDrawDtl(this.val1)
|
||||
if (res && res.data.length > 0) {
|
||||
this.dataList = [...res.data]
|
||||
this.dataList.forEach(e => {
|
||||
e.initialQty = e.qty
|
||||
toZh () {
|
||||
if (!this.dataList.length) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/hdyy/wrcdj/wrczh-matersave?title=物料维护'
|
||||
})
|
||||
this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
|
||||
} else {
|
||||
this.dataList = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.dataList = []
|
||||
if (this.dataList.length) {
|
||||
this._install()
|
||||
}
|
||||
},
|
||||
async _queryDrawConfirm () {
|
||||
this.checkedArr = this.dataList.filter(el => el.checked === true)
|
||||
async _install () {
|
||||
this.disabled = true
|
||||
if (!this.checkedArr.length) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await queryDrawConfirm(this.checkedArr)
|
||||
let res = await install(this.checkedArr)
|
||||
if (res) {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
this.toEmpty()
|
||||
this.disabled = false
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async _callCar () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await callCar()
|
||||
if (res) {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
this.toEmpty()
|
||||
this.disabled = false
|
||||
} catch (e) {
|
||||
this.disabled = false
|
||||
}
|
||||
},
|
||||
async _installConfirm () {
|
||||
this.disabled = true
|
||||
try {
|
||||
let res = await installConfirm()
|
||||
if (res) {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
|
||||
117
pages/hdyy/wrcdj/wrczh-matersave.vue
Normal file
117
pages/hdyy/wrcdj/wrczh-matersave.vue
Normal file
@@ -0,0 +1,117 @@
|
||||
<template>
|
||||
<view class="zd_container">
|
||||
<!-- 物料维护 -->
|
||||
<nav-bar :title="title" :inner="true"></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-14">
|
||||
<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
|
||||
</view>
|
||||
<button class="mini-btn" type="primary" @tap="_queryZhPoint">查询</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd_wrapper grid-wraper">
|
||||
<view class="slide_new">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
|
||||
<!-- <th></uni-icons></th> -->
|
||||
<th>点位编码</th>
|
||||
<th>点位名称</th>
|
||||
<th>点位状态</th>
|
||||
<th>物料编码</th>
|
||||
<th>物料名称</th>
|
||||
<th>批号</th>
|
||||
<th>数量</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(e, i) in dataList" :key="i">
|
||||
<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
|
||||
<td>{{e.point_code}}</td>
|
||||
<td>{{e.point_name}}</td>
|
||||
<td>{{['', '空位', '有箱有料'][Number(e.point_status)]}}</td>
|
||||
<td>{{e.material_code}}</td>
|
||||
<td>{{e.material_name}}</td>
|
||||
<td>{{e.pcsn}}</td>
|
||||
<td>{{e.qty}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-24 button-primary" :class="{'button-info': !(this.checkedArr.length > 0 && this.checkedArr.length < 4)}" @tap="toSure">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {queryZhPoint} from '@/utils/getData3.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
SearchBox
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
keyword: null,
|
||||
dataList: [],
|
||||
// dataList: [{material_code: 'm001', qty: 100, checked: false, initialQty: 100}, {material_code: 'm002', qty: 200, checked: false, initialQty: 200}, {material_code: 'm003', qty: 300, checked: false, initialQty: 300}, {material_code: 'm004', qty: 400, checked: false, initialQty: 400}],
|
||||
allCheck: false,
|
||||
checkedArr: []
|
||||
};
|
||||
},
|
||||
onLoad (options) {
|
||||
this.title = options.title
|
||||
this._queryZhPoint()
|
||||
},
|
||||
methods: {
|
||||
handleFocus () {
|
||||
this.keyword = null
|
||||
},
|
||||
async _queryZhPoint () {
|
||||
try {
|
||||
let res = await queryZhPoint(this.keyword)
|
||||
if (res && res.data.length > 0) {
|
||||
this.dataList = [...res.data]
|
||||
} else {
|
||||
this.dataList = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.dataList = []
|
||||
}
|
||||
},
|
||||
toAllCheck () {
|
||||
this.allCheck = !this.allCheck
|
||||
this.dataList.map(el => {
|
||||
el.checked = this.allCheck
|
||||
})
|
||||
this.checkedArr = this.dataList.filter(el => el.checked === true)
|
||||
},
|
||||
toCheck (e) {
|
||||
e.checked = !e.checked
|
||||
this.checkedArr = this.dataList.filter(el => el.checked === true)
|
||||
this.allCheck = this.checkedArr.length === this.dataList.length
|
||||
},
|
||||
toSure () {
|
||||
if (this.checkedArr.length > 0 && this.checkedArr.length < 4) {
|
||||
this.$store.dispatch('setPublicArr', this.checkedArr)
|
||||
// uni.navigateBack()
|
||||
uni.navigateTo({
|
||||
url: '/pages/hdyy/wrcdj/wrc-load?title=无人车装货'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -468,12 +468,12 @@ export const queryZhPoint = (pcode) => request({
|
||||
})
|
||||
|
||||
// 呼叫无人车
|
||||
export const callCar = (rows) => request({
|
||||
export const callCar = () => request({
|
||||
url:'api/notCar/callCar',
|
||||
data: {}
|
||||
})
|
||||
// 装货
|
||||
export const install = () => request({
|
||||
export const install = (rows) => request({
|
||||
url:'api/notCar/install',
|
||||
data: {rows: rows}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user