diff --git a/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue b/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue index 5a9a593..1a8ef08 100644 --- a/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue +++ b/src/views/pszc/hrelongatordata108/operationtimedata108/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue b/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue index 8fe0183..60f4755 100644 --- a/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue +++ b/src/views/pszc/hrelongatordata90/operationtimedata90/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue index 10dc6a6..557ba1e 100644 --- a/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue +++ b/src/views/pszc/hrpuncherdata108/operationtimedata108/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue b/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue index e736bbf..1991abc 100644 --- a/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue +++ b/src/views/pszc/hrpuncherdata90/operationtimedata90/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts index d83f420..75458c9 100644 --- a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts +++ b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts @@ -20,11 +20,11 @@ export const HrSizingmilldata108 = useCrudSchemas(reactive([ }, { label: '数据点名称', - field: 'icode', + field: 'iname', isTable: true, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return sjdList.find((obj) => obj.code === cellValue)?.label - }, + // formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + // return sjdList.find((obj) => obj.code === cellValue)?.label + // }, search: { show: true, component: 'Select', @@ -63,9 +63,9 @@ export const HrSizingmilldata108 = useCrudSchemas(reactive([ label: '仪表的名称', field: 'mcode', isTable: true, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return yqbList.find((obj) => obj.code === cellValue)?.label - }, + // formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + // return yqbList.find((obj) => obj.code === cellValue)?.label + // }, search: { show: true, component: 'Select', diff --git a/src/views/pszc/hrsizingmilldata108/index.vue b/src/views/pszc/hrsizingmilldata108/index.vue index b15070c..db35929 100644 --- a/src/views/pszc/hrsizingmilldata108/index.vue +++ b/src/views/pszc/hrsizingmilldata108/index.vue @@ -31,6 +31,13 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > + + + diff --git a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts index 685fb01..055df3d 100644 --- a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts +++ b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts @@ -20,11 +20,11 @@ export const HrSizingmilldata90 = useCrudSchemas(reactive([ }, { label: '数据点名称', - field: 'icode', + field: 'iname', isTable: true, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return sjdList.find((obj) => obj.code === cellValue)?.label - }, + // formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + // return sjdList.find((obj) => obj.code === cellValue)?.label + // }, search: { show: true, component: 'Select', diff --git a/src/views/pszc/hrsizingmilldata90/index.vue b/src/views/pszc/hrsizingmilldata90/index.vue index 0c19f3b..ae126c7 100644 --- a/src/views/pszc/hrsizingmilldata90/index.vue +++ b/src/views/pszc/hrsizingmilldata90/index.vue @@ -27,7 +27,14 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -