From 420128e549d9987ea891226deff462b4c8ee5236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Thu, 15 Aug 2024 15:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q3=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRecordMain.data.ts | 11 +++++------ .../productionscrapRequestMain.data.ts | 15 +++++++-------- .../productscrapJobMain.data.ts | 11 +++++------ .../productscrapRecordMain.data.ts | 15 +++++++-------- .../productscrapRequestMain.data.ts | 15 +++++++-------- 5 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts index 0ca439920..c931b3c69 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts @@ -1,8 +1,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' -import * as InspectionQ3Api from '@/api/qms/inspectionQ3' -import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main' +import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data' /** * @returns {Array} 生产退料记录主表 @@ -40,14 +40,13 @@ export const ProductionscrapRecordMain = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, - // multiple: true, + enterSearch: true, // multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: 'Q3通知单号', // 查询弹窗标题 - searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法 + searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index c86473107..52940a1dd 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -23,8 +23,8 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' -import * as InspectionQ3Api from '@/api/qms/inspectionQ3' -import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main' +import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data' // import * as LocationApi from '@/api/wms/location' // import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' @@ -75,14 +75,13 @@ export const ProductionscrapRequestMain = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, - // multiple: true, + enterSearch: true, // multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: 'Q3通知单号', // 查询弹窗标题 - searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法 + searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', @@ -496,8 +495,8 @@ export const ProductionscrapRequestMain = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '创建者', diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts index 7238ce579..5b93fbace 100644 --- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts @@ -1,8 +1,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -import * as InspectionQ3Api from '@/api/qms/inspectionQ3' -import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main' +import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data' /** * @returns {Array} 制品报废任务主表 @@ -40,14 +40,13 @@ export const ProductscrapJobMain = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, - // multiple: true, + enterSearch: true, // multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: 'Q3通知单号', // 查询弹窗标题 - searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法 + searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index badf50da6..16a0a352d 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -1,8 +1,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' -import * as InspectionQ3Api from '@/api/qms/inspectionQ3' -import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main' +import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data' /** * @returns {Array} 制品报废记录主表 @@ -40,14 +40,13 @@ export const ProductscrapRecordMain = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, - // multiple: true, + enterSearch: true, // multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: 'Q3通知单号', // 查询弹窗标题 - searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法 + searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', @@ -304,8 +303,8 @@ export const ProductscrapRecordMain = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '最后更新时间', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 9d07913a5..881153b74 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -21,8 +21,8 @@ import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/produ import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data' import * as BomApi from '@/api/wms/bom' -import * as InspectionQ3Api from '@/api/qms/inspectionQ3' -import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main' +import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data' const { t } = useI18n() // 国际化 @@ -72,14 +72,13 @@ export const ProductscrapRequestMain = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, - // multiple: true, + enterSearch: true, // multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 searchTitle: 'Q3通知单号', // 查询弹窗标题 - searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类 - searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法 + searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', @@ -391,8 +390,8 @@ export const ProductscrapRequestMain = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '创建者',