Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/eam/sparepartsinlocation/index.vue

@@ -168,9 +168,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
-  // defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:spare-parts-in-location-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:spare-parts-in-location-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:spare-parts-in-location-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -218,7 +218,7 @@ const isShowMainButton = (row, val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({ hasPermi: 'wms:sparePartsInLocationMain:update' }) // 编辑
+    defaultButtons.mainListEditBtn({ hasPermi: 'eam:spare-parts-in-location-main:update' }) // 编辑
     // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:sparePartsInLocationMain:delete' }) // 删除
   ]
 }
@@ -358,7 +358,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购订单主导入模版.xlsx'
+  templateTitle: '备件入库记录导入模版.xlsx'
 })
 
 // 导入成功之后

src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts

@@ -120,25 +120,7 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
+
   {
     label: '操作',
     field: 'action',