Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

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

@@ -74,6 +74,9 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false,
+   detail: {
+     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+   }
  },
   {
     label: '操作',

src/views/eam/item/transaction/index.vue

@@ -97,7 +97,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'item:transaction:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'item:transaction:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'item:transaction:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -131,8 +131,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
+  // defaultButtons.mainListEditBtn({hasPermi:'item:transaction:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
+  // defaultButtons.mainListDeleteBtn({hasPermi:'item:transaction:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -152,6 +152,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType, data) => {
+  try {
     var isHave =Transaction.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
@@ -172,6 +173,10 @@ const formsSuccess = async (formType,data) => {
   }
   basicFormRef.value.dialogVisible = false
   getList()
+  } finally {
+     basicFormRef.value.formLoading = false
+  }
+  
 }
 
 /** 详情操作 */

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

@@ -17,7 +17,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '库位编码',
+    label: '库位编号',
     field: 'locationNumber',
     sort: 'custom',
     isSearch: true,
@@ -74,6 +74,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
+    dictType: DICT_TYPE.UOM,
     isSearch: false,
   },
   {
@@ -82,13 +83,13 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    field: 'action',
+  //   field: 'action',
-    isForm: false,
+  //   isForm: false,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    }
+  //   }
-  }
+  // }
 ]))