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

src/views/finance/modules/auditDetail.vue

@@ -658,7 +658,7 @@
                 <div v-else>{{ detailData?.costRatio?.jqExportRatio }}%</div>
               </th>
               <th>
-                <div>￥{{ Math.floor(Number(detailData?.insFeeOrders?.jqExportPremium) * 100) / 100 || '--' }}</div>
+                <div>￥{{ (new Decimal(detailData?.insFeeOrders?.jqExportPremium || 0).mul(100).floor().div(100).toFixed(2)) || '--' }}</div>
               </th>
 
               <th>
@@ -729,7 +729,7 @@
                 <div v-else>{{ detailData?.costRatio?.syExportRatio }}%</div>
               </th>
               <th>
-                <div>￥{{ Math.floor(Number(detailData?.insFeeOrders?.syExportPremium) * 100) / 100 || '--' }}</div>
+                <div>￥{{ (new Decimal(detailData?.insFeeOrders?.syExportPremium || 0).mul(100).floor().div(100).toFixed(2)) || '--' }}</div>
               </th>
 
               <th>
@@ -800,7 +800,7 @@
                 <div v-else>{{ detailData?.costRatio?.jyExportRatio }}%</div>
               </th>
               <th>
-                <div>￥{{ Math.floor(Number(detailData?.insFeeOrders?.jyExportPremium) * 100) / 100 || '--' }}</div>
+                <div>￥{{ (new Decimal(detailData?.insFeeOrders?.jyExportPremium || 0).mul(100).floor().div(100).toFixed(2)) || '--' }}</div>
               </th>
 
               <th>
@@ -972,7 +972,7 @@ import file1 from '@/assets/images/additional/file1.png'
 
 import api from '@/api'
 import { useRoute, useRouter } from 'vue-router'
-
+import Decimal from 'decimal.js'
 import image from "@/assets/images/image.png";
 import pdf from "@/assets/images/pdf.png";
 import word from "@/assets/images/word.png";
@@ -1878,4 +1878,4 @@ onUnmounted(() => {
     display: none;
   }
 }
-</style>
+</style>

src/views/insurancePolicy/index.vue

@@ -3516,7 +3516,8 @@ const quoteInsurance = async (companyId: any, companyIndex: any) => {
       insuranceCompanyCode: companyId,  // 保险公司代码
       quoteNo: insurancePolicyForm.value.order.quoteNo,       // 报价单号
       agreementId: company.isDispatch ? company.dispatchAgreementId : company.agreement, // 协议ID
-      productId: insurancePolicyForm.value.productId,         // 产品ID
+      productId: insurancePolicyForm.value.productId,
+      orderSource:'0',       // 订单来源
     },
     carInfoVo: {  // 车辆信息
       licenseKindCode: '02',              // 车牌种类代码

src/views/payCredit/agentCount.vue

@@ -76,7 +76,7 @@
                 <el-input type="textarea" v-model="agentReason" maxlength="200"></el-input>
                 <div style="display: flex; align-items: center; justify-content: flex-end; margin-top: 10px">
                   <el-button size="small" @click="scope.row.agentShow = false">取消</el-button>
-                  <el-button type="danger" size="small" @click="handleAgentConfirm(scope.row)">确定驳回</el-button>
+                  <el-button type="danger" size="small" @click="handleAgentConfirm(scope.row)" :loading="auditLoading">确定驳回</el-button>
                 </div>
               </el-popover>
             </template>
@@ -269,7 +269,7 @@
       </el-form>
       <div class="footer">
         <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="show = false">取消</el-button>
-        <el-button type="primary" @click="handleConfirmAudit">审核通过</el-button>
+        <el-button type="primary" @click="handleConfirmAudit" :loading="auditLoading">审核通过</el-button>
       </div>
     </el-dialog>
   </PageMain>
@@ -287,7 +287,7 @@ const handleClick = (e) => {
   firstForm.value = {}
   initList(Number(activeName.value))
 }
-
+  const auditLoading = ref(false)//审核loading
 // 待审核
 let firstForm = ref({})
 let firstData = ref([])
@@ -373,6 +373,7 @@ let rules = ref({
 
 // 通过
 const handleConfirmAudit = () => {
+  auditLoading.value = true
   api.financeApi.userBankCardAudit({
     id: agentForm.value.id,
     auditStatus: '1'
@@ -382,6 +383,7 @@ const handleConfirmAudit = () => {
         message: res.msg,
         type: 'success'
       })
+      auditLoading.value = false
       show.value = false
       initList(0)
       initList(1)
@@ -395,6 +397,7 @@ const handleAgentCancel = (row) => {
   agentReason.value = ''
 }
 const handleAgentConfirm = (row) => {
+  auditLoading.value = true
   row.agentShow = false
   api.financeApi.userBankCardAudit({
     id: row.id,
@@ -406,6 +409,7 @@ const handleAgentConfirm = (row) => {
         message: res.msg,
         type: 'success'
       })
+      auditLoading.value = false
       initList(0)
       initList(2)
     }

src/views/payCredit/myTask.vue

@@ -74,7 +74,7 @@
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper" :total="total1" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"></el-pagination>
+            @current-change="pageCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
       <el-tab-pane  name="1" class="h-full">
@@ -142,7 +142,7 @@
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"></el-pagination>
+            @current-change="pageCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
       <el-tab-pane  name="2" class="h-full">
@@ -206,7 +206,7 @@
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
             layout="total, sizes, prev, pager, next, jumper" :total="total3" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"></el-pagination>
+            @current-change="pageCurrentChange"></el-pagination>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -245,9 +245,8 @@
           <el-button type="primary" @click="accountSearch">查询</el-button>
         </el-col>
       </el-row>
-      <el-table ref="AccountRef" row-key="id" style="margin: 24px 0; max-height: 400px" @select="handleSelect"
-        :data="accountData">
-        <el-table-column type="selection" width="80"></el-table-column>
+      <el-table ref="AccountRef" row-key="id" style="margin: 24px 0; max-height: 400px" @select="handleSelect" highlight-current-row
+        :data="accountData" @current-change="handleCurrentChange" @row-dblclick="handleSelectedRow">
         <!-- <el-table-column prop="bankCardNum" label="账户名称"></el-table-column> -->
         <el-table-column prop="bankCardNum" label="银行卡号"></el-table-column>
         <el-table-column prop="bankNum" label="开户行"></el-table-column>
@@ -374,13 +373,14 @@ const accountSearch = () => {
   initAccount();
 }
 let selectItem = ref(null)
-const handleSelect = (val, row) => {
+const handleCurrentChange = ( row:any) => {
   selectItem.value = row
-  console.log(row)
-  if (val.length > 1) {
     AccountRef.value.clearSelection()
     AccountRef.value.toggleRowSelection(row);
-  }
+}
+const handleSelectedRow = (row: any) => {
+  selectItem.value = row
+  handleAccountSubmit()
 }
 const handleAccountCancel = () => {
   selectItem.value = null
@@ -435,7 +435,7 @@ const handleSizeChange = (size) => {
   size.value = size
   initData(activeName.value)
 }
-const handleCurrentChange = (page) => {
+const pageCurrentChange = (page) => {
   pages.value = page
   initData(activeName.value)
 }

src/views/platform/platformReport.vue

@@ -158,7 +158,7 @@
         <el-table height="calc(100% - 192px)" :data="recordData2">
           <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
-          <el-table-column prop="dockingPerson" label="对接人" width="150"></el-table-column>
+          <el-table-column prop="contactPerson" label="对接人" width="150"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="150"></el-table-column>
           <el-table-column prop="productName" label="险种" width="150"></el-table-column>