From 86be993ba0ee8a5ba5fdb2322798824e37c94f63 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 23 May 2024 09:56:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:coding#413=E7=94=9F=E4=BA=A7=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept6.vue        |  21 +-
 src/views/wpm/mlog_dept6_detail.vue | 596 +++++++++++++++++-----------
 2 files changed, 384 insertions(+), 233 deletions(-)

diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index 7ad85391..68f8e355 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -296,14 +296,21 @@
 			</el-container>
 		</el-main>
 	</el-container>
+	<el-drawer title="进度详情" v-model="dialog.detail" :size="'90%'">
+		<detail-dialog :mtaskId="mtaskId" ref="detailDialogs"> </detail-dialog>
+	</el-drawer>
 </template>
 
 <script>
+import detailDialog from "./mlog_dept6_detail.vue";
 export default {
+	components: {
+		detailDialog,
+	},
 	data() {
 		return {
 			dialog: {
-				save: false,
+				detail: false,
 			},
 			apiObj: null,
 			query: {},
@@ -337,6 +344,7 @@ export default {
 			queryMtask: {
 				state__in: "",
 			},
+			mtaskId: "",
 		};
 	},
 	mounted() {
@@ -364,17 +372,18 @@ export default {
 		},
 		//工序详情
 		itemClick(row) {
+			this.mtaskId = row.id;
+			this.dialog.detail = true;
 			// this.currentMtask = row;
 			// this.mgroup = row.mgroup;
-			// this.mtask = row.id;
 			// this.material_out = row.material_out_.id;
 			// this.handledate = row.start_date;
 			// this.paramsMlog.mtask = this.mtask;
 			// this.apiObjMlog = this.$API.wpm.mlog.list;
-			this.$router.push({
-				name: "mlogDept6Detail",
-				query: { mtaskId: row.id },
-			});
+			// this.$router.push({
+			// 	name: "mlogDept6Detail",
+			// 	query: { mtaskId: row.id },
+			// });
 		},
 		handleQueryMtask() {
 			if (this.queryMtaskState) {
diff --git a/src/views/wpm/mlog_dept6_detail.vue b/src/views/wpm/mlog_dept6_detail.vue
index d2e4d756..b18987ec 100644
--- a/src/views/wpm/mlog_dept6_detail.vue
+++ b/src/views/wpm/mlog_dept6_detail.vue
@@ -1,248 +1,390 @@
 <template>
-  <el-container>
-    <!-- 任务信息 -->
-    <el-header style="height: 20%; padding: 0">
-      <el-card style="width: 100%; height: 100%">
-        <template #header>
-          <div class="card-header">
-            <span>任务信息</span>
-          </div>
-        </template>
-        <el-descriptions>
-          <el-descriptions-item label="任务编号">{{ currentMtask.number }}</el-descriptions-item>
-          <el-descriptions-item label="产品全称">
-            <span v-if="currentMtask.material_out_">{{ currentMtask.material_out_name }}</span>
-          </el-descriptions-item>
-          <el-descriptions-item label="计划数量">{{ currentMtask.count }}</el-descriptions-item>
-          <el-descriptions-item label="计划日期">{{ currentMtask.start_date }}</el-descriptions-item>
-          <el-descriptions-item label="合格数">{{ currentMtask.count_ok }}</el-descriptions-item>
-        </el-descriptions>
-      </el-card>
-    </el-header>
-    <!-- 日志 -->
-    <el-main style="padding: 0;">
-      <el-container>
-        <el-header>
-          <div class="left-panel">
-            <el-button type="primary" icon="el-icon-plus" @click="addMlog"
-              v-if="currentMtask && currentMtask.state == 20" v-auth="'mlog.create'">新增</el-button>
-          </div>
-        </el-header>
-        <el-main style="padding: 0;">
-          <scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe hidePagination hideDo>
-            <el-table-column label="工序" prop="mgroup_name"></el-table-column>
-            <el-table-column label="产品名称" prop="material_out_" min-width="120">
-                <template #default="scope">
-                    <span v-if="scope.row.material_out_">{{scope.row.material_out_.name}}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="批次号" prop="batch"></el-table-column>
-            <el-table-column label="加工设备" prop="equipment_name"></el-table-column>
-            <el-table-column label="领用数量" prop="count_use"> </el-table-column>
-            <el-table-column label="加工数量" prop="count_real"> </el-table-column>
-            <el-table-column label="合格数量" prop="count_ok"></el-table-column>
-            <el-table-column label="不合格数量" align="center">
-              <el-table-column prop="count_n_hs" label="划伤" />
-              <el-table-column prop="count_n_zs" label="挫伤" />
-              <el-table-column prop="count_n_zz" label="杂质" />
-              <el-table-column prop="count_n_tw" label="条纹" />
-              <el-table-column prop="count_n_zdd" label="锥度大" />
-              <el-table-column prop="count_n_d" label="短" />
-              <!-- 棒 -->
-              <!-- <template v-if="currentMtask.material_out_.name=='光纤预制棒'"> -->
-              <template v-if="material_name.indexOf('棒')>-1">
-                <el-table-column prop="count_n_dl" label="断裂" />
-                <el-table-column prop="count_n_qp" label="气泡"/>
-                <el-table-column prop="count_n_bl" label="不亮" />
-                <el-table-column prop="count_n_hw" label="横纹" />
-                <el-table-column prop="count_n_yp" label="有皮" />
-                <el-table-column prop="count_n_bp" label="爆皮" />
-                <el-table-column prop="count_n_sc" label="色差" />
-              </template>
-              <!-- 管 -->
-              <!-- <template v-if="currentMtask.material_out_.name=='光纤预制管'"> -->
-              <template v-if="material_name.indexOf('管')>-1">
-                <el-table-column prop="count_n_qx" label="气线"/>
-                <el-table-column prop="count_n_js" label="结石" />
-                <el-table-column prop="count_n_tydd" label="椭圆度大" />
-                <el-table-column prop="count_n_sw" label="水雾" />
-                <el-table-column prop="count_n_bhpcd" label="壁厚偏差大" />
-                <el-table-column prop="count_n_wq" label="弯" />
-              </template>
-            </el-table-column>
-            <el-table-column label="操作人" prop="update_by_name"></el-table-column>
-            <el-table-column label="操作" fixed="right" width="130">
-              <template #default="scope">
-                <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'mlog.update'"
-                  v-if="scope.row.submit_time == null">编辑
-                </el-button>
-                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
-                  v-if="scope.row.submit_time == null">删除
-                </el-button>
-                <el-button link type="primary" @click="mlog_submit(scope.row)" v-auth="'mlog.submit'"
-                  v-if="scope.row.submit_time == null" :loading="mlogHandleLoading">提交
-                </el-button>
-                <el-button link type="danger" @click="mlog_revert(scope.row)" v-auth="'mlog.submit'"
-                  v-if="scope.row.submit_time != null" :loading="mlogHandleLoading">撤回
-                </el-button>
-                <el-button link type="success" @click="table_show(scope.row)">
-                  日志记录
-                </el-button>
-              </template>
-            </el-table-column>
-          </scTable>
-        </el-main>
-      </el-container>
-    </el-main>
-    <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="mtask" :mgroup="mgroup" :handledate="handledate"
-      :material_out="material_out" :material_name="material_name" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
-    <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
-    </showDrawer>
-  </el-container>
+	<el-container>
+		<!-- 任务信息 -->
+		<el-header style="height: 20%; padding: 0">
+			<el-card style="width: 100%; height: 100%">
+				<template #header>
+					<div class="card-header">
+						<span>任务信息</span>
+					</div>
+				</template>
+				<el-descriptions>
+					<el-descriptions-item label="任务编号">{{
+						currentMtask.number
+					}}</el-descriptions-item>
+					<el-descriptions-item label="产品全称">
+						<span v-if="currentMtask.material_out_">{{
+							currentMtask.material_out_name
+						}}</span>
+					</el-descriptions-item>
+					<el-descriptions-item label="计划数量">{{
+						currentMtask.count
+					}}</el-descriptions-item>
+					<el-descriptions-item label="计划日期">{{
+						currentMtask.start_date
+					}}</el-descriptions-item>
+					<el-descriptions-item label="合格数">{{
+						currentMtask.count_ok
+					}}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+		</el-header>
+		<!-- 日志 -->
+		<el-main style="padding: 0">
+			<el-container>
+				<el-header>
+					<div class="left-panel">
+						<el-button
+							type="primary"
+							icon="el-icon-plus"
+							@click="addMlog"
+							v-if="currentMtask && currentMtask.state == 20"
+							v-auth="'mlog.create'"
+							>新增</el-button
+						>
+					</div>
+				</el-header>
+				<el-main style="padding: 0">
+					<scTable
+						ref="mtaskMlogs"
+						:apiObj="apiObj"
+						row-key="id"
+						:params="params"
+						stripe
+						hidePagination
+						hideDo
+					>
+						<el-table-column
+							label="工序"
+							prop="mgroup_name"
+						></el-table-column>
+						<el-table-column
+							label="产品名称"
+							prop="material_out_"
+							min-width="120"
+						>
+							<template #default="scope">
+								<span v-if="scope.row.material_out_">{{
+									scope.row.material_out_.name
+								}}</span>
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="批次号"
+							prop="batch"
+						></el-table-column>
+						<el-table-column
+							label="加工设备"
+							prop="equipment_name"
+						></el-table-column>
+						<el-table-column label="领用数量" prop="count_use">
+						</el-table-column>
+						<el-table-column label="加工数量" prop="count_real">
+						</el-table-column>
+						<el-table-column
+							label="合格数量"
+							prop="count_ok"
+						></el-table-column>
+						<el-table-column label="不合格数量" align="center">
+							<el-table-column prop="count_n_hs" label="划伤" />
+							<el-table-column prop="count_n_zs" label="挫伤" />
+							<el-table-column prop="count_n_zz" label="杂质" />
+							<el-table-column prop="count_n_tw" label="条纹" />
+							<el-table-column
+								prop="count_n_zdd"
+								label="锥度大"
+							/>
+							<el-table-column prop="count_n_d" label="短" />
+							<!-- 棒 -->
+							<!-- <template v-if="currentMtask.material_out_.name=='光纤预制棒'"> -->
+							<template v-if="material_name.indexOf('棒') > -1">
+								<el-table-column
+									prop="count_n_dl"
+									label="断裂"
+								/>
+								<el-table-column
+									prop="count_n_qp"
+									label="气泡"
+								/>
+								<el-table-column
+									prop="count_n_bl"
+									label="不亮"
+								/>
+								<el-table-column
+									prop="count_n_hw"
+									label="横纹"
+								/>
+								<el-table-column
+									prop="count_n_yp"
+									label="有皮"
+								/>
+								<el-table-column
+									prop="count_n_bp"
+									label="爆皮"
+								/>
+								<el-table-column
+									prop="count_n_sc"
+									label="色差"
+								/>
+							</template>
+							<!-- 管 -->
+							<!-- <template v-if="currentMtask.material_out_.name=='光纤预制管'"> -->
+							<template v-if="material_name.indexOf('管') > -1">
+								<el-table-column
+									prop="count_n_qx"
+									label="气线"
+								/>
+								<el-table-column
+									prop="count_n_js"
+									label="结石"
+								/>
+								<el-table-column
+									prop="count_n_tydd"
+									label="椭圆度大"
+								/>
+								<el-table-column
+									prop="count_n_sw"
+									label="水雾"
+								/>
+								<el-table-column
+									prop="count_n_bhpcd"
+									label="壁厚偏差大"
+								/>
+								<el-table-column prop="count_n_wq" label="弯" />
+							</template>
+						</el-table-column>
+						<el-table-column
+							label="操作人"
+							prop="update_by_name"
+						></el-table-column>
+						<el-table-column label="操作" fixed="right" width="130">
+							<template #default="scope">
+								<el-button
+									link
+									type="primary"
+									@click="table_edit(scope.row)"
+									v-auth="'mlog.update'"
+									v-if="scope.row.submit_time == null"
+									>编辑
+								</el-button>
+								<el-button
+									link
+									type="danger"
+									@click="table_del(scope.row)"
+									v-auth="'mlog.delete'"
+									v-if="scope.row.submit_time == null"
+									>删除
+								</el-button>
+								<el-button
+									link
+									type="primary"
+									@click="mlog_submit(scope.row)"
+									v-auth="'mlog.submit'"
+									v-if="scope.row.submit_time == null"
+									:loading="mlogHandleLoading"
+									>提交
+								</el-button>
+								<el-button
+									link
+									type="danger"
+									@click="mlog_revert(scope.row)"
+									v-auth="'mlog.submit'"
+									v-if="scope.row.submit_time != null"
+									:loading="mlogHandleLoading"
+									>撤回
+								</el-button>
+								<el-button
+									link
+									type="success"
+									@click="table_show(scope.row)"
+								>
+									日志记录
+								</el-button>
+							</template>
+						</el-table-column>
+					</scTable>
+				</el-main>
+			</el-container>
+		</el-main>
+		<save-dialog
+			v-if="dialogSave"
+			ref="saveDialog"
+			:mtask="mtask"
+			:mgroup="mgroup"
+			:handledate="handledate"
+			:material_out="material_out"
+			:material_name="material_name"
+			@success="handleSaveSuccess"
+			@closed="dialogSave = false"
+		></save-dialog>
+		<showDrawer
+			ref="showDrawer"
+			v-if="visibleDrawer"
+			:mlogId="mlogId"
+			@closed="visibleDrawer = false"
+		>
+		</showDrawer>
+	</el-container>
 </template>
 <script>
 import saveDialog from "./mlog6_form.vue";
 import showDrawer from "./mlog_drawer.vue";
 export default {
-  components: {
-    saveDialog, showDrawer
-  },
-  data() {
-    return {
-      mlogHandleLoading: false,
-      dialog: {
-        save: false,
-      },
-      state_: {
-        10: '创建中',
-        20: '已下达',
-        30: '生产中',
-        40: '已提交',
-      },
-      hideDo: true,
-      currentMtask: {},
-      apiObj: null,
-      params: {
-        mtask: ''
-      },
-      mlogId: '',
-      handledate: '',
-      dialogSave: false,
-      visibleDrawer: false,
-    }
-  },
-  mounted() {
-    this.mtaskId = this.$route.query.mtaskId;
-    console.log(this.$route.query)
-    debugger;
-    this.getMtask(this.mtaskId);
-  },
-  methods: {
-    getMtask(id) {
-      let that = this;
-      this.$API.pm.mtask.item.req(id).then(res => {
-        that.currentMtask = res;
-        this.mgroup = res.mgroup;
-        this.mtask = res.id;
-        this.material_out = res.material_out_.id;
-        this.material_name = res.material_out_.name;
-        this.handledate = res.start_date;
+	components: {
+		saveDialog,
+		showDrawer,
+	},
+	props: {
+		mtaskId: {
+			type: String,
+			default: "",
+		},
+	},
+	data() {
+		return {
+			mlogHandleLoading: false,
+			dialog: {
+				save: false,
+			},
+			state_: {
+				10: "创建中",
+				20: "已下达",
+				30: "生产中",
+				40: "已提交",
+			},
+			hideDo: true,
+			currentMtask: {},
+			apiObj: null,
+			params: {
+				mtask: "",
+			},
+			mlogId: "",
+			handledate: "",
+			dialogSave: false,
+			visibleDrawer: false,
+		};
+	},
+	mounted() {
+		console.log(this.mtaskId);
+		this.getMtask();
+	},
+	methods: {
+		getMtask() {
+			let that = this;
+			this.$API.pm.mtask.item.req(that.mtaskId).then((res) => {
+				that.currentMtask = res;
+				this.mgroup = res.mgroup;
+				this.mtask = res.id;
+				this.material_out = res.material_out_.id;
+				this.material_name = res.material_out_.name;
+				this.handledate = res.start_date;
 
-        this.params.mtask = this.mtaskId;
-        this.apiObj = this.$API.wpm.mlog.list;
-      })
-    },
-    table_show(row) {
-      this.visibleDrawer = true;
-      this.mlogId = row.id;
-      this.$nextTick(() => {
-        this.$refs.showDrawer.open();
-      });
-    },
+				this.params.mtask = this.mtaskId;
+				this.apiObj = this.$API.wpm.mlog.list;
+			});
+		},
+		table_show(row) {
+			this.visibleDrawer = true;
+			this.mlogId = row.id;
+			this.$nextTick(() => {
+				this.$refs.showDrawer.open();
+			});
+		},
 
-    handleQueryMtask() {
-      this.$refs.table.refresh();
-    },
-    //添加
-    addMlog() {
-      let that = this;
-      that.mgroup = that.currentMtask.mgroup;
-      that.material_out = that.currentMtask.material_out;
-      that.dialogSave = true;
-      that.$nextTick(() => {
-        that.$refs.saveDialog.open("add");
-      });
-    },
-    //编辑
-    table_edit(row) {
-      this.dialogSave = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("edit").setData(row);
-      });
-    },
-    //删除
-    table_del(row) {
-      this.$confirm(`确定删除吗？`, "提示", {
-        type: "warning",
-      }).then(() => {
-        this.$API.wpm.mlog.delete.req(row.id).then((res) => {
-          this.$message.success("删除成功");
-          this.$refs.mtaskMlogs.refresh();
-          return res;
-        }).catch((err) => {
-          return err;
-        });
-      }).catch(() => { });
-    },
+		handleQueryMtask() {
+			this.$refs.table.refresh();
+		},
+		//添加
+		addMlog() {
+			let that = this;
+			that.mgroup = that.currentMtask.mgroup;
+			that.material_out = that.currentMtask.material_out;
+			that.dialogSave = true;
+			that.$nextTick(() => {
+				that.$refs.saveDialog.open("add");
+			});
+		},
+		//编辑
+		table_edit(row) {
+			this.dialogSave = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("edit").setData(row);
+			});
+		},
+		//删除
+		table_del(row) {
+			this.$confirm(`确定删除吗？`, "提示", {
+				type: "warning",
+			})
+				.then(() => {
+					this.$API.wpm.mlog.delete
+						.req(row.id)
+						.then((res) => {
+							this.$message.success("删除成功");
+							this.$refs.mtaskMlogs.refresh();
+							return res;
+						})
+						.catch((err) => {
+							return err;
+						});
+				})
+				.catch(() => {});
+		},
 
-    //本地更新数据
-    handleSaveSuccess(data, mode) {
-      this.$refs.mtaskMlogs.refresh();
-    },
-    resetQuery() {
-      this.query = {};
-    },
-    mlog_submit(row) {
-      this.$API.wpm.mlog.submit.req(row.id).then(res => {
-        this.$message.success('操作成功')
-        this.getMtask(row.mtask)
-      }).catch(err => { })
-    },
-    mlog_revert(row) {
-      this.mlogHandleLoading = true;
-      this.$API.wpm.mlog.revert.req(row.id).then(res => {
-        this.$message.success("撤回成功");
-        this.getMtask(row.mtask)
-        this.mlogHandleLoading = false;
-      }).catch(e => {
-        this.mlogHandleLoading = false;
-      })
-    },
-  }
-}
+		//本地更新数据
+		handleSaveSuccess(data, mode) {
+			this.$refs.mtaskMlogs.refresh();
+		},
+		resetQuery() {
+			this.query = {};
+		},
+		mlog_submit(row) {
+			this.$API.wpm.mlog.submit
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("操作成功");
+					this.getMtask(row.mtask);
+				})
+				.catch((err) => {});
+		},
+		mlog_revert(row) {
+			this.mlogHandleLoading = true;
+			this.$API.wpm.mlog.revert
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("撤回成功");
+					this.getMtask(row.mtask);
+					this.mlogHandleLoading = false;
+				})
+				.catch((e) => {
+					this.mlogHandleLoading = false;
+				});
+		},
+	},
+};
 </script>
 <style scoped>
 .tabsHeader {
-  display: inline-block;
-  position: absolute;
-  right: 20px;
-  margin-top: 4px;
-  z-index: 100
+	display: inline-block;
+	position: absolute;
+	right: 20px;
+	margin-top: 4px;
+	z-index: 100;
 }
 
-.right-panel>*+* {
-  margin-left: 10px;
+.right-panel > * + * {
+	margin-left: 10px;
 }
 
 .el-main.nopadding {
-  padding: 0 20px 0 20px
+	padding: 0 20px 0 20px;
 }
 
 .tableTitle {
-  height: 40px;
-  line-height: 40px;
-  font-size: 14px;
-  box-sizing: border-box;
-  border-bottom: 1px solid #eeeeee;
+	height: 40px;
+	line-height: 40px;
+	font-size: 14px;
+	box-sizing: border-box;
+	border-bottom: 1px solid #eeeeee;
 }
-</style>
\ No newline at end of file
+</style>