Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/audit.vue

@@ -14,6 +14,11 @@
                 <el-input v-model="firstForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="车架号">
+                <el-input v-model="firstForm.vinNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -103,6 +108,7 @@
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="vinNo" label="车架号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
@@ -147,6 +153,11 @@
                 <el-input v-model="firstForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="车架号">
+                <el-input v-model="firstForm.vinNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -236,6 +247,7 @@
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="vinNo" label="车架号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
@@ -281,6 +293,11 @@
                 <el-input v-model="firstForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="车架号">
+                <el-input v-model="firstForm.vinNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -370,6 +387,7 @@
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="vinNo" label="车架号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
@@ -419,6 +437,11 @@
                 <el-input v-model="firstForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="车架号">
+                <el-input v-model="firstForm.vinNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="业务员类型">
                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -508,6 +531,8 @@
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="vinNo" label="车架号" width="120"></el-table-column>
+
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="problemReason" label="疑问原因" width="120"></el-table-column>
           <el-table-column prop="problemTime" label="疑问订单时间" width="120"></el-table-column>

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>

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"
         }