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

src/http/moudules/task.js

@@ -1417,4 +1417,11 @@ export const esmInsCompany = (val) => {
     url: `esmInsCompany/queryListByParentId/`+val,
     method: "get",
   })
+}
+export const reconciliation = (data) => {
+  return axios({
+    url: "/fnc/plyFee/reconciliation",
+    method: "put",
+    data
+  })
 }

src/views/FinancialManagement/AcountWithdrawal/WithdrawalReview.vue

@@ -116,8 +116,8 @@ export default {
         },
         handleButton2({ row, index }) {
             this.$prompt('输入驳回原因', '提示', {
-                confirmButtonText: '取消',
-                  cancelButtonText: '确定',
+                 confirmButtonText: '确定',
+                  cancelButtonText: '取消',
                   inputPattern: /^.+$/,
                   distinguishCancelAndClose: true,
                 inputErrorMessage: '输入驳回原因!'

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -752,10 +752,10 @@ export default {
     }
     let data = {
       isNotCar: '0',
-      selectIds: this.selectionListbatch.map(e => e.id),
+      taskId: this.selectionListbatch.map(e => e.id),
       settlementImageId:this.fileListBatchId
     }
-    this.$api.task.batchInvoicing(data)
+    this.$api.task.reconciliation(data)
       .then(res => {
         if (res.code == 200) {
           this.$message({

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

@@ -666,10 +666,10 @@ export default {
     }
     let data = {
       isNotCar: '1',
-      selectIds: this.selectionListbatch.map(e => e.id),
+      taskId: this.selectionListbatch.map(e => e.id),
       settlementImageId:this.fileListBatchId
     }
-    this.$api.task.batchInvoicing(data)
+    this.$api.task.reconciliation(data)
       .then(res => {
         if (res.code == 200) {
           this.$message({

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceno.vue

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable
       :formList="formList"
       :searchData.sync="searchData"
@@ -185,6 +185,9 @@ export default {
 </script>
     
   <style scoped>
-
+.InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+}
 </style>