From cdc86356f2030a4a556ede9da7b2cdc2fe17f2e3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 1 Nov 2022 14:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=B7=E5=A5=97=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/ZjCasing.vue | 24 +++++++++++++++++++++++-
 utils/getData2.js                |  6 ++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index c0723ae..152eb4c 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -29,6 +29,26 @@
 						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val4"
+						/>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -95,6 +115,8 @@
 			return {
 				val1: '',
 				val2: '',
+				val3: '',
+				val4: '',
 				options: [],
 				index: '',
 				qty: '',
@@ -119,7 +141,7 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo2(this.val1, this.index)
+				let res = await queryMaterialInfo2(this.val1, this.index, this.val3, this.val4)
 				res.data.map(el => {
 					this.$set(el, 'checked', false)
 				})
diff --git a/utils/getData2.js b/utils/getData2.js
index 2451c62..a4b96ef 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -33,11 +33,13 @@ export const emptyConfirm = (jo, qty, code, option) => request({
  * 子卷套管
  */
 // 1.1分切计划初始化查询
-export const queryMaterialInfo2 = (code, area) => request({
+export const queryMaterialInfo2 = (code, area, device, name) => request({
 	url:'api/pda/casing/queryMaterialInfo',
 	data: {
 		point_code: code,
-		product_area: area
+		product_area: area,
+		device_code: device,
+		container_name: name
 	}
 })
 // 1.2套轴确认