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

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

@@ -196,8 +196,10 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.type="DEVICE"
+    tableObject.params.status="MAINTAIN"
     const data = await DeviceMaintenanceApi.exportDeviceMoldItems(tableObject.params)
-    download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
+    download.excel(data, '设备保养项配置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

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

@@ -197,6 +197,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.type="DEVICE"
+    tableObject.params.status="INSPECTION"
     const data = await DeviceMoldItemsApi.exportDeviceMoldItems(tableObject.params)
     download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
   } catch {

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

@@ -190,7 +190,7 @@
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
-      const data = await LocationAreaApi.exportLocationArea(setSearchParams)
+      const data = await LocationAreaApi.exportLocationArea(tableObject.params)
       download.excel(data, '库区.xls')
     } catch {
     } finally {

src/views/eam/basic/locationArea/locationArea.data.ts

@@ -34,17 +34,17 @@ export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.LOCATION_AREA_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Select'
     },
   },
   {
-    label: '状态',
+    label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

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

@@ -196,6 +196,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.type="MOLD"
+    tableObject.params.status="MAINTAIN"
     const data = await MoldMaintenanceApi.exportDeviceMoldItems(tableObject.params)
     download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
   } catch {