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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
shijing 2026-07-28 17:02:15 +08:00
parent c18899be5c d8daf21925
commit 7f814e1a4f
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/wpm_bx/handover.vue
View File

@ -166,7 +166,7 @@
</el-popconfirm>
<el-popconfirm
title="确定删除吗？"
v-if="(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&scope.row.submit_time == null"
v-if="canDelete(scope.row)"
@confirm="table_del(scope.row, scope.$index)"
>
<template #reference>
@ -277,6 +277,7 @@ export default {
deptId:'',
mtask: "",
mlogId: "",
userId: this.$TOOL.data.get("USER_INFO").id,
mgroupId: "",
processId: "",
changeText: "展开",
@ -305,6 +306,15 @@ export default {
this.getMgroupOptions();
},
methods: {
canDelete(row) {
if (row.submit_time != null) {
return false;
}
const userId = String(this.userId);
return [row.send_user, row.recive_user, row.create_by].some(
(id) => id != null && String(id) === userId
);
},
expendChange(){
this.expendCode = !this.expendCode;
if(this.expendCode){

7
src/views/wpm_bx/mlog_detail.vue
View File

@ -683,10 +683,12 @@ export default {
}else{
that.$API.wpm.mlogb.list.req(that.paramsOut).then((res_out) => {
that.tableData2 = res_out;
if(res.is_fix&&res_out[0].qct!==null){
if(res.is_fix&&res_out[0]?.qct!==null&&res_out[0]?.qct!==undefined){
that.mlogItem.qct = res_out[0].qct;
}
that.checkTableShow = true;
}).catch(() => {
that.checkTableShow = true;
})
}
if(!res.is_fix){
@ -1060,7 +1062,8 @@ export default {
if(this.mlogItem.material_out_&&this.mlogItem.material_out_.tracking==10){
this.$refs.tableOut.refresh();
}else{
this.$refs.checkTable?.refreshfun?.();
this.checkTableShow = false;
this.getMlogItem();
}
},
handleCheckSuccess() {

15
src/views/wpm_gx/handover.vue
View File

@ -236,10 +236,7 @@
>
<el-popconfirm
title="确定删除吗？"
v-if="
(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
scope.row.submit_time == null&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type!== 0))
"
v-if="canDelete(scope.row)"
@confirm="table_del(scope.row, scope.$index)"
>
<template #reference>
@ -387,6 +384,7 @@ export default {
values: "交送",
mtask: "",
mlogId: "",
userId: this.$TOOL.data.get("USER_INFO").id,
codeText:"",
codeText2:"",
printer_name: "",
@ -419,6 +417,15 @@ export default {
that.route_code = that.$route.path.split("/")[2];
},
methods: {
canDelete(row) {
if (row.submit_time != null) {
return false;
}
const userId = String(this.userId);
return [row.send_user, row.recive_user, row.create_by].some(
(id) => id != null && String(id) === userId
);
},
//获取工段列表
getMgroupOptions() {
let that = this;