diff --git a/src/views/mes/process/process.data.ts b/src/views/mes/process/process.data.ts
index 0f6dce604..93008e46c 100644
--- a/src/views/mes/process/process.data.ts
+++ b/src/views/mes/process/process.data.ts
@@ -423,10 +423,10 @@ export const TabsList = [
label: "模具",
prop: 'PatternTab',
},
- {
- label: "物料",
- prop: 'ItembasicTab',
- }
+ // {
+ // label: "物料",
+ // prop: 'ItembasicTab',
+ // }
]
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index 571e045fb..589d36a19 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -259,7 +259,7 @@ const deleteNode=(row)=>{
const openDetail = (row: any) => {
rowData.value = row
- console.log('rowData',rowData.value)
+ //console.log('rowData',rowData.value)
titleNameRef.value = rowData.value.processName
titleValueRef.value =rowData.value.processrouteCode
processRouteId.value = rowData.value.id
@@ -498,33 +498,26 @@ const deleteAnnexSuccess = async () => {
const handleCurrentChange=(value: number)=>{
let index=(value-1)*page.value.size
page.value.current=value
- //console.log('index',index)
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)=>{
page.value.current=value-1
if(page.value.current==0) {
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)=>{
page.value.current=value+1
if(page.value.current>page.value.total/page.value.size) {
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)=>{
let index=(value-1)*pageM.value.size
pageM.value.current=value
- //console.log('index',index)
showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size)
}
@@ -533,18 +526,13 @@ const handlePrevClickM=(value: number)=>{
if(pageM.value.current==0) {
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)=>{
pageM.value.current=value+1
if(pageM.value.current>pageM.value.total/page.value.size) {
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?.(() => {})
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index e89edeacf..19577fe7a 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -29,7 +29,7 @@
>
- {{ row.planMasterCode }}
+ {{ row.schedulingCode }}