0418合并

yudao-ui-admin-vue3/src/utils/constants.ts

@@ -635,6 +635,17 @@ export const PressureEquipTypeMap = {
   [PressureEquipType.BOILER]: '压力容器'
 }
 
+export const PressureEquipMainType = {
+  CONTAINER: 100,
+  BOILER: 200,
+  PIPE: 300
+}
+export const PressureEquipMainTypeMap = {
+  [PressureEquipMainType.CONTAINER]: '容器',
+  [PressureEquipMainType.BOILER]: '锅炉',
+  [PressureEquipMainType.PIPE]: '管道'
+}
+
 //任务单审核状态
 export const PressureTaskOrderStatus = {
   AUDITING: 100,

yudao-ui-admin-vue3/src/views/pressure2/boilerconnectrecordreport/FeeCalculator.vue

@@ -143,7 +143,7 @@
 </template>
 
 <script setup lang="ts">
-import '@grapecity/spread-sheets-resources-zh'
+// import '@grapecity/spread-sheets-resources-zh'
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'

yudao-ui-admin-vue3/src/views/pressure2/equipboilerscheduling/components/calcProjectFee.vue

@@ -114,7 +114,7 @@ import axios from 'axios'
 import {is} from '@/utils/is'
 
 // 导入葡萄城相关依赖
-import '@grapecity/spread-sheets-resources-zh'
+// import '@grapecity/spread-sheets-resources-zh'
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
@@ -146,7 +146,9 @@ const props = defineProps({
   newAmount: {
     type: Number,
   },
-  feeCalculateJson,
+  feeCalculateJson:{
+    type:Object
+  },
 })
 
 const emit = defineEmits(['update:modelValue', 'refresh', 'save'])