From 5adbbb8debe4cf0cad6ff6bcaeabdb3979bb1871 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Jun 2026 11:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/General/material.vue      |  2 ++
 pages/General/warehouse-box.vue | 52 ++++++++++++++++++++-------------
 utils/mork2.js                  |  3 +-
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/pages/General/material.vue b/pages/General/material.vue
index 311804d..305bd59 100644
--- a/pages/General/material.vue
+++ b/pages/General/material.vue
@@ -22,6 +22,7 @@
 								<th>物料编码</th>
 								<th>物料名称</th>
 								<th>物料规格</th>
+								<th>是否压容</th>
 								<th>型号</th>
 								<th>有效期(天)</th>
 								<th>执行标准</th>
@@ -32,6 +33,7 @@
 								<td>{{e.material_code}}</td>
 								<td>{{e.material_name}}</td>
 								<td>{{e.material_spec}}</td>
+								<td>{{e.material_type ? ['压容', '非压容'][Number(e.material_type)] : ''}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.quality_time}}</td>
 								<td>{{e.execution_stand}}</td>
diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index 6523cf5..8f2ddce 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -131,7 +131,10 @@
 						<span class="filter_label">执行标准</span>
 					</view>
 					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index3" :localdata="options3"></uni-data-select>
+						<!-- <uni-data-select v-model="index3" :localdata="options3"></uni-data-select> -->
+						<view class="filter_input filter_input_disabled" style="line-height: 80rpx;">
+							{{ materialData.execution_stand }}
+						</view>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -139,7 +142,10 @@
 						<span class="filter_label">是否压容</span>
 					</view>
 					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index4" :localdata="options4"></uni-data-select>
+						<!-- <uni-data-select v-model="index4" :localdata="options4"></uni-data-select> -->
+						<view class="filter_input filter_input_disabled" style="line-height: 80rpx;">
+							{{ materialTypeText }}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -196,10 +202,10 @@
 				index1: '',
 				options2: [],
 				index2: '',
-				options3: [],
-				index3: '',
-				options4: [{text:'压容', value: '0'}, {text:'非压容', value: '1'}],
-				index4: '',
+				// options3: [],
+				// index3: '',
+				// options4: [{text:'压容', value: '0'}, {text:'非压容', value: '1'}],
+				// index4: '',
 				boxType: null,
 				materialData: {},
 				suppData: {},
@@ -223,6 +229,12 @@
 			},
 			endDate() {
 				return getDate('end');
+			},
+			materialTypeText() {
+				const type = this.materialData.material_type;
+				if (type === '0') return '压容';
+				if (type === '1') return '非压容';
+				return '';
 			}
 		},
 		onLoad (options) {
@@ -230,7 +242,7 @@
 			this._queryGroupQuality()
 			this._queryPcsn()
 			this._queryDevice()
-			this._queryExecution()
+			// this._queryExecution()
 		},
 		onShow () {
 			if (this.$store.getters.publicObj !== '') {
@@ -325,18 +337,18 @@
 				}
 			},
 			/** 执行标准下拉框*/
-			async _queryExecution () {
-				try {
-					let res = await queryExecution()
-					if (res && res.data) {
-						this.options3 = [...res.data]
-					} else {
-						this.options3 = []
-					}
-				} catch (e) {
-					this.options3 = []
-				}
-			},
+			// async _queryExecution () {
+			// 	try {
+			// 		let res = await queryExecution()
+			// 		if (res && res.data) {
+			// 			this.options3 = [...res.data]
+			// 		} else {
+			// 			this.options3 = []
+			// 		}
+			// 	} catch (e) {
+			// 		this.options3 = []
+			// 	}
+			// },
 			toEmpty () {
 				this.vehicleCode = ''
 				this.date = currentDate
@@ -355,7 +367,7 @@
 					return
 				}
 				try {
-					let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num, this.index2, this.index3, this.index4)
+					let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num, this.index2, this.materialData.execution_stand, this.materialData.material_type)
 					if (res) {
 						uni.showToast({
 							title: res.message,
diff --git a/utils/mork2.js b/utils/mork2.js
index d74617c..cab21c7 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -61,7 +61,8 @@ export const queryMaterial = (code) => {
 				material_spec: 'material_spec',
 				material_model: 'material_model',
 				execution_stand: 'execution_stand',
-				quality_time: 'quality_time'
+				quality_time: 'quality_time',
+				material_type: '0'
 			}
 		]
 	}