Merge remote-tracking branch 'remotes/origin/intex_online20250528' into intex

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@@ -88,6 +88,14 @@
       @searchTableSuccess="searchTableSuccess"
       sourcePage="InducedProduct"
   />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef1"
+    url="/wms/deliver-record-main/import-ShunYin"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 <script setup lang="ts">
 import download from '@/utils/download'
@@ -174,6 +182,7 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增
   defaultButtons.defaultReceiptOfInclusionBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入纳入受领书
   defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -193,7 +202,10 @@ const buttonBaseClick = (val, item) => {
     handleCreate('create')
   } else if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  }else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters
@@ -208,7 +220,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+const importFormRef1 = ref()
+const handleImport = () => {
+  importFormRef1.value.open()
+}
 //为true表示子表数据中存在数量为0的数据
 const flag = ref(false)
 
@@ -273,7 +288,10 @@ const submitForm = async (formType, submitData) => {
 
 }
 
-
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@@ -622,9 +622,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter2,
+    formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -634,11 +634,20 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'DatePicker',
       componentProps: {
         style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetimerange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
   },
   {
     label: '目标库位',