change

pages.json

@@ -485,6 +485,13 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/zw/wl-groupplate",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/home/home.vue

@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶出入', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]},
-					{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: '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: 'RF07', sonTree: [{title: '人工叫料', path: '/pages/zw/manual-callmater'}, {title: '人工退料', path: '/pages/zw/manual-returnmater'}]},
 					// {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
 					// {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},

pages/zw/wl-groupplate.vue

@@ -0,0 +1,159 @@
+<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-7">
+						<span class="filter_label">源单编码</span>
+					</view>
+					<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">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料信息</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.material_name" @tap="toJump">
+					</view>
+				</view>
+				<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.material_name" disabled>
+					</view>
+				</view>
+				<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.material_spec" disabled>
+					</view>
+				</view>
+				<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.material_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="currentData.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-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}' || !val1}" :disabled="disabled" @tap="_groupPlate">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {regionList, groupPlate} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow() {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+			}
+		},
+		created () {
+			this._regionList()
+		},
+		methods: {
+			async _regionList () {
+				try {
+					let res = await regionList()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options = []
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.currentData = {}
+				this.disabled = false
+			},
+			async _groupPlate () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}' || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					this.currentData.stor_code = this.index
+					let arr = [
+						{
+							material_id: this.currentData.material_id,
+							qty: this.currentData.qty,
+							pcsn: this.currentData.pcsn,
+						}
+					]
+					let res = await groupPlate(arr, this.val1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>

utils/getData4.js

@@ -40,10 +40,10 @@ export const getMaterialList = (search, page, size) => request({
 
 // 入库管理
 // 物料组盘确认
-export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({
+// export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({
-	url:'api/pda/iosIn/groupPlate',
+// 	url:'api/pda/iosIn/groupPlate',
-	data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode}
+// 	data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode}
-})
+// })
 // 组盘入库确认
 export const confirmIn = (vcode, sitecode, sid) => request({
 	url:'api/pda/iosIn/confirmIn',
@@ -251,3 +251,9 @@ export const updatePointType = (code, type) => request({
 	url:'api/schBasePoint/updatePointType',
 	data: {point_code: code, point_type: type}
 })
+
+// 组盘入库
+export const groupPlate = (mid, pcsn, qty, vcode, ecode) => request({
+	url:'api/pda/iosIn/groupPlate',
+	data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode}
+})