Merge branch 'dev' into release

@@ -298,7 +298,7 @@ const tableBtnClick = (scope, btn) => {
     if (row.registerApproveState == 'Y') {
     if (row.registerApproveState == 'Y') {
       router.push({
       router.push({
         name: 'registerDetail',
         name: 'registerDetail',
-        query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid }
+        query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
       });
       });
     } else {
     } else {
       router.push({
       router.push({

 <route lang="yaml">
 <route lang="yaml">
-    name: registerDetail
-    </route>
+  name: registerDetail
+  </route>
 
 
 <script lang="ts" setup name="registerDetail">
 <script lang="ts" setup name="registerDetail">
 import { ref } from 'vue';
 import { ref } from 'vue';

@@ -400,7 +400,7 @@ const tableBtnClick = (scope, btn) => {
     if (row.registerApproveState == 'Y') {
     if (row.registerApproveState == 'Y') {
       router.push({
       router.push({
         name: 'registerValueDetail',
         name: 'registerValueDetail',
-        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid }
+        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
       });
       });
     } else {
     } else {
       router.push({
       router.push({

@@ -1509,7 +1509,7 @@ const timeRangeInfo = computed(() => {
 });
 });
 const prcieInfo = computed(() => {
 const prcieInfo = computed(() => {
   // 还需要把flowDetail.value.productPrice 拼接priceUnitList.value.find(item => item.value == flowDetail.value.priceUnit)?.label
   // 还需要把flowDetail.value.productPrice 拼接priceUnitList.value.find(item => item.value == flowDetail.value.priceUnit)?.label
-  return flowDetail.value.productPrice ? `${flowDetail.value.productPrice} ${priceUnitList.value.find(item => item.value == flowDetail.value.priceUnit)?.label}` : '--';
+  return flowDetail.value.productPrice ? `${changeNum(parseInt(flowDetail.value.productPrice), 2)} ${priceUnitList.value.find(item => item.value == flowDetail.value.priceUnit)?.label}` : '--';
 })
 })
 
 
 const toolBtns: any = computed(() => {
 const toolBtns: any = computed(() => {