From f93cfa8000765e2a4a6793dbfc75ce4dd8a8dbf6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 5 Sep 2024 12:12:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=91=E5=8C=96=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E9=AA=8C=E9=99=84=E4=BB=B6excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlog_detail.vue | 24 +++++++++--------
 src/views/wpm_gx/mlog_form.vue   | 44 +++++++++++++++++++++++++-------
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 2056c9ea..a2aca7d7 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -33,11 +33,14 @@
 					<el-descriptions-item label="创建时间">{{
 						mlogItem.create_time
 					}}</el-descriptions-item>
+					<el-descriptions-item label="检验表单" v-if="mlogItem.mgroup_name=='退火'||mlogItem.mgroup_name=='黑化'">
+						<el-link :href="mlogItem.test_file" target="_blank" type="primary" :underline="false">{{mlogItem.test_file}}</el-link>
+					</el-descriptions-item>
 				</el-descriptions>
 				<div style="padding: 5px 10px;display: flex;justify-content: end;">
 					<el-button
 						type="primary"
-						v-if="mlogItem.submit_time == null&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1))"
+						v-if="mlogItem.submit_time == null&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1))"
 						@click="mlogUpdate"
 						style="margin-right: 10px;"
 						v-auth="'mlog.update'"
@@ -51,10 +54,11 @@
 						@click="mlogSubmit"
 						>提交</el-button
 					>
+					
 					<!-- 退火-->
 					<el-button
 						type="primary"
-						v-if="mlogItem.mgroup_name=='退火'&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1))"
+						v-if="mlogItem.mgroup_name=='退火'&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1))"
 						:loading="isSaveing"
 						@click="createTicket"
 					>放行审批</el-button>
@@ -69,7 +73,7 @@
 				<div>
 					<el-button
 						type="primary"
-						v-if="mlogItem.submit_time == null&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1))"
+						v-if="mlogItem.submit_time == null&&(mlogItem.ticket==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1))"
 						icon="el-icon-plus"
 						@click="table_add"
 						>新增</el-button
@@ -113,13 +117,13 @@
 								link
 								type="primary"
 								@click="table_in_edit(scope.row)"
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
+								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
 							>
 								编辑
 							</el-button>
 							<el-button
 								link
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
+								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
 								type="danger"
 								@click="table_in_del(scope.row)"
 							>
@@ -254,7 +258,7 @@
 							<el-button
 								link
 								type="primary"
-								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type!==1)"
+								:disabled="mlogItem.submit_time !== null||mlogItem.ticket!==null||(mlogItem.ticket_&&mlogItem.ticket_.state_.type==1)"
 								@click="table_out_check(scope.row)"
 							>
 								检验
@@ -581,10 +585,7 @@ export default {
 			let obj = {};
 			obj.oinfo_json = that.oinfo_json;
 			obj.test_file = that.test_file;
-			console.log('test_file',that.test_file)
-			console.log('oinfo_json',that.oinfo_json)
-			that.$API.wpm.mlog.change.req(that.mlogItem.id, obj)
-			.then((res) => {
+			that.$API.wpm.mlog.change.req(that.mlogItem.id, obj).then((res) => {
 				let ticket = {};
 				that.isSaveing = true;
 				ticket.title = '退火放行审批单';
@@ -608,8 +609,9 @@ export default {
 			this.$refs.tableOut.refresh();
 		},
 		fileUPSuccess(res) {
+			let that = this;
 			console.log('res',res);
-			this.test_file = res.id;
+			this.test_file = res.path;
 		},
 		handleEditSuccess() {},
 		//设置过滤项
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 2458c29c..e3bf86bb 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -162,6 +162,21 @@
 								></ehsSelect>
 							</el-form-item>
 						</el-col>
+						<!-- 黑化 -->
+						<el-col :md="12" :sm="24" 	v-if="mgroupName=='黑化'">
+							<el-form-item label="检验文件">
+								<sc-upload-file
+									v-model="fileList"
+									:multiple="false"
+									:limit="1"
+									:accept="['.xlsx', '.xls']"
+									@success = "fileUPSuccess"
+									>
+									<el-button type="primary" icon="el-icon-upload"> </el-button>
+								</sc-upload-file>
+							</el-form-item>
+						</el-col>
+					
 						<el-col :md="12" :sm="24">
 							<el-form-item label="备注">
 								<el-input
@@ -231,6 +246,8 @@ export default {
 				edit: "编辑日志",
 				show: "查看日志",
 			},
+			test_file:'',
+			fileList:[],
 			//表单数据
 			form: Object.assign({}, defaultForm),
 			//验证规则
@@ -328,9 +345,17 @@ export default {
 		setData(data) {
 			console.log("data", data);
 			Object.assign(this.form, data);
+			if(data.test_file!==null){
+				this.form.test_file = data.test_file;
+				this.fileList = [{name:data.test_file,url:data.test_file}];
+			}
 			this.getRoute(data.id);
 		},
-
+		fileUPSuccess(res) {
+			let that = this;
+			console.log('res',res);
+			this.test_file = res.path;
+		},
 		//表单提交方法
 		submit() {
 			let that = this;
@@ -350,14 +375,15 @@ export default {
 						obj.work_end_time = that.form.work_end_time;
 						obj.handle_user = that.form.handle_user;
 						obj.note = that.form.note;
-						that.$API.wpm.mlog.change
-							.req(that.form.id, that.form)
-							.then((res) => {
-								that.isSaveing = false;
-								that.$emit("success");
-								that.visible = false;
-								that.$message.success("操作成功");
-							});
+						if(that.mgroupName=='黑化'){
+							that.form.test_file = that.test_file;
+						}
+						that.$API.wpm.mlog.change.req(that.form.id, that.form).then((res) => {
+							that.isSaveing = false;
+							that.$emit("success");
+							that.visible = false;
+							that.$message.success("操作成功");
+						});
 					}
 				}
 			});