From b768946738a7523aca8f3806106e3cfa109720c6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 30 May 2024 09:23:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Ael-drawer=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98-=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/good_mio.vue     |  28 +--
 src/views/inm/halfgood_mio.vue |  28 +--
 src/views/inm/helpso_mio.vue   |  28 +--
 src/views/inm/mainso_mio.vue   |  28 +--
 src/views/inm/mioitem.vue      | 348 +++++++++++++++++----------------
 5 files changed, 239 insertions(+), 221 deletions(-)

diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index 96c14b0a..0035ee0b 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -132,15 +132,15 @@
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
 	></save-dialog>
-	<el-drawer title="出入库记录" v-model="dialog.record" :size="'90%'">
-		<record-dialog
-			:type="type"
-			:cate="cate"
-			:mioId="mioId"
-			ref="recordDialogs"
-		>
-		</record-dialog>
-	</el-drawer>
+	<record-dialog
+		ref="showDrawer"
+		v-if="visibleDrawer"
+		:type="type"
+		:cate="cate"
+		:mioId="mioId"
+		@closed="visibleDrawer = false"
+	>
+	</record-dialog>
 </template>
 <script>
 import saveDialog from "./mio_form.vue";
@@ -185,6 +185,7 @@ export default {
 			type: "",
 			cate: "good",
 			mioId: "",
+			visibleDrawer: false,
 		};
 	},
 	methods: {
@@ -206,11 +207,10 @@ export default {
 		table_detail(row) {
 			this.type = row.type;
 			this.mioId = row.id;
-			this.dialog.record = true;
-			// this.$router.push({
-			// 	name: "mioitem",
-			// 	query: { mio: row.id, type: row.type, cate: "good" },
-			// });
+			this.visibleDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
 		},
 		//删除
 		table_del(row) {
diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue
index 57d0e6de..15146cdf 100644
--- a/src/views/inm/halfgood_mio.vue
+++ b/src/views/inm/halfgood_mio.vue
@@ -149,15 +149,15 @@
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
 	></save-dialog>
-	<el-drawer title="出入库记录" v-model="dialog.record" :size="'90%'">
-		<record-dialog
-			:type="type"
-			:cate="cate"
-			:mioId="mioId"
-			ref="recordDialogs"
-		>
-		</record-dialog>
-	</el-drawer>
+	<record-dialog
+		ref="showDrawer"
+		v-if="visibleDrawer"
+		:type="type"
+		:cate="cate"
+		:mioId="mioId"
+		@closed="visibleDrawer = false"
+	>
+	</record-dialog>
 </template>
 <script>
 import saveDialog from "./mio_form.vue";
@@ -201,6 +201,7 @@ export default {
 			type: "",
 			cate: "halfgood",
 			mioId: "",
+			visibleDrawer: false,
 		};
 	},
 	methods: {
@@ -222,11 +223,10 @@ export default {
 		table_detail(row) {
 			this.type = row.type;
 			this.mioId = row.id;
-			this.dialog.record = true;
-			// this.$router.push({
-			// 	name: "mioitem",
-			// 	query: { mio: row.id, type: row.type, cate: "halfgood" },
-			// });
+			this.visibleDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
 		},
 		//删除
 		table_del(row) {
diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue
index df2c45be..82689009 100644
--- a/src/views/inm/helpso_mio.vue
+++ b/src/views/inm/helpso_mio.vue
@@ -132,15 +132,15 @@
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
 	></save-dialog>
-	<el-drawer title="出入库记录" v-model="dialog.record" :size="'90%'">
-		<record-dialog
-			:type="type"
-			:cate="cate"
-			:mioId="mioId"
-			ref="recordDialogs"
-		>
-		</record-dialog>
-	</el-drawer>
+	<record-dialog
+		ref="showDrawer"
+		v-if="visibleDrawer"
+		:type="type"
+		:cate="cate"
+		:mioId="mioId"
+		@closed="visibleDrawer = false"
+	>
+	</record-dialog>
 </template>
 <script>
 import saveDialog from "./mio_form.vue";
@@ -179,6 +179,7 @@ export default {
 			type: "",
 			cate: "helpso",
 			mioId: "",
+			visibleDrawer: false,
 		};
 	},
 	methods: {
@@ -200,11 +201,10 @@ export default {
 		table_detail(row) {
 			this.type = row.type;
 			this.mioId = row.id;
-			this.dialog.record = true;
-			// this.$router.push({
-			// 	name: "mioitem",
-			// 	query: { mio: row.id, type: row.type, cate: "helpso" },
-			// });
+			this.visibleDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
 		},
 		//删除
 		table_del(row) {
diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue
index 1c9e687d..9f830db3 100644
--- a/src/views/inm/mainso_mio.vue
+++ b/src/views/inm/mainso_mio.vue
@@ -149,15 +149,15 @@
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
 	></save-dialog>
-	<el-drawer title="出入库记录" v-model="dialog.record" :size="'90%'">
-		<record-dialog
-			:type="type"
-			:cate="cate"
-			:mioId="mioId"
-			ref="recordDialogs"
-		>
-		</record-dialog>
-	</el-drawer>
+	<record-dialog
+		ref="showDrawer"
+		v-if="visibleDrawer"
+		:type="type"
+		:cate="cate"
+		:mioId="mioId"
+		@closed="visibleDrawer = false"
+	>
+	</record-dialog>
 </template>
 <script>
 import saveDialog from "./mio_form.vue";
@@ -202,6 +202,7 @@ export default {
 			type: "",
 			cate: "mainso",
 			mioId: "",
+			visibleDrawer: false,
 		};
 	},
 	methods: {
@@ -223,11 +224,10 @@ export default {
 		table_detail(row) {
 			this.type = row.type;
 			this.mioId = row.id;
-			this.dialog.record = true;
-			// this.$router.push({
-			// 	name: "mioitem",
-			// 	query: { mio: row.id, type: row.type, cate: "mainso" },
-			// });
+			this.visibleDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
 		},
 		//删除
 		table_del(row) {
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 2a00475c..d38782c3 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -1,175 +1,189 @@
 <template>
-	<div style="padding: 8px">
-		<div>
-			<el-card style="width: 100%" header="基本信息" shadow="hover">
-				<el-descriptions>
-					<el-descriptions-item label="编号">{{
-						mioObj.number
-					}}</el-descriptions-item>
-					<el-descriptions-item label="出入库类型">{{
-						typeDict[mioObj.type]
-					}}</el-descriptions-item>
-					<el-descriptions-item label="状态">{{
-						stateDict[mioObj.state]
-					}}</el-descriptions-item>
-					<el-descriptions-item label="部门/车间">{{
-						mioObj.belong_dept_name
-					}}</el-descriptions-item>
-					<el-descriptions-item label="执行人">{{
-						mioObj.do_user_name
-					}}</el-descriptions-item>
-					<el-descriptions-item label="创建时间">{{
-						mioObj.create_time
-					}}</el-descriptions-item>
-					<el-descriptions-item
-						label="采购订单"
-						v-if="mioObj.type == 'pur_in'"
-						>{{ mioObj.order_number }}</el-descriptions-item
-					>
-					<el-descriptions-item
-						label="供应商"
-						v-if="mioObj.type == 'pur_in'"
-						>{{ mioObj.supplier_name }}</el-descriptions-item
-					>
-					<el-descriptions-item
-						label="销售订单"
-						v-if="mioObj.type == 'sale_out'"
-						>{{ mioObj.pu_order_number }}</el-descriptions-item
-					>
-					<el-descriptions-item
-						label="客户"
-						v-if="mioObj.type == 'sale_out'"
-						>{{ mioObj.customer_name }}</el-descriptions-item
-					>
-				</el-descriptions>
-				<!-- <el-button type="primary" @click="mioSubmit" v-auth="'mio.submit'" v-if="mioObj.state == 10">
+	<el-drawer
+		v-model="visible"
+		title="出入库记录"
+		:size="'90%'"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<div style="padding: 8px">
+			<div>
+				<el-card style="width: 100%" header="基本信息" shadow="hover">
+					<el-descriptions>
+						<el-descriptions-item label="编号">{{
+							mioObj.number
+						}}</el-descriptions-item>
+						<el-descriptions-item label="出入库类型">{{
+							typeDict[mioObj.type]
+						}}</el-descriptions-item>
+						<el-descriptions-item label="状态">{{
+							stateDict[mioObj.state]
+						}}</el-descriptions-item>
+						<el-descriptions-item label="部门/车间">{{
+							mioObj.belong_dept_name
+						}}</el-descriptions-item>
+						<el-descriptions-item label="执行人">{{
+							mioObj.do_user_name
+						}}</el-descriptions-item>
+						<el-descriptions-item label="创建时间">{{
+							mioObj.create_time
+						}}</el-descriptions-item>
+						<el-descriptions-item
+							label="采购订单"
+							v-if="mioObj.type == 'pur_in'"
+							>{{ mioObj.order_number }}</el-descriptions-item
+						>
+						<el-descriptions-item
+							label="供应商"
+							v-if="mioObj.type == 'pur_in'"
+							>{{ mioObj.supplier_name }}</el-descriptions-item
+						>
+						<el-descriptions-item
+							label="销售订单"
+							v-if="mioObj.type == 'sale_out'"
+							>{{ mioObj.pu_order_number }}</el-descriptions-item
+						>
+						<el-descriptions-item
+							label="客户"
+							v-if="mioObj.type == 'sale_out'"
+							>{{ mioObj.customer_name }}</el-descriptions-item
+						>
+					</el-descriptions>
+					<!-- <el-button type="primary" @click="mioSubmit" v-auth="'mio.submit'" v-if="mioObj.state == 10">
                     提交
                 </el-button> -->
-			</el-card>
-		</div>
-		<div style="height: 8px"></div>
-		<div>
-			<el-card style="width: 100%" header="物料明细" shadow="hover">
-				<div>
-					<el-button
-						type="primary"
-						icon="el-icon-plus"
-						@click="table_add"
-						v-if="mioObj.state == 10"
-						>新增</el-button
+				</el-card>
+			</div>
+			<div style="height: 8px"></div>
+			<div>
+				<el-card style="width: 100%" header="物料明细" shadow="hover">
+					<div>
+						<el-button
+							type="primary"
+							icon="el-icon-plus"
+							@click="table_add"
+							v-if="mioObj.state == 10"
+							>新增</el-button
+						>
+					</div>
+					<scTable
+						ref="table"
+						:apiObj="apiObj"
+						row-key="id"
+						stripe
+						:params="params"
+						hidePagination
+						hideDo
 					>
-				</div>
-				<scTable
-					ref="table"
-					:apiObj="apiObj"
-					row-key="id"
-					stripe
-					:params="params"
-					hidePagination
-					hideDo
-				>
-					<el-table-column type="index" width="50" />
-					<el-table-column
-						label="物料"
-						prop="material"
-						show-overflow-tooltip
-					>
-						<template #default="scope"
-							>{{ scope.row.material_name }}
-						</template>
-					</el-table-column>
-					<el-table-column label="批次号" prop="batch">
-					</el-table-column>
-					<el-table-column label="仓库" prop="warehouse_name">
-					</el-table-column>
-					<el-table-column label="数量" prop="count">
-					</el-table-column>
-					<el-table-column
-						label="组合件信息"
-						v-if="cate == 'good'"
-						width="300"
-					>
-						<template #default="scope">
-							<div v-if="scope.row.assemb.length > 0">
-								<div
-									v-for="item in scope.row.assemb"
-									:key="item.id"
-								>
-									<div>
-										{{ item.material_name }}
-										<span
-											style="color: gray; font-size: 12px"
-											>批:</span
-										>{{ item.batch }}
-										<span
-											style="color: gray; font-size: 12px"
-											>比:</span
-										>{{ item.rate }}
+						<el-table-column type="index" width="50" />
+						<el-table-column
+							label="物料"
+							prop="material"
+							show-overflow-tooltip
+						>
+							<template #default="scope"
+								>{{ scope.row.material_name }}
+							</template>
+						</el-table-column>
+						<el-table-column label="批次号" prop="batch">
+						</el-table-column>
+						<el-table-column label="仓库" prop="warehouse_name">
+						</el-table-column>
+						<el-table-column label="数量" prop="count">
+						</el-table-column>
+						<el-table-column
+							label="组合件信息"
+							v-if="cate == 'good'"
+							width="300"
+						>
+							<template #default="scope">
+								<div v-if="scope.row.assemb.length > 0">
+									<div
+										v-for="item in scope.row.assemb"
+										:key="item.id"
+									>
+										<div>
+											{{ item.material_name }}
+											<span
+												style="
+													color: gray;
+													font-size: 12px;
+												"
+												>批:</span
+											>{{ item.batch }}
+											<span
+												style="
+													color: gray;
+													font-size: 12px;
+												"
+												>比:</span
+											>{{ item.rate }}
+										</div>
 									</div>
 								</div>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="不合格数量" prop="count_notok">
-					</el-table-column>
-					<el-table-column
-						label="创建时间"
-						prop="create_time"
-						show-overflow-tooltip
-					>
-					</el-table-column>
-					<el-table-column
-						label="操作"
-						fixed="right"
-						align="center"
-						width="100px"
-					>
-						<template #default="scope">
-							<el-button
-								link
-								type="primary"
-								@click="table_check(scope.row)"
-								v-if="
-									scope.row.test_date == null &&
-									mioObj.state == 20 &&
-									(type == 'pur_in' ||
-										type == 'do_in' ||
-										type == 'other_in')
-								"
-								v-auth="'mioitem.test'"
-							>
-								检验
-							</el-button>
-							<el-button
-								link
-								type="primary"
-								@click="check_Show(scope.row)"
-								v-if="scope.row.test_date !== null"
-							>
-								查看
-							</el-button>
-							<el-button
-								link
-								type="danger"
-								@click="check_reSet(scope.row)"
-								v-if="scope.row.test_date !== null"
-							>
-								撤回
-							</el-button>
-							<el-button
-								link
-								type="danger"
-								@click="table_del(scope.row)"
-								v-if="mioObj.state == 10"
-							>
-								删除
-							</el-button>
-						</template>
-					</el-table-column>
-				</scTable>
-			</el-card>
+							</template>
+						</el-table-column>
+						<el-table-column label="不合格数量" prop="count_notok">
+						</el-table-column>
+						<el-table-column
+							label="创建时间"
+							prop="create_time"
+							show-overflow-tooltip
+						>
+						</el-table-column>
+						<el-table-column
+							label="操作"
+							fixed="right"
+							align="center"
+							width="100px"
+						>
+							<template #default="scope">
+								<el-button
+									link
+									type="primary"
+									@click="table_check(scope.row)"
+									v-if="
+										scope.row.test_date == null &&
+										mioObj.state == 20 &&
+										(type == 'pur_in' ||
+											type == 'do_in' ||
+											type == 'other_in')
+									"
+									v-auth="'mioitem.test'"
+								>
+									检验
+								</el-button>
+								<el-button
+									link
+									type="primary"
+									@click="check_Show(scope.row)"
+									v-if="scope.row.test_date !== null"
+								>
+									查看
+								</el-button>
+								<el-button
+									link
+									type="danger"
+									@click="check_reSet(scope.row)"
+									v-if="scope.row.test_date !== null"
+								>
+									撤回
+								</el-button>
+								<el-button
+									link
+									type="danger"
+									@click="table_del(scope.row)"
+									v-if="mioObj.state == 10"
+								>
+									删除
+								</el-button>
+							</template>
+						</el-table-column>
+					</scTable>
+				</el-card>
+			</div>
 		</div>
-	</div>
+	</el-drawer>
 	<save-dialog
 		v-if="dialog.save"
 		ref="saveDialog"
@@ -240,6 +254,7 @@ export default {
 				other_in: "其他入库",
 				other_out: "其他出库",
 			},
+			visible: false,
 			mioitemId: "",
 			// type: "",
 			// cate: "",
@@ -256,6 +271,9 @@ export default {
 		this.getMio();
 	},
 	methods: {
+		open() {
+			this.visible = true;
+		},
 		getMio() {
 			this.$API.inm.mio.item.req(this.mioId).then((res) => {
 				this.mioObj = res;