Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...InventorymoveRecordMain.allSchemas.searchSchema,...InventorymoveRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,8 +11,8 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="InventorymoveRecordMain.allSchemas"
-      :detailAllSchemas="InventorymoveRecordDetail.allSchemas"
+      :allSchemas="InventorymoveRecordMainNew.allSchemas"
+      :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
     />
 
   <!-- 列表 -->
@@ -66,9 +66,9 @@
   <Detail
     ref="detailRef"
     :isBasic="false"
-    :allSchemas="InventorymoveRecordMain.allSchemas"
-    :detailAllSchemas="InventorymoveRecordDetail.allSchemas"
-    :detailAllSchemasRules="InventorymoveRecordDetailRules"
+    :allSchemas="InventorymoveRecordMainNew.allSchemas"
+    :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
+    :detailAllSchemasRules="InventorymoveRecordDetailNewRules"
     :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
   />
   <!-- 标签打印 -->
@@ -80,7 +80,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecordDetail,InventorymoveRecordDetailRules } from './inventorymoveRecordMain.data'
+import { InventorymoveRecordMainNew,InventorymoveRecordDetailNew,InventorymoveRecordDetailNewRules } from './inventorymoveRecordMainNew.data'
 import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data'
 import {
   SupplierdeliverRequestPackage
@@ -96,7 +96,7 @@ import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存转移记录主
-defineOptions({ name: 'InventorymoveRecordMain' })
+defineOptions({ name: 'InventorymoveRecordMainNew' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -105,7 +105,7 @@ const importFileName = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...InventorymoveRecordMainNew.allSchemas.tableColumns,...InventorymoveRecordDetailNew.allSchemas.tableMainColumns])
 
 console.log(99 ,  routeName.value)
 const fromInventoryStatus = ref()
@@ -278,7 +278,7 @@ const handleExport = async () => {
   * tableForm方法
 */
 const tableFormKeys = {}
-InventorymoveRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+InventorymoveRecordDetailNew.allSchemas.tableFormColumns.forEach(item => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
 const tableData = ref([])

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMain.data.ts → src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts

@@ -4,7 +4,7 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 /**
  * @returns {Array} 库存转移记录主表
  */
-export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
@@ -351,7 +351,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
 ]))
 
 //表单校验
-export const InventorymoveRecordMainRules = reactive({
+export const InventorymoveRecordMainNewRules = reactive({
   requestNumber: [
     { required: true, message: '请选择申请单号', trigger: 'change' }
   ],
@@ -408,7 +408,7 @@ export const InventorymoveRecordMainRules = reactive({
 /**
  * @returns {Array} 库存转移记录子表
  */
-export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
@@ -688,7 +688,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
 ]))
 
 //表单校验
-export const InventorymoveRecordDetailRules = reactive({
+export const InventorymoveRecordDetailNewRules = reactive({
   fromPackingNumber: [
     { required: true, message: '请选择从包装号', trigger: 'change' }
   ],