From c48a4b471af03e3d664d70b9e6a4059300eb6b18 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 28 Oct 2025 17:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=9B=98=E5=85=A5=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json        |  4 +++-
 locale/vi.json        |  4 +++-
 locale/zh-Hans.json   |  4 +++-
 pages/manage/zprk.vue | 45 ++++++++++++++++++++++++++++++++++++-------
 utils/getData.js      |  8 ++++++--
 5 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 36b04bd..8a8553f 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -73,7 +73,9 @@
 		"Keyword": "Keyword",
 		"Pointlocation": "Point location",
 		"Pointlocationcarrier": "Point - location carrier",
-		"Unitmeasurement": "Unit of measurement"
+		"Unitmeasurement": "Unit of measurement",
+		"WarehousingType": "Warehousing Type",
+		"MaterialQRCode": "Material QR Code"
 	},
 	"th": {
 		"MaterialBoxNumber": "Material Box Number",
diff --git a/locale/vi.json b/locale/vi.json
index f67e66b..20afbd9 100644
--- a/locale/vi.json
+++ b/locale/vi.json
@@ -73,7 +73,9 @@
         "Keyword": "Từ khóa",
         "Pointlocation": "Điểm",
         "Pointlocationcarrier": "Vật chở tại điểm",
-		"Unitmeasurement": "Đơn vị đo"
+		"Unitmeasurement": "Đơn vị đo",
+		"WarehousingType": "Loại nhập kho",
+		"MaterialQRCode": "Mã QR vật liệu"
     },
     "th": {
         "MaterialBoxNumber": "Số hộp vật liệu",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 24dbb8f..5a0269e 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -73,7 +73,9 @@
 		"Keyword": "关键字",
 		"Pointlocation": "点位",
 		"Pointlocationcarrier": "点位载具",
-		"Unitmeasurement": "计量单位"
+		"Unitmeasurement": "计量单位",
+		"WarehousingType": "入库类型",
+		"MaterialQRCode": "物料二维码"
 	},
 	"th": {
 		"MaterialBoxNumber": "料框号",
diff --git a/pages/manage/zprk.vue b/pages/manage/zprk.vue
index a261d2e..56596aa 100644
--- a/pages/manage/zprk.vue
+++ b/pages/manage/zprk.vue
@@ -29,6 +29,18 @@
 						<uni-data-select :placeholder="$t('utils.selectPlaceholder')" :emptyTips="$t('utils.selectEmptyTips')" v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
+				<view class="is-required">
+					<view class="filter_label">{{$t('label.WarehousingType')}}</view>
+					<view class="filter_select">
+						<uni-data-select :placeholder="$t('utils.selectPlaceholder')" :emptyTips="$t('utils.selectEmptyTips')" v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view>
+					<view class="filter_label">{{$t('label.MaterialQRCode')}}</view>
+					<search-box
+					v-model="qrcode"
+					/>
+				</view>
 				<view>
 					<view class="filter_label">{{$t('label.MaterialName')}}</view>
 					<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
@@ -70,7 +82,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_confirmIn">{{$t('button.confirm')}}</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index || !index1}" :disabled="disabled" @tap="_confirmIn">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -78,7 +90,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, getVehicleMaterial, confirmIn} from '@/utils/getData.js'
+	import {getSect, getVehicleMaterial, confirmIn, dictDetail} from '@/utils/getData.js'
 	export default {
 		components: {
 			NavBar,
@@ -91,6 +103,9 @@
 				val2: '',
 				options: [],
 				index: '',
+				options1: [],
+				index1: '',
+				qrcode: '',
 				disabled: false,
 				currentData: {},
 				dataList: []
@@ -98,16 +113,15 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-		},
-		created () {
 			this._getSect()
+			this._dictDetail()
 		},
 		methods: {
 			async _getSect () {
 				try {
 					let res = await getSect()
 					if (res) {
-						this.options = res
+						this.options = [...res]
 					} else {
 						this.options =[]
 					}
@@ -115,9 +129,24 @@
 					this.options = []
 				}
 			},
+			async _dictDetail () {
+				try {
+					let res = await dictDetail('ST_INV_IN_TYPE')
+					if (res && res.code === '200') {
+						this.options1 = [...res.content]
+					} else {
+						this.options1 =[]
+					}
+				} catch (e) {
+					this.options1 = []
+				}
+			},
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
 			handleChange (e) {
 				if (e) {
 					this._getVehicleMaterial(e)
@@ -142,18 +171,20 @@
 				this.val1 = ''
 				this.val2 = ''
 				this.index = ''
+				this.index1 = ''
+				this.qrcode = ''
 				this.disabled = false
 				this.currentData = {}
 				this.dataList = []
 			},
 			async _confirmIn () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
+				if (!this.val1 || !this.val2 || !this.index || !this.index1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await confirmIn(this.val1, this.val2, this.index)
+					let res = await confirmIn(this.val1, this.val2, this.index, this.index1, this.qrcode)
 					if (res.status === '200') {
 						this.clearUp()
 					}
diff --git a/utils/getData.js b/utils/getData.js
index 882bc0e..bf1df93 100644
--- a/utils/getData.js
+++ b/utils/getData.js
@@ -60,9 +60,9 @@ export const getVehicleMaterial = (search) => request({
 	url:'api/pda/iosIn/getVehicleMaterial',
 	data: {search: search}
 })
-export const confirmIn = (vcode, sitecode, sid) => request({
+export const confirmIn = (vcode, sitecode, sid, type, barcode) => request({
 	url:'api/pda/iosIn/confirmIn',
-	data: {vehicle_code: vcode,  site_code: sitecode, sect_id: sid}
+	data: {vehicle_code: vcode,  site_code: sitecode, sect_id: sid, in_type: type, barcode: barcode}
 })
 
 // 人工叫料
@@ -132,4 +132,8 @@ export const addTaskV2 = (Value, point1, point2) => request({
 			}
 		]
 	}
+})
+export const dictDetail = (code) => request({
+	url:'api/dict/dictDetail?code=' + code + '&page=0&size=9999',
+	method: 'GET'
 })
\ No newline at end of file