zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 

feat:修改水平涡流选粉机
This commit is contained in:
zty 2024-10-09 09:27:32 +08:00
parent ab6e9ac889 3fbd419ffd
commit a831c17838
3 changed files with 112 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/views/wf/ticketdetail.vue
View File

@ -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,60 +722,62 @@ export default {
showMoreVisit() {
this.visitShow = true;
this.$nextTick(() => {
this.$refs.visitDialog
.open("show")
.setData({ id: this.projectId });
this.$refs.visitDialog.open("show").setData({ id: this.projectId });
});
},
//工单详情
getticketItem() {
this.mainLoading = true;
this.$API.wf.ticket.ticketItem
.req(this.ticketId)
.then((res) => {
this.mainLoading = false;
this.ticketDetail = res;
if (this.ticketDetail.state_.key == "opl_close") {
// 如果是作业关闭,展示需要提交的表单
this.getCloseDos();
}
// 判断是不是我的或该我处理的
if (this.ticketDetail.create_by == this.userId) {
this.isOwn = true;
}
let participant = this.ticketDetail.participant;
if (
participant == this.userId ||
participant.indexOf(this.userId) > -1
) {
this.isDuty = true;
}
})
.catch((e) => {
this.mainLoading = false;
});
let that = this;
that.mainLoading = true;
that.$API.wf.ticket.ticketItem.req(that.ticketId).then((res) => {
that.mainLoading = false;
that.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();
}
// 判断是不是我的或该我处理的
if (this.ticketDetail.create_by == this.userId) {
this.isOwn = true;
}
let participant = this.ticketDetail.participant;
if (
participant == this.userId ||
participant.indexOf(this.userId) > -1
) {
this.isDuty = true;
}
}).catch((e) => {
this.mainLoading = false;
});
},
//获取应有的流转
getBtns() {
let that = this;
that.audit_imgs_show = false;
that.$API.wf.ticket.ticketTransitions
.req(that.ticketId)
.then((res) => {
that.operationBtn = res;
console.log("operationBtn", that.operationBtn);
if(res.length>0){
for (let i = 0; i < res.length; i++) {
if(res[i].on_submit_func=="apps.opm.services.check_opl_audit_imgs"){
that.audit_imgs_show = true;
}
if(res[i].on_submit_func=="apps.opm.services.check_opl_work_imgs"){
that.audit_work_show = true;
}
that.$API.wf.ticket.ticketTransitions.req(that.ticketId).then((res) => {
that.operationBtn = res;
console.log("operationBtn", that.operationBtn);
if(res.length>0){
for (let i = 0; i < res.length; i++) {
if(res[i].on_submit_func=="apps.opm.services.check_opl_audit_imgs"){
that.audit_imgs_show = true;
}
if(res[i].on_submit_func=="apps.opm.services.check_opl_work_imgs"){
that.audit_work_show = true;
}
}
});
}
});
},
//访客详情
getVisit() {
@ -848,15 +865,13 @@ export default {
this.userName = data.name;
},
deliverNodeHandler() {
this.$API.wf.ticket.ticketDeliver
.req(this.ticketId, this.deliverForm)
.then((res) => {
if (res.err_msg) {
} else {
this.limitedDeliver = false;
this.$router.push("dutywork");
}
});
this.$API.wf.ticket.ticketDeliver.req(this.ticketId, this.deliverForm).then((res) => {
if (res.err_msg) {
} else {
this.limitedDeliver = false;
this.$router.push("dutywork");
}
});
},
//转交处理-end
//流转按钮触发
@ -879,18 +894,15 @@ export default {
return;
}
}
this.$API.wf.ticket.ticketHandle
.req(this.ticketId, params)
.then((res) => {
if (res.err_msg) {
} else {
this.$router.push("dutywork");
this.submitLoading = false;
}
})
.catch((e) => {
this.$API.wf.ticket.ticketHandle.req(this.ticketId, params).then((res) => {
if (res.err_msg) {
} else {
this.$router.push("dutywork");
this.submitLoading = false;
});
}
}).catch((e) => {
this.submitLoading = false;
});
},
reStart() {
this.$API.wf.ticket.retryScript.req(this.ticketId).then((res) => {

6
src/views/wpm_gx/mlog_detail.vue
View File

@ -610,6 +610,7 @@ export default {
that.$API.wf.ticket.create.req(ticket).then((res) => {
that.isSaveing = false;
that.ticketDialog = false;
that.visible = false;
that.$message.success("提交成功");
}).catch((e) => {
that.isSaveing = false;
@ -628,7 +629,10 @@ export default {
console.log('res',res);
this.test_file = res.path;
},
handleEditSuccess() {},
//编辑成功后的方法调用
handleEditSuccess() {
this.getMlogItem();
},
//设置过滤项
setFilters(filters) {
this.selectionFilters = filters;

28
src/views/wpm_gx/mlogs.vue
View File

@ -72,6 +72,11 @@
prop="handle_user_name"
width="80"
></el-table-column>
<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'">
<template #default="scope">
{{ getRemaTime(scope.row) }}
</template>
</el-table-column>
<el-table-column
label="开始时间"
prop="work_start_time"
@ -208,6 +213,29 @@ export default {
});
},
methods: {
getRemaTime(row){
if(row.work_start_time !== null){
let times = 0;
let nowTime = new Date().getTime();
let startTiem = new Date(row.work_start_time).getTime();
console.log('nowTime',nowTime)
console.log('startTiem',startTiem)
let remaTime = nowTime - startTiem;
console.log('remaTime',remaTime)
let temp = Math.floor(remaTime/1000*60);
console.log('temp',temp)
if(remaTime>0&&row.reminder_interval_list[0]){
if(temp<row.reminder_interval_list[0]){
times = row.reminder_interval_list[0]-temp;
}else{
return '/';
}
return times
}else{
return '/';
}
}
},
detailClose() {
this.dialog.detail = false;
this.$refs.table.refresh();