平台结算上传凭证

src/http/moudules/task.js

@@ -1564,3 +1564,11 @@ export const updateNoHand = (data) => {
     data
   })
 }
+
+export const batchPinBalanceNew = (data) => {
+  return axios({
+    url: "/fnc/plyFee/batchPinBalanceNew",
+    method: "put",
+    data
+  })
+}

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

@@ -188,7 +188,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

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

@@ -158,7 +158,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

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

@@ -30,7 +30,7 @@
     </template>
     <div v-if="!Object.keys(totalList).length == 0">
         <el-row class="customStyle">
-          <el-col :span="4">总手续费：{{ totalList.commissionFeevalue }}</el-col>
+          <el-col :span="4">总应收金额：{{ totalList.commissionFeevalue }}</el-col>
           <el-col :span="4">已结算金额：{{ totalList.readyCommissionFeevalue }}</el-col>
           <el-col :span="4">未结算金额：{{ totalList.noInvoicCommissionFeevalue }}</el-col>
         </el-row>
@@ -166,10 +166,21 @@
   <el-col :span="8">总跟单费 ：{{ importData.totalHandingAmount }}</el-col>
   <el-col :span="8">总金额 ：{{ importData.totalOtherAmount }}</el-col>
 </el-row>
-  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+  <el-row>
+    <el-col :span="4">
+      <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
         :on-change="handImport"  ref="upload3"  :file-list="fileList">
         <el-button size="small" type="primary">点击上传</el-button>
-  </el-upload>
+      </el-upload>
+    </el-col>
+    <el-col :span="8">
+      <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+        :on-change="handleUpload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList1">
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+    </el-col>
+  </el-row>
+  
     <el-table
     v-if="importData.resultList"
         border
@@ -345,6 +356,8 @@ export default {
   },
   data() {
     return {
+      fileList1: [],
+      batchData: {},
       totalList:{},
       importData:{},
       fileList:[],
@@ -840,6 +853,24 @@ export default {
   },
   
   methods: {
+    // 上传凭证
+    handleUpload(file, fileList) {
+      this.fileList1=[]
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", file.raw);
+      params.append("type", "image");
+      // params.append("isNotCar", "0");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.batchData =res.data
+          this.fileList1 = fileList
+        }
+        else{
+          this.fileList1=[]
+          this.$message.error(res.msg)
+        }
+      });
+    },
     deleteBtn(row) {
       this.$confirm('是否确认删除?', '提示', {
         confirmButtonText: '确定',
@@ -1097,10 +1128,12 @@ export default {
       });
     },
     submitImport(){
-      this.$api.task
-          .batchPinBalance({selectIds:this.importData.ids.split(',')})
-          .then(res => {
-            if (res.code==200) {
+      let data = {
+        settlementImageId: this.batchData.id,
+        settIdList: this.importData.settIdList
+      }
+      this.$api.task.batchPinBalanceNew(data).then(res => {
+        if (res.code==200) {
               this.$message({
                     message: '导入成功',
                     type: 'success'
@@ -1111,7 +1144,22 @@ export default {
             else{
               this.$message.error(res.msg)
             }
-          });
+      })
+      // this.$api.task
+      //     .batchPinBalance({selectIds:this.importData.ids.split(',')})
+      //     .then(res => {
+      //       if (res.code==200) {
+      //         this.$message({
+      //               message: '导入成功',
+      //               type: 'success'
+      //           })
+      //           this.findPage()
+      //           this.dialogVisibleImport=false
+      //       }
+      //       else{
+      //         this.$message.error(res.msg)
+      //       }
+      //     });
     },
     // 结算
     balanceFun(row){

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceyes.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" :tableConfig="tableConfig" :data="tableData" @findPage="findPage"
       @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
@@ -15,9 +15,12 @@
         </el-select>
       </template>
     </templateTable>
-    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="40%" :before-close="handleCloserecord">
       <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
         :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+        <template slot="imageUrl" slot-scope="scope">
+          <img v-if="scope.row.imageUrl" :src="`${process + scope.row.imageUrl}`" class="imageclass" />
+        </template>
       </templateTable>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
@@ -145,6 +148,11 @@ export default {
             label: "进帐金额",
             type: "text"
           },
+          {
+            name: "imageUrl",
+            label: "凭证",
+            type: 'slot'
+          }
         ],
         loading: true,
         isPaginationShow: true,
@@ -221,6 +229,7 @@ export default {
         isPaginationShow: true,
         showSummary: true,
         isShowIndex: true,
+        tableHeight: 'auto',
         optBtns: [
           {
             type: 'primary',
@@ -438,6 +447,10 @@ export default {
 </script>
 
 <style scoped>
+.InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+}
 >>>.dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }