From ee809aa571a5dda083a5320c622370fe0fb728ae Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 22 Jul 2024 16:55:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/chaoxi.vue        |  45 ++++++++++---
 src/views/wpm_gx/daojiao.vue       |  45 ++++++++++---
 src/views/wpm_gx/handover.vue      | 103 +++++++++++++++++++++++++++--
 src/views/wpm_gx/handover_form.vue |   5 ++
 src/views/wpm_gx/heihua.vue        |  45 ++++++++++---
 src/views/wpm_gx/huohua.vue        |  45 ++++++++++---
 src/views/wpm_gx/jianbo.vue        |  45 ++++++++++---
 src/views/wpm_gx/jingdiao.vue      |  45 ++++++++++---
 src/views/wpm_gx/mopao.vue         |  45 ++++++++++---
 src/views/wpm_gx/print.vue         |  72 ++++++++++----------
 src/views/wpm_gx/shaojie.vue       |  45 ++++++++++---
 11 files changed, 433 insertions(+), 107 deletions(-)

diff --git a/src/views/wpm_gx/chaoxi.vue b/src/views/wpm_gx/chaoxi.vue
index 4a25b6ec..2d0cd26b 100644
--- a/src/views/wpm_gx/chaoxi.vue
+++ b/src/views/wpm_gx/chaoxi.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "超洗",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/daojiao.vue b/src/views/wpm_gx/daojiao.vue
index 4a25b6ec..2fba2562 100644
--- a/src/views/wpm_gx/daojiao.vue
+++ b/src/views/wpm_gx/daojiao.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "倒角",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index a1be20dc..1b111bf9 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -2,13 +2,27 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
+				<el-header>
+					<el-segmented
+						v-model="values"
+						:options="options"
+						size="default"
+					></el-segmented>
+				</el-header>
 				<el-button
 					type="primary"
 					icon="el-icon-plus"
-					@click="table_add"
+					@click="table_add(10)"
 					v-auth="'mgroup.create'"
 					>新增</el-button
 				>
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="table_add(20)"
+					v-auth="'mgroup.create'"
+					>返工</el-button
+				>
 			</div>
 			<div class="right-panel">
 				<el-input
@@ -25,7 +39,79 @@
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" :params="params">
+			<scTable
+				v-if="values == '交送'"
+				ref="table"
+				:apiObj="apiObj"
+				row-key="id"
+				:params="params_sender"
+			>
+				<el-table-column
+					label="#"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column
+					label="物料"
+					prop="material_name"
+					min-width="120"
+				></el-table-column>
+				<el-table-column label="批次" prop="batch" min-width="100">
+				</el-table-column>
+				<el-table-column label="数量" prop="count"></el-table-column>
+				<el-table-column
+					label="交送人"
+					prop="send_user_name"
+				></el-table-column>
+				<el-table-column
+					label="接收人"
+					prop="recive_user_name"
+				></el-table-column>
+				<el-table-column
+					label="交接日期"
+					prop="send_date"
+					width="120"
+				></el-table-column>
+				<el-table-column
+					label="操作"
+					fixed="right"
+					align="center"
+					width="120"
+				>
+					<template #default="scope">
+						<el-button
+							link
+							size="small"
+							@click="table_edit(scope.row)"
+							v-auth="'mgroup.update'"
+							type="primary"
+							>编辑</el-button
+						>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm
+							title="确定删除吗？"
+							@confirm="table_del(scope.row, scope.$index)"
+						>
+							<template #reference>
+								<el-button
+									link
+									size="small"
+									v-auth="'mgroup.delete'"
+									type="danger"
+									>删除</el-button
+								>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<scTable
+				v-if="values == '接收'"
+				ref="table"
+				:apiObj="apiObj"
+				row-key="id"
+				:params="params_recive"
+			>
 				<el-table-column
 					label="#"
 					type="index"
@@ -90,6 +176,7 @@
 	<save-dialog
 		v-if="dialog.save"
 		ref="saveDialog"
+		:type="type"
 		:mgroupId="mgroupId"
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
@@ -112,14 +199,17 @@ export default {
 	data() {
 		return {
 			apiObj: null,
-			params: { cate: "photon" },
 			query: {},
 			dialog: {
 				save: false,
 				permission: false,
 			},
+			params_sender: { send_mgroup: "" },
+			params_recive: { recive_mgroup: "" },
+			options: ["交送", "接收"],
 			tableData: [],
 			selection: [],
+			values: "交送",
 			mtask: "",
 			mlogId: "",
 			processId: "",
@@ -134,15 +224,16 @@ export default {
 				that.mgroupId = res[0].id;
 				that.processId = res[0].process;
 				that.processCate = res[0].process_cate;
-				that.params.send_mgroup = res[0].id;
-				that.params.recive_mgroup = res[0].id;
+				that.params_sender.send_mgroup = that.mgroupId;
+				that.params_recive.recive_mgroup = that.mgroupId;
 				that.apiObj = that.$API.wpm.handover.list;
 			});
 	},
 	methods: {
 		//添加
-		table_add() {
+		table_add(type) {
 			this.dialog.save = true;
+			this.type = type;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open("add");
 			});
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index c2c1ab4a..15056839 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -129,6 +129,10 @@
 export default {
 	emits: ["success", "closed"],
 	props: {
+		type: {
+			type: Number,
+			default: 10,
+		},
 		mgroupId: {
 			type: String,
 			default: "",
@@ -214,6 +218,7 @@ export default {
 		};
 	},
 	mounted() {
+		this.form.type = this.type;
 		let materialObj = this.$TOOL.data.get("MATERIAL_OBJECT");
 		this.materialObj = materialObj;
 		let date = new Date();
diff --git a/src/views/wpm_gx/heihua.vue b/src/views/wpm_gx/heihua.vue
index 4a25b6ec..a3863d3a 100644
--- a/src/views/wpm_gx/heihua.vue
+++ b/src/views/wpm_gx/heihua.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "黑化",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/huohua.vue b/src/views/wpm_gx/huohua.vue
index 4a25b6ec..08738a61 100644
--- a/src/views/wpm_gx/huohua.vue
+++ b/src/views/wpm_gx/huohua.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "活化",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue
index 4a25b6ec..cf785ed7 100644
--- a/src/views/wpm_gx/jianbo.vue
+++ b/src/views/wpm_gx/jianbo.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "减薄",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/jingdiao.vue b/src/views/wpm_gx/jingdiao.vue
index 4a25b6ec..dbd2c523 100644
--- a/src/views/wpm_gx/jingdiao.vue
+++ b/src/views/wpm_gx/jingdiao.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "精雕",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/mopao.vue b/src/views/wpm_gx/mopao.vue
index 4a25b6ec..718254df 100644
--- a/src/views/wpm_gx/mopao.vue
+++ b/src/views/wpm_gx/mopao.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "磨抛",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;
diff --git a/src/views/wpm_gx/print.vue b/src/views/wpm_gx/print.vue
index ac7ebd21..a07d0b7f 100644
--- a/src/views/wpm_gx/print.vue
+++ b/src/views/wpm_gx/print.vue
@@ -10,7 +10,7 @@
 			<p class="lineStyle">批次号：{{ batch }}</p>
 			<p class="lineStyle">数量：{{ count }}</p>
 		</div>
-		<el-button type="primary" @click="toGetPdf">打印 </el-button>
+		<el-button type="primary" @click="toGetPdf1">打印 </el-button>
 	</div>
 </template>
 <script>
@@ -49,15 +49,20 @@ export default {
 					let title = "交接单";
 					getPdf(title, download).then((res) => {
 						console.log("res", res);
-						// that.dataURLtoFile(res, "pdf");
-						let obj = {};
-						obj.file = res;
-						obj.printer_name = "GP-3150TN";
-						http.post(`http://192.168.1.242:8080/print/`, obj, {
-							headers: { "Content-Type": "multipart/form-data" },
-						}).then((res) => {
-							console.log("postRes", res);
-						});
+
+						// 创建 FormData 对象
+						let formData = new FormData();
+						formData.append("file", res, "document.pdf"); // 添加文件到 FormData
+						formData.append("printer_name", "GP-3150TN"); // 添加其他字段
+
+						// 发送 POST 请求
+						http.post("http://localhost:8080/print/", formData)
+							.then((response) => {
+								console.log("postRes", response);
+							})
+							.catch((error) => {
+								console.error("postError", error);
+							});
 					});
 				}, 1000);
 			});
@@ -76,34 +81,27 @@ export default {
 		},
 
 		toGetPdf1() {
-			let exportDiv = document.getElementById("pdfDom"); // 需要导出部分页面的id名
-			this.pdfDownLoader = new PdfLoader(exportDiv, "print"); // fileName -->导出文件名,  question-table -->防止被截断的class名
-			this.pdfDownLoader.getPDF("0000");
-			console.log(this.pdfDownLoader);
+			let str = [
+				"SIZE 70 mm,90 mm",
+				"GAP 2 mm,0 mm",
+				"CLS",
+				"WINTEXT 100,100,36,0,0,0,Simhei,光芯——交接单",
+				'BARCODE 100,200,"128",108,0,0,2,4,"' + this.batch + '"',
+				"WINTEXT 100,380,36,0,0,0,Simhei,物料：" + this.name,
+				"WINTEXT 100,460,36,0,0,0,Simhei,批次：" + this.batch,
+				"WINTEXT 100,540,36,0,0,0,Simhei,数量：" + this.count,
+				"PRINT 1",
+			];
+			let obj = {};
+			obj.print_commands = str;
+			http.post("http://localhost:8080/prints/", obj)
+				.then((response) => {
+					console.log("postRes", response);
+				})
+				.catch((error) => {
+					console.error("postError", error);
+				});
 		},
-		// async handlePrint() {
-		// 	let content = this.$refs.pdfContent;
-		// 	let canvas = await html2canvas(content);
-		// 	let imgData = canvas.toDataURL("image/png");
-
-		// 	let pdf = jsPDF("", "pt", "a4");
-		// 	let blob = new Blob([JSON.stringify(imgData, null, 2)], {
-		// 		type: "application/json",
-		// 	});
-
-		// 	// http://192.168.1.242:8000/print
-		// 	//POST form-data
-		// 	//{"file":"","printer_name":"GP-3150TN"}
-		// 	console.log("blob", blob);
-		// 	let obj = {};
-		// 	obj.file = blob;
-		// 	obj.printer_name = "GP-3150TN";
-		// 	http.post(`http://192.168.1.242:8000/print/`, obj).then((res) => {
-		// 		console.log(res);
-		// 	});
-		// 	// const blob = new Blob([response.data], { type: "application/pdf" });
-		// 	this.$PRINT("#myReport");
-		// },
 	},
 };
 </script>
diff --git a/src/views/wpm_gx/shaojie.vue b/src/views/wpm_gx/shaojie.vue
index 4a25b6ec..d2a0419a 100644
--- a/src/views/wpm_gx/shaojie.vue
+++ b/src/views/wpm_gx/shaojie.vue
@@ -1,28 +1,57 @@
 <template>
 	<el-container>
-		<el-header
-			><el-segmented
+		<el-header>
+			<el-segmented
 				v-model="values"
 				:options="options"
 				size="default"
-			></el-segmented
-		></el-header>
-		<el-main>
-			<log v-if="values == '日志'">日志 </log>
-			<handover v-else-if="values == '交接记录'"> 交接记录</handover>
-			<mio v-else>库存 </mio>
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 50%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
 		</el-main>
 	</el-container>
 </template>
 
 <script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
 export default {
+	components: { inm, mlogs, mtask, handover },
 	data() {
 		return {
+			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
+			mgroupName: "烧结",
+			mgroupId: "",
 		};
 	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
 	methods: {
 		handleChange(value) {
 			this.value = value;