fix:coding500

src/views/wf/ticketdetail.vue

@@ -26,12 +26,28 @@
 							ticketDetail.workflow_.name
 						}}</span>
 					</el-descriptions-item>
-					<el-descriptions-item label="创建时间:">
+					<el-descriptions-item label="创建时间:" :column="3">
 						{{ ticketDetail.create_time }}
 					</el-descriptions-item>
-					<el-descriptions-item label="工单标题:" :span="3">
+					<el-descriptions-item label="工单标题:" :column="3">
 						{{ ticketDetail.title }}
 					</el-descriptions-item>
+					<el-descriptions-item label="工艺路线:" :column="3" v-if="ticketDetail.ticket_data&&ticketDetail.ticket_data.t_model=='mlog'">
+						{{ ticketDetail.routepack_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="输入物料:" :column="3" v-if="ticketDetail.ticket_data&&ticketDetail.ticket_data.t_model=='mlog'">
+						{{ ticketDetail.material_in_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="输出物料:" :column="3" v-if="ticketDetail.ticket_data&&ticketDetail.ticket_data.t_model=='mlog'">
+						{{ ticketDetail.material_out_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="处理人:" :column="3" v-if="ticketDetail.ticket_data&&ticketDetail.ticket_data.t_model=='mlog'">
+						{{ ticketDetail.handle_user_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="检验表单:" :column="3" v-if="ticketDetail.ticket_data&&ticketDetail.ticket_data.t_model=='mlog'">
+						<el-link :href="ticketDetail.test_file" target="_blank" type="primary" :underline="false">{{ticketDetail.test_file}}</el-link>
+						<!-- {{ ticketDetail.test_file }} -->
+					</el-descriptions-item>
 				</el-descriptions>
 			</el-card>
 			<el-card
@@ -665,8 +681,7 @@ export default {
 				confirmButtonText: "确认",
 				cancelButtonText: "取消",
 				type: "warning",
-			})
+			}).then(() => {
-				.then(() => {
 					if (that.handleTitle === "撤回工单") {
 						that.$API.wf.ticket.ticketRetreat
 							.req(that.ticketId, that.handleForm)
@@ -707,19 +722,25 @@ export default {
 		showMoreVisit() {
 			this.visitShow = true;
 			this.$nextTick(() => {
-				this.$refs.visitDialog
+				this.$refs.visitDialog.open("show").setData({ id: this.projectId });
-					.open("show")
-					.setData({ id: this.projectId });
 			});
 		},
 		//工单详情
 		getticketItem() {
-			this.mainLoading = true;
+			let that = this;
-			this.$API.wf.ticket.ticketItem
+			that.mainLoading = true;
-				.req(this.ticketId)
+			that.$API.wf.ticket.ticketItem.req(that.ticketId).then((res) => {
-				.then((res) => {
+				that.mainLoading = false;
-					this.mainLoading = false;
+				that.ticketDetail = res;
-					this.ticketDetail = res;
+				if(res.ticket_data.t_model&&res.ticket_data.t_model=="mlog"){
+					that.$API.wpm.mlog.item.req(res.ticket_data.t_id).then((res1) => {
+						that.ticketDetail.routepack_name = res1.routepack_name;
+						that.ticketDetail.material_in_name = res1.material_in_name;
+						that.ticketDetail.material_out_name = res1.material_out_name;
+						that.ticketDetail.handle_user_name = res1.handle_user_name;
+						that.ticketDetail.test_file = res1.test_file;
+					})
+				}
 				if (this.ticketDetail.state_.key == "opl_close") {
 					// 如果是作业关闭,展示需要提交的表单
 					this.getCloseDos();
@@ -735,8 +756,7 @@ export default {
 				) {
 					this.isDuty = true;
 				}
-				})
+			}).catch((e) => {
-				.catch((e) => {
 				this.mainLoading = false;
 			});
 		},
@@ -744,9 +764,7 @@ export default {
 		getBtns() {
 			let that = this;
 			that.audit_imgs_show = false;
-			that.$API.wf.ticket.ticketTransitions
+			that.$API.wf.ticket.ticketTransitions.req(that.ticketId).then((res) => {
-				.req(that.ticketId)
-				.then((res) => {
 				that.operationBtn = res;
 				console.log("operationBtn", that.operationBtn);
 				if(res.length>0){
@@ -759,7 +777,6 @@ export default {
 						}
 					}
 				}
-					
 			});
 		},
 		//访客详情
@@ -848,9 +865,7 @@ export default {
 			this.userName = data.name;
 		},
 		deliverNodeHandler() {
-			this.$API.wf.ticket.ticketDeliver
+			this.$API.wf.ticket.ticketDeliver.req(this.ticketId, this.deliverForm).then((res) => {
-				.req(this.ticketId, this.deliverForm)
-				.then((res) => {
 				if (res.err_msg) {
 				} else {
 					this.limitedDeliver = false;
@@ -879,16 +894,13 @@ export default {
 					return;
 				}
 			}
-			this.$API.wf.ticket.ticketHandle
+			this.$API.wf.ticket.ticketHandle.req(this.ticketId, params).then((res) => {
-				.req(this.ticketId, params)
-				.then((res) => {
 				if (res.err_msg) {
 				} else {
 					this.$router.push("dutywork");
 					this.submitLoading = false;
 				}
-				})
+			}).catch((e) => {				
-				.catch((e) => {
 				this.submitLoading = false;
 			});
 		},