add 二楼生产出库\二楼取货确认\二楼货架绑定
This commit is contained in:
24
pages.json
24
pages.json
@@ -274,6 +274,30 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
,{
|
||||||
|
"path" : "pages/outbound/produce-out-store-2nd",
|
||||||
|
"style" :
|
||||||
|
{
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
,{
|
||||||
|
"path" : "pages/outbound/pick-confirm-2nd",
|
||||||
|
"style" :
|
||||||
|
{
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
,{
|
||||||
|
"path" : "pages/outbound/shelf-bind-2nd",
|
||||||
|
"style" :
|
||||||
|
{
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
],
|
],
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
// "pageOrientation": "landscape",
|
// "pageOrientation": "landscape",
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
],
|
],
|
||||||
menuList: [
|
menuList: [
|
||||||
{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
|
{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
|
||||||
{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}]},
|
{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}, {title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
|
||||||
{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
|
{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
|
||||||
{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
|
{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
|
||||||
{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]}
|
{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]}
|
||||||
|
|||||||
@@ -181,6 +181,10 @@
|
|||||||
try {
|
try {
|
||||||
let res = await outStorageConfirm(obj)
|
let res = await outStorageConfirm(obj)
|
||||||
if (res.code === '200') {
|
if (res.code === '200') {
|
||||||
|
uni.showToast({
|
||||||
|
title: res.msg,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
this.toEmpty()
|
this.toEmpty()
|
||||||
}
|
}
|
||||||
this.disabled = false
|
this.disabled = false
|
||||||
|
|||||||
84
pages/outbound/pick-confirm-2nd.vue
Normal file
84
pages/outbound/pick-confirm-2nd.vue
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
<template>
|
||||||
|
<view class="zd_container">
|
||||||
|
<!-- 二楼取货确认 -->
|
||||||
|
<nav-bar :title="title"></nav-bar>
|
||||||
|
<view class="zd_content">
|
||||||
|
<view class="zd_wrapper">
|
||||||
|
<view class="zd-row border-bottom">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">产线站点编号</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val1"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">货架编号</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val2"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row submit-bar">
|
||||||
|
<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
|
||||||
|
<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_takeConfirm">扫码取货确认</button>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import NavBar from '@/components/NavBar.vue'
|
||||||
|
import SearchBox from '@/components/SearchBox.vue'
|
||||||
|
import {takeConfirm} from '@/utils/getData2.js'
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
NavBar,
|
||||||
|
SearchBox
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
title: '',
|
||||||
|
val1: '',
|
||||||
|
val2: '',
|
||||||
|
disabled: false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
onLoad (options) {
|
||||||
|
this.title = options.title
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
toEmpty () {
|
||||||
|
this.val1 = ''
|
||||||
|
this.val2 = ''
|
||||||
|
this.disabled = false
|
||||||
|
},
|
||||||
|
async _takeConfirm () {
|
||||||
|
this.disabled = true
|
||||||
|
if (!this.val1 || !this.val2) {
|
||||||
|
this.disabled = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
let res = await takeConfirm(this.val1, this.val2)
|
||||||
|
if (res.code === '200') {
|
||||||
|
this.toEmpty()
|
||||||
|
}
|
||||||
|
this.disabled = false
|
||||||
|
uni.showToast({
|
||||||
|
title: res.msg,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
this.disabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
141
pages/outbound/produce-out-store-2nd.vue
Normal file
141
pages/outbound/produce-out-store-2nd.vue
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
<template>
|
||||||
|
<view class="zd_container">
|
||||||
|
<!-- 二楼生产出库 -->
|
||||||
|
<nav-bar :title="title"></nav-bar>
|
||||||
|
<view class="zd_content">
|
||||||
|
<view class="zd_wrapper">
|
||||||
|
<view class="zd-row border-bottom">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">产线站点编号</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val1"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">单据编码</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val2"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd_wrapper grid-wraper">
|
||||||
|
<view class="slide_new">
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>选择</th>
|
||||||
|
<th class="td_3"><view class="td_3">物料名称</view></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 class="td_3">{{e.material_name}}</td>
|
||||||
|
<td>{{e.material_code}}</td>
|
||||||
|
<td>{{e.qty}}</td>
|
||||||
|
<td>{{e.pcsn}}</td>
|
||||||
|
<td>{{e.unit_id}}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row submit-bar">
|
||||||
|
<button class="zd-col-6 button-primary" @tap="_getCtuOrderList">查询</button>
|
||||||
|
<button class="zd-col-16 button-primary" :class="{'button-info': checkData.length === 0}" :disabled="disabled" @tap="_ctuOutConfirm">确认</button>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import NavBar from '@/components/NavBar.vue'
|
||||||
|
import SearchBox from '@/components/SearchBox.vue'
|
||||||
|
import {getCtuOrderList, ctuOutConfirm} from '@/utils/getData2.js'
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
NavBar,
|
||||||
|
SearchBox
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
title: '',
|
||||||
|
val1: '',
|
||||||
|
val2: '',
|
||||||
|
dataList: [],
|
||||||
|
disabled: false,
|
||||||
|
checkData: []
|
||||||
|
};
|
||||||
|
},
|
||||||
|
onLoad (options) {
|
||||||
|
this.title = options.title
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
async _getCtuOrderList () {
|
||||||
|
try {
|
||||||
|
let res = await getCtuOrderList(this.val1, this.val2)
|
||||||
|
if (res.code === '200') {
|
||||||
|
this.checkData = []
|
||||||
|
if (res.content.length > 0) {
|
||||||
|
this.dataList = [...res.content]
|
||||||
|
this.dataList.map(el => {
|
||||||
|
this.$set(el, 'checked', false)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
uni.showToast({
|
||||||
|
title: res.msg,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
toCheck (e) {
|
||||||
|
e.checked = !e.checked
|
||||||
|
let arr = this.dataList.filter(el => el.checked === true)
|
||||||
|
if (arr.length > 9) {
|
||||||
|
uni.showToast({
|
||||||
|
title: '最多只能选择9个物料',
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
e.checked = false
|
||||||
|
arr = this.dataList.filter(el => el.checked === true)
|
||||||
|
}
|
||||||
|
this.checkData = arr
|
||||||
|
},
|
||||||
|
async _ctuOutConfirm () {
|
||||||
|
this.disabled = true
|
||||||
|
if (this.checkData.length === 0) {
|
||||||
|
this.disabled = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
let res = await ctuOutConfirm(this.val1, this.val2, this.checkData)
|
||||||
|
if (res.code === '200') {
|
||||||
|
this._getCtuOrderList()
|
||||||
|
}
|
||||||
|
this.disabled = false
|
||||||
|
uni.showToast({
|
||||||
|
title: res.msg,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
this.disabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
88
pages/outbound/shelf-bind-2nd.vue
Normal file
88
pages/outbound/shelf-bind-2nd.vue
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
<template>
|
||||||
|
<view class="zd_container">
|
||||||
|
<!-- 二楼货架绑定 -->
|
||||||
|
<nav-bar :title="title"></nav-bar>
|
||||||
|
<view class="zd_content">
|
||||||
|
<view class="zd_wrapper">
|
||||||
|
<view class="zd-row border-bottom">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">地面站点编号</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val1"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row">
|
||||||
|
<view class="zd-col-8">
|
||||||
|
<span class="filter_label">货架编号</span>
|
||||||
|
</view>
|
||||||
|
<view class="zd-col-16">
|
||||||
|
<search-box
|
||||||
|
v-model="val2"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="zd-row submit-bar">
|
||||||
|
<button class="zd-col-5 button-primary" @tap="toEmpty">清空</button>
|
||||||
|
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">绑定</button>
|
||||||
|
<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">解绑</button>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import NavBar from '@/components/NavBar.vue'
|
||||||
|
import SearchBox from '@/components/SearchBox.vue'
|
||||||
|
import {bindOrUnbind} from '@/utils/getData2.js'
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
NavBar,
|
||||||
|
SearchBox
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
title: '',
|
||||||
|
val1: '',
|
||||||
|
val2: '',
|
||||||
|
disabled: false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
onLoad (options) {
|
||||||
|
this.title = options.title
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
toEmpty () {
|
||||||
|
this.val1 = ''
|
||||||
|
this.val2 = ''
|
||||||
|
this.disabled = false
|
||||||
|
},
|
||||||
|
toSure (type) {
|
||||||
|
this.disabled = true
|
||||||
|
if (!this.val1 || !this.val2) {
|
||||||
|
this.disabled = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this._bindOrUnbind(type)
|
||||||
|
},
|
||||||
|
async _bindOrUnbind (type) {
|
||||||
|
try {
|
||||||
|
let res = await bindOrUnbind(this.val1, this.val2, type)
|
||||||
|
if (res.code === '200') {
|
||||||
|
this.toEmpty()
|
||||||
|
}
|
||||||
|
this.disabled = false
|
||||||
|
uni.showToast({
|
||||||
|
title: res.msg,
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
} catch (e) {
|
||||||
|
this.disabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -219,3 +219,30 @@ export const outStorageMaterConfirm = (obj) => request({
|
|||||||
url:'api/pda/outStorage/materConfirm',
|
url:'api/pda/outStorage/materConfirm',
|
||||||
data: obj
|
data: obj
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 二楼生产出库
|
||||||
|
*/
|
||||||
|
export const getCtuOrderList = (scode, bcode) => request({
|
||||||
|
url:'api/pda/outStorage/getCtuOrderList?site_code=' + scode + '&bill_code=' + bcode,
|
||||||
|
method: 'GET'
|
||||||
|
})
|
||||||
|
export const ctuOutConfirm = (scode, bcode, arr) => request({
|
||||||
|
url:'api/pda/outStorage/ctuOutConfirm',
|
||||||
|
data: {site_code: scode, bill_code: bcode, form_data: arr}
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 二楼取货确认
|
||||||
|
*/
|
||||||
|
export const takeConfirm = (scode, bcode) => request({
|
||||||
|
url:'api/pda/outStorage/takeConfirm',
|
||||||
|
data: {site_code: scode, shelf_code: bcode}
|
||||||
|
})
|
||||||
|
/**
|
||||||
|
* 二楼货架绑定
|
||||||
|
*/
|
||||||
|
export const bindOrUnbind = (scode, bcode, mode) => request({
|
||||||
|
url:'api/point/bindOrUnbind',
|
||||||
|
data: {site_code: scode, shelf_code: bcode, mode: mode}
|
||||||
|
})
|
||||||
@@ -237,3 +237,17 @@ export const structattrPage = () => {
|
|||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
export const getCtuOrderList = () => {
|
||||||
|
let res = {
|
||||||
|
"code": "200",
|
||||||
|
content: [{material_name: '1'}, {material_name: '2'}, {material_name: '3'}, {material_name: '4'}, {material_name: '5'}, {material_name: '6'}, {material_name: '7'}, {material_name: '8'}, {material_name: '9'}, {material_name: '10'}, {material_name: '11'}, {material_name: '12'}]
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
export const ctuOutConfirm = () => {
|
||||||
|
let res = {
|
||||||
|
"code": "200",
|
||||||
|
msg: 'ok'
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user