From 78d6c3a75f07493761d37e8fc635b5ac8427bc62 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 15 Nov 2023 11:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 24 -------------------
 .../itemManage/itembasic/index.vue            |  3 ++-
 .../orderManage/shift/shift.data.ts           | 10 +++++++-
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4659af170..beb2baf6f 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -240,31 +240,7 @@ const submitForm = async () => {
     // 基础数据单表——提交请求
     formLoading.value = true
     try {
-      // const data = unref(formRef)?.formModel as ItempackagingApi.ItempackagingVO 
       const data = unref(formRef)?.formModel
-      // if(props.masterParmas.masterId){
-      //   data.masterId = props.masterParmas.masterId
-      //   data.number = props.masterParmas.number
-      // }
-      // console.log(props.formAllSchemas.formSchema)
-      // var isHave = props.formAllSchemas.formSchema.some(function (item) {
-      //   return item.field === 'activeTime' || item.field === 'expireTime';
-      // });
-      // if(isHave){
-      //   if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      //     message.error('失效时间要大于生效时间')
-      //     return;
-      //   }
-      // }
-      // if (formType.value === 'create') {
-      //   await props.apiCreate(data)
-      //   message.success(t('common.createSuccess'))
-      // } else {
-      //   await props.apiUpdate(data)
-      //   message.success(t('common.updateSuccess'))
-      // }
-      // dialogVisible.value = false
-      // 发送操作成功的事件
       emit('success',formType.value,data)
     } finally {
       formLoading.value = false
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index 3c40167b6..77b384200 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -205,7 +205,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ItembasicApi.exportItembasic(setSearchParams)
+    console.log(tableObject.params)
+    const data = await ItembasicApi.exportItembasic(tableObject.params)
     download.excel(data, '物品基本信息.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
index 58eb23e1c..f59abd705 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -45,6 +45,15 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
   },
   {
     label: '结束时间',
@@ -83,7 +92,6 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
     sort: 'custom',
     table: {
       width: 150