diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index ad4c9c7..2a7b1cc 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -18,7 +18,7 @@ { path: 'list', name: 'contractManagementList', - component: () => import('@/views/finance/businessSettlement/list.vue'), + component: () => import('@/views/finance/contract/list.vue'), meta: { title: '收入合同管理', icon: 'ep:key', diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index ad4c9c7..2a7b1cc 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -18,7 +18,7 @@ { path: 'list', name: 'contractManagementList', - component: () => import('@/views/finance/businessSettlement/list.vue'), + component: () => import('@/views/finance/contract/list.vue'), meta: { title: '收入合同管理', icon: 'ep:key', diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index 86eed99..d4661a3 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -10,6 +10,7 @@ import { exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement/businessSettlement' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' +import { IlabMeasureList } from '@/views/business/schedule/task/task-interface' const $router = useRouter() const { proxy } = getCurrentInstance() as any const isUrgentMap = ref([]) // 是否加急 @@ -33,7 +34,7 @@ { text: '送样人', value: 'deliverer', align: 'center' }, { text: '联系方式', value: 'delivererTel', align: 'center' }, { text: '样品数量', value: 'sampleCount', align: 'center' }, - { text: '是否加急', value: 'isUrgent', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } }, + { text: '是否加急', value: 'isUrgentName', align: 'center', width: '90px', styleFilter: (row: IList) => { return row.isUrgent === '1' ? 'color: red' : '' } }, { text: '创建时间', value: 'createTime', align: 'center', width: '180px' }, { text: '标价(单位分)', value: 'postedPrice', align: 'center' }, { text: '建议折扣(%)', value: 'suggestedDiscount', align: 'center' }, @@ -53,7 +54,7 @@ listQuery.value.offset = 1 } getBusinessSettlementList(listQuery.value).then((response) => { - list.value = response.data.rows.map((item: IList) => { + list.value = response.data.map((item: IList) => { return { ...item, isUrgentName: item.isUrgent === '1' ? '是' : '否', @@ -63,9 +64,12 @@ postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`, } }) + console.log('-----', list.value) total.value = parseInt(response.data.total) loadingTable.value = false + }).catch(() => { + loadingTable.value = false }) } // 搜索 @@ -157,8 +161,8 @@ const handleEdit = (row, status) => { } -// 取消 -const handleCancle = (row) => { +// 删除 +const handledelete = (row: IList) => { } // 获取字典值 @@ -181,8 +185,8 @@ } onMounted(async () => { - // await getDict() - // fetchData(true) + await getDict() // 获取字典 + fetchData(true) // 获取数据 }) @@ -190,8 +194,7 @@
- 敬请期待 - +