From b72840d40ff46c486cb08395a2f5b2ebac95b58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 27 Mar 2024 18:38:14 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/basic/location/index.vue        |  20 +-
 src/views/eam/basic/locationArea/index.vue    |  21 +-
 src/views/eam/basic/supplier/index.vue        | 344 +++++++++---------
 .../item/itemApplyMain/itemApplyMain.data.ts  |  42 +--
 4 files changed, 210 insertions(+), 217 deletions(-)

diff --git a/src/views/eam/basic/location/index.vue b/src/views/eam/basic/location/index.vue
index 37b70d9..74180a6 100644
--- a/src/views/eam/basic/location/index.vue
+++ b/src/views/eam/basic/location/index.vue
@@ -151,15 +151,19 @@
     }
     if (data.activeTime == 0) data.activeTime = null;
     if (data.expireTime == 0) data.expireTime = null;
-    if (formType === 'create') {
-      await LocationApi.createLocation(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await LocationApi.updateLocation(data)
-      message.success(t('common.updateSuccess'))
+    try {
+      if (formType === 'create') {
+        await LocationApi.createLocation(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationApi.updateLocation(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+    } finally {
+      basicFormRef.value.formLoading = false
     }
-    basicFormRef.value.dialogVisible = false
-    getList()
   }
 
   /** 详情操作 */
diff --git a/src/views/eam/basic/locationArea/index.vue b/src/views/eam/basic/locationArea/index.vue
index 45cf784..5dc03e0 100644
--- a/src/views/eam/basic/locationArea/index.vue
+++ b/src/views/eam/basic/locationArea/index.vue
@@ -143,15 +143,20 @@
     }
     if (data.activeTime == 0) data.activeTime = null;
     if (data.expireTime == 0) data.expireTime = null;
-    if (formType === 'create') {
-      await LocationAreaApi.createLocationArea(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await LocationAreaApi.updateLocationArea(data)
-      message.success(t('common.updateSuccess'))
+    try {
+      if (formType === 'create') {
+        await LocationAreaApi.createLocationArea(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationAreaApi.updateLocationArea(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+    } finally {
+      basicFormRef.value.formLoading = false
     }
-    basicFormRef.value.dialogVisible = false
-    getList()
+    
   }
 
   // 查询页面返回
diff --git a/src/views/eam/basic/supplier/index.vue b/src/views/eam/basic/supplier/index.vue
index 39206d0..d8940c4 100644
--- a/src/views/eam/basic/supplier/index.vue
+++ b/src/views/eam/basic/supplier/index.vue
@@ -4,29 +4,16 @@
     <Search :schema="Supplier.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Supplier.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Supplier.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
-      }"
-      v-model:pageSize="tableObject.pageSize"
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -39,187 +26,184 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="SupplierRules"
-    :formAllSchemas="Supplier.allSchemas"
-    :apiUpdate="SupplierApi.updateSupplier"
-    :apiCreate="SupplierApi.createSupplier"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="SupplierRules" :formAllSchemas="Supplier.allSchemas"
+    :apiUpdate="SupplierApi.updateSupplier" :apiCreate="SupplierApi.createSupplier"
+    @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Supplier.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/eam/supplier/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/eam/supplier/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import { Supplier,SupplierRules } from './supplier.data'
-import * as SupplierApi from '@/api/eam/basic/supplier'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
-defineOptions({ name: 'Supplier' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(Supplier.allSchemas.tableColumns)
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  import download from '@/utils/download'
+  import { Supplier, SupplierRules } from './supplier.data'
+  import * as SupplierApi from '@/api/eam/basic/supplier'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
+
+  defineOptions({ name: 'Supplier' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(Supplier.allSchemas.tableColumns)
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
+  }
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: SupplierApi.getSupplierPage // 分页接口
   })
-}
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: SupplierApi.getSupplierPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+    // {
+    //   label: '自定义扩展按钮',
+    //   name: 'zdy',
+    //   hide: false,
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   color: ''
+    // },
+  ]
+
+  // 头部按钮事件
+  const buttonBaseClick = (val, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
   }
-}
 
-// 列表-操作按钮
-const butttondata = [
+  // 列表-操作按钮
+  const butttondata = [
     defaultButtons.mainListEditBtn(null), // 编辑
     defaultButtons.mainListDeleteBtn(null), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+  ]
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const basicFormRef = ref()
+  const openForm = (type : string, row ?: any) => {
+    basicFormRef.value.open(type, row)
   }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-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;
+
+  // form表单提交
+  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;
+    try {
+      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()
+    } finally {
+      basicFormRef.value.formLoading = false
     }
   }
-  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'))
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
   }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SupplierApi.deleteSupplier(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SupplierApi.exportSupplier(tableObject.params)
-    download.excel(data, '供应商.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await SupplierApi.deleteSupplier(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
   }
-}
 
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await SupplierApi.exportSupplier(tableObject.params)
+      download.excel(data, '供应商.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
   }
-  getList() // 刷新当前列表
-}
 
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-})
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
 
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+  })
 </script>
diff --git a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
index d053746..4a9d03d 100644
--- a/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
+++ b/src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
@@ -258,27 +258,27 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
-  {
-    label: '是否账内库',
-    field: 'isInAccount',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true,
-      }
-    },
-  },
+  // {
+  //   label: '是否账内库',
+  //   field: 'isInAccount',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true,
+  //     }
+  //   },
+  // },
   {
     label: '是否可用',
     field: 'available',