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

src/views/finance/audit.vue

@@ -104,7 +104,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <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>
@@ -243,7 +243,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="secondData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <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>
@@ -383,7 +383,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="thirdData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <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>
@@ -527,7 +527,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="forthData" height="calc(100% - 294px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <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>
@@ -875,4 +875,13 @@ let isTrue = ref(false)
 :deep(.el-badge__content--danger) {
   background-color: #D40000;
 }
-</style>
+
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
+</style>

src/views/finance/index.vue

@@ -115,7 +115,7 @@
           </el-row>
         </el-form>
         <el-table :data="firstData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
-          style="width: 100%; margin-top: 20px;">
+          style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -267,7 +267,7 @@
           </el-row>
         </el-form>
         <el-table :data="secondData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
-          style="width: 100%; margin-top: 20px;">
+          style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -421,7 +421,7 @@
           </el-row>
         </el-form>
         <el-table :data="thirdData" :height="isTrue ? 'calc(100% - 312px)' : 'calc(100% - 212px)'"
-          style="width: 100%; margin-top: 20px;">
+          style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
@@ -553,7 +553,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;">
+        <el-table :data="forthData" height="calc(100% - 262px )" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <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>
@@ -946,4 +946,12 @@ onMounted(() => {
 :deep(.el-badge__content--danger) {
   background-color: #D40000;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>

src/views/payCredit/index.vue

@@ -60,7 +60,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData4" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData4" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -150,7 +150,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData1" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData1" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -249,7 +249,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData2" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData2" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -336,7 +336,7 @@
             <span>提现金额总计: {{ totalAmount || 0 }}</span>
           </el-col>
         </el-form>
-        <el-table :data="firstData3" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;">
+        <el-table :data="firstData3" height="calc(100% - 218px)" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="mobile" label="业务员工号"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型">
@@ -797,4 +797,12 @@ onMounted(() => {
   border: unset;
   border-radius: unset;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>

src/views/platform/index.vue

@@ -152,7 +152,7 @@
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 446px)' : 'calc(100% - 346px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
-          @select-all="handleSelectAll1">
+          @select-all="handleSelectAll1" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="typeAttrName" label="业务来源" width="120"></el-table-column>
@@ -983,4 +983,12 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>

src/views/platform/platformReport.vue

@@ -438,7 +438,7 @@ const initOption = () => {
 }
 const handleSettlementDetail = (row) => {
   activeName.value = '3'
-  recordForm2.value.companyId = row.id
+  recordForm2.value.companyId = row.companyId
   initData3()
 }
 onMounted(() => {

src/views/receivable/documentary/documentaryRecord.vue

@@ -389,7 +389,8 @@ const handelComfirm = (CountForm) => {
         invoicingId: invoicingId.value,
         actualReceivedAmount: countForm.value.actualReceivedAmount,
         receivePaymentDate: countForm.value.receivePaymentDate,
-        attachmentIds: countForm.value.attachmentIds
+        attachmentIds: countForm.value.attachmentIds,
+        settlementPaymentReason: countForm.value.settlementPaymentReason
       }).then((res: any) => {
         countShow.value = false
         if (res.code == 200) {

src/views/receivable/documentary/documentaryReport.vue

@@ -36,14 +36,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="8">
+              <el-form-item prop="invoiceType" label="应收项">
+                <el-select v-model="recordForm.invoiceType">
+                  <el-option value="2" label="车险"></el-option>
+                  <el-option value="4" label="非车险"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="val=>getSummaries(val,['settlementPaymentDifference'])"
-          show-summary>
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id"
+          :summary-method="val => getSummaries(val, ['settlementPaymentDifference'])" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
           <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
@@ -53,6 +61,11 @@
           <el-table-column prop="totalSettlementAmount" label="已结算"></el-table-column>
           <el-table-column prop="totalUnSettlementAmount" label="未结算"></el-table-column>
           <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>
+          <el-table-column prop="invoiceType" label="应收项">
+            <template #default="scope">
+              {{ scope.row.invoiceType == 2 ? '车险' : '非车险' }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <div class="flex a-c">
@@ -133,7 +146,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary :summary-method="val=>getSummaries(val,['taxPoint','actualReceivedAmount','settlementPaymentDifference'])">
+        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary
+          :summary-method="val => getSummaries(val, ['taxPoint', 'actualReceivedAmount', 'settlementPaymentDifference'])">
           <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="invoiceParty" label="开票方" width="150"></el-table-column>
@@ -325,7 +339,7 @@ import { useRouter, useRoute } from 'vue-router'
 
 const router = useRouter()
 const route = useRoute()
-const   activeName = ref('1')
+const activeName = ref('1')
 const handleClick = (e) => {
   activeName.value = e.props.name
   pages.value = 1
@@ -493,6 +507,7 @@ const initData1 = () => {
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
+    invoiceType: recordForm.value.invoiceType,
     invoiceTypes: ['2', '4'],
     agreementType: '2'
   }).then((res: any) => {
@@ -579,12 +594,7 @@ const handleSearch = (type) => {
     case 2:
       initData2()
       break;
-    case 3:
-      initData3(['2'])
-      break;
-    case 4:
-      initData3(['4'])
-      break;
+
   }
 }
 const handleReset = (type) => {

src/views/receivable/documentary/index.vue

@@ -154,7 +154,7 @@
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
-          @select-all="handleSelectAll1">
+          @select-all="handleSelectAll1" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
@@ -336,7 +336,7 @@
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef2" @select="handleSelectChange2"
-          @select-all="handleSelectAll2">
+          @select-all="handleSelectAll2" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
@@ -563,11 +563,12 @@
 import api from '@/api'
 
 import { ElMessage, ElMessageBox } from "element-plus";
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
+const myRoute = useRoute()
 
 let myRouter = useRouter()
 
-let activeName = ref('1')
+let activeName = ref(myRoute.query.activeindex as any || '1')
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
 const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
@@ -865,7 +866,8 @@ const handleInvoiceSubmit = () => {
   myRouter.push({
     name: 'documentaryTicket',
     query: {
-      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : '',
+      activeindex: activeName.value
     }
   })
 }
@@ -1255,4 +1257,12 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>

src/views/receivable/documentary/ticket.vue

@@ -72,7 +72,12 @@
       <el-table-column prop="uninvoiced" label="未开票"></el-table-column>
     </el-table>
     <div class="footer">
-      <el-button plain @click="router.back()">取消</el-button>
+      <el-button plain @click="router.push({
+        path: previousRoute,
+        query: {
+          activeindex: activeindex
+        }
+      })">取消</el-button>
       <el-button plain type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0)"
         @click="handleTicket(true)">开票并结算</el-button>
       <el-button type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0)"
@@ -185,6 +190,9 @@ import { ElMessage } from "element-plus";
 
 let router = useRouter()
 let route = useRoute()
+const activeindex = ref(route.query.activeindex)
+// 获取上一个路由的完整信息
+const previousRoute = ref(router.options.history.state.back)
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const year = new Date().getFullYear() + ''
@@ -594,4 +602,4 @@ onMounted(() => {
     color: #ccc;
   }
 }
-</style>
+</style>

src/views/receivable/handingFee/index.vue

@@ -164,7 +164,7 @@
 
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
           style="width: 100%; margin-top: 20px;" row-key="id" ref="ReceiveDataRef1" @select="handleSelectChange1"
-          @select-all="handleSelectAll1">
+          @select-all="handleSelectAll1" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
@@ -197,7 +197,7 @@
           <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
-              <el-button link type="primary" @click="toEdit(scope.row)">编辑</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>
             </template>
           </el-table-column>
@@ -345,7 +345,7 @@
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef2" @select="handleSelectChange2"
-          @select-all="handleSelectAll2">
+          @select-all="handleSelectAll2" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
@@ -1249,4 +1249,12 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>