开合盖

pages.json

@@ -167,6 +167,13 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/finished/CheckToStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
         ,{
             "path" : "pages/SecondPhase/finished/abnorToStore",
             "style" :                                                                                    

pages/SecondPhase/finished/CheckToStore.vue

@@ -0,0 +1,96 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="盘点入库"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.box-no')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.pallet-number')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.point-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val3" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.warehousing')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import { confirmAction } from '@/utils/utils.js'
+	import {inventoryCheckIn} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async handleConfirm() {
+				if (!this.val1 || !this.val2 || !this.val3) {
+					return
+				}
+				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
+				if (isConfirmed) {
+					this._inventoryCheckIn()
+				}
+			},
+			async _inventoryCheckIn () {
+				this.disabled = true
+				try {
+					let res = await inventoryCheckIn(this.val1, this.val2, this.val3)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.disabled = false
+					this.clearUp()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+			}
+		}
+	}
+</script>

pages/SecondPhase/finished/abnorToStore.vue

@@ -10,6 +10,12 @@
 						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label">{{$t('filter.is_un_cap')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
 				<view class="filter_item is-required">
 					<view class="filter_label_wraper">
 						<span class="filter_label">{{$t('filter.box-no')}}</span>
@@ -38,7 +44,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !val1 || !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.warehousing')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index || !index2 || !val1 || !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.warehousing')}}</button>
 		</view>
 	</view>
 </template>
@@ -58,6 +64,8 @@
 				title: '',
 				options: [{value: '1', text: this.$t('select.return-inspection-warehousing')}, {value: '2', text: this.$t('select.recut-warehousing')}, {value: '0001', text: this.$t('select.production-warehousing')}, {value: '0009', text: this.$t('select.manual-warehousing')}],
 				index: '',
+				options2: [{value: '1', text: this.$t('select.yes')}, {value: '0', text: this.$t('select.no')}],
+				index2: '',
 				val1: '',
 				val2: '',
 				val3: '',
@@ -71,8 +79,11 @@
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
 			async handleConfirm() {
-				if (!this.index || !this.val1 || !this.val2 || !this.val3) {
+				if (!this.index || !this.index2 || !this.val1 || !this.val2 || !this.val3) {
 					return
 				}
 				const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation'))
@@ -83,7 +94,7 @@
 			async _twoPdaReback () {
 				this.disabled = true
 				try {
-					let res = await twoPdaReback(this.index, this.val1, this.val2, this.val3)
+					let res = await twoPdaReback(this.index, this.index2, this.val1, this.val2, this.val3)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -96,6 +107,7 @@
 			},
 			clearUp () {
 				this.index = ''
+				this.index2 = ''
 				this.val1 = ''
 				this.val2 = ''
 				this.val3 = ''