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

src/views/receivable/documentary/documentaryRecord.vue

@@ -350,7 +350,7 @@ const initList = () => {
   api.invoiceRecordApi.invoiceRecord({
     pages: pages.value,
     size: size.value,
-    invoiceType: '2',
+    invoiceTypes: ['2', '4'],
     ...form.value
   }).then((res: any) => {
     if (res.code == 200) {

src/views/receivable/documentary/documentaryReport.vue

@@ -52,6 +52,8 @@
 </el-table-column>-->
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
           <el-table-column prop="followFee" label="应收跟单费"></el-table-column>
+          <el-table-column prop="year" label="年"></el-table-column>
+          <el-table-column prop="month" label="月"></el-table-column>
           <el-table-column prop="totalInvoiced" label="已开票"></el-table-column>
           <el-table-column prop="totalSettlementAmount" label="已结算"></el-table-column>
           <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>

src/views/receivable/documentary/index.vue

@@ -332,6 +332,7 @@
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
           </span>
+          <span>应收金额总计：￥{{ JYreceivedAmountTotal || 0 }}</span>
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef2" @select="handleSelectChange2"
@@ -568,7 +569,8 @@ let myRouter = useRouter()
 
 let activeName = ref('1')
 let subActiveName = ref('first')
-const receivedAmountTotal = ref(0)
+const receivedAmountTotal = ref(0)//应收金额总计
+const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
 const handleTabsClick = (e) => {
   activeName.value = e.props.name
   if (e.props.name == '1') {
@@ -1149,6 +1151,7 @@ const getJyOtherReceivableList = () => {
       receiveData.value = res.data.insPlyIncomePage.records
       allData.value = res.data.insPlyIncomeOrders
       total2.value = res.data.insPlyIncomePage.total
+      JYreceivedAmountTotal.value = res.data.allAmount
       receiveData.value.forEach(element => {
         if (selectedList.value.find(v => v.id === element.id)) {
           nextTick(() => {

src/views/receivable/handingFee/index.vue

@@ -334,6 +334,7 @@
           <span class="col-108 m-r-8">
             已选: <span class="text-red">{{ selectedList.length }}</span> 条
           </span>
+          <span>应收金额总计：￥{{ JYreceivedAmountTotal || 0 }}</span>
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef2" @select="handleSelectChange2"
@@ -568,6 +569,7 @@ let myRouter = useRouter()
 let activeName = ref('1')
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
+const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
 const handleTabsClick = (e) => {
   if (e.props.name == '1') {
     getCommissionReceivableList()
@@ -1147,6 +1149,7 @@ const getJyReceivableList = () => {
       receiveData.value = res.data.insPlyIncomePage.records
       allData.value = res.data.insPlyIncomeOrders
       total2.value = res.data.insPlyIncomePage.total
+      JYreceivedAmountTotal.value = res.data.allAmount
       receiveData.value.forEach(element => {
         if (selectedList.value.find(v => v.id === element.id)) {
           nextTick(() => {

src/views/receivable/handingFee/invoiceRecord.vue

@@ -349,7 +349,7 @@ const initList = () => {
   api.invoiceRecordApi.invoiceRecord({
     pages: pages.value,
     size: size.value,
-    invoiceType: '1',
+    invoiceTypes: ['1', '3'],
     ...form.value
   }).then((res: any) => {
     if (res.code == 200) {