7c736912 by xukangle

fix

1 parent 9c0e648f
......@@ -346,6 +346,12 @@ onMounted(() => {
<template #default="scope" v-else-if="item.type == 'input'">
<el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input>
</template>
<template #default="scope" v-else-if="item.type == 'approveTag'">
<el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{
tagMethod(scope.row.approveVO, 'approveState')
}}</el-tag>
<span v-else>{{ '--' }}</span>
</template>
<template #default="scope" v-else-if="item.type == 'tooltip'">
<el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip"
:trigger="item.trigger">
......
......@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => {
tag = '已撤销'
break;
default:
tag = row['dataState'] === 1 ? '已提交' : '草稿中'
tag = '--'
break;
}
} else if (type == 'standardType') {
......
......@@ -36,7 +36,7 @@ const tableFields = ref([
{ label: "登记时间", field: "registerTime", width: 120 },
// { label: "企业名称", field: "tenantName", width: 240, align: "left" },
{ label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
{ label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
{ label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
]);
const deploymentId = ref('');
......@@ -177,7 +177,7 @@ const tableInfo = ref({
const getTableBtns = (row) => {
let btnsArr: any[] = [];
const approveVO = row.approveVO || {};
const approveState = row.approveState || null;
const approveState = row.approveVO.approveState || null;
const approveStaffGuids = approveVO.approveStaffGuids || [];
const staffGuid = approveVO.staffGuid || '';
const bizApproveState = row.bizApproveState;
......
......@@ -46,7 +46,7 @@ const tableFields = ref([
// { label: "企业名称", field: "tenantName", width: 240, align: "left" },
{ label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
{
label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
const approveVO = scope.row.approveVO || {}
switch (approveVO.approveState) {
case 'N':
......@@ -264,7 +264,7 @@ const tableInfo = ref({
const getTableBtns = (row) => {
let btnsArr: any[] = [];
const approveVO = row.approveVO || {};
const approveState = row.approveState || null;
const approveState = row.approveVO.approveState || null;
const approveStaffGuids = approveVO.approveStaffGuids || [];
const staffGuid = approveVO.staffGuid || '';
const bizApproveState = row.bizApproveState;
......
......@@ -80,7 +80,7 @@ const tableInfo = ref({
},
{
label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
return filterVal(scope.row.approveState, 'approveState');
return filterVal(scope.row.approveVO.approveState, 'approveState');
}
},
{
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!