From 73ba5ceef6c7eb0bad1e1b4171e940fc76dd0be8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 13 Nov 2023 17:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=EF=BC=8Cbu?=
 =?UTF-8?q?g=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itembasic/index.ts                |  1 -
 src/components/BasicForm/src/BasicForm.vue    |  2 +-
 src/components/Search/src/Search.vue          | 37 ++++++++++++++++---
 .../factoryModeling/enterprise/index.vue      |  8 ----
 .../itemManage/itembasic/index.vue            |  2 +-
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index d6b9648cc..446f89cfa 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -32,7 +32,6 @@ export interface ItembasicVO {
 // 查询物品基本信息列表
 export const getItembasicPage = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
     return request.post({ url: '/wms/itembasic/senior', data })
   } else {
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 6c0fadcef..1bf3b167b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -249,7 +249,7 @@ const submitForm = async () => {
         return item.field === 'activeTime' || item.field === 'expireTime';
       });
       if(isHave){
-        if(data.activeTime >=data.expireTime){
+        if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
           message.error('失效时间要大于生效时间')
           return;
         }
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index eef62c159..cebc50ed3 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -101,15 +101,22 @@ const setVisible = () => {
   visible.value = !unref(visible)
 }
 const Search = ref()
-onMounted(() => {
-})
+onMounted(() => {})
 </script>
 
 <template>
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <div ref="Search">
-    <Form :inline="inline" :is-col="isCol" :is-custom="false" :label-width="labelWidth" :schema="newSchema"
-      class="-mb-15px" hide-required-asterisk @register="register">
+    <Form
+      :inline="inline"
+      :is-col="isCol"
+      :is-custom="false"
+      :label-width="labelWidth"
+      :schema="newSchema"
+      class="-mb-15px search"
+      hide-required-asterisk
+      @register="register"
+    >
       <template #action>
         <div v-if="layout === 'inline'">
           <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
@@ -136,7 +143,6 @@ onMounted(() => {
     </Form>
   </div>
 
-
   <template v-if="layout === 'bottom'">
     <div :style="bottonButtonStyle">
       <ElButton v-if="showSearch" type="primary" @click="search">
@@ -156,3 +162,24 @@ onMounted(() => {
     </div>
   </template>
 </template>
+<style lang="scss" scoped>
+.search ::v-deep(.el-form-item) {
+  margin-right: 1%;
+  width: 20%;
+}
+.search ::v-deep(.el-form-item:nth-last-child(1)) {
+  margin-right: 0px;
+  width: 16%;
+  .el-form-item__content {
+    flex: 1;
+    >div{
+      flex: 1;
+        button {
+        width: 46%;
+        max-width: 80px;
+      }
+    }
+    
+  }
+}
+</style>
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
index 30c307ac7..c4bdc535b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -52,8 +52,6 @@
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Enterprise.allSchemas" />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/enterprise/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -191,11 +189,6 @@ const handleImport = () => {
   importFormRef.value.open()
 }
 
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '企业导入模版.xls'
-})
 
 // 导入成功之后
 const importSuccess = () => {
@@ -214,6 +207,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await EnterpriseApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index 16ec0bd8c..f9788935e 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -65,7 +65,6 @@ defineOptions({ name: 'Itembasic' })
 const { tableObject, tableMethods } = useTable({
   getListApi: ItembasicApi.getItembasicPage // 分页接口
 })
-console.log(tableObject)
 const importFormRef = ref()
 // 列表头部按钮
 const HeadButttondata = [
@@ -165,6 +164,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
+  console.log(tableObject.params)
     await message.delConfirm()
     // 发起删除
     await ItembasicApi.deleteItembasic(id)