From c009cf68ec7dce688ec09e7cbd339556f9bc8e1e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 3 Sep 2024 15:25:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=80=E7=81=AB=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BA=A4=E6=8E=A5=E6=97=B6=E5=87=BA=E5=8F=91?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=EF=BC=8C=E7=A0=B4=E7=A2=8E=E6=95=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8A=A0=E5=B7=A5=E5=89=8D=E4=B8=8D=E8=89=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_detail.vue | 246 +++++++++++++++++++++++--------
 1 file changed, 183 insertions(+), 63 deletions(-)

diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 7dc7c634..45ec64a0 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -34,30 +34,35 @@
 						mlogItem.create_time
 					}}</el-descriptions-item>
 				</el-descriptions>
-				<div
-					style="
-						padding: 5px 10px;
-						display: flex;
-						justify-content: end;
-					"
-				>
+				<div style="padding: 5px 10px;display: flex;justify-content: end;">
 					<el-button
 						type="primary"
 						v-if="mlogItem.submit_time == null"
 						@click="mlogUpdate"
+						style="margin-right: 10px;"
 						v-auth="'mlog.update'"
 					>
 						编辑
 					</el-button>
-					<el-button
-						type="primary"
-						v-if="mlogItem.submit_time == null"
-						:loading="isSaveing"
-						@click="mlogSubmit"
-						>提交</el-button
-					>
+					<div v-if="mlogItem.submit_time == null">
+						<!-- 退火-->
+						<el-button
+							type="primary"
+							v-if="mlogItem.mgroup_name=='退火'"
+							:loading="isSaveing"
+							@click="createTicket"
+						>放行审批</el-button>
+						<el-button
+							type="primary"
+							v-else
+							:loading="isSaveing"
+							@click="mlogSubmit"
+							>提交</el-button
+						>
+					</div>
 				</div>
 			</el-card>
+			<!-- 物料消耗 -->
 			<el-card
 				style="width: 100%; margin: 1vh 0"
 				header="物料消耗"
@@ -91,7 +96,7 @@
 					</el-table-column>
 					<el-table-column label="领用数量" prop="count_use">
 					</el-table-column>
-					<el-table-column label="破碎数量" prop="count_break">
+					<el-table-column label="加工前不良" prop="count_n_jgqbl">
 					</el-table-column>
 					<el-table-column
 						label="创建时间"
@@ -126,6 +131,47 @@
 					</el-table-column>
 				</scTable>
 			</el-card>
+			<!-- 物料消耗编辑 -->
+			<el-dialog v-model="saveInDialog" title="编辑">
+				<el-form
+					:model="saveInForm"
+					:rules="rules"
+					label-width="100px"
+					ref="saveInForm"
+				>
+					<el-row>
+						<el-col :span="23">
+							<el-form-item label="领取数量" prop="count_use">
+								<el-input-number
+									v-model="saveInForm.count_use"
+									:min="1"
+									style="width: 100%"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="23">
+							<el-form-item label="加工前不良" prop="count_n_jgqbl">
+								<el-input-number
+									v-model="saveInForm.count_n_jgqbl"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button
+						type="primary"
+						:loading="isSaveing"
+						@click="saveInSubmit()"
+						>保 存</el-button
+					>
+				</template>
+			</el-dialog>
+			<!-- 产出物料 -->
 			<el-card style="width: 100%" header="产出物料" shadow="never">
 				<scTable
 					ref="tableOut"
@@ -220,45 +266,6 @@
 				@closed="dialog.check = false"
 			>
 			</check-dialog>
-			<el-dialog v-model="saveInDialog" title="新增/编辑">
-				<el-form
-					:model="saveInForm"
-					:rules="rules"
-					label-width="100px"
-					ref="saveInForm"
-				>
-					<el-row>
-						<el-col :span="23">
-							<el-form-item label="领取数量" prop="count_use">
-								<el-input-number
-									v-model="saveInForm.count_use"
-									:min="1"
-									style="width: 100%"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="23">
-							<el-form-item label="破碎数量" prop="count_break">
-								<el-input-number
-									v-model="saveInForm.count_break"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-				<template #footer>
-					<el-button
-						type="primary"
-						:loading="isSaveing"
-						@click="saveInSubmit()"
-						>保 存</el-button
-					>
-				</template>
-			</el-dialog>
 			<edit-dialog
 				v-if="dialog.edit"
 				ref="editDialog"
@@ -267,6 +274,86 @@
 				@closed="dialog.edit = false"
 			>
 			</edit-dialog>
+			<!-- 退火放行通知单 -->
+			<el-dialog v-model="ticketDialog" title="退火放行通知单">
+				<el-form
+					:model="saveInForm"
+					:rules="rules"
+					label-width="100px"
+					ref="saveInForm"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="退火炉号">
+								<el-input v-model="oinfo_json.退火炉号"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="退火时间">
+								<el-date-picker
+									type="datetime"
+									v-model="oinfo_json.退火时间"
+									style="width: 100%"
+									value-format="YYYY-MM-DD HH:mm"
+									format="YYYY-MM-DD HH:mm"
+								></el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="退火温度">
+								<el-input-number
+									v-model="oinfo_json.退火温度"
+									:min="1"
+									style="width: 100%"
+									controls-position="right"
+								/>
+								<span style="position: absolute;right: -17px;">°C</span>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="抽检结果">
+								<el-input v-model="oinfo_json.抽检结果"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="抽检数">
+								<el-input-number
+									v-model="oinfo_json.抽检数"
+									:precision="0"
+									:min="1"
+									style="width: 100%"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="强度落球">
+								<el-input-number
+									v-model="oinfo_json.强度落球"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-form-item label="放行标准">：退火后直径23.5±0.2；黑圈内径：5.9±0.1；外径7.6-7.77</el-form-item>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button
+						v-for="item in initForm.transitions"
+						:key="item.id"
+						type="primary"
+						:loading="isSaveing"
+						:disabled="isSaveing"
+						@click="submitTicketCreate(item.id)"
+						style="margin-right: 4px"
+						>{{ item.name }}</el-button
+					>
+				</template>
+			</el-dialog>
 		</div>
 	</el-drawer>
 </template>
@@ -312,13 +399,22 @@ export default {
 			mlogItem: {},
 			saveInForm: {
 				count_use: 0,
-				count_break: 0,
+				count_n_jgqbl: 0,
+			},
+			oinfo_json:{
+				退火炉号:'',
+				退火时间:'',
+				退火温度:'',
+				抽检结果:'',
+				抽检数:'',
+				强度落球:'',
 			},
 			deptId: "",
 			visible: false,
 			isSaveing: false,
 			options: [],
 			saveInDialog: false,
+			ticketDialog:false,
 			setFiltersVisible: false,
 			rules: {
 				count_use: [
@@ -328,13 +424,6 @@ export default {
 						trigger: "blur",
 					},
 				],
-				count_break: [
-					{
-						required: true,
-						message: "请输入破碎数量",
-						trigger: "blur",
-					},
-				],
 			},
 		};
 	},
@@ -343,11 +432,13 @@ export default {
 		this.paramsIn.mlog = this.mlogId;
 		this.paramsOut.mlog = this.mlogId;
 		this.apiObj = this.$API.wpm.mlogb.list;
+		this.getInit();
 	},
 	methods: {
 		open() {
 			this.visible = true;
 		},
+		
 		getMlogItem() {
 			let that = this;
 			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
@@ -391,7 +482,7 @@ export default {
 					that.isSaveing = true;
 					let obj = {};
 					obj.count_use = that.saveInForm.count_use;
-					obj.count_break = that.saveInForm.count_break;
+					obj.count_n_jgqbl = that.saveInForm.count_n_jgqbl;
 					that.$API.wpm.mlogb.updateIn
 						.req(that.saveInForm.id, obj)
 						.then((res) => {
@@ -434,6 +525,35 @@ export default {
 				that.$message.success("操作成功");
 			});
 		},
+		//渲染工单提交按钮
+		getInit() {
+			let that = this;
+			that.$API.wf.workflow.initkey.req("	backfire").then((res) => {
+				that.initForm = res;
+			});
+		},
+		//填写退火放行单信息
+		createTicket(){
+			this.ticketDialog = true;
+			this.oinfo_json.退火炉号 = this.mlogItem.equipment_name.split("|")[0];
+		},
+		//提交退火放行单信息,创建工单
+		submitTicketCreate(id) {
+			let that = this;
+			let ticket = {};
+			that.isSaveing = true;
+			ticket.title = '退火放行审批单';
+			ticket.workflow = that.initForm.workflow;
+			ticket.ticket_data = {t_id: that.mlogItem.id};
+			ticket.transition = id;
+			that.$API.wf.ticket.create.req(ticket).then((res) => {
+				that.isSaveing = false;
+				that.ticketDialog = false;
+				that.$message.success("提交成功");
+			}).catch((e) => {
+				that.isSaveing = false;
+			});
+		},
 		handleSaveSuccess() {
 			this.$refs.tableIn.refresh();
 			this.$refs.tableOut.refresh();