From ae1a9e2fd60a40ef9a9fccb57c2d823eadb0645f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 14 Nov 2023 10:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  38 +++----
 .../itemManage/itembasic/index.vue            |  27 ++++-
 .../itemManage/itempackaging/index.vue        | 100 ++++++++++++------
 .../supplierManage/supplier/index.vue         |  25 ++++-
 4 files changed, 137 insertions(+), 53 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 1bf3b167b..4ae198926 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -244,26 +244,26 @@ const submitForm = async () => {
       //   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
+      // 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')
+      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 f9788935e..3c40167b6 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -38,7 +38,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="rules" 
     :formAllSchemas="Itembasic.allSchemas" 
     :apiUpdate="ItembasicApi.updateItembasic"
@@ -155,6 +155,30 @@ const basicFormRef = ref()
 const openForm = (type: string, id?: number) => {
   basicFormRef.value.open(type, id)
 }
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Itembasic.allSchemas.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(data.activeTime==0)data.activeTime = null;
+      if(data.expireTime==0)data.expireTime = null;
+      if (formType === 'create') {
+        await ItembasicApi.createItembasic(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ItembasicApi.updateItembasic(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicItembasic')
@@ -198,6 +222,7 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue b/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue
index a0f37daa8..7e98abd65 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue
@@ -1,17 +1,21 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Itempackaging.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Itempackaging.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead 
-    :HeadButttondata="HeadButttondata" 
-    @button-base-click="buttonBaseClick" 
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
     :routeName="routeName"
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
-    :allSchemas="Itempackaging.allSchemas" 
+    :allSchemas="Itempackaging.allSchemas"
   />
 
   <!-- 列表 -->
@@ -27,23 +31,23 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #itemCode="{row}">
+      <template #itemCode="{ row }">
         <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="basicFormRef" 
-    @success="getList" 
-    :rules="ItempackagingRules" 
-    :formAllSchemas="Itempackaging.allSchemas" 
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItempackagingRules"
+    :formAllSchemas="Itempackaging.allSchemas"
     :apiUpdate="ItempackagingApi.updateItempackaging"
     :apiCreate="ItempackagingApi.createItempackaging"
     @searchTableSuccess="searchTableSuccess"
@@ -54,7 +58,12 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Itempackaging.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/itempackaging/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/itempackaging/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
@@ -63,7 +72,7 @@ import * as ItempackagingApi from '@/api/wms/itempackaging'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Itempackaging, ItempackagingRules } from './itempackaging.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
@@ -91,12 +100,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:itempackaging:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:itempackaging:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:itempackaging:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackaging:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackaging:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackaging:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -107,35 +116,43 @@ const HeadButttondata = [
   // },
 ]
 
-// 头部按钮事件 
+// 头部按钮事件
 const buttonBaseClick = (val, item) => {
   console.log(104, val)
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮 
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:itempackaging:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itempackaging:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackaging:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackaging:delete' }) // 删除
 ]
 
-// 列表-操作按钮事件 
+// 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     // const res = await ItempackagingApi.getItempackaging(row.id)
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -145,7 +162,28 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-
+const formsSuccess = async (formType, data) => {
+  var isHave = Itempackaging.allSchemas.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 (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  if (formType === 'create') {
+    await ItempackagingApi.createItempackaging(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItempackagingApi.updateItempackaging(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
index 0153a1c52..ef1aed92c 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="SupplierRules" 
     :formAllSchemas="Supplier.allSchemas"
     :apiUpdate="SupplierApi.updateSupplier"
@@ -143,7 +143,28 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-
+const formsSuccess = async (formType, data) => {
+  var isHave = Supplier.allSchemas.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 (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
+  if (formType === 'create') {
+    await SupplierApi.createSupplier(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierApi.updateSupplier(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {