From 87a43199c4ad57e0fd2666633c4baccbe9d8518c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Jul 2025 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=93014=E3=80=81015?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/inmIn.vue  | 52 ++++++++++++++++++++++++++++---------
 src/views/wpm_bx/inmOut.vue |  6 ++---
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index bdb50cea..9c3f8583 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -80,10 +80,10 @@
 				<el-table-column
 					label="批次号"
 					prop="batch"
-					min-width="120"
+					min-width="150"
 				>
 					<template #default="scope">
-						<el-link @click="rowClick(scope.row)" type="primary">{{scope.row.batch}}</el-link>
+						<span @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -202,9 +202,20 @@
 		<el-drawer v-model="wprVisibleDrawer" :size="'70%'">
 			<template #header>
 				<h4>关联产品</h4>
+				<el-input
+					style="margin-right: 5px;width: 200px;"
+					v-model="wprsearch"
+					placeholder="编号"
+					clearable
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleWprQuery"
+				></el-button>
 			</template>
 			<template #default>
-				<scTable ref="wprTable" hidePagination :data="wprList">
+				<el-table ref="wprTable" id="wprTable" :height="wprTableHeight" hidePagination highlight-current-row border :data="wprList">
 					<el-table-column label="产品编号" prop="number" min-width="100px"></el-table-column>
 					<el-table-column label="记录数据" prop="oinfo">
 						<template #default="scope">
@@ -227,20 +238,20 @@
 						label="操作"
 						fixed="right"
 						align="center"
-						width="120"
+						width="200"
 					>
 						<template #default="scope">
-							<el-link :underline="false"  @click="QRCode(scope.row,'wpr')" type="primary" v-if="mgroupName=='毛坯检测后打码'">二维码</el-link>
-							<el-link :underline="false"  @click="printMaterial(scope.row,'wpr')" type="primary">打印标签</el-link>
+							<el-button v-if="mgroupName=='毛坯检测后打码'"  @click="QRCode(scope.row,'wpr')" type="success">二维码</el-button>
+							<el-button  @click="printMaterial(scope.row,'wpr')" type="primary">打印标签</el-button>
 						</template>
 					</el-table-column>
-				</scTable>
-			</template>
-			<template #footer>
-			<div style="flex: auto">
-				<el-button @click="wprVisibleDrawer=false">关闭</el-button>
-			</div>
+				</el-table>
 			</template>
+			<!-- <template #footer>
+				<div style="flex: auto">
+					<el-button @click="wprVisibleDrawer=false">关闭</el-button>
+				</div>
+			</template> -->
 		</el-drawer>
 		<el-drawer v-model="limitedWatch" title="工艺路线流程图" size="80%" @closeDialog="limitedWatch = false">
 			<scDegra
@@ -341,6 +352,8 @@ export default {
 				page:0,
 				wm: "" 
 			},
+			wprTableHeight: 500,
+			wprsearch:"",
 			route_code:"",
 			showBatch: "",
 			wmMaterial:'',
@@ -470,12 +483,27 @@ export default {
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},
+		handleWprQuery(){
+			let that = this;
+			that.wprList.forEach((item,index)=>{
+			    if(item.number.indexOf(that.wprsearch) > -1){
+					let rows = document.querySelectorAll("#wprTable .el-table__row");
+					let row = rows[index];
+					let rowTop = row.offsetTop;
+					this.$refs.wprTable.scrollTo({ top: rowTop });
+				}
+			})
+		},
 		showWpr(row){
 			let that = this;
 			that.ofrom_name = row.material_ofrom_name;
 			that.ofrom_batch = row.batch;
 			that.wprParams.wm = row.id;
 			that.wprVisibleDrawer = true;
+			that.$nextTick(() => {
+			    let heights = document.getElementsByClassName("el-drawer__body")[0].clientHeight;
+				that.wprTableHeight = heights-20;
+			})
 			this.$API.wpm.wpr.list.req(that.wprParams).then((res) => {
 			    that.wprList = res;
 			})
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index 8f22149d..140a4d64 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -55,7 +55,7 @@
 				<el-table-column
 					label="物料名称"
 					prop="material_name"
-					min-width="150"
+					min-width="120"
 				>
 					<template #default="scope">
 						{{ scope.row.material_name }}
@@ -81,10 +81,10 @@
 				<el-table-column
 					label="批次号"
 					prop="batch"
-					min-width="120"
+					min-width="150"
 				>
 					<template #default="scope">
-						<el-link @click="rowClick(scope.row)" type="primary">{{scope.row.batch}}</el-link>
+						<span @click="rowClick(scope.row)" style="color:#0052d9;font-weight: 600;cursor: pointer;">{{scope.row.batch}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column