BUG修改

src/views/eam/basic/location/index.vue

@@ -151,6 +151,7 @@
     }
     if (data.activeTime == 0) data.activeTime = null;
     if (data.expireTime == 0) data.expireTime = null;
+    try {
       if (formType === 'create') {
         await LocationApi.createLocation(data)
         message.success(t('common.createSuccess'))
@@ -160,6 +161,9 @@
       }
       basicFormRef.value.dialogVisible = false
       getList()
+    } finally {
+      basicFormRef.value.formLoading = false
+    }
   }
 
   /** 详情操作 */

src/views/eam/basic/locationArea/index.vue

@@ -143,6 +143,7 @@
     }
     if (data.activeTime == 0) data.activeTime = null;
     if (data.expireTime == 0) data.expireTime = null;
+    try {
       if (formType === 'create') {
         await LocationAreaApi.createLocationArea(data)
         message.success(t('common.createSuccess'))
@@ -152,6 +153,10 @@
       }
       basicFormRef.value.dialogVisible = false
       getList()
+    } finally {
+      basicFormRef.value.formLoading = false
+    }
+    
   }
 
   // 查询页面返回

src/views/eam/basic/supplier/index.vue

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Supplier.allSchemas" />
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Supplier.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      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,66 +26,60 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="SupplierRules" :formAllSchemas="Supplier.allSchemas"
-    ref="basicFormRef"
+    :apiUpdate="SupplierApi.updateSupplier" :apiCreate="SupplierApi.createSupplier"
-    @success="formsSuccess"
+    @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
-    :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 download from '@/utils/download'
-import { Supplier,SupplierRules } from './supplier.data'
+  import { Supplier, SupplierRules } from './supplier.data'
-import * as SupplierApi from '@/api/eam/basic/supplier'
+  import * as SupplierApi from '@/api/eam/basic/supplier'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  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 ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
-
+
-defineOptions({ name: 'Supplier' })
+  defineOptions({ name: 'Supplier' })
-
+
-const message = useMessage() // 消息弹窗
+  const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+  const { t } = useI18n() // 国际化
-
+
-const route = useRoute() // 路由信息
+  const route = useRoute() // 路由信息
-const routeName = ref()
+  const routeName = ref()
-routeName.value = route.name
+  routeName.value = route.name
-const tableColumns = ref(Supplier.allSchemas.tableColumns)
+  const tableColumns = ref(Supplier.allSchemas.tableColumns)
-
+
-// 查询页面返回
+  // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     })
-}
+  }
 
-// 字段设置 更新主列表字段
+  // 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: SupplierApi.getSupplierPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
+  // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
+  // 列表头部按钮
-const HeadButttondata = [
+  const HeadButttondata = [
     defaultButtons.defaultAddBtn(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
@@ -112,10 +93,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'export') { // 导出
@@ -126,42 +107,43 @@ const buttonBaseClick = (val, item) => {
     } else { // 其他按钮
       console.log('其他按钮', item)
     }
-}
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata = [
+  const butttondata = [
     defaultButtons.mainListEditBtn(null), // 编辑
     defaultButtons.mainListDeleteBtn(null), // 删除
-]
+  ]
 
-// 列表-操作按钮事件
+  // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }
-}
+  }
 
-/** 添加/修改操作 */
+  /** 添加/修改操作 */
-const basicFormRef = ref()
+  const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
+  const openForm = (type : string, row ?: any) => {
     basicFormRef.value.open(type, row)
-}
+  }
 
-// form表单提交
+  // form表单提交
-const formsSuccess = async (formType,data) => {
+  const formsSuccess = async (formType, data) => {
-  var isHave =Supplier.allSchemas.formSchema.some(function (item) {
+    var isHave = Supplier.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
-  if(isHave){
+    if (isHave) {
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
         message.error('失效时间要大于生效时间')
         return;
       }
     }
-  if(data.activeTime==0)data.activeTime = null;
+    if (data.activeTime == 0) data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+    if (data.expireTime == 0) data.expireTime = null;
+    try {
       if (formType === 'create') {
         await SupplierApi.createSupplier(data)
         message.success(t('common.createSuccess'))
@@ -171,16 +153,19 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.dialogVisible = false
       getList()
-}
+    } finally {
+      basicFormRef.value.formLoading = false
+    }
+  }
 
-/** 详情操作 */
+  /** 详情操作 */
-const detailRef = ref()
+  const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
-}
+  }
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -189,12 +174,12 @@ const handleDelete = async (id: number) => {
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
-  } catch {}
+    } catch { }
-}
+  }
 
-/** 导出按钮操作 */
+  /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
+  const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -206,20 +191,19 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
 
-// 筛选提交
+  // 筛选提交
-const searchFormClick = (searchData) => {
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
+  /** 初始化 **/
-onMounted(async () => {
+  onMounted(async () => {
     getList()
-})
+  })
-
 </script>

src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

@@ -258,27 +258,27 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 2
     }
   },
-  {
+  // {
-    label: '是否账内库',
+  //   label: '是否账内库',
-    field: 'isInAccount',
+  //   field: 'isInAccount',
-    sort: 'custom',
+  //   sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: true,
+  //   isSearch: true,
-    isTable: true,
+  //   isTable: true,
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      type: 'Select',
+  //     type: 'Select',
-      disabled: true
+  //     disabled: true
-    },
+  //   },
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-        disabled: true,
+  //       disabled: true,
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
   {
     label: '是否可用',
     field: 'available',