财务车险、非车

src/http/moudules/task.js

@@ -1237,3 +1237,24 @@ export const bxImportData = (data) => {
     data
   })
 }
+export const bxOtherDetailsExcel = (data) => {
+  return axios({
+    url: "/fnc/plyFee/bxOtherDetailsExcel",
+    method: "post",
+    data
+  })
+}
+export const bxNoOtherDetailsExcel = (data) => {
+  return axios({
+    url: "/fnc/plyFee/bxNoOtherDetailsExcel",
+    method: "post",
+    data
+  })
+}
+export const invicdetai = (data) => {
+  return axios({
+    url: "/fnc/plyFee/invicdetail",
+    method: "post",
+    data
+  })
+} 

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -678,18 +678,42 @@
     </el-dialog>
     <el-dialog :title="underwritingRulesAddDialogTitle" :visible.sync="underwritingRulesAddVehicleFactorVisible"
       :close-on-click-modal="false" :fullscreen="true" width="70%" top="6vh" @close="underwritingRulescloseDialog">
-      <el-form ref="form" :model="underwritingRulesForm" label-width="80px" size="small">
-        <el-form-item label="是否有效">
+      <el-form ref="form"  :model="underwritingRulesForm" label-width="80px" size="small">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="是否有效">
           <el-select v-model="underwritingRulesForm.validInd" placeholder="请选择活动区域">
             <el-option label="有效" value="1"></el-option>
             <el-option label="无效" value="0"></el-option>
             <el-option label="待审核" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="规则描述">
-          <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述"
-            maxlength="100" show-word-limit></el-input>
-        </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="规则起期">
+                <el-date-picker
+                  v-model="underwritingRulesForm.rulesStartDate"
+                  type="date"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="规则止期">
+                <el-date-picker
+                  v-model="underwritingRulesForm.rulesEndDate"
+                  type="date"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="规则描述">
+                <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述"
+                  maxlength="100" show-word-limit></el-input>
+              </el-form-item>
+        </el-col>
+      </el-row>
       </el-form>
       <Product-Cost-Form v-if="underwritingRulesAddVehicleFactorVisible" :form="dynamicFormArray" :operator="operatorlist"
         over-size="small" @saveForm="underwritingRulesSaveForm"

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

@@ -167,13 +167,13 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
-        optBtns:[
-          {
-            type:'primary',
-            label:'详情',
-            click:(row, index) => {return this.haldDetail(row)},
-        },
-        ]
+        // optBtns:[
+        //   {
+        //     type:'primary',
+        //     label:'详情',
+        //     click:(row, index) => {return this.haldDetail(row)},
+        // },
+        // ]
       },
       btnGroup:[
       {

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

@@ -0,0 +1,269 @@
+<template>
+  <!--布局容器-->
+  <div class="container" style="width: 99%; margin-top: 0px">
+    <templateTable ref="templateTable" :formList="formList"  :btnGroup="btnGroup" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
+      @findPage="findPage" @getList="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
+    </templateTable>
+  </div>
+</template>
+<script>
+import templateTable from '@/components/TemplateTable/index.vue'
+import { mapState } from 'vuex'
+import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
+
+export default {
+  name: "baosi",
+  components: {  templateTable,yearMonthYay },
+  created() {
+  },
+  computed: {
+    ...mapState({
+      perms: state => state.user.perms
+    })
+  },
+  data() {
+    return {
+      year: '',
+      searchData: {},
+      formList:[
+       {
+          label: "车牌号",
+          prop: "licenseno",
+          type: "input",
+        },
+        {
+          label: "被保人",
+          prop: "userId",
+          type: "input",
+        },
+        {
+          label: "保险公司",
+          prop: "companyName",
+          type: "company",
+        },
+       
+        {
+          label: "险种",
+          prop: "riskcode",
+          type: "input",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesName",
+          type: "input",
+        },
+       
+        {
+          label: "交强保单号",
+          prop: "policyno",
+          type: "input",
+        },
+        {
+          label: "商业保单号",
+          prop: "syPolicyno",
+          type: "input",
+        }, {
+          label: "非车保单号:",
+          prop: "noPolicyno",
+          type: "input",
+        },
+        {
+          label: "结算日期",
+          prop: "settlementTime",
+          type: "date",
+        }, {
+          label: "结算状态",
+          prop: "handlingFeesStatus",
+          type: "select",
+          options:[
+            {
+              label:'已结算',
+              value:'1'
+            },{
+              label:'未结算',
+              value:'0'
+            }
+          ],
+          
+        }, 
+        {
+          label: "创建日期",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "签单日期",
+          prop: "signDate",
+          type: "datePicker",
+        },
+    ],
+      btnGroup:[
+      {
+        name:'导出',
+        click:(row, index) => {return this.handExport()},
+      }
+    ],
+      tableData: [],
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        agreementType :2,
+        handlingFeesStatus : 0,
+        documentaryFeesStatus: 0,
+        isNotCar: 0,
+        isNotDocumentary:  1,
+      },
+      tableConfig:{
+        columns: [
+          {
+            prop: "orderno",
+            label: "订单号(子订单)",
+            type: "text"
+          },
+          {
+            prop: "companyName",
+            label: "保险公司名称",
+            type: "text"
+          },
+          {
+            prop: "partnerCompaniesName",
+            label: "合作公司名称",
+            type: "text"
+          },
+          {
+            prop: "policyno",
+            label: "交强保单号",
+            type: "text"
+          },
+          {
+            prop: "syPolicyno",
+            label: "商业保单号",
+            type: "text"
+          },
+          {
+            prop: "jqPremium",
+            label: "交强保费",
+            type: "text"
+          },
+          {
+            prop: "syPremium",
+            label: "商业保费",
+            type: "text"
+          },
+          {
+            prop: "jqNoTaxPremium",
+            label: "交强不含税保费",
+            type: "text"
+          },
+          {
+            prop: "syNoTaxPremium",
+            label: "商业不含税保费",
+            type: "text"
+          },
+          {
+            prop: "otherFeevalue",
+            label: "跟单费金额",
+            type: "text"
+          },
+          {
+            prop: "otherFeerate",
+            label: "跟单费比例",
+            type: "text"
+          },
+          {
+            prop: "jqOtherCostsProportion",
+            label: "交强跟单比例",
+            type: "text"
+          },
+          {
+            prop: "syOtherCostsProportion",
+            label: "商业跟单比例",
+            type: "text"
+          },
+          {
+            prop: "jqOtherCostsPremium",
+            label: "交强跟单金额",
+            type: "text"
+          },
+          {
+            prop: "syOtherCostsPremium",
+            label: "商业跟单金额",
+            type: "text"
+          },
+        
+        ],
+        isPaginationShow:true,
+        loading: true,
+      }
+    };
+  },
+  created() {
+    this.findPage();
+  },
+  methods: {
+    // 查询
+    handleSearchList(data) {
+      this.findPage(data);
+    },
+    //列表数据
+    findPage(data) {
+      let signDateStart=''
+        let signDateEnd=''
+      if(data&& data.signDate){
+          signDateStart=data.signDate[0]
+          signDateEnd=data.signDate[1]
+      }
+      else{
+        signDateStart=''
+        signDateEnd=''
+    }
+      this.tableConfig.loading = true;
+      this.$api.task
+        .plyFeequery({...this.pageData,...data,signDateStart,signDateEnd})
+        .then(res => {
+          if (res.code==200) {
+            this.tableData = res.data.content;
+            this.pageData.pageNum = res.data.pageNum;
+            this.pageData.pageSize = res.data.pageSize;
+            this.pageData.totalSize = res.data.totalSize;
+            this.tableConfig.loading = false;
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    handExport(){
+      if( this.$refs.templateTable.searchDataClone){
+        let signDateStart=''
+        let signDateEnd=''
+        if(this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.signDate && this.$refs.templateTable.searchDataClone.signDate.length>0){
+          signDateStart=this.$refs.templateTable.searchDataClone.signDate[0]
+          signDateEnd=this.$refs.templateTable.searchDataClone.signDate[1]
+        }
+      else{
+        signDateStart=''
+        signDateEnd=''
+      }
+      this.$api.task.bxOtherDetailsExcel({...this.pageData,...this.$refs.templateTable.searchDataClone,signDateStart,signDateEnd})
+          .then(res => {
+            if (res.code==200) {
+               let url = process.env.BASE_URL  + res.data; // 3.创建一个临时的url指向blob对象
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = "导出文件.xlsx";
+                a.click();
+                window.URL.revokeObjectURL(url);
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+        }
+    },
+  }
+};
+</script>
+    
+<style scoped></style>
+    

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

@@ -67,7 +67,8 @@
   :visible.sync="dialogVisibleBatch"
   width="30%"
   :before-close="handleCloseBatch">
-  <span v-if="batchData.totalAmount">总手续费 ：{{ batchData.totalAmount }}</span>
+  <p >开票号 ：<el-input style="width: 200px;" v-model="invoicId" placeholder="请输入开票号"></el-input></p>
+  <p >总手续费 ：{{ batchData.totalAmount }}</p>
   <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
         :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
         <el-button size="small" type="primary">点击上传</el-button>
@@ -102,6 +103,7 @@ export default {
       formDataList:{},
       dialogVisible:false,
       formDataId:'',
+      invoicId:'',
       batchData:{},
       moneyList:{},
       searchData:{},
@@ -370,7 +372,7 @@ export default {
       });
     },
     handleSumbit(){
-      this.$api.task.batchInvoicing( {ids:this.batchData.ids})
+      this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
           .then(res => {
             if (res.code==200) {
               this.$message({

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

@@ -62,11 +62,21 @@ export default {
                         label: "开票手续费",
                         type: "text"
                     },
+                    {
+                        prop: "noInvoicCommissionFeevalue",
+                        label: "未开票手续费",
+                        type: "text"
+                    },
                     {
                         prop: "readyCommissionFeevalue",
                         label: "结算手续费",
                         type: "text"
                     },
+                    {
+                        prop: "unSettledAmount",
+                        label: "未结算手续费",
+                        type: "text"
+                    },
                 ],
                 loading: true,
                 isPaginationShow: true,

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

@@ -7,6 +7,18 @@
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
             </template>
         </templateTable>
+        <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="80%"
+      :before-close="handleClose">
+      <templateTable ref="templateTable"   :tableConfig="tableConfigDetail" :data="formTableData"
+      @findPage="findPageDetail" >
+    </templateTable>
+      <span slot="footer" class="dialog-footer">
+      <el-button  size="small" @click="dialogVisible = false">取消</el-button>
+    </span>
+  </el-dialog>
     </div>
 </template>
 <script>
@@ -15,7 +27,7 @@ import { mapState } from 'vuex'
 import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
 
 export default {
-    name: "baosi",
+    name: "InvoicingUnsettled",
     components: {  templateTable,yearMonthYay },
     created() {
     },
@@ -26,6 +38,35 @@ export default {
     },
     data() {
         return {
+            formTableData:[],
+      tableConfigDetail:{
+        columns: [
+          {
+            prop: "invoicId",
+            label: "开票号",
+            type: "text"
+          },
+          {
+            prop: "invoicCommissionFeevalue",
+            label: "开票金额",
+            type: "text"
+          },
+          {
+            prop: "invoicTime",
+            label: "开票时间",
+            type: "text"
+          },
+         
+        ],
+        loading: true,
+        optBtns:[
+          {
+            type:'primary',
+            label:'结算',
+            click:(row, index) => {return this.balanceFun(row)},
+        },
+      ]
+      },
             searchData: {},
             formList: [
                 {
@@ -44,6 +85,7 @@ export default {
                     type: "slot",
                     },
             ],
+            dialogVisible:false,
             tableConfig: {
                 columns: [
                     {
@@ -73,11 +115,11 @@ export default {
                 optBtns: [
                     {
                         type: 'primary',
-                        label: '结算',
-                        hide:(row)=>{
-                            return !row.invoicCommissionFeevalue?true:false
-                        },
-                        click: (row, index) => { return this.balanceFun(row) },
+                        label: '详情',
+                        // hide:(row)=>{
+                        //     return !row.invoicCommissionFeevalue?true:false
+                        // },
+                        click: (row, index) => { return this.haldDetail(row) },
                     }
                 ]
             },
@@ -91,7 +133,6 @@ export default {
                 handlingFeesStatus:'0'
             },
             formData: {},
-            
         };
     },
     created() {
@@ -111,6 +152,25 @@ export default {
         handleSearchList() {
             this.findPage();
         },
+    haldDetail(row){
+      this.dialogVisible=true
+      this.findPageDetail(row)
+    },
+        findPageDetail(data) {
+      this.tableConfigDetail.loading=true
+      this.$api.task
+        .invicdetai({ids:data.ids})
+        .then(res => {
+          if (res.code==200) {
+            this.formTableData = res.data;
+            this.tableConfigDetail.loading = false;
+          }
+          else{
+            this.tableConfigDetail.loading = false;
+            this.$message.error(res.msg)
+          }
+        });
+    },
         //列表数据
         findPage(data) {
             if (data) {
@@ -137,7 +197,9 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-      
+        handleClose(){
+      this.dialogVisible=false
+    },  
         // 结算
         balanceFun(row) {
             this.$api.task
@@ -145,6 +207,7 @@ export default {
                 .then(res => {
                     if (res.code==200) {
                         this.findPage()
+                        this.dialogVisible=false
                         this.$message({
                             message: res.msg ||'操作成功',
                             type: 'success'

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

@@ -0,0 +1,234 @@
+<template>
+  <!--布局容器-->
+  <div class="container" style="width: 99%; margin-top: 0px">
+    <templateTable ref="templateTable" :formList="formList"  :btnGroup="btnGroup" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
+      @findPage="findPage" @getList="findPage" @handleSearchList="handleSearchList" :pagination="pageData">
+    </templateTable>
+  </div>
+</template>
+<script>
+import templateTable from '@/components/TemplateTable/index.vue'
+import { mapState } from 'vuex'
+import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
+
+export default {
+  name: "baosi",
+  components: {  templateTable,yearMonthYay },
+  created() {
+  },
+  computed: {
+    ...mapState({
+      perms: state => state.user.perms
+    })
+  },
+  data() {
+    return {
+      year: '',
+      searchData: {},
+      formList:[
+       {
+          label: "车牌号",
+          prop: "licenseno",
+          type: "input",
+        },
+        {
+          label: "被保人",
+          prop: "userId",
+          type: "input",
+        },
+        {
+          label: "保险公司",
+          prop: "companyName",
+          type: "company",
+        },
+       
+        {
+          label: "险种",
+          prop: "riskcode",
+          type: "input",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesName",
+          type: "input",
+        },
+       
+        {
+          label: "交强保单号",
+          prop: "policyno",
+          type: "input",
+        },
+        {
+          label: "商业保单号",
+          prop: "syPolicyno",
+          type: "input",
+        }, {
+          label: "非车保单号:",
+          prop: "noPolicyno",
+          type: "input",
+        },
+        {
+          label: "结算日期",
+          prop: "settlementTime",
+          type: "date",
+        }, {
+          label: "结算状态",
+          prop: "handlingFeesStatus",
+          type: "select",
+          options:[
+            {
+              label:'已结算',
+              value:'1'
+            },{
+              label:'未结算',
+              value:'0'
+            }
+          ],
+          
+        }, 
+        {
+          label: "创建日期",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "签单日期",
+          prop: "signDate",
+          type: "datePicker",
+        },
+    ],
+      btnGroup:[
+      {
+        name:'导出',
+        click:(row, index) => {return this.handExport()},
+      }
+    ],
+      tableData: [],
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        agreementType :2,
+        handlingFeesStatus : 0,
+        documentaryFeesStatus: 0,
+        isNotCar: 1,
+        isNotDocumentary:  1,
+      },
+      tableConfig:{
+        columns: [
+          {
+            prop: "orderno",
+            label: "订单号(子订单)",
+            type: "text"
+          },
+          {
+            prop: "companyName",
+            label: "保险公司名称",
+            type: "text"
+          },
+          {
+            prop: "partnerCompaniesName",
+            label: "合作公司名称",
+            type: "text"
+          },
+          {
+            prop: "noPolicyno",
+            label: "非车保单号",
+            type: "text"
+          },
+          {
+            prop: "noPremium",
+            label: "非车保费",
+            type: "text"
+          },
+          {
+            prop: "noNoTaxPremium",
+            label: "非车不含税保费",
+            type: "text"
+          },
+          {
+            prop: "otherFeevalue",
+            label: "跟单费金额",
+            type: "text"
+          },
+          {
+            prop: "otherFeerate",
+            label: "跟单费比例",
+            type: "text"
+          },
+        
+        ],
+        isPaginationShow:true,
+        loading: true,
+      } 
+    };
+  },
+  created() {
+    this.findPage();
+  },
+  methods: {
+    // 查询
+    handleSearchList(data) {
+      this.findPage(data);
+    },
+    //列表数据
+    findPage(data) {
+      let signDateStart=''
+        let signDateEnd=''
+      if(data&& data.signDate){
+          signDateStart=data.signDate[0]
+          signDateEnd=data.signDate[1]
+      }
+      else{
+        signDateStart=''
+        signDateEnd=''
+    }
+      this.tableConfig.loading = true;
+      this.$api.task
+        .plyFeequery({...this.pageData,...data,signDateStart,signDateEnd})
+        .then(res => {
+          if (res.code==200) {
+            this.tableData = res.data.content;
+            this.pageData.pageNum = res.data.pageNum;
+            this.pageData.pageSize = res.data.pageSize;
+            this.pageData.totalSize = res.data.totalSize;
+            this.tableConfig.loading = false;
+          }
+          else{
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    handExport(){
+      if( this.$refs.templateTable.searchDataClone){
+        let signDateStart=''
+        let signDateEnd=''
+        if(this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.signDate && this.$refs.templateTable.searchDataClone.signDate.length>0){
+          signDateStart=this.$refs.templateTable.searchDataClone.signDate[0]
+          signDateEnd=this.$refs.templateTable.searchDataClone.signDate[1]
+        }
+      else{
+        signDateStart=''
+        signDateEnd=''
+      }
+      this.$api.task.bxNoOtherDetailsExcel({...this.pageData,...this.$refs.templateTable.searchDataClone,signDateStart,signDateEnd})
+          .then(res => {
+            if (res.code==200) {
+               let url = process.env.BASE_URL  + res.data; // 3.创建一个临时的url指向blob对象
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = "导出文件.xlsx";
+                a.click();
+                window.URL.revokeObjectURL(url);
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+        }
+    },
+  }
+};
+</script>
+    
+<style scoped></style>
+    

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

@@ -23,6 +23,21 @@
     </el-row>
   </div>
     </templateTable>
+    <el-dialog
+  :visible.sync="dialogVisibleBatch"
+  width="30%"
+  :before-close="handleCloseBatch">
+  <p >开票号 ：<el-input style="width: 200px;" v-model="invoicId" placeholder="请输入开票号"></el-input></p>
+  <p >总手续费 ：{{ batchData.totalAmount }}</p>
+  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+        :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+  <span slot="footer" class="dialog-footer">
+    <el-button size="small" @click="dialogVisibleBatch = false">取 消</el-button>
+    <el-button size="small" type="primary" @click="handleSumbit()">确 定</el-button>
+  </span>
+</el-dialog>
   </div>
 </template>
   <script>
@@ -44,6 +59,7 @@ export default {
     return {
       moneyList:{},
       searchData:{},
+      invoicId:'',
       formList:[
        {
           label: "车牌号",
@@ -299,13 +315,35 @@ export default {
           contractFileId: [
             { required: true, message: '请上传合同', trigger: 'blur' },
           ],
-      }
+      },
+      dialogVisibleBatch:false,
+      totalAmount:'',
+      batchData:{},
+      fileList:[],
+
     };
   },
   created(){
     this.findPage();
   },
   methods: {
+    drivingupload(file, fileList){
+      this.fileList=[]
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", file.raw);
+      params.append("type", "image");
+      this.$api.task.bxImportData(params).then(res => {
+        if (res.code == "200") {
+          this.batchData =res.data
+          this.fileList = fileList
+          this.fileList = fileList
+        }
+        else{
+          this.fileList=[]
+          this.$message.error(res.msg)
+        }
+      });
+    },
     // 查询
     handleSearchList(data) {
       let signDateStart=''
@@ -412,9 +450,30 @@ export default {
           });
         }
     },
+    handleCloseBatch(){
+      this.dialogVisibleBatch=false
+    },
     balanceFunPro(){
-      this.assembly('batchInvoicing',2)
-  }
+      // this.assembly('batchInvoicing',2)
+      this.fileList=[]
+      this.dialogVisibleBatch=true
+  },
+  handleSumbit(){
+      this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
+          .then(res => {
+            if (res.code==200) {
+              this.$message({
+                    message: '批量开票成功' || res.msg,
+                    type: 'success'
+                })
+                this.findPage()
+                this.dialogVisibleBatch=false
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          });
+    },
 }
 };
 </script>

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

@@ -62,11 +62,21 @@ export default {
                         label: "开票手续费",
                         type: "text"
                     },
+                    {
+                        prop: "noInvoicCommissionFeevalue",
+                        label: "未开票手续费",
+                        type: "text"
+                    },
                     {
                         prop: "readyCommissionFeevalue",
                         label: "结算手续费",
                         type: "text"
                     },
+                    {
+                        prop: "unSettledAmount",
+                        label: "未结算手续费",
+                        type: "text"
+                    },
                 ],
                 loading: true,
                 isPaginationShow: true,

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

@@ -4,9 +4,18 @@
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
             @findPage="findPage" @handleSearchList="handleSearchList" :pagination="pageData" @getList="getList">
             <template slot="data">
-                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+                <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
+                    @getDayData="getDayData"></yearMonthYay>
             </template>
         </templateTable>
+        <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
+            <templateTable ref="templateTable" :tableConfig="tableConfigDetail" :data="formTableData"
+                @findPage="findPageDetail">
+            </templateTable>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisible = false">取消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -16,7 +25,7 @@ import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
 
 export default {
     name: "baosi",
-    components: {  templateTable,yearMonthYay },
+    components: { templateTable, yearMonthYay },
     created() {
     },
     computed: {
@@ -26,6 +35,36 @@ export default {
     },
     data() {
         return {
+            formTableData: [],
+            dialogVisible: false,
+            tableConfigDetail: {
+                columns: [
+          {
+            prop: "invoicId",
+            label: "开票号",
+            type: "text"
+          },
+          {
+            prop: "invoicCommissionFeevalue",
+            label: "开票金额",
+            type: "text"
+          },
+          {
+            prop: "invoicTime",
+            label: "开票时间",
+            type: "text"
+          },
+         
+        ],
+                loading: true,
+                optBtns: [
+                    {
+                        type: 'primary',
+                        label: '结算',
+                        click: (row, index) => { return this.balanceFun(row) },
+                    },
+                ]
+            },
             searchData: {},
             formList: [
                 {
@@ -42,7 +81,7 @@ export default {
                     label: "年月日",
                     name: "data",
                     type: "slot",
-                    },
+                },
             ],
             tableConfig: {
                 columns: [
@@ -73,8 +112,8 @@ export default {
                 optBtns: [
                     {
                         type: 'primary',
-                        label: '结算',
-                        click: (row, index) => { return this.balanceFun(row) },
+                        label: '详情',
+                        click: (row, index) => { return this.haldDetail(row) },
                     }
                 ]
             },
@@ -84,26 +123,48 @@ export default {
                 pageSize: 20,
                 agreementType: '2',
                 isNotCar: '1',
-                isNotDocumentary : '0',
-                handlingFeesStatus:'0'
+                isNotDocumentary: '0',
+                handlingFeesStatus: '0'
             },
             formData: {},
-            
+
         };
     },
     created() {
         this.findPage();
     },
     methods: {
-        getYearData(val){
-      this.formData.year=val
-    },
-    getMonthData(val){
-      this.formData.month=val
-    },
-    getDayData(val){
-      this.formData.day=val
-    },
+        getYearData(val) {
+            this.formData.year = val
+        },
+        getMonthData(val) {
+            this.formData.month = val
+        },
+        getDayData(val) {
+            this.formData.day = val
+        },
+        haldDetail(row) {
+            this.dialogVisible = true
+            this.findPageDetail(row)
+        },
+        findPageDetail(data) {
+            this.tableConfigDetail.loading = true
+            this.$api.task
+                .invicdetai({ ids: data.ids })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.formTableData = res.data;
+                        this.tableConfigDetail.loading = false;
+                    }
+                    else {
+                        this.tableConfigDetail.loading = false;
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        handleClose() {
+            this.dialogVisible = false
+        },
         // 查询
         handleSearchList() {
             this.findPage();
@@ -116,16 +177,16 @@ export default {
             }
             this.tableConfig.loading = true;
             this.$api.task
-                .totalBxAmount({...this.pageData,...this.formData})
+                .totalBxAmount({ ...this.pageData, ...this.formData })
                 .then(res => {
-                    if (res.code==200) {
+                    if (res.code == 200) {
                         this.tableData = res.data;
                         // this.pageData.pageNum = res.data.pageNum;
                         // this.pageData.pageSize = res.data.pageSize;
                         // this.pageData.totalSize = res.data.totalSize;
                         this.tableConfig.loading = false;
                     }
-                    else{
+                    else {
                         this.tableConfig.loading = false;
                         this.$message.error(res.msg)
                     }
@@ -134,19 +195,21 @@ export default {
         getList(data) {
             this.findPage(data)
         },
-      
+
         // 结算
         balanceFun(row) {
             this.$api.task
-                .batchBxBalance({ids:row.ids})
+            .batchBxBalance({ids:row.ids})
                 .then(res => {
-                    if (res.code==200) {
+                    if (res.code == 200) {
+                        this.findPage()
+                        this.dialogVisible=false
                         this.$message({
-                            message: res.msg ||'操作成功',
+                            message: res.msg || '操作成功',
                             type: 'success'
                         })
                     }
-                    else{
+                    else {
                         this.$message.error(res.msg)
                     }
                 });

src/views/Sys/Deptall.vue

@@ -1082,7 +1082,7 @@ export default {
           inputPattern:  /.+/,
           inputErrorMessage: '请输入密码'
         }).then(({ value  }) => {
-          this.$api.dept.deptDelete({password:value ,deptId:data.id,code:'dept'}).then((res) => {
+          this.$api.dept.deptDelete({password:value ,deptId:data.id}).then((res) => {
             if (res.code == 200) {
               this.findSubDeptPage();
               this.findTreeData();