fix
Showing
5 changed files
with
12 additions
and
6 deletions
| ... | @@ -346,6 +346,12 @@ onMounted(() => { | ... | @@ -346,6 +346,12 @@ onMounted(() => { |
| 346 | <template #default="scope" v-else-if="item.type == 'input'"> | 346 | <template #default="scope" v-else-if="item.type == 'input'"> |
| 347 | <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input> | 347 | <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input> |
| 348 | </template> | 348 | </template> |
| 349 | <template #default="scope" v-else-if="item.type == 'approveTag'"> | ||
| 350 | <el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{ | ||
| 351 | tagMethod(scope.row.approveVO, 'approveState') | ||
| 352 | }}</el-tag> | ||
| 353 | <span v-else>{{ '--' }}</span> | ||
| 354 | </template> | ||
| 349 | <template #default="scope" v-else-if="item.type == 'tooltip'"> | 355 | <template #default="scope" v-else-if="item.type == 'tooltip'"> |
| 350 | <el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip" | 356 | <el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip" |
| 351 | :trigger="item.trigger"> | 357 | :trigger="item.trigger"> | ... | ... |
| ... | @@ -723,7 +723,7 @@ export const tagMethod = (row, type) => { | ... | @@ -723,7 +723,7 @@ export const tagMethod = (row, type) => { |
| 723 | tag = '已撤销' | 723 | tag = '已撤销' |
| 724 | break; | 724 | break; |
| 725 | default: | 725 | default: |
| 726 | tag = row['dataState'] === 1 ? '已提交' : '草稿中' | 726 | tag = '--' |
| 727 | break; | 727 | break; |
| 728 | } | 728 | } |
| 729 | } else if (type == 'standardType') { | 729 | } else if (type == 'standardType') { | ... | ... |
| ... | @@ -36,7 +36,7 @@ const tableFields = ref([ | ... | @@ -36,7 +36,7 @@ const tableFields = ref([ |
| 36 | { label: "登记时间", field: "registerTime", width: 120 }, | 36 | { label: "登记时间", field: "registerTime", width: 120 }, |
| 37 | // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, | 37 | // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, |
| 38 | { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, | 38 | { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, |
| 39 | { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' }, | 39 | { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' }, |
| 40 | ]); | 40 | ]); |
| 41 | 41 | ||
| 42 | const deploymentId = ref(''); | 42 | const deploymentId = ref(''); |
| ... | @@ -177,7 +177,7 @@ const tableInfo = ref({ | ... | @@ -177,7 +177,7 @@ const tableInfo = ref({ |
| 177 | const getTableBtns = (row) => { | 177 | const getTableBtns = (row) => { |
| 178 | let btnsArr: any[] = []; | 178 | let btnsArr: any[] = []; |
| 179 | const approveVO = row.approveVO || {}; | 179 | const approveVO = row.approveVO || {}; |
| 180 | const approveState = row.approveState || null; | 180 | const approveState = row.approveVO.approveState || null; |
| 181 | const approveStaffGuids = approveVO.approveStaffGuids || []; | 181 | const approveStaffGuids = approveVO.approveStaffGuids || []; |
| 182 | const staffGuid = approveVO.staffGuid || ''; | 182 | const staffGuid = approveVO.staffGuid || ''; |
| 183 | const bizApproveState = row.bizApproveState; | 183 | const bizApproveState = row.bizApproveState; | ... | ... |
| ... | @@ -46,7 +46,7 @@ const tableFields = ref([ | ... | @@ -46,7 +46,7 @@ const tableFields = ref([ |
| 46 | // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, | 46 | // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, |
| 47 | { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, | 47 | { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" }, |
| 48 | { | 48 | { |
| 49 | label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { | 49 | label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { |
| 50 | const approveVO = scope.row.approveVO || {} | 50 | const approveVO = scope.row.approveVO || {} |
| 51 | switch (approveVO.approveState) { | 51 | switch (approveVO.approveState) { |
| 52 | case 'N': | 52 | case 'N': |
| ... | @@ -264,7 +264,7 @@ const tableInfo = ref({ | ... | @@ -264,7 +264,7 @@ const tableInfo = ref({ |
| 264 | const getTableBtns = (row) => { | 264 | const getTableBtns = (row) => { |
| 265 | let btnsArr: any[] = []; | 265 | let btnsArr: any[] = []; |
| 266 | const approveVO = row.approveVO || {}; | 266 | const approveVO = row.approveVO || {}; |
| 267 | const approveState = row.approveState || null; | 267 | const approveState = row.approveVO.approveState || null; |
| 268 | const approveStaffGuids = approveVO.approveStaffGuids || []; | 268 | const approveStaffGuids = approveVO.approveStaffGuids || []; |
| 269 | const staffGuid = approveVO.staffGuid || ''; | 269 | const staffGuid = approveVO.staffGuid || ''; |
| 270 | const bizApproveState = row.bizApproveState; | 270 | const bizApproveState = row.bizApproveState; | ... | ... |
| ... | @@ -80,7 +80,7 @@ const tableInfo = ref({ | ... | @@ -80,7 +80,7 @@ const tableInfo = ref({ |
| 80 | }, | 80 | }, |
| 81 | { | 81 | { |
| 82 | label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { | 82 | label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { |
| 83 | return filterVal(scope.row.approveState, 'approveState'); | 83 | return filterVal(scope.row.approveVO.approveState, 'approveState'); |
| 84 | } | 84 | } |
| 85 | }, | 85 | }, |
| 86 | { | 86 | { | ... | ... |
-
Please register or sign in to post a comment