This commit is contained in:
shijing 2023-12-18 12:36:23 +08:00
commit 29330fe515
3 changed files with 95 additions and 72 deletions

View File

@ -203,6 +203,15 @@ export default {
`${config.API_URL}/wpm/mlog/${id}/submit/`,
);
}
},
revert:{
name: "撤回",
req: async function(id, data){
return await http.post(
`${config.API_URL}/wpm/mlog/${id}/revert/`,
data
);
}
}
},
handover:{

View File

@ -45,7 +45,7 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="60">
<template #default="scope">
<el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'"
<el-link type="primary" @click="mtask_submit(scope.row)" v-auth="'mtask.submit'"
v-if="scope.row.state != 40">提交
</el-link>
</template>
@ -110,7 +110,8 @@
<el-table-column label="合格量" prop="count_ok"> </el-table-column>
<el-table-column label="合格率" prop="count">
<template #default="scope">
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real*100) }}%</span>
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real * 100)
}}%</span>
</template>
</el-table-column>
<el-table-column label="不合格原因及数量" align="center">
@ -136,15 +137,20 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="120" align="center">
<template #default="scope">
<el-link type="primary" @click="table_edit(scope.row)"
<el-button link type="primary" @click="table_edit(scope.row)"
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
</el-link>
<el-link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
v-if="scope.row.submit_time == null">删除
</el-link>
<el-link type="primary" @click="mlog_submit(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time == null">提交
</el-link>
</el-button>
<el-button link type="danger" @click="table_del(scope.row)"
v-auth="'mlog.delete'" v-if="scope.row.submit_time == null">删除
</el-button>
<el-button link type="primary" @click="mlog_submit(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time == null"
:loading="mlogHandleLoading">提交
</el-button>
<el-button link type="danger" @click="mlog_revert(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time != null"
:loading="mlogHandleLoading">撤回
</el-button>
<el-button link type="success" @click="table_show(scope.row)">
日志记录
</el-button>
@ -244,20 +250,10 @@
</el-main>
</el-container>
</el-main>
<save-dialog
v-if="dialogSave"
ref="saveDialog"
:mtask="mtask"
:mgroup="mgroup"
:material_out="material_out"
:activeType="activeName"
@success="handleSaveSuccess"
@closed="dialogSave = false"
></save-dialog>
<showDrawer ref="showDrawer"
v-if="visibleDrawer"
:mlogId="mlogId"
@closed="visibleDrawer = false">
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false"></save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer>
</el-container>
</template>
@ -266,11 +262,12 @@ import saveDialog from "./worktask_form.vue";
import showDrawer from "./mlog_drawer.vue";
export default {
components: {
saveDialog,showDrawer
saveDialog, showDrawer
},
data() {
return {
activeName:'7车间',
mlogHandleLoading: false,
activeName: '7车间',
currentDept: {},
currentMtask: {},
apiMtask: null,
@ -282,27 +279,37 @@ export default {
30: "生产中",
40: "已提交",
},
dialogSave:false,
visibleDrawer:false,
dialogSave: false,
visibleDrawer: false,
apiObjHandover: null,
paramsHandover: {},
apiObjWm: null,
paramsWm: {},
mlogs:[],
mlogId:'',
mtask:'',
mgroup:'',
material_out:''
mlogs: [],
mlogId: '',
mgroup: '',
material_out: ''
}
},
mounted() {
this.initDept()
},
methods: {
mlog_revert(row) {
this.mlogHandleLoading = true;
this.$API.wpm.mlog.revert.req(row.id).then(res => {
this.$message.success("撤回成功");
this.mtaskClick(this.currentMtask)
this.$refs.table_wm.refresh()
this.mlogHandleLoading = false;
}).catch(e => {
this.mlogHandleLoading = false;
})
},
tomio() {
this.$router.push({ name: "mainso_mio" });
},
tomioin(){
tomioin() {
this.$router.push({ name: "halfgood_mio" });
},
//
@ -319,7 +326,7 @@ export default {
that.$message.warning("请选择任务");
}
},
table_edit(row){
table_edit(row) {
this.dialogSave = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
@ -369,27 +376,29 @@ export default {
})
},
getMlogs() {
this.$API.wpm.mlog.list.req({ mtask: this.mtask, page: 0 }).then(res => {
this.$API.wpm.mlog.list.req({ mtask: this.currentMtask.id, page: 0 }).then(res => {
this.mlogs = res
})
},
getMtask() {
this.$API.pm.mtask.item.req(this.currentMtask.id).then(res => {
this.currentMtask = res
})
},
mtaskClick(row) {
this.currentMtask = row;
this.mtask = row.id;
this.getMtask()
this.getMlogs()
},
table_submit(row) {
mtask_submit(row) {
this.$API.pm.mtask.submit.req(row.id).then(res => {
this.$message.success('操作成功')
if (row.id == this.currentMtask.id) {
this.mtaskClick(row)
}
this.$refs.table_mtask.refresh()
this.mtaskClick(this.currentMtask)
}).catch(err => {
})
},
handleSaveSuccess(){
handleSaveSuccess() {
this.getMlogs();
},
table_show(row) {
@ -399,11 +408,16 @@ export default {
this.$refs.showDrawer.open();
});
},
mlog_submit(row){
mlog_submit(row) {
this.mlogHandleLoading = true
this.$API.wpm.mlog.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_mlog.refresh()
}).catch(err => {})
this.mtaskClick(this.currentMtask)
this.$refs.table_wm.refresh()
this.mlogHandleLoading = false
}).catch(err => {
this.mlogHandleLoading = false
})
},
}
}

View File

@ -6,92 +6,92 @@
<!-- <el-table-column type="index" fixed="left" width="40" /> -->
<el-table-column label="变更时间" fixed="left">
<template #default="scope">
<span>{{scope.row.change_time.slice(0, -3)}}</span>
<span>{{ scope.row.change_time.slice(0, -3) }}</span>
</template>
</el-table-column>
<el-table-column label="变更类型" fixed="left">
<template #default="scope">
<el-table-column label="变更类型" fixed="left" prop="action">
<!-- <template #default="scope">
<span v-if="scope.row.action=='create'">新建</span>
<span v-if="scope.row.action=='update'">更改</span>
<span v-if="scope.row.action=='submit'">提交</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="变更人" fixed="left" prop="change_user_name">
</el-table-column>
<el-table-column label="工序">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.mgroup_name}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.mgroup_name }}</span>
</template>
</el-table-column>
<el-table-column label="产品编号">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.batch}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.batch }}</span>
</template>
</el-table-column>
<el-table-column label="加工设备">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.equipment_name}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.equipment_name }}</span>
</template>
</el-table-column>
<el-table-column label="领用数量">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_use}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_use }}</span>
</template>
</el-table-column>
<el-table-column label="加工数量">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_real}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_real }}</span>
</template>
</el-table-column>
<el-table-column label="合格数量">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_ok}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_ok }}</span>
</template>
</el-table-column>
<el-table-column label="不合格数量" align="center">
<el-table-column label="弯曲">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_wq}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_wq }}</span>
</template>
</el-table-column>
<el-table-column label="炸纹">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_zw}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_zw }}</span>
</template>
</el-table-column>
<el-table-column label="条纹">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_tw}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_tw }}</span>
</template>
</el-table-column>
<el-table-column prop="" label="气泡">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_qp}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_qp }}</span>
</template>
</el-table-column>
<el-table-column label="断裂">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_dl}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_dl }}</span>
</template>
</el-table-column>
<el-table-column label="偏壁">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_pb}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_pb }}</span>
</template>
</el-table-column>
<el-table-column prop="" label="大小头">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_dxt}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_dxt }}</span>
</template>
</el-table-column>
<el-table-column label="结石气绒">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_jsqx}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_jsqx }}</span>
</template>
</el-table-column>
<el-table-column label="其他">
<template #default="scope">
<span v-if="scope.row.val_new">{{scope.row.val_new.count_n_qt}}</span>
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_qt }}</span>
</template>
</el-table-column>
</el-table-column>
@ -104,15 +104,15 @@
export default {
emits: ["closed"],
props: {
mlogId:{ type: String, default:''}
mlogId: { type: String, default: '' }
},
data() {
return {
visible: false,
apiObj: null,
paramsObj: {
model_name:'wpm.mlog',
instance_id:''
model_name: 'wpm.mlog',
instance_id: ''
},
state_: {
10: "创建中",