Browse Source

2024-05-10 工单暂停时不能进行工序完工操作的控制

master_hella_20240701
zhousq 4 months ago
parent
commit
1ee38eeed8
  1. 11
      src/views/mes/workScheduling/components/Detail.vue
  2. 5
      src/views/mes/workScheduling/index.vue

11
src/views/mes/workScheduling/components/Detail.vue

@ -104,8 +104,8 @@
:countScopeType="countScopeType" :countScopeType="countScopeType"
:key="updateKey" :key="updateKey"
> >
<template #actionDetail="{ row }"> <template #action="{ row }">
<ButtonBase <ButtonBase v-if="row.status == '0'"
:Butttondata="buttondata" :Butttondata="buttondata"
@button-base-click="buttonTableClick($event, row)" @button-base-click="buttonTableClick($event, row)"
/> />
@ -603,7 +603,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
tableObjectRef.value.params = { tableObjectRef.value.params = {
schedulingCode: row.schedulingCode schedulingCode: row.schedulingCode
} }
console.log(tableObjectRef.value.params) //console.log(tableObjectRef.value.params)
await getList() await getList()
} }
isShowDrawer.value = true isShowDrawer.value = true
@ -659,6 +659,11 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
] ]
} }
if(row.status == '1'){
props.buttondataTable[0].hide = false
}else{
props.buttondataTable[0].hide = true
}
buttondata.value = [...detailButtonEdit, ...detailButtonDelete, ...props.buttondataTable] buttondata.value = [...detailButtonEdit, ...detailButtonDelete, ...props.buttondataTable]
} finally { } finally {
detailLoading.value = false detailLoading.value = false

5
src/views/mes/workScheduling/index.vue

@ -191,7 +191,8 @@ const butttondata=(row) =>{ return [
defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['1'] ),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['4'] ),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"质检",name:'check',hide: isShowMainButton(row,['5'] ),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
//defaultButtons.mainListHandleBtn({label:"",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), //defaultButtons.mainListHandleBtn({label:"",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
@ -212,6 +213,8 @@ const buttonTableClick = async (val, row) => {
changeBillStatus(row,"1") changeBillStatus(row,"1")
}else if(val=='report'){ }else if(val=='report'){
reportRef.value.openDetail(row,"报工") reportRef.value.openDetail(row,"报工")
}else if(val=='check'){
//reportRef.value.openDetail(row,"")
}else if(val=='finish'){ }else if(val=='finish'){
finishReport(row) finishReport(row)
} else if(val=='callMaterial'){ } else if(val=='callMaterial'){

Loading…
Cancel
Save