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

.env.hella15

@@ -37,4 +37,4 @@ VITE_INTERFACE_URL='http://172.21.32.15:90/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://172.21.32.15:90'
 
 # 租户配置
-VITE_TENANT='["长春"]'
+VITE_TENANT='["长春","成都"]'

src/api/eam/basicDocumentType/index.ts

@@ -48,7 +48,12 @@ export const deleteDocumentType = async (id: number) => {
 
 // 导出文档类型 Excel
 export const exportDocumentType = async (params) => {
-  return await request.download({ url: `/eam/document-type/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/document-type/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/document-type/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/eam/basicFaultCause/index.ts

@@ -49,7 +49,12 @@ export const deleteBasicFaultCause = async (id: number) => {
 
 // 导出故障原因 Excel
 export const exportBasicFaultCause = async (params) => {
-  return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-fault-cause/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-fault-cause/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/eam/basicFaultType/index.ts

@@ -48,7 +48,12 @@ export const deleteBasicFaultType = async (id: number) => {
 
 // 导出故障类型 Excel
 export const exportBasicFaultType = async (params) => {
-  return await request.download({ url: `/eam/basic-fault-type/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-fault-type/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-fault-type/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/eam/equipmentMainPart/index.ts

@@ -48,7 +48,12 @@ export const deleteEquipmentMainPart = async (id: number) => {
 
 // 导出主要部件 Excel
 export const exportEquipmentMainPart = async (params) => {
-  return await request.download({ url: `/eam/equipment-main-part/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/equipment-main-part/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/equipment-main-part/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/eam/basicDocumentType/basicDocumentType.data.ts

@@ -35,7 +35,12 @@ export const DocumentType = useCrudSchemas(reactive<CrudSchema[]>([
     label: '类型设备',
     field: 'type',
     sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
+    form: {
+      component: 'Select'
+    }
   },
   {
     label: '创建时间',
@@ -81,14 +86,13 @@ export const DocumentType = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '删除时间',

src/views/eam/basicFaultCause/basicFaultCause.data.ts

@@ -92,14 +92,13 @@ export const BasicFaultCause = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '删除时间',

src/views/eam/basicFaultType/basicFaultType.data.ts

@@ -79,14 +79,13 @@ export const BasicFaultType = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '删除时间',

src/views/eam/basicInspectionOption/basicInspectionOption.data.ts

@@ -51,7 +51,7 @@ export const BasicInspectionOption = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '来源于类型配置',
+    label: '巡检项',
     field: 'type',
     sort: 'custom',
     isSearch: true,

src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts

@@ -51,7 +51,7 @@ export const BasicMaintenanceOption = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '来源于类型配置',
+    label: '保养项',
     field: 'type',
     sort: 'custom',
     isSearch: true,

src/views/eam/equipmentMainPart/equipmentMainPart.data.ts

@@ -31,10 +31,15 @@ export const EquipmentMainPart = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '设备工装枚举',
+    label: '类型',
     field: 'type',
     sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
+    form: {
+      component: 'Select'
+    }
   },
   {
     label: '创建时间',
@@ -77,18 +82,16 @@ export const EquipmentMainPart = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '是否可用',
+    label: '是否启用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '删除时间',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -420,7 +420,7 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
 const searchTableRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
+  const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber}
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
     getListApi: PackageApi.getLabelDetailPage  // 分页接口