修改bug

柏杨
1 parent 3c27bc92
Showing 4 changed files with 11 additions and 10 deletions
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
src/views/project/finance/pay/InvoiceUpload.vue
src/views/project/finance/receive/Commit.vue
@@ -215,7 +215,7 @@
           customRender: (column) => {
             const { record } = column || {};
             if (record?.type === 40) {
-              return record.financePerson;
+              return record?.fieldInfos?.checkBillOrderDO?.financePerson;
             } else if (record?.type == 50) {
               return record?.fieldInfos?.checkBillOrderDO?.productionName;
             }
@@ -195,8 +195,12 @@
       let columns = [
         {
           title: '申请人',
-          dataIndex: 'financePerson',
+          dataIndex: 'createBy',
           width: 150,
+          customRender: (column) => {
+            const { record } = column || {};
+            return record?.fieldInfos?.checkBillOrderDO?.financePerson;
+          },
         },
         {
           title: 'INVOICE编号',
@@ -62,12 +62,10 @@
   const fileList = ref<UploadProps['fileList']>([]);
   async function handleOk() {
-    console.log(invoiceUrl.value, '5656invoiceUrl.value');
-    // await updateInvoiceInfo({
-    //   id: id.value,
-    //   invoiceUrl: invoiceUrl.value,
-    // });
-    // await updateDeduct(requestData);
+    await updateInvoiceInfo({
+      id: id.value,
+      invoiceUrl: invoiceUrl.value,
+    });
     fileList.value = [];
     emit('success');
     closeModal();
@@ -11,7 +11,7 @@
     <a-date-picker v-model:value="date" />
     <div style="height: 10px"></div>
     请选择收款单位：
-    <a-select v-model="payee" style="width: 100%; padding: 5px; border-radius: 4px">
+    <a-select v-model:value="payee" style="width: 100%; padding: 5px; border-radius: 4px">
       <option value="翱特建行城阳支行-美元(5107)">翱特建行城阳支行-美元(5107)</option>
       <option value="吉庆建行城阳支行-美元(4820)">吉庆建行城阳支行-美元(4820)</option>
     </a-select>
@@ -44,7 +44,6 @@
   async function handleOk() {
     const formattedDate = formatDate(date.value);
-
     commit({ id: id.value, actualRefundDate: formattedDate, payee: payee.value });
     closeModal();
   }