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,22 +26,16 @@
   </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">
@@ -162,6 +143,7 @@ const formsSuccess = async (formType,data) => {
     }
     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'))
@@ -171,6 +153,9 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.dialogVisible = false
       getList()
+    } finally {
+      basicFormRef.value.formLoading = false
+    }
   }
 
   /** 详情操作 */
@@ -221,5 +206,4 @@ const searchFormClick = (searchData) => {
   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',