diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index f81f8f35a..a7c49f853 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -127,6 +127,7 @@ const showAll = () =>{ :label-align="labelAlign" :label-class-name="labelClassName" :width="width" + :span="item.span" > + + diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index 393d2e8c6..d0d705a23 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -39,7 +39,7 @@ const fixedMenu = computed(() => appStore.getFixedMenu) // 搜索图片 const search = computed(() => appStore.search) const scrollBarHeight = computed(() => { - return (window.innerHeight - appStore.getCategoryMenuHeight - 85)+'px' + return (window.innerHeight - appStore.getCategoryMenuHeight - 35)+'px' }) export const useRenderLayout = () => { diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 73b49ad15..70eb5fc22 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -287,6 +287,7 @@ export enum DICT_TYPE { BILL_TYPE = 'bill_type', // 发票类型 CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型 INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差 + PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型 // ========== 业务 - mes ========== MESDO_STATUS = 'mes_do_status', // 工单执行状态 diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 64bb9c8b3..db7948081 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -26,11 +26,10 @@ export function formatDate(date: Date | number, format?: string): string { /** * 获取当前的日期+时间 */ -export function addDay(date: Date | number,addDay:number) { - return dayjs(date).add(addDay,'day') +export function addDay(date: Date | number, addDay: number) { + return dayjs(date).add(addDay, 'day') } - /** * 获取当前的日期+时间 */ @@ -163,6 +162,21 @@ export const dateFormatter = (row, column, cellValue) => { } return formatDate(cellValue) } +/** + * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式 + * + * @param row 行数据 + * @param column 字段 + * @param cellValue 字段值 + */ +// @ts-ignore +export const dateFormatter3 = (row, column, cellValue) => { + if (!cellValue) { + return + } + let str = formatDate(cellValue).split(' ')[1] + return str +} // 获取时间戳 export const formatGetTime = (row, column, cellValue) => { console.log(cellValue.getTime()) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 3566e702d..edd41b170 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -1,33 +1,52 @@