合格证入库

pages.json

@@ -240,6 +240,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/entry/qualified-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/entry/group-to-store.vue

@@ -31,6 +31,14 @@
 					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
 					<view class="zd-col-16"><span class="filter_input">{{currentData.MONumber}}</span></view>
 				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">组织</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">货主</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
+				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
 					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
 					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
@@ -50,17 +58,9 @@
 				<view class="zd-row border-bottom">
 					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
 					<view class="zd-col-16">
-						<input type="number" class="filter_input" v-model="currentData.qty">
+						<input type="number" class="filter_input" v-model="val3">
 					</view>
 				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">组织</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">货主</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
-				</view>
 				<view class="zd-row">
 					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
 					<view class="zd-col-16 filter_select">
@@ -71,7 +71,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': !val1 || !val2 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -90,6 +90,7 @@
 				title: '',
 				val1: '',
 				val2: '',
+				val3: '',
 				currentData: {},
 				options: [],
 				index: '',
@@ -116,22 +117,26 @@
 			async _getCertificateInfo (e) {
 				let res = await getCertificateInfo(e)
 				this.currentData = res
+				if (JSON.stringify(this.currentData) !== '{}') {
+					this.val3 = this.currentData.qty
+				}
 			},
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
+				this.val3 = ''
 				this.currentData = {}
 				this.index = ''
 				this.disabled = false
 			},
 			async _inStorageConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
+				if (!this.val2 || !this.val3 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index})
+					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3})
 					let res = await inStorageConfirm(obj)
 					if (res.code === '200') {
 						this.toEmpty()

pages/entry/qualified-to-store.vue

@@ -0,0 +1,170 @@
+<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"
+						@handleChange="handleChange1"
+						/>
+					</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">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.MONumber}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">组织</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">货主</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">单位</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">单重</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="currentData.single_weight">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">批次</span></view>
+					<view class="zd-col-16">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</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': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		methods: {
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			handleChange1 (e) {
+				this._getCertificateInfo(e)
+			},
+			async _getCertificateInfo (e) {
+				let res = await getCertificateInfo(e)
+				this.currentData = res
+				if (JSON.stringify(this.currentData) !== '{}') {
+					this.val3 = this.currentData.qty
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.val2 || !this.val3 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3})
+					let res = await inStorageConfirm(obj)
+					if (res.code === '200') {
+						this.toEmpty()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/home/home.vue

@@ -41,7 +41,7 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '单据入库', path: '/pages/entry/group-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-out-store'}]},
 					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', active: false, path: '/pages/in/store-info'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},

utils/getData2.js

@@ -28,6 +28,13 @@ export const storList = () => request({
 	url:'api/pda/common/storList',
 	data: {}
 })
+// export const storList = () => {
+// 	let res = {
+// 		code: '200',
+// 		content: [{value: '1', label: 'aaaa'}]
+// 	}
+// 	return res
+// }
 export const groupMaterList = (page, size, search) => request({
 	url:'api/groupMater/maters',
 	data: {page: page, size: size, search: search}
@@ -229,7 +236,9 @@ export const getCertificateInfo = (id) => request({
 // 		unit_name: 'unit_name',
 // 		qty: '100',
 // 		StockOrgId: 'StockOrgId',
-// 		OwnerId_Id: 'OwnerId_Id'
+// 		OwnerId_Id: 'OwnerId_Id',
+// 		single_weight: '500',
+// 		pcsn: 'pcsn'
 // 	}
 // 	return res
 // }