Browse Source

2024-04-30 工序中去掉物料配置项,

master_hella_20240701
zhousq 5 months ago
parent
commit
9986fb095f
  1. 8
      src/views/mes/process/process.data.ts
  2. 22
      src/views/mes/processroute/components/configDialog.vue
  3. 2
      src/views/mes/workScheduling/index.vue

8
src/views/mes/process/process.data.ts

@ -423,10 +423,10 @@ export const TabsList = [
label: "模具", label: "模具",
prop: 'PatternTab', prop: 'PatternTab',
}, },
{ // {
label: "物料", // label: "物料",
prop: 'ItembasicTab', // prop: 'ItembasicTab',
} // }
] ]

22
src/views/mes/processroute/components/configDialog.vue

@ -259,7 +259,7 @@ const deleteNode=(row)=>{
const openDetail = (row: any) => { const openDetail = (row: any) => {
rowData.value = row rowData.value = row
console.log('rowData',rowData.value) //console.log('rowData',rowData.value)
titleNameRef.value = rowData.value.processName titleNameRef.value = rowData.value.processName
titleValueRef.value =rowData.value.processrouteCode titleValueRef.value =rowData.value.processrouteCode
processRouteId.value = rowData.value.id processRouteId.value = rowData.value.id
@ -498,33 +498,26 @@ const deleteAnnexSuccess = async () => {
const handleCurrentChange=(value: number)=>{ const handleCurrentChange=(value: number)=>{
let index=(value-1)*page.value.size let index=(value-1)*page.value.size
page.value.current=value page.value.current=value
//console.log('index',index)
showProcessNodeData.value=processData.value.slice(index,index+page.value.size) showProcessNodeData.value=processData.value.slice(index,index+page.value.size)
//console.log('processData.value-472',processData.value)
//console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handlePrevClick=(value: number)=>{ const handlePrevClick=(value: number)=>{
page.value.current=value-1 page.value.current=value-1
if(page.value.current==0) { if(page.value.current==0) {
page.value.current=1 page.value.current=1
} }
// let index=(value-1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleNextClick=(value: number)=>{ const handleNextClick=(value: number)=>{
page.value.current=value+1 page.value.current=value+1
if(page.value.current>page.value.total/page.value.size) { if(page.value.current>page.value.total/page.value.size) {
page.value.current=page.value.total/page.value.size -1 page.value.current=page.value.total/page.value.size -1
} }
// let index=(value+1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleCurrentChangeM=(value: number)=>{ const handleCurrentChangeM=(value: number)=>{
let index=(value-1)*pageM.value.size let index=(value-1)*pageM.value.size
pageM.value.current=value pageM.value.current=value
//console.log('index',index)
showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size)
} }
@ -533,18 +526,13 @@ const handlePrevClickM=(value: number)=>{
if(pageM.value.current==0) { if(pageM.value.current==0) {
pageM.value.current=1 pageM.value.current=1
} }
// let index=(value-1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleNextClickM=(value: number)=>{ const handleNextClickM=(value: number)=>{
pageM.value.current=value+1 pageM.value.current=value+1
if(pageM.value.current>pageM.value.total/page.value.size) { if(pageM.value.current>pageM.value.total/page.value.size) {
pageM.value.current=page.value.total/pageM.value.size -1 pageM.value.current=page.value.total/pageM.value.size -1
} }
// let index=(value+1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
// //
onUnmounted?.(() => {}) onUnmounted?.(() => {})

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

@ -29,7 +29,7 @@
> >
<template #schedulingCode="{row}"> <template #schedulingCode="{row}">
<el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)"> <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
<span>{{ row.planMasterCode }}</span> <span>{{ row.schedulingCode }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">

Loading…
Cancel
Save