From 88f1ea7af7d970f35d0ea0ab68428790a1fe7e97 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 14 Jan 2025 14:16:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mio_form.vue        | 13 ++++++-------
 src/views/wpm_bx/inm.vue          |  5 +----
 src/views/wpm_bx/mlog_detail.vue  |  7 ++++---
 src/views/wpm_bx/mlogb_form.vue   |  2 +-
 src/views/wpm_bx/mlogbw_check.vue |  4 +++-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/inm/mio_form.vue b/src/views/inm/mio_form.vue
index 976ccc28..88965f1e 100644
--- a/src/views/inm/mio_form.vue
+++ b/src/views/inm/mio_form.vue
@@ -102,7 +102,7 @@
 					v-model="form.belong_dept"
 					clearable
 					style="width: 100%"
-					@change="deptChange"
+					@change="getgetDeptUsers"
 				>
 					<el-option
 						v-for="item in deptOptions"
@@ -228,6 +228,7 @@ export default {
 				this.getDeptOptions();
 				this.getDeptUser();
 				this.getmgroupOptions();
+				this.getgetDeptUsers();
 			} else if (type == "other_in") {
 				this.getSupplierOptions();
 			} else if (type == "other_out") {
@@ -270,12 +271,10 @@ export default {
 					this.orderOptions = res;
 				});
 		},
-		deptChange(val) {
-			this.$API.system.user.list
-				.req({ depts: val, page: 0 })
-				.then((res) => {
-					this.userOptions = res;
-				});
+		getgetDeptUsers(){
+			this.$API.system.user.list.req({ depts: this.form.belong_dept, page: 0 }).then((res) => {
+				this.userOptions = res;
+			});
 		},
 		getDeptUser() {
 			this.$API.system.user.list
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index 48c3e8f5..234760f7 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -113,7 +113,7 @@
 					<template #default="scope">
 						<el-link :underline="false"  @click="printMaterial(scope.row,'wm')" type="primary">物料标签</el-link>
 						<el-link 
-							v-if="scope.row.material_&&scope.row.material_.tracking==10"
+							v-if="scope.row.material_&&scope.row.material_.tracking==10&&scope.row.state!==20"
 							:underline="false"  
 							@click="inmCheck(scope.row)" 
 							type="primary" 
@@ -379,9 +379,6 @@ export default {
 			that.wprParams.wm='';
 			that.wprParams.wm = row.id;
 			that.wprVisibleDrawer = true;
-			// that.$API.wpm.wpr.list.req({ wm: row.id,page:0 }).then((res) => {
-			// 	that.wprList = res;
-			// })
 		},
 		//本地更新数据
 		handleSaveSuccess(data, mode) {
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index a52db8d3..a27ba00a 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -288,13 +288,14 @@
 						width="100px"
 					>
 						<template #default="scope">
-							<!-- 批次 -->
+							<!-- 批次 v-if="mlogItem.submit_time == null&&mlogItem.material_out_&&mlogItem.material_out_.tracking==10" -->
 							<el-link
 								:underline="false"
 								 type="primary"
-								v-if="mlogItem.submit_time == null&&mlogItem.material_out_&&mlogItem.material_out_.tracking==10"
+								  v-if="mlogItem.submit_time == null"
+								 style="margin-right: 10px;"
 								@click="table_out_check(scope.row)"
-							>详情</el-link>
+							>编辑</el-link>
 							<!-- 单个 -->
 							<el-link
 								:underline="false"
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index 1e6464b9..8347fb51 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -209,7 +209,7 @@ export default {
 					this.$API.cm.labelmat.item.req(codeId).then((res) => {
 						if(res){
 							arr = that.materialOptions.filter((item) => {
-								return item.batch == res.batch&&item.material==res.material&&item.state==res.state;
+								return item.batch == res.batch&&item.state==res.state;
 							})
 							if (arr.length > 0) {
 								that.form.batch = arr[0].batch;
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index e5ea057b..e555d04a 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -111,7 +111,7 @@
 					<el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
 				</template>
 			</el-table-column>
-			<el-table-column prop="open" label="操作" width="60" align="center">
+			<el-table-column prop="open" label="操作" width="120" align="center">
 				<template #default="scope">
 					<el-button
 						v-if="scope.row.isEdit"
@@ -245,6 +245,7 @@ export default {
 					console.log('item',item);
 					let index = that.mlogbwlist.indexOf(row);
 					that.mlogbwlist[index].number = item.number;
+					// that.mlogbwlist[index].wpr = item.id;
 				}
 			})
 		},
@@ -288,6 +289,7 @@ export default {
 			let obj = {};
 			obj.number = row.number;
 			obj.mlogb = row.mlogb;
+			obj.wpr = row.wpr;
 			obj.note = row.note;
 			if(that.qct!==null&&that.qct!==''){
 				obj.ftest = {};