This commit is contained in:
2024-08-09 13:53:23 +08:00
parent 03e0d44dd6
commit 615af3a957
8 changed files with 502 additions and 107 deletions

View File

@@ -58,7 +58,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {FormTypes, pmFormData} from '@/utils/mork2.js'
import {pmFormData2} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -67,8 +67,6 @@
data() {
return {
title: '',
options: [],
index: '',
val1: '',
dataList: [],
pkId: '',
@@ -87,26 +85,15 @@
},
onLoad (options) {
this.title = options.title
this._FormTypes()
},
methods: {
async _FormTypes () {
let res = await FormTypes()
this.options = [...res]
this.options.map(el => {
this.$set(el, 'text', el.lable)
})
},
selectChange (e) {
this.index = e
},
searchList () {
this.dataList = []
this.pageNum = 1
this._pmFormData()
},
async _pmFormData () {
let res = await pmFormData(this.pageNum + '', this.pageSize + '', this.val1, this.index)
let res = await pmFormData2(this.pageNum + '', this.pageSize + '', 'Picking', '10', this.val1)
if (res.code === '200') {
this.totalCount = res.totalElements
if (res.totalElements > 0) {
@@ -134,7 +121,6 @@
}
},
toEmpty () {
this.index = ''
this.val1 = ''
this.dataList = []
this.pageNum = 1
@@ -147,7 +133,7 @@
},
toSure () {
if (this.pkId) {
this.$store.dispatch('setPublicArr', [this.pkObj])
this.$store.dispatch('setPublicObj', this.pkObj)
uni.navigateBack()
}
}

View File

@@ -9,80 +9,110 @@
<span class="filter_label">拣选单据</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" @click="toJump">
<input type="text" class="filter_input" @click="toJump" v-model="data.code">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">返回时间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">料箱编码</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选仓库</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.vehicle_code">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选载具</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">车间</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">车间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.product_area">
</view>
</view>
<view class="zd-row">
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">拣选站台</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选仓库</span>
</view>
<view class="zd-col-12">
<view class="zd-row border-bottom">
<view class="zd-col-10">
<span class="filter_label">创建时间</span>
</view>
<view class="zd-col-14">
<input type="text" class="filter_input">
</view>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.stor_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选站台</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.point_code">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料名称</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_name">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">物料数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">拣选数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.assign_qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移出料箱</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.out_pick_vehicle">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移出数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.out_qty">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">是否人工搬运</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.is_move">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移入料箱</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.in_pick_vehicle">
</view>
</view>
<view class="zd-row border-bottom">
<view class="zd-col-7">
<span class="filter_label">移入数量</span>
</view>
<view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.in_qty">
</view>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
<button class="zd-col-15 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(data) === '{}'}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
</view>
</view>
</template>
@@ -90,7 +120,7 @@
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {ioStorageOut} from '@/utils/getData2.js'
import {savePickTask} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -98,14 +128,17 @@
},
data() {
return {
code: '',
data: {},
disabled: false
};
},
onLoad (options) {
this.title = options.title
},
created () {
onShow() {
if (this.$store.getters.publicObj !== '') {
this.data = this.$store.getters.publicObj
}
},
methods: {
toJump () {
@@ -114,17 +147,17 @@
})
},
clearUp () {
this.code = ''
this.data = {}
this.disabled = false
},
async _ioStorageOut () {
async _savePickTask () {
this.disabled = true
if (!this.code) {
if (JSON.stringify(this.data) === '{}') {
this.disabled = false
return
}
try {
let res = await ioStorageOut(this.code)
let res = await savePickTask(this.data)
if (res.code === '200') {
uni.showToast({
title: res.msg,