2baa7de2 by lihua

Merge branch 'dev' into release

2 parents 5f9da9a0 69864e61
......@@ -298,7 +298,7 @@ const tableBtnClick = (scope, btn) => {
if (row.registerApproveState == 'Y') {
router.push({
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 {
router.push({
......
<route lang="yaml">
name: registerDetail
</route>
name: registerDetail
</route>
<script lang="ts" setup name="registerDetail">
import { ref } from 'vue';
......
......@@ -400,7 +400,7 @@ const tableBtnClick = (scope, btn) => {
if (row.registerApproveState == 'Y') {
router.push({
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 {
router.push({
......
......@@ -1509,7 +1509,7 @@ const timeRangeInfo = computed(() => {
});
const prcieInfo = computed(() => {
// 还需要把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(() => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!