Fix handover actions and inspection refresh
This commit is contained in:
parent
e990c4e150
commit
d8daf21925
|
|
@ -166,7 +166,7 @@
|
||||||
</el-popconfirm>
|
</el-popconfirm>
|
||||||
<el-popconfirm
|
<el-popconfirm
|
||||||
title="确定删除吗?"
|
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)"
|
@confirm="table_del(scope.row, scope.$index)"
|
||||||
>
|
>
|
||||||
<template #reference>
|
<template #reference>
|
||||||
|
|
@ -277,6 +277,7 @@ export default {
|
||||||
deptId:'',
|
deptId:'',
|
||||||
mtask: "",
|
mtask: "",
|
||||||
mlogId: "",
|
mlogId: "",
|
||||||
|
userId: this.$TOOL.data.get("USER_INFO").id,
|
||||||
mgroupId: "",
|
mgroupId: "",
|
||||||
processId: "",
|
processId: "",
|
||||||
changeText: "展开",
|
changeText: "展开",
|
||||||
|
|
@ -305,6 +306,15 @@ export default {
|
||||||
this.getMgroupOptions();
|
this.getMgroupOptions();
|
||||||
},
|
},
|
||||||
methods: {
|
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(){
|
expendChange(){
|
||||||
this.expendCode = !this.expendCode;
|
this.expendCode = !this.expendCode;
|
||||||
if(this.expendCode){
|
if(this.expendCode){
|
||||||
|
|
|
||||||
|
|
@ -683,10 +683,12 @@ export default {
|
||||||
}else{
|
}else{
|
||||||
that.$API.wpm.mlogb.list.req(that.paramsOut).then((res_out) => {
|
that.$API.wpm.mlogb.list.req(that.paramsOut).then((res_out) => {
|
||||||
that.tableData2 = 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.mlogItem.qct = res_out[0].qct;
|
||||||
}
|
}
|
||||||
that.checkTableShow = true;
|
that.checkTableShow = true;
|
||||||
|
}).catch(() => {
|
||||||
|
that.checkTableShow = true;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if(!res.is_fix){
|
if(!res.is_fix){
|
||||||
|
|
@ -1060,7 +1062,8 @@ export default {
|
||||||
if(this.mlogItem.material_out_&&this.mlogItem.material_out_.tracking==10){
|
if(this.mlogItem.material_out_&&this.mlogItem.material_out_.tracking==10){
|
||||||
this.$refs.tableOut.refresh();
|
this.$refs.tableOut.refresh();
|
||||||
}else{
|
}else{
|
||||||
this.$refs.checkTable?.refreshfun?.();
|
this.checkTableShow = false;
|
||||||
|
this.getMlogItem();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCheckSuccess() {
|
handleCheckSuccess() {
|
||||||
|
|
|
||||||
|
|
@ -236,10 +236,7 @@
|
||||||
>
|
>
|
||||||
<el-popconfirm
|
<el-popconfirm
|
||||||
title="确定删除吗?"
|
title="确定删除吗?"
|
||||||
v-if="
|
v-if="canDelete(scope.row)"
|
||||||
(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))
|
|
||||||
"
|
|
||||||
@confirm="table_del(scope.row, scope.$index)"
|
@confirm="table_del(scope.row, scope.$index)"
|
||||||
>
|
>
|
||||||
<template #reference>
|
<template #reference>
|
||||||
|
|
@ -387,6 +384,7 @@ export default {
|
||||||
values: "交送",
|
values: "交送",
|
||||||
mtask: "",
|
mtask: "",
|
||||||
mlogId: "",
|
mlogId: "",
|
||||||
|
userId: this.$TOOL.data.get("USER_INFO").id,
|
||||||
codeText:"",
|
codeText:"",
|
||||||
codeText2:"",
|
codeText2:"",
|
||||||
printer_name: "",
|
printer_name: "",
|
||||||
|
|
@ -419,6 +417,15 @@ export default {
|
||||||
that.route_code = that.$route.path.split("/")[2];
|
that.route_code = that.$route.path.split("/")[2];
|
||||||
},
|
},
|
||||||
methods: {
|
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() {
|
getMgroupOptions() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue