私有手续费 跟单费 增加字段区分车险非车险

src/views/receivable/documentary/index.vue

@@ -353,7 +353,11 @@
             </template>
           </el-table-column>
           <!--                    <el-table-column prop="a" label="非车险不含税保费" width="100"></el-table-column>-->
-          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
+          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100">
+            <template #default="scope">
+              {{ Number(scope.row.jyOtherCostsProportion) || ' ' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="jyPolicyNo" label="非车险保单号" width="100"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
@@ -848,7 +852,10 @@ let invoiceShow = ref(false)
 let invoiceRadio = ref(null)
 const handleInvoiceSubmit = () => {
   myRouter.push({
-    name: 'documentaryTicket'
+    name: 'documentaryTicket',
+    query: {
+        invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+      }
   })
 }
 
@@ -1052,7 +1059,6 @@ const search = () => {
   }
   if (activeName.value == '2') {
     getJyOtherReceivableList()
-    getreceivedAmountTotal()
   }
 }
 const reset = () => {
@@ -1082,6 +1088,7 @@ const getOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'2'
   }
   api.financeApi.getOtherReceivableList({
     ...params,
@@ -1122,6 +1129,7 @@ const getJyOtherReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'4'
   }
   api.financeApi.getJyOtherReceivableList({
     ...params,

src/views/receivable/documentary/ticket.vue

@@ -168,6 +168,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from "element-plus";
 
 let router = useRouter()
+let route = useRoute()
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const year = new Date().getFullYear() + ''
@@ -380,7 +381,7 @@ const handelComfirm = async () => {
     details: selectedList.value,
     ...countForm.value,
     attachmentIds,
-    invoiceType: "2"
+    invoiceType: route.query.invoiceType,
 
   }
   let apiFn = api.financeApi.followInvoicing
@@ -390,7 +391,7 @@ const handelComfirm = async () => {
       invoiceVO: params,
       ...countForm.value,
       attachmentIds,
-      invoiceType: "2"
+      invoiceType: route.query.invoiceType,
     }
   }
   apiFn(params).then((sub: any) => {
@@ -410,6 +411,7 @@ const initData = () => {
   const params = {
     searchList: searchList.value,
     logicJudge: logicJudge.value,
+    invoiceType: route.query.invoiceType,
   }
   api.financeApi.followInvoicePageList(params).then((res: any) => {
     if (res.code == 200) {

src/views/receivable/handingFee/index.vue

@@ -365,7 +365,7 @@
             <template #default="scope">
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
-              <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
+              <!-- <el-dropdown class="width-100" trigger="click" placement="bottom" @command="dropdownCommand">
                 <el-button class="radius-2px width-100">
                   更多&nbsp;&nbsp;<el-icon>
                     <ArrowDown />
@@ -376,7 +376,7 @@
                     <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
-              </el-dropdown>
+              </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -570,7 +570,7 @@ const handleTabsClick = (e) => {
   isTrue.value = false
   receivableForm.value = {}
   selectedList.value = []
-  activeName.value = e
+  activeName.value = e.props.name
 }
 const companyIdprops = {
   expandTrigger: 'hover' as const,
@@ -1087,6 +1087,7 @@ const getCommissionReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'1'
   }
   api.financeApi.getCommissionReceivableList({
     ...params,
@@ -1127,6 +1128,7 @@ const getJyReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
+    invoiceType:'3'
   }
   api.financeApi.getJyCommissionReceivableList({
     ...params,

src/views/receivable/handingFee/ticket.vue

@@ -352,6 +352,7 @@ const handleSearch = () => {
   // router
   api.financeApi.getSelectedReceivableList({
     companyId: route.query.id,
+    invoiceType: route.query.invoiceType,
     orderNos: selectedList.value.map(item => item.orderNo),
     searchList: searchList.value,
     logicJudge: logicJudge.value,