Commit d4ba96aaafd714da5d643d1f234be42fbe8e798f
1 parent
3c27bc92
修改bug
Showing
4 changed files
with
11 additions
and
10 deletions
src/views/project/approve/PayPanel.vue
... | ... | @@ -215,7 +215,7 @@ |
215 | 215 | customRender: (column) => { |
216 | 216 | const { record } = column || {}; |
217 | 217 | if (record?.type === 40) { |
218 | - return record.financePerson; | |
218 | + return record?.fieldInfos?.checkBillOrderDO?.financePerson; | |
219 | 219 | } else if (record?.type == 50) { |
220 | 220 | return record?.fieldInfos?.checkBillOrderDO?.productionName; |
221 | 221 | } | ... | ... |
src/views/project/approve/ReceivePanel.vue
... | ... | @@ -195,8 +195,12 @@ |
195 | 195 | let columns = [ |
196 | 196 | { |
197 | 197 | title: '申请人', |
198 | - dataIndex: 'financePerson', | |
198 | + dataIndex: 'createBy', | |
199 | 199 | width: 150, |
200 | + customRender: (column) => { | |
201 | + const { record } = column || {}; | |
202 | + return record?.fieldInfos?.checkBillOrderDO?.financePerson; | |
203 | + }, | |
200 | 204 | }, |
201 | 205 | { |
202 | 206 | title: 'INVOICE编号', | ... | ... |
src/views/project/finance/pay/InvoiceUpload.vue
... | ... | @@ -62,12 +62,10 @@ |
62 | 62 | const fileList = ref<UploadProps['fileList']>([]); |
63 | 63 | |
64 | 64 | async function handleOk() { |
65 | - console.log(invoiceUrl.value, '5656invoiceUrl.value'); | |
66 | - // await updateInvoiceInfo({ | |
67 | - // id: id.value, | |
68 | - // invoiceUrl: invoiceUrl.value, | |
69 | - // }); | |
70 | - // await updateDeduct(requestData); | |
65 | + await updateInvoiceInfo({ | |
66 | + id: id.value, | |
67 | + invoiceUrl: invoiceUrl.value, | |
68 | + }); | |
71 | 69 | fileList.value = []; |
72 | 70 | emit('success'); |
73 | 71 | closeModal(); | ... | ... |
src/views/project/finance/receive/Commit.vue
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 | <a-date-picker v-model:value="date" /> |
12 | 12 | <div style="height: 10px"></div> |
13 | 13 | 请选择收款单位: |
14 | - <a-select v-model="payee" style="width: 100%; padding: 5px; border-radius: 4px"> | |
14 | + <a-select v-model:value="payee" style="width: 100%; padding: 5px; border-radius: 4px"> | |
15 | 15 | <option value="翱特建行城阳支行-美元(5107)">翱特建行城阳支行-美元(5107)</option> |
16 | 16 | <option value="吉庆建行城阳支行-美元(4820)">吉庆建行城阳支行-美元(4820)</option> |
17 | 17 | </a-select> |
... | ... | @@ -44,7 +44,6 @@ |
44 | 44 | |
45 | 45 | async function handleOk() { |
46 | 46 | const formattedDate = formatDate(date.value); |
47 | - | |
48 | 47 | commit({ id: id.value, actualRefundDate: formattedDate, payee: payee.value }); |
49 | 48 | closeModal(); |
50 | 49 | } | ... | ... |