Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

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 * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 生产退料记录主表
@@ -40,14 +40,13 @@ export const ProductionscrapRecordMain = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch: true,
+          enterSearch: true, // multiple: true,
-          // multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',

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 * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+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,
+          enterSearch: true, // multiple: true,
-          // multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: '创建者',

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 * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 制品报废任务主表
@@ -40,14 +40,13 @@ export const ProductscrapJobMain = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch: true,
+          enterSearch: true, // multiple: true,
-          // multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',

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 * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 /**
  * @returns {Array} 制品报废记录主表
@@ -40,14 +40,13 @@ export const ProductscrapRecordMain = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch: true,
+          enterSearch: true, // multiple: true,
-          // multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: '最后更新时间',

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 * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
 const { t } = useI18n() // 国际化
 
@@ -72,14 +72,13 @@ export const ProductscrapRequestMain = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch: true,
+          enterSearch: true, // multiple: true,
-          // multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: 'Q3通知单号', // 查询弹窗标题
-          searchAllSchemas: Q3.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ3Api.getQ3Page, // 查询弹窗所需分页方法
+          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: '创建者',