修改
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
menuList: [
|
||||
{title: '原料管理', path: 'RF04', sonTree: [{title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}, {title: '物料组盘', path: '/pages/zw/wl-groupplate'}, {title: '点位更新', path: '/pages/zw/confirm-quhuo'}]},
|
||||
{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]},
|
||||
{title: '缓存管理', path: 'RF06', sonTree: [{title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '料桶组盘', path: '/pages/zw/ltzp'}]},
|
||||
{title: '缓存管理', path: 'RF06', sonTree: [{title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '物料入库', path: '/pages/zw/ltzp'}]},
|
||||
{title: '产线管理', path: 'RF02', sonTree: [{title: '手工叫料', path: '/pages/zw/manual-callmater'}, {title: '手工退料', path: '/pages/zw/manual-returnmater'}]},
|
||||
{title: '作业管理', path: 'RF07', sonTree: [{title: '作业管理', path: '/pages/zw/zygl'}]},
|
||||
// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="zd_container">
|
||||
<!-- 料桶组盘 -->
|
||||
<!-- 物料入库 -->
|
||||
<nav-bar :title="title"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
@@ -30,7 +30,7 @@
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">物料单重</span>
|
||||
<span class="filter_label">物料单重(kg)</span>
|
||||
</view>
|
||||
<view class="zd-col-17">
|
||||
<NumberInput v-model="currentData.single_weight" />
|
||||
@@ -54,7 +54,7 @@
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">载具编码</span>
|
||||
<span class="filter_label">料桶编码</span>
|
||||
</view>
|
||||
<view class="zd-col-17">
|
||||
<search-box v-model="currentData.vehicle_code" @handleChange="handleChange" @handleDel="handleDel" />
|
||||
@@ -64,7 +64,7 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
|
||||
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_combination">组盘确认</button>
|
||||
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="toSure">组盘确认</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -138,12 +138,28 @@
|
||||
this.index = ''
|
||||
this.disabled = false
|
||||
},
|
||||
async _combination () {
|
||||
toSure () {
|
||||
this.disabled = true
|
||||
if (JSON.stringify(this.currentData) === '{}') {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
if (Number(this.currentData.single_weight) > 2000) {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '输入的重量'+ Number(this.currentData.single_weight) +'过大,是否继续?',
|
||||
confirmColor: '#ff6a00',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
this._combination()
|
||||
} else if (res.cancel) {
|
||||
this.disabled = false
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
async _combination () {
|
||||
try {
|
||||
let selobj = this.options.find(item => item.value === this.index)
|
||||
let res = await combination(this.currentData.vehicle_code, this.currentData.pcsn, this.currentData.material_id, selobj.value, selobj.text, this.currentData.single_weight)
|
||||
|
||||
@@ -8,10 +8,8 @@
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label">仓位编码</span>
|
||||
</view>
|
||||
<view class="zd-col-17">
|
||||
<search-box
|
||||
v-model="val1"
|
||||
/>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
@@ -26,14 +24,6 @@
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="Object.prototype.toString.call(currentData) === '[object Object]' ">
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label filter_input_disabled">托盘码</span>
|
||||
</view>
|
||||
<view class="zd-col-17">
|
||||
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.storagevehicle_code" disabled>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7">
|
||||
<span class="filter_label filter_input_disabled">批次</span>
|
||||
@@ -105,10 +95,10 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_checkStruct">检查站点</button> -->
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_jbGetLtInfo">刷新数据</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled3" @tap="_jbEmptyTakeOut">空桶取出</button>
|
||||
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || flag === '2'}" :disabled="disabled2" @tap="_confirmSet">确认放置</button>
|
||||
<!-- <button class="zd-col-11 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_checkStruct">检查站点</button> -->
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_jbGetLtInfo">查询</button>
|
||||
<button class="zd-col-7 button-primary" :class="{'button-info': !index}" :disabled="disabled3" @tap="_jbEmptyTakeOut">空桶取出</button>
|
||||
<button class="zd-col-8 button-primary" :class="{'button-info': !index || !val2 || flag === '2'}" :disabled="disabled2" @tap="_confirmSet">确认放置</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -116,7 +106,7 @@
|
||||
<script>
|
||||
import NavBar from '@/components/NavBar.vue'
|
||||
import SearchBox from '@/components/SearchBox.vue'
|
||||
import {checkStruct, jbGetLtInfo, jbEmptyTakeOut, confirmSet} from '@/utils/getData4.js'
|
||||
import {structList, checkStruct, jbGetLtInfo, jbEmptyTakeOut, confirmSet} from '@/utils/getData4.js'
|
||||
export default {
|
||||
components: {
|
||||
NavBar,
|
||||
@@ -125,7 +115,8 @@
|
||||
data() {
|
||||
return {
|
||||
title: '',
|
||||
val1: '',
|
||||
options: [],
|
||||
index: '',
|
||||
val2: '',
|
||||
flag: '',
|
||||
currentData: {},
|
||||
@@ -138,20 +129,36 @@
|
||||
this.title = options.title
|
||||
},
|
||||
created () {
|
||||
this._structList()
|
||||
},
|
||||
methods: {
|
||||
async _structList () {
|
||||
try {
|
||||
let res = await structList()
|
||||
if (res) {
|
||||
this.options = res.data
|
||||
} else {
|
||||
this.options = []
|
||||
}
|
||||
} catch (e) {
|
||||
this.options = []
|
||||
}
|
||||
},
|
||||
selectChange (e) {
|
||||
this.index = e
|
||||
},
|
||||
clearUp () {
|
||||
this.val1 = ''
|
||||
this.index = ''
|
||||
this.val2 = ''
|
||||
this.disabled = false
|
||||
},
|
||||
clearUp2 () {
|
||||
this.val1 = ''
|
||||
this.index = ''
|
||||
this.val2 = ''
|
||||
this.disabled2 = false
|
||||
},
|
||||
clearUp3 () {
|
||||
this.val1 = ''
|
||||
this.index = ''
|
||||
this.disabled3 = false
|
||||
},
|
||||
handleChange (e) {
|
||||
@@ -161,12 +168,12 @@
|
||||
},
|
||||
async _checkStruct () {
|
||||
this.disabled = true
|
||||
if (!this.val1) {
|
||||
if (!this.index) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await checkStruct(this.val1)
|
||||
let res = await checkStruct(this.index)
|
||||
if (res.code === '200') {
|
||||
this.flag = res.data.flag
|
||||
uni.showToast({
|
||||
@@ -187,13 +194,13 @@
|
||||
},
|
||||
async _jbGetLtInfo () {
|
||||
this.disabled = true
|
||||
if (!this.val1) {
|
||||
if (!this.index) {
|
||||
this.disabled = false
|
||||
return
|
||||
}
|
||||
this.currentData = {}
|
||||
try {
|
||||
let res = await jbGetLtInfo(this.val1, this.val2)
|
||||
let res = await jbGetLtInfo(this.index, this.val2)
|
||||
if (res.code === '200') {
|
||||
this.currentData = res.data
|
||||
uni.showToast({
|
||||
@@ -213,12 +220,12 @@
|
||||
},
|
||||
async _jbEmptyTakeOut () {
|
||||
this.disabled3 = true
|
||||
if (!this.val1) {
|
||||
if (!this.index) {
|
||||
this.disabled3 = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await jbEmptyTakeOut(this.val1)
|
||||
let res = await jbEmptyTakeOut(this.index)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
@@ -238,12 +245,12 @@
|
||||
},
|
||||
async _confirmSet () {
|
||||
this.disabled2 = true
|
||||
if (!this.val1 || !this.val2 || this.flag === '2') {
|
||||
if (!this.index || !this.val2 || this.flag === '2') {
|
||||
this.disabled2 = false
|
||||
return
|
||||
}
|
||||
try {
|
||||
let res = await confirmSet(this.val1, this.val2)
|
||||
let res = await confirmSet(this.index, this.val2)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
|
||||
Reference in New Issue
Block a user