From 50aed63ff2436a50fd72e23a665a3da84ca7d5b5 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 13 Dec 2022 17:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/SlittingFeeding.vue | 19 ++++++++++++++++---
 utils/getData2.js                       |  5 +++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 56637c3..c804e0e 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -19,6 +19,16 @@
 						/>
 					</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="val2"
+						/>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -26,12 +36,13 @@
 						<thead>
 							<tr>
 								<th>序号</th>
-								<th>订单号</th>
+								<th>母卷号</th>
 								<th>子卷号</th>
 								<th>机台编号</th>
 								<th>分切组</th>
 								<th>生产顺序</th>
 								<th>生产日期</th>
+								<th>订单号</th>
 								<th>纸筒/FRP管</th>
 								<th>纸筒物料编码</th>
 								<th>纸筒物料描述</th>
@@ -44,12 +55,13 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{Number(i) + 1}}</td>
-								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.source_container_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
 								<td>{{e.manufacture_sort}}</td>
 								<td>{{e.manufacture_date}}</td>
+								<td>{{e.mfg_order_name}}</td>
 								<td>{{e.paper_tube_or_FRP}}</td>
 								<td>{{e.paper_tube_material}}</td>
 								<td>{{e.paper_tube_description}}</td>
@@ -83,6 +95,7 @@
 		data() {
 			return {
 				val1: '',
+				val2: '',
 				options: [],
 				index: '',
 				dataList: [],
@@ -121,7 +134,7 @@
 			},
 			/** 初始化查询 */
 			async _feedingQueryMaterialInfo () {
-				let res = await feedingQueryMaterialInfo(this.index, this.val1, this.pageNum + '', this.pageSize + '')
+				let res = await feedingQueryMaterialInfo(this.index, this.val1, this.val2, this.pageNum + '', this.pageSize + '')
 				this.totalCount = res.size
 				if (res.size > 0) {
 					const dataMap = res.data
diff --git a/utils/getData2.js b/utils/getData2.js
index 5620f00..c664f2d 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -345,11 +345,12 @@ export const virtualprintType = (url) => request1({
  * 分切上料
  */
 // 1.1分切计划初始化查询
-export const feedingQueryMaterialInfo = (area, code, page, size) => request({
+export const feedingQueryMaterialInfo = (area, dcode, sname, page, size) => request({
 	url:'api/pda/feeding/queryMaterialInfo',
 	data: {
 		product_area: area,
-		point_code: code,
+		device_code: dcode,
+		source_container_name: sname,
 		page: page,
 		size: size
 	}