Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/task.js

@@ -916,6 +916,14 @@ export const batchSumBalance = (data) => {
     data
   })
 }
+// 批次批量結算
+export const noBatchSumBalance = (data) => {
+  return axios({
+    url: "/fnc/noPlyFee/noBatchSumBalance",
+    method: "put",
+    data
+  })
+}
 
 
 export const fncSettlementSumFees = (data) => {
@@ -1195,6 +1203,14 @@ export const batchBxBalance = (data) => {
     data
   })
 }
+
+export const noBatchBxBalance = (data) => {
+  return axios({
+    url: "/fnc/noPlyFee/noBatchBxBalance",
+    method: "put",
+    data
+  })
+}
 export const batchInvoicing = (data) => {
   return axios({
     url: "/fnc/plyFee/batchInvoicing",
@@ -1202,6 +1218,16 @@ export const batchInvoicing = (data) => {
     data
   })
 }
+
+// 非车保险手续费批量开票
+export const noBatchInvoicing = (data) => {
+  return axios({
+    url: "/fnc/noPlyFee/noBatchInvoicing",
+    method: "put",
+    data
+  })
+}
+
 export const batchInvoic = (data) => {
   return axios({
     url: "/fnc/plyFee/batchInvoic",
@@ -1209,7 +1235,14 @@ export const batchInvoic = (data) => {
     data
   })
 }
-
+// 非车开票跟单费
+export const noBatchInvoic = (data) => {
+  return axios({
+    url: "/fnc/noPlyFee/noBatchInvoic",
+    method: "put",
+    data
+  })
+}
 export const allOtherAmount = (data) => {
   return axios({
     url: "/fnc/plyFee/allOtherAmount",
@@ -1379,6 +1412,14 @@ export const singleInvoic = (data) => {
     data
   })
 }
+// 批量开票跟单费
+export const noSingleInvoic = (data) => {
+  return axios({
+    url: "/fnc/noPlyFee/noSingleInvoic",
+    method: "put",
+    data
+  })
+}
 
 export const fncplyFeeQuery = (data) => {
   return axios({

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -467,7 +467,8 @@ export default {
        subData.multipleSelection.forEach(val => {
         val.createTime = null
        })
-      this.$api.task.batchSumBalance(subData).then(res => {
+      // this.$api.task.batchSumBalance(subData).then(res => {
+        this.$api.task.noBatchSumBalance(subData).then(res => {
         if (res.code == 200) {
           this.$message.success('操作成功')
           this.handleClose()

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -1036,10 +1036,11 @@ export default {
           }
           let data = {
             ...this.InvoicingData,
-            isNotCar: '1',
+            // isNotCar: '1',
             selectIds: this.selectionList.map(e => e.id),
           }
-          this.$api.task.batchInvoicing(data)
+          // this.$api.task.batchInvoicing(data)
+          this.$api.task.noBatchInvoicing(data)
             .then(res => {
               if (res.code == 200) {
                 this.$message({

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -531,12 +531,13 @@ export default {
 
         balanceSumbit() {
             this.$api.task
-                .batchBxBalance({
+                // .batchBxBalance({
+                .noBatchBxBalance({
                     ...this.openBalanceDetail,
                     otherFeevalue: this.formDetail.otherFeevalue,
                     // partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     companyId: this.formDetail.companyId,
-                    isNotCar: '1',
+                    // isNotCar: '1',
                     handlingFeesStatus: '1',
                     settlementImageId: this.batchData.id,
                     ...this.form

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/Notinvoiced.vue

@@ -404,7 +404,8 @@ export default {
               multipleSelection:this.multipleSelection,
                monthNumber:this.multipleSelection.map(val=>val.monthNumber)}
                if (this.isSingle == '2') {
-            this.$api.task.singleInvoic(data).then(res => {
+            // this.$api.task.singleInvoic(data).then(res => {
+              this.$api.task.noSingleInvoic(data).then(res => {
               if (res.code == "200") {
                 this.$message({
                   message: res.msg || '操作成功',
@@ -419,7 +420,8 @@ export default {
             });
           }
           else {
-            this.$api.task.batchInvoic(data).then(res => {
+            // this.$api.task.batchInvoic(data).then(res => {
+              this.$api.task.noBatchInvoic(data).then(res => {
               if (res.code == "200") {
                 this.$message({
                   message: res.msg || '操作成功',