@dongkboy 3 месяцев назад
Родитель
Сommit
83f4be0b72
2 измененных файлов с 8 добавлено и 5 удалено
  1. 1 1
      src/views/platform/index.vue
  2. 7 4
      src/views/platform/ticket.vue

+ 1 - 1
src/views/platform/index.vue

@@ -206,7 +206,7 @@
           <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
           <el-table-column label="操作" width="180" fixed="right">
             <template #default="scope">
-              <el-button link type="primary"
+              <el-button link type="primary" :disabled="scope.row.settlementStatusName == '已结算'"
                 @click="ticketRef.openSettlement([scope.row], scope.row.contactPersonPhone)">结算</el-button>
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>

+ 7 - 4
src/views/platform/ticket.vue

@@ -525,14 +525,17 @@ const handelComfirm = (formEl: FormInstance | undefined) => {
   formEl.validate((valid) => {
     console.log(countForm.value)
     if (valid) {
-      const contactPersonObj = options.value.find(v => v.contactPersonPhone === contactPersonPhone.value)
+      let contactPersonObj = {}
+      if(options.value) {
+        contactPersonObj = options.value.find(v => v.contactPersonPhone === contactPersonPhone.value)
+      }
       api.financeApi.platformSettlement({
         settlementVo: countForm.value,
         invoicingVo: {
-          incomeIds: tableData.value.map(item => item.id),
-          orderNos: tableData.value.map(item => item.orderNo),
+          incomeIds: selectedList.value.map(item => item.id),
+          orderNos: selectedList.value.map(item => item.orderNo),
           contactPersonPhone: contactPersonPhone.value,
-          contactPerson: contactPersonObj.contactPerson,
+          contactPerson: contactPersonObj.contactPerson || '',
           receivablePremium: receivablePremium.value,
           invoiceType: "5"
         }