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

src/views/finance/modules/auditDetail.vue

@@ -118,18 +118,6 @@
               <span>{{ detailData?.order?.signingTime || '--' }}</span>
             </span>
           </el-col>
-          <el-col :span="6" class="TBMsgItem">
-            <span class="label">评分</span>
-            <span class="value">
-              <span>{{ detailData?.scoreVo?.score || '--' }}</span>
-            </span>
-          </el-col>
-          <el-col :span="6" class="TBMsgItem" v-for="(item, index) in detailData?.scoreVo?.scoreJson" :key="index">
-            <span class="label">{{ item.scoreName }}</span>
-            <span class="value">
-              <span>{{ item.score || '--' }}</span>
-            </span>
-          </el-col>
           <el-col :span="6" class="TBMsgItem">
             <span class="label">车船税</span>
             <span class="value">
@@ -215,6 +203,12 @@
               <span>--</span>
             </span>
           </el-col>
+          <el-col :span="6" class="TBMsgItem" v-for="(item, index) in detailData?.scoreVo?.scoreJson" :key="index">
+            <span class="label">{{ item.scoreName }}</span>
+            <span class="value">
+              <span>{{ item.score }}</span>
+            </span>
+          </el-col>
         </el-row>
       </div>
       <div id="carMsg" class="carMsg">

src/views/receivable/documentary/ticket.vue

@@ -22,7 +22,7 @@
             filterable :disabled="item.type == '为空'">
             <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
           </el-select> -->
-          <el-cascader class="w-350px" clearable :disabled="item.type == '为空'" v-if="item.name == 'companyId'" placeholder="请选择"  v-model="item.search" :options="companyList"
+          <el-cascader class="w-350px" filterable clearable :disabled="item.type == '为空'" v-if="item.name == 'companyId'" placeholder="请选择"  v-model="item.search" :options="companyList"
           :props="companyIdprops" @change="handleCompanyChange(index, $event)" />
           <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
             v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
@@ -39,6 +39,9 @@
       <el-table-column prop="year" label="年"></el-table-column>
       <el-table-column prop="month" label="月"></el-table-column>
       <el-table-column prop="receivablePremium" label="应收总额"></el-table-column>
+      <el-table-column prop="receivablePremium" label="对账金额"></el-table-column>
+      <el-table-column prop="receivablePremium" label="虚增金额"></el-table-column>
+      <el-table-column prop="receivablePremium" label="虚增金额原因"></el-table-column>
       <el-table-column prop="invoiced" label="已开票"></el-table-column>
       <el-table-column prop="uninvoiced" label="未开票"></el-table-column>
     </el-table>

src/views/receivable/handingFee/index.vue

@@ -175,8 +175,11 @@
           <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
           <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsPremiums" label="交强手续费" width="100"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="100"></el-table-column>
+          <el-table-column prop="sySuperviseCostsPremiums" label="商业手续费" width="100"></el-table-column>
+          <el-table-column prop="otherCostsPremiums" label="跟单金额" width="100"></el-table-column>
           <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
           <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>

src/views/receivable/handingFee/invoiceRecord.vue

@@ -219,7 +219,10 @@ const reset = () => {
   size.value = 10
   initList()
 }
-
+const invoiceId = route.query.invoiceId
+  if(invoiceId){
+    form.value.recordId = invoiceId
+  }
 let countShow = ref(false)
 let countForm = ref({})
 let countRules = ref({

src/views/receivable/handingFee/report.vue

@@ -162,6 +162,7 @@
           <el-table-column label="操作" width="200" align="center" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="handleDetail(scope.row)">删除</el-button>
+              <el-button link type="primary" @click="handleAssociateInvoice(scope.row)">关联发票</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -768,6 +769,14 @@ const handleDetail = (type) => {
     .catch(() => {
     })
 }
+const handleAssociateInvoice = (row) => {
+  router.push({
+    path: '/receivable/private/invoiceRecord',
+    query: {
+      invoiceId: row.invoiceId
+    }
+  })
+}
 const handleOrderDetail = (type: any) => {
   router.push({
     path: '/insurancePolicy/order/insurancePolicyOrderDetail',

src/views/receivable/handingFee/ticket.vue

@@ -528,6 +528,7 @@ const calBeforeInvoice = async (params: any) => {
     countForm.value.invoiceTime = res.data.invoiceTime
     countForm.value.receivableSupervisePremium = res.data.receivableSupervisePremium
     receivableSupervisePremium.value = res.data.receivableSupervisePremium
+    router.back()
   }
 }