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

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

@@ -13,7 +13,6 @@
         <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
           :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
       </template> -->
-      
       <template slot="imageUrl" slot-scope="scope">
         <img :src="`${process + scope.row.imageUrl}`" class="imageclass" />
       </template>
@@ -24,6 +23,12 @@
           </el-option>
         </el-select>
       </template>
+      <template slot="riskcode">
+        <el-select v-model="pageData.riskcode"  placeholder="选择险种" size="small">
+          <el-option v-for="item in riskcodeList" :key="item.dictValue" :label="item.dictTag"
+            :value="item.dictTag"></el-option>
+        </el-select>
+      </template>
     </templateTable>
     <el-dialog
     title="编辑"
@@ -47,7 +52,7 @@
               <el-input v-model="formDataList.syOtherCostsProportion" class="inputType"></el-input>
             </el-form-item>
         </el-col>
-      </el-row> 
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
     <el-button size="small" @click="dialogVisible = false">取消</el-button>
@@ -232,6 +237,7 @@ export default {
     return {
       process:'http://192.168.0.42:8080',
       dockingPersonOption: [],
+      riskcodeList: [],
       rulesAdd: {
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
@@ -317,7 +323,7 @@ export default {
           options: []
         },
         {
-          prop: 'PartnerCompaniesId',
+          prop: 'partnerCompaniesId',
           label: '保司中心支公司',
           type: 'selectCompany',
           options: []
@@ -330,9 +336,11 @@ export default {
 
         {
           label: "险种",
-          prop: "riskcode",
-          type: "select",
-          options:[]
+          name: "riskcode",
+          type: "slot"
+          // prop: "riskcode",
+          // type: "select",
+          // options:[]
         },
         {
           label: "交强保单号",
@@ -633,6 +641,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称",
+            type: "text"
+          },
           {
             prop: "createdAt",
             label: "开始时间",
@@ -737,10 +750,10 @@ export default {
           this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
           break;
         case 'provincePartnerCompaniesId':
-          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          this.companyqueryList( obj.id, 'partnerCompaniesId')
           break;
-        case 'PartnerCompaniesId':
-          
+        case 'partnerCompaniesId':
+
           break;
         default:
       }
@@ -935,14 +948,14 @@ export default {
     });
     },
     selectionChange(val,ref) {
-      this.selectionList = val;      
+      this.selectionList = val;
     },
     selectionChangebatch(val,ref) {
       if(val.length > 1){
           const del_row = val.shift()
           ref.toggleRowSelection(del_row,false) //设置这一行取消选中
         }
-    this.selectionListbatch = val;      
+    this.selectionListbatch = val;
     },
     drivingupload(file, fileList){
       this.$refs.upload1.clearFiles()
@@ -1058,7 +1071,7 @@ export default {
           }
         });
     },
-  
+
     handExport(){
       if( this.$refs.templateTable.searchDataClone){
         let signDateStart=''
@@ -1090,7 +1103,7 @@ export default {
   }
 };
 </script>
-    
+
 <style scoped>
 .avatar {
   border: 1px dashed #d9d9d9;
@@ -1106,4 +1119,3 @@ export default {
   text-align: center;
 }
 </style>
-    

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

@@ -24,6 +24,12 @@
           </el-option>
         </el-select>
       </template>
+      <template slot="riskcode">
+        <el-select v-model="pageData.riskcode"  placeholder="选择险种" size="small">
+          <el-option v-for="item in riskcodeList" :key="item.dictValue" :label="item.dictTag"
+            :value="item.dictTag"></el-option>
+        </el-select>
+      </template>
       <div v-if="!Object.keys(moneyList).length == 0">
         <el-row class="customStyle">
           <el-col :span="4">总手续费：{{ moneyList.commissionFeevalue }}</el-col>
@@ -228,6 +234,7 @@ export default {
   },
   data() {
     return {
+      riskcodeList: [],
       formListbatch:[
         {
               label: "上传时间",
@@ -329,7 +336,7 @@ export default {
           prop: "licenseno",
           type: "input",
         },
-        
+
         {
           label: "保险公司",
           prop: "companyName",
@@ -348,7 +355,7 @@ export default {
           options: []
         },
         {
-          prop: 'PartnerCompaniesId',
+          prop: 'partnerCompaniesId',
           label: '保司中心支公司',
           type: 'selectCompany',
           options: []
@@ -358,13 +365,17 @@ export default {
           prop: "insuredName",
           type: "input",
         },
+        // {
+        //   label: "险种",
+        //   prop: "riskcode",
+        //   type: "select",
+        //   options: []
+        // },
         {
           label: "险种",
-          prop: "riskcode",
-          type: "select",
-          options: []
+          name: "riskcode",
+          type: "slot"
         },
-
         {
           label: "交强保单号",
           prop: "policyno",
@@ -587,6 +598,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称",
+            type: "text"
+          },
           {
             prop: "partnerCompaniesName",
             label: "保司名称 ",
@@ -745,10 +761,10 @@ export default {
           this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
           break;
         case 'provincePartnerCompaniesId':
-          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          this.companyqueryList( obj.id, 'partnerCompaniesId')
           break;
-        case 'PartnerCompaniesId':
-          
+        case 'partnerCompaniesId':
+
           break;
         default:
       }
@@ -758,6 +774,7 @@ export default {
         if (res.code == 200) {
           this[type + "options"] = res.data.ddList;
           if (type == 'productsType') {
+            this.riskcodeList = res.data.ddList
             this.formList.forEach(e => {
               if (e.prop == 'riskcode') {
                 e.options = res.data.ddList

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

@@ -19,6 +19,12 @@
           </el-option>
         </el-select>
       </template>
+      <template slot="riskcode">
+        <el-select v-model="pageData.riskcode"  placeholder="选择险种" size="small">
+          <el-option v-for="item in riskcodeList" :key="item.dictValue" :label="item.dictTag"
+            :value="item.dictTag"></el-option>
+        </el-select>
+      </template>
     <!-- <template slot="保司机构">
         <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
           :options="ztreeNodes" :props="optionProps" clearable filterable></el-cascader>
@@ -36,7 +42,7 @@
               <el-input v-model="formDataList.otherFeerate" class="inputType"></el-input>
             </el-form-item>
         </el-col>
-      </el-row> 
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
     <el-button size="small" @click="dialogVisible = false">取消</el-button>
@@ -200,6 +206,7 @@ export default {
     return {
       process:process.env.BASE_URL,
       dockingPersonOption: [],
+      riskcodeList: [],
       rulesAdd: {
         signDate: [
           { required: true, message: '请输入签单日期', trigger: 'blur' },
@@ -291,7 +298,7 @@ export default {
           options: []
         },
         {
-          prop: 'PartnerCompaniesId',
+          prop: 'partnerCompaniesId',
           label: '保司中心支公司',
           type: 'selectCompany',
           options: []
@@ -304,9 +311,12 @@ export default {
 
         {
           label: "险种",
-          prop: "riskcode",
-          type: "select",
-          options:[]
+          name: "riskcode",
+          type: "slot"
+          // label: "险种",
+          // prop: "riskcode",
+          // type: "select",
+          // options:[]
         },
         {
           label: "非车保单号",
@@ -534,6 +544,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称",
+            type: "text"
+          },
           {
             prop: "createdAt",
             label: "开始时间",
@@ -583,6 +598,7 @@ export default {
       this.treedata = res.data;
     });
     this.getDicType("productsType"); //险种类型
+    this.getDicType("productsType"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");
     this.companyqueryList(0,'allPartnerCompaniesId');
@@ -650,10 +666,10 @@ export default {
           this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
           break;
         case 'provincePartnerCompaniesId':
-          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          this.companyqueryList( obj.id, 'partnerCompaniesId')
           break;
-        case 'PartnerCompaniesId':
-          
+        case 'partnerCompaniesId':
+
           break;
         default:
       }
@@ -786,7 +802,7 @@ drivinguploadBatchs(file, fileList){
       params.append("multipartFile", file.raw);
       params.append("type", "file");
       params.append("isNotCar", "1");
-      this.$api.task.bxImportOther(params).then(res => {
+      this.$api.task.noBxImportOther(params).then(res => {
         if (res.code == "200") {
           this.tableDataRadio=res.data
         }
@@ -848,14 +864,14 @@ drivinguploadBatchs(file, fileList){
       });
     },
     selectionChange(val,ref) {
-      this.selectionList = val;      
+      this.selectionList = val;
     },
     selectionChangebatch(val,ref) {
       if(val.length > 1){
           const del_row = val.shift()
           ref.toggleRowSelection(del_row,false) //设置这一行取消选中
         }
-    this.selectionListbatch = val;      
+    this.selectionListbatch = val;
     },
     selectAll (selection,ref){
           ref.clearSelection()
@@ -985,7 +1001,7 @@ drivinguploadBatchs(file, fileList){
   }
 };
 </script>
-    
+
 <style scoped>
 .avatar {
   border: 1px dashed #d9d9d9;
@@ -996,4 +1012,3 @@ drivinguploadBatchs(file, fileList){
   display: block;
 }
 </style>
-    

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

@@ -24,6 +24,12 @@
           </el-option>
         </el-select>
       </template>
+      <template slot="riskcode">
+        <el-select v-model="pageData.riskcode"  placeholder="选择险种" size="small">
+          <el-option v-for="item in riskcodeList" :key="item.dictValue" :label="item.dictTag"
+            :value="item.dictTag"></el-option>
+        </el-select>
+      </template>
       <div v-if="!Object.keys(moneyList).length == 0">
         <el-row class="customStyle">
           <el-col :span="4">总手续费：{{ moneyList.commissionFeevalue }}</el-col>
@@ -131,7 +137,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构" prop="partnerCompaniesId">
-              <el-cascader ref="partnerCompaniesCascader" v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small" 
+              <el-cascader ref="partnerCompaniesCascader" v-model="formDataAdd.partnerCompaniesId" size="small" :show-all-levels="false" ize="small"
                 :options="ztreeNodes" @change="partnerCompaniesFun" :props="optionProps" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
@@ -229,6 +235,7 @@ export default {
       ],
       ztreeNodes: [],
       productsTypeoptions: [],
+      riskcodeList: [],
       optionProps: {
         //公司下拉列表配置
         checkStrictly: true,
@@ -305,7 +312,7 @@ export default {
           options: []
         },
         {
-          prop: 'PartnerCompaniesId',
+          prop: 'partnerCompaniesId',
           label: '保司中心支公司',
           type: 'selectCompany',
           options: []
@@ -318,9 +325,8 @@ export default {
 
         {
           label: "险种",
-          prop: "riskcode",
-          type: "select",
-          options:[]
+          name: "riskcode",
+          type: "slot"
         },
         {
           label: "非车保单号",
@@ -372,6 +378,11 @@ export default {
             label: "任务id",
             type: "text"
           },
+          {
+            prop: "partnerCompaniesName",
+            label: "保司名称",
+            type: "text"
+          },
           {
             prop: "partnerCompaniesName",
             label: "保司名称 ",
@@ -645,10 +656,10 @@ export default {
           this.companyqueryList( obj.id, 'provincePartnerCompaniesId')
           break;
         case 'provincePartnerCompaniesId':
-          this.companyqueryList( obj.id, 'PartnerCompaniesId')
+          this.companyqueryList( obj.id, 'partnerCompaniesId')
           break;
-        case 'PartnerCompaniesId':
-          
+        case 'partnerCompaniesId':
+
           break;
         default:
       }
@@ -675,7 +686,7 @@ export default {
           const del_row = val.shift()
           ref.toggleRowSelection(del_row,false) //设置这一行取消选中
         }
-    this.selectionList = val;      
+    this.selectionList = val;
     },
     findPagegbatch(data) {
       this.tableConfigbatch.loading = true
@@ -730,11 +741,12 @@ export default {
         if (res.code == 200) {
           this[type + "options"] = res.data.ddList;
           if(type=='productsType'){
-              this.formList.forEach(e=>{
+            this.riskcodeList = res.data.ddList
+            this.formList.forEach(e=>{
                 if(e.prop=='riskcode'){
                   e.options=res.data.ddList
                 }
-              }) 
+              })
           }
         }
       });
@@ -821,7 +833,7 @@ export default {
         signDateStart = ''
         signDateEnd = ''
       }
-     
+
       this.$api.task
         .bxTotalAmount({ ...this.pageData, ...data, signDateStart, signDateEnd })
         .then(res => {

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

@@ -44,7 +44,7 @@
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button size="small" @click="dialogVisiblebalance = false">取消</el-button>
-                <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
+                <el-button type="primary" size="small" @click="balanceSumbit">确定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -321,7 +321,7 @@ export default {
                 .batchBxBalance({
                     ...this.openBalanceDetail,
                     otherFeevalue: this.formDetail.otherFeevalue,
-                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                    // partnerCompaniesId: this.formDetail.partnerCompaniesId,
                     companyId: this.formDetail.companyId,
                     isNotCar: '1',
                     handlingFeesStatus: '1',

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

@@ -41,11 +41,11 @@
               <el-input v-model="InvoicingData.taxPoints"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <!-- <el-col :span="10">
             <el-form-item label="开票金额" prop="settlementAmount">
               <el-input v-model="InvoicingData.settlementAmount"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <el-table
@@ -257,9 +257,9 @@ export default {
         contractId: [
             { required: true, message: '请输入开票号', trigger: 'blur' },
           ],
-          settlementAmount: [
-            { required: true, message: '请输入开票金额', trigger: 'blur' },
-          ],
+          // settlementAmount: [
+          //   { required: true, message: '请输入开票金额', trigger: 'blur' },
+          // ],
           invoicingMethod: [
             { required: true, message: '请输入开票方式', trigger: 'blur' },
           ],
@@ -399,6 +399,7 @@ export default {
             let data={ ...this.formDataList,...this.InvoicingData,isNotCar:1,handlingFeesStatus:'1',
             yeartsStart:this.yeartsStart,
                yeartsEnd:this.yeartsEnd,
+              multipleSelection:this.multipleSelection,
                monthNumber:this.multipleSelection.map(val=>val.monthNumber)}
                if (this.isSingle == '2') {
             this.$api.task.singleInvoic(data).then(res => {

src/views/FinancialManagement/CarInsurance/DeptSettlement/CommissionList.vue

@@ -2,87 +2,55 @@
   <div>
     <el-main ref="elMain" style="padding: 0px">
       <Split :gutterSize="2" style="height: calc(100vh - 120px)">
-         <!-- 左侧树Start -->
-         <SplitArea :size="leftSplitWidth" :minSize="240">
+        <!-- 左侧树Start -->
+        <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
             <el-divider></el-divider>
-            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated"/>
+            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated" />
           </div>
         </SplitArea>
         <!-- 左侧树End -->
-         <!-- 右侧列表页面Start -->
-         <SplitArea :size="rightSplitWidth">
-        <el-form
-          class="queryForm"
-          ref="queryFormRef"
-          :model="pageRequest"
-          label-width="80px"
-          size="small"
-        >
-          <el-row style="margin-bottom: 15px">
-            <el-col :span="5">
-              <el-form-item label="机构名称">
-                <el-input
-                  clearable
-                  style="width: 220px"
-                  placeholder="请输入机构名称"
-                  v-model="pageRequest.deptName"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="类型">
-                <el-select
-                  style="width: 220px"
-                  clearable
-                  v-model="pageRequest.documentary"
-                  placeholder="选择类型"
-                >
-                  <el-option label="提现" value="1"></el-option>
-                  <el-option label="收入" value="2"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="签单时间">
-                <el-date-picker
-                  size="small"
-                  v-model="pageRequest.signDate"
-                  type="daterange"
-                  @change="dateChange"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+        <!-- 右侧列表页面Start -->
+        <SplitArea :size="rightSplitWidth">
+          <el-form class="queryForm" ref="queryFormRef" :model="pageRequest" label-width="80px" size="small">
+            <el-row style="margin-bottom: 15px">
+              <el-col :span="5">
+                <el-form-item label="机构名称">
+                  <el-input clearable style="width: 220px" placeholder="请输入机构名称"
+                    v-model="pageRequest.deptName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="类型">
+                  <el-select style="width: 220px" clearable v-model="pageRequest.documentary" placeholder="选择类型">
+                    <el-option label="提现" value="1"></el-option>
+                    <el-option label="收入" value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="创建时间">
+                  <el-date-picker size="small" v-model="pageRequest.signDate" type="datetimerange" @change="dateChange"
+                    range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
 
-            <el-col :span="4">
-              <el-form-item label-width="20px">
-                <el-button @click="getOrderList" type="primary" size="small"
-                  >查询</el-button
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+              <el-col :span="2">
+                <el-form-item label-width="20px">
+                  <el-button @click="getOrderList" type="primary" size="small">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
 
-        <kt-common-table
-          permsDelete="sys:user:delete"
-          :showBatchDelete="false"
-          :showBatchPrint="false"
-          permsButton3="sys:user:edit"
-          :data="pageResult"
-          :columns="columns"
-          @findPage="findPage"
-          :showOperation="false"
-          @handlePrint="handlePrint"
-        >
-        </kt-common-table>
+          <kt-common-table permsDelete="sys:user:delete" :showBatchDelete="false" :showBatchPrint="false"
+            permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" :showOperation="false"
+            @handlePrint="handlePrint">
+          </kt-common-table>
 
-        <!-- <el-dialog
+          <!-- <el-dialog
       v-dialogDrag
       title="提现"
       :visible.sync="dialogVisible"
@@ -118,8 +86,8 @@
         >
       </span>
     </el-dialog> -->
-         </SplitArea>    
-  </Split>
+        </SplitArea>
+      </Split>
     </el-main>
   </div>
 </template>
@@ -146,10 +114,11 @@ export default {
       pageRequest: {
         deptName: "",
         documentary: "",
+        signDate: "",
         //查询的默认条件
         pageNo: 1,
         pageSize: 10,
-        
+
       },
       columns: [
         //数据列
@@ -162,30 +131,30 @@ export default {
         { prop: "remark", label: "备注" },
         { prop: "createTime", label: "创建时间" },
       ],
-       /**Split 开始 */
-       leftSplitWidth: 20,
-        rightSplitWidth: 80,
-        /**Split 结束 */
+      /**Split 开始 */
+      leftSplitWidth: 20,
+      rightSplitWidth: 80,
+      /**Split 结束 */
 
-        //----ztreeLeft begin---------
-        ztreeObj: null,
-        ztreeSetting: {
-          check: {
-            enable: false
-          },
-          data: {
-            simpleData: {
-              enable: true,
-              pIdKey: "parentId"
-            }
-          },
-          view: {
-            showIcon: false
+      //----ztreeLeft begin---------
+      ztreeObj: null,
+      ztreeSetting: {
+        check: {
+          enable: false
+        },
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId"
           }
         },
-        ztreeNodes: [],
-        currentTreeNode: null,
-        //----ztreeLeft end---------
+        view: {
+          showIcon: false
+        }
+      },
+      ztreeNodes: [],
+      currentTreeNode: null,
+      //----ztreeLeft end---------
     };
   },
   created() {
@@ -232,6 +201,7 @@ export default {
       this.findPage();
     },
     dateChange(e) {
+      console.log(e)
       if (e == null) {
         this.pageRequest.createTimeStart = "";
         this.pageRequest.createTimeEnd = "";
@@ -246,7 +216,7 @@ export default {
         .then((_) => {
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     closeVisible() {
       this.withdrawal = "";
@@ -302,34 +272,34 @@ export default {
         })
         .then(data != null ? data.callback : "");
     },
-       /**Split 开始 */
-       changeTreeWidth(widthVal){
-        // 初始化树的宽度
-        this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
-        this.rightSplitWidth = 100-(this.leftSplitWidth)
-      },
-      /**Split 结束 */
+    /**Split 开始 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      this.leftSplitWidth = Math.ceil(widthVal / this.$refs.elMain.$el.clientWidth * 100);
+      this.rightSplitWidth = 100 - (this.leftSplitWidth)
+    },
+    /**Split 结束 */
 
-      //--left tree start-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findTree().then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = treeNode;
-        this.pageRequest.deptId = this.currentTreeNode.id;
-        this.findPage();
-      },
-      //--left tree end-------
+    //--left tree start-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then(res => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = treeNode;
+      this.pageRequest.deptId = this.currentTreeNode.id;
+      this.findPage();
+    },
+    //--left tree end-------
   },
 };
 </script>
@@ -344,7 +314,7 @@ export default {
   height: 110px;
 }
 
-.basicdata > div {
+.basicdata>div {
   height: 100%;
 }
 

src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -2,209 +2,163 @@
   <div>
     <el-main ref="elMain" style="padding: 0px">
       <Split :gutterSize="2" style="height: calc(100vh - 120px)">
-         <!-- 左侧树Start -->
-         <SplitArea :size="leftSplitWidth" :minSize="240">
+        <!-- 左侧树Start -->
+        <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
             <el-divider></el-divider>
-            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated"/>
+            <tree
+              :setting="ztreeSetting"
+              :nodes="ztreeNodes"
+              @onClick="onZTreeClick"
+              @onCreated="onZTreeCreated"
+            />
           </div>
         </SplitArea>
         <!-- 左侧树End -->
-         <!-- 右侧列表页面Start -->
-         <SplitArea :size="rightSplitWidth">
-        <el-form
-          class="queryForm"
-          ref="queryFormRef"
-          :model="pageRequest"
-          label-width="80px"
-          size="small"
-        >
-          <el-row style="margin-bottom: 15px">
-            <el-col :span="5">
-              <el-form-item label="机构名称">
-                <el-input
-                  clearable
-                  style="width: 220px"
-                  placeholder="请输入机构名称"
-                  v-model="pageRequest.deptName"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="类型">
-                <el-select
-                  style="width: 220px"
-                  clearable
-                  v-model="pageRequest.documentary"
-                  placeholder="选择类型"
-                >
-                  <el-option label="提现" value="1"></el-option>
-                  <el-option label="收入" value="2"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="签单时间">
-                <el-date-picker
-                  size="small"
-                  v-model="pageRequest.signDate"
-                  type="daterange"
-                  @change="dateChange"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+        <!-- 搜索区域Start -->
+        <SplitArea :size="rightSplitWidth">
+          <el-form
+            class="queryForm"
+            ref="queryFormRef"
+            :model="queryForm"
+            label-width="80px"
+          >
+            <el-row style="margin-bottom: 15px">
+              <el-col :span="8">
+                <el-form-item label="申请时间">
+                  <el-date-picker
+                    size="small"
+                    v-model="queryForm.date"
+                    type="daterange"
+                    @change="dateChange"
+                    value-format="yyyy-MM-dd"
+                    align="left"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label-width="20px">
+                  <el-button @click="findPage" type="primary" size="small"
+                    >查询</el-button
+                  >
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="4">
+            <el-form-item>
+              <el-button @click="findPage" size="small">查询</el-button>
+            </el-form-item>
+          </el-col> -->
+            </el-row>
+          </el-form>
 
-            <el-col :span="4">
-              <el-form-item label-width="20px">
-                <el-button @click="getOrderList" type="primary" size="small"
-                  >查询</el-button
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <kt-common-table
-          permsDelete="sys:user:delete"
-          :showBatchDelete="false"
-          :showBatchPrint="false"
-          permsButton3="sys:user:edit"
-          :data="pageResult"
-          :columns="columns"
-          @findPage="findPage"
-          :showOperation="false"
-          @handlePrint="handlePrint"
-        >
-        </kt-common-table>
-
-        <!-- <el-dialog
-      v-dialogDrag
-      title="提现"
-      :visible.sync="dialogVisible"
-      width="600px"
-      :before-close="handleClose"
-      @close="closeVisible"
-    >
-      <div style="color: red">
-        提现最低100元，最高不超过可提现金额（只可提取整数部分）
-      </div>
-      <div>
-        <div style="font-size: 16px; margin: 20px 0">
-          提现工号：{{ peopleid }}
-        </div>
-        <div style="font-size: 16px; margin: 20px 0">
-          可提现金额：{{ canwithdrawal }}
-        </div>
-        <div style="font-size: 16px; margin: 20px 0">
-          提现金额：<el-input-number
-            size="medium"
-            v-model="withdrawal"
-            :precision="0"
-            :min="100"
-            :max="canwithdrawal"
-            :step="1000"
-          ></el-input-number>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="toWithdrawal"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog> -->
-         </SplitArea>    
-  </Split>
+          <kt-common-table
+            :showOperation="false"
+            :showBatchDelete="false"
+            :showBatchPrint="false"
+            :data="pageResult"
+            :columns="columns"
+            @findPage="findPage"
+            @handlePrint="handlePrint"
+          >
+          </kt-common-table>
+        </SplitArea>
+      </Split>
     </el-main>
   </div>
 </template>
 <script>
-import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import tree from "@/components/ztree.vue";  // 机构树组件
 import Cookies from "js-cookie";
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import tree from "@/components/ztree.vue"; // 机构树组件
+import KtButton from "@/views/Core/KtButton";
+import CommonUtil from "@/utils/comutil.js";
+import { formatWithSeperator, format } from "@/utils/datetime.js";
 export default {
   components: {
     KtCommonTable,
-    tree
+    KtButton,
+    tree,
   },
   data() {
     return {
-      canwithdrawal: "",
-      withdrawal: "",
-
       peopleid: "",
       peopledeptid: "",
-
-      dialogVisible: false, //提现对话框
+      // 右侧列表查询数据Start
       queryForm: {},
       pageResult: {},
       pageRequest: {
-        deptName: "",
-        documentary: "",
         //查询的默认条件
         pageNo: 1,
         pageSize: 10,
-        
+        status: "1",
       },
       columns: [
         //数据列
+        { prop: "id", label: "提现单号" },
         { prop: "deptId", label: "机构代码" },
-        { prop: "deptName", label: "机构名称" },
-        { prop: "amount", label: "金额" },
-        { prop: "surplusAmount", label: "账户剩余金额" },
-        { prop: "documentary", label: "类型" },
-        { prop: "suborder", label: "来源订单" },
-        { prop: "remark", label: "备注" },
-        { prop: "createTime", label: "创建时间" },
+        { prop: "name", label: "机构名称" },
+        { prop: "amount", label: "提现金额" },
+        { prop: "createTime", label: "申请时间" },
       ],
-       /**Split 开始 */
-       leftSplitWidth: 20,
-        rightSplitWidth: 80,
-        /**Split 结束 */
-
-        //----ztreeLeft begin---------
-        ztreeObj: null,
-        ztreeSetting: {
-          check: {
-            enable: false
-          },
-          data: {
-            simpleData: {
-              enable: true,
-              pIdKey: "parentId"
-            }
+      //------------协议下拉框数据   begin-----------------
+      agreementtypeoptions: [], //协议类型
+      //------------协议下拉框数据   end-----------------
+      /**Split 开始 */
+      leftSplitWidth: 20,
+      rightSplitWidth: 80,
+      /**Split 结束 */
+      //----ztreeLeft begin---------
+      ztreeObj: null,
+      ztreeSetting: {
+        check: {
+          enable: false,
+        },
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId",
           },
-          view: {
-            showIcon: false
-          }
         },
-        ztreeNodes: [],
-        currentTreeNode: null,
-        //----ztreeLeft end---------
+        view: {
+          showIcon: false,
+        },
+      },
+      ztreeNodes: [],
+      currentTreeNode: null,
+      //----ztreeLeft end---------
     };
   },
   created() {
-    // this.peopleid = Cookies.get("user");
-    // if (this.peopleid != "admin") {
-    //   this.peopledeptid = Cookies.get("user").split("D")[0];
-    //   this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
-    // } else {
-    //   this.peopledeptid = "";
-    //   this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
+    // this.peopleid = Cookies.get('user');
+    // if(this.peopleid!='admin'){
+    //   this.peopledeptid = Cookies.get('user').split('D')[0];
+    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+    // }else{
+    //   this.peopledeptid = '9';
+    //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
     // }
-    this.deptAccount();
-    this.findLeftTreeData();// 获取机构树的数据
+    //获取所有下拉框数据
+    this.getDictItems("agreementtype");
+    this.findLeftTreeData(); // 获取机构树的数据
   },
   mounted() {
     //用像素初始化左边的split的宽度
     this.changeTreeWidth(240);// 初始化树的宽度
   },
   methods: {
+    dateChange(e) {
+      if (e == null) {
+        this.pageRequest.createTimeStart = "";
+        this.pageRequest.createTimeEnd = "";
+      } else {
+        this.pageRequest.createTimeStart = e[0];
+        this.pageRequest.createTimeEnd = e[1];
+      }
+    },
     handlePrint() {
       this.$api.task.excelExport(this.pageRequest).then((res) => {
         console.log(res);
@@ -215,67 +169,54 @@ export default {
         // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
         let a = document.createElement("a");
         a.href = url;
-        a.download = "可提现余额清单.xlsx";
+        a.download = "提现中清单.xlsx";
         a.click();
         // 5.释放这个临时的对象url
         window.URL.revokeObjectURL(url);
       });
     },
-    getOrderList() {
-      // this.pageRequest.columnFilters.orderno.value = this.queryForm.orderno;
-      // this.pageRequest.columnFilters.comlevel.value = this.queryForm.comlevel;
-      // this.pageRequest.columnFilters.comcode.value = this.queryForm.comcode;
-      // this.pageRequest.columnFilters.licenseno.value = this.queryForm.licenseno;
-      // this.pageRequest.columnFilters.policyno.value = this.queryForm.policyno;
-      // this.pageRequest.columnFilters.settlestatus.value = this.queryForm.settlestatus;
-      this.pageRequest.pageNum = 1;
-      this.findPage();
-    },
-    dateChange(e) {
-      if (e == null) {
-        this.pageRequest.createTimeStart = "";
-        this.pageRequest.createTimeEnd = "";
-      } else {
-        this.pageRequest.createTimeStart = e[0];
-        this.pageRequest.createTimeEnd = e[1];
-      }
-    },
-    //确认是否关闭对话框
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-    closeVisible() {
-      this.withdrawal = "";
-    },
-    toWithdrawal() {
-      let param = {
-        amount: this.withdrawal,
-        deptid: this.peopledeptid,
-      };
-      this.$api.task.deptApply(param).then((res) => {
-        if (res.code == 200) {
-          this.$message.success("提现申请已提交");
-          this.deptAccount();
-        }
+    //-- formatter begin--
+    agreetypeFormatter(row, column) {
+      //协议类型
+      let agreetype = row.agreetype;
+      return CommonUtil.getDataName({
+        dataList: this.agreementtypeoptions,
+        value: "value",
+        label: "label",
+        data: agreetype,
       });
-      this.dialogVisible = false;
     },
-    // 机构账户余额查询
-    deptAccount() {
-      this.$api.task.deptAccount(this.peopledeptid).then((res) => {
-        if (res.code == 200) {
-          this.basicdata[0].money = res.data.accountBalance;
-          this.basicdata[1].money = res.data.applyAmount;
-          this.basicdata[2].money = res.data.totalAmount;
-          this.basicdata[3].money = res.data.payamount;
-          this.canwithdrawal = res.data.accountBalance;
-        }
+    inscompanyFormatter(row, column) {
+      //协议类型
+      let inscompany = row.inscompany;
+      return CommonUtil.getDataName({
+        dataList: this.global.insCompanyList,
+        value: "code",
+        label: "name",
+        data: inscompany,
       });
     },
+    totalmoenyFormatter(row, column) {
+      //协议类型
+      let inscompany = row.inscompany;
+      return (row.feeamount + row.disamount).toFixed(2);
+    },
+    //-- formatter end--
+
+    //--数据字典 begin --
+    getDictItems: function (typeName) {
+      let that = this;
+      that.$api.dict
+        .findByLableName(typeName)
+        .then(function (res) {
+          that[typeName + "options"] = res.data; // 把获取到的数据赋给this.data
+        })
+        .catch(function (error) {
+          that[typeName + "options"] = [];
+        });
+    },
+    //--数据字典 end --
+
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
@@ -285,7 +226,7 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       that.$api.task
-        .sysDeptAccountHistoryPage(that.pageRequest)
+        .WithdrawqueryStatus(that.pageRequest)
         .then((res) => {
           let pageList = {
             content: res.data.records,
@@ -294,58 +235,77 @@ export default {
             totalPages: res.data.pages,
             totalSize: res.data.total,
           };
-          pageList.content.forEach(
-            (val) =>
-              (val.documentary = val.documentary == "1" ? "提现" : "收入")
-          );
           that.pageResult = pageList;
         })
         .then(data != null ? data.callback : "");
     },
-       /**Split 开始 */
-       changeTreeWidth(widthVal){
-        // 初始化树的宽度
-        this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
-        this.rightSplitWidth = 100-(this.leftSplitWidth)
-      },
-      /**Split 结束 */
 
-      //--left tree start-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findTree().then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = treeNode;
-        this.pageRequest.deptId = this.currentTreeNode.id;
-        this.findPage();
-      },
-      //--left tree end-------
+    // 格式化日期，如月、日、时、分、秒保证为2位数
+    formatNumber(n) {
+      n = n.toString();
+      return n[1] ? n : "0" + n;
+    },
+    // 参数number为毫秒时间戳，format为需要转换成的日期格式
+    formatTime(number, format) {
+      let time = new Date(number);
+      let newArr = [];
+      let formatArr = ["Y", "M", "D", "h", "m", "s"];
+      newArr.push(time.getFullYear());
+      newArr.push(this.formatNumber(time.getMonth() + 1));
+      newArr.push(this.formatNumber(time.getDate()));
+
+      newArr.push(this.formatNumber(time.getHours()));
+      newArr.push(this.formatNumber(time.getMinutes()));
+      newArr.push(this.formatNumber(time.getSeconds()));
+
+      for (let i in newArr) {
+        format = format.replace(formatArr[i], newArr[i]);
+      }
+      return format;
+    },
+    /**Split 开始 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      this.leftSplitWidth = Math.ceil(
+        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
+      );
+      this.rightSplitWidth = 100 - this.leftSplitWidth;
+    },
+    /**Split 结束 */
+    //--left tree start-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then((res) => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = treeNode;
+      this.pageRequest.deptId = this.currentTreeNode.id;
+      this.findPage();
+    },
+    //--left tree end-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then((res) => {
+        this.ztreeNodes = res.data;
+      });
+    },
   },
 };
 </script>
 
 
 <style scoped>
-.basicdata {
-  border-radius: 5px;
-  background-color: #ffffff;
-  box-shadow: -1px -1px 5px 0 rgb(0 0 0 / 10%);
-  margin: 15px 8px;
-  height: 110px;
-}
-
-.basicdata > div {
-  height: 100%;
+.el-divider {
+  margin: 10px 0px 15px !important;
 }
 
 .queryForm .el-row {

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

@@ -23,6 +23,14 @@
         <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="明细" :visible.sync="dialogVisibleDetail" width="60%" :before-close="handleCloseDetail">
+      <templateTable ref="templateTable2" :pagination="pageDataDetail" @getList="getListDetail"
+        :tableConfig="tableConfigDetailDetail" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+      </templateTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisibleDetail = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -43,6 +51,78 @@ export default {
   },
   data() {
     return {
+      tableConfigDetailDetail: {
+        columns: [
+          {
+            prop: "licenseno",
+            label: "车牌",
+            type: "text"
+          },
+          {
+            prop: "policyno",
+            label: "交强保单号",
+            type: "text"
+          },
+          {
+            prop: "syPolicyno",
+            label: "商业保单号",
+            type: "text"
+          },
+          {
+            prop: "noPolicyno",
+            label: "非车保单号",
+            type: "text"
+          },
+          {
+            prop: "insuredName",
+            label: "被保人",
+            type: "text"
+          },
+          {
+            prop: "jqPremium",
+            label: "交强保费",
+            type: "text"
+          },
+          {
+            prop: "syPremium",
+            label: "商业保费",
+            type: "text"
+          },
+          {
+            prop: "noPremium",
+            label: "非车保费",
+            type: "text"
+          },
+          {
+            prop: "jqReceivableProportion",
+            label: "交强应收比例",
+            type: "text"
+          },
+          {
+            prop: "syReceivableProportion",
+            label: "商业应收比例",
+            type: "text"
+          },
+          {
+            prop: "noReceivableProportion",
+            label: "非车应收比例",
+            type: "text"
+          },
+          {
+            prop: "allFeeValue",
+            label: "应收金额",
+            type: "text"
+          }
+        ],
+        loading: true,
+        isPaginationShow: true
+      },
+      pageDataDetail: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
+      dialogVisibleDetail: false,
       dialogVisiblerecord: false,
       formTableDatarecord: [],
       tableConfigDetailrecord: {
@@ -125,12 +205,18 @@ export default {
         ],
         loading: true,
         isPaginationShow: true,
+        showSummary: true,
         isShowIndex: true,
         optBtns: [
           {
             type: 'primary',
             label: '记录',
             click: (row, index) => { return this.haldRecord(row) },
+          },
+          {
+            type: 'primary',
+            label: '明细',
+            click: (row, index) => { return this.haldDetail(row) },
           }
         ]
       },
@@ -160,6 +246,43 @@ export default {
       });
   },
   methods: {
+    // 明细
+    findPageDetailDetail(data) {
+      this.tableConfigDetailDetail.loading = true
+      this.$api.task
+        .plyFeeQuery({
+          partnerCompaniesId: data.partnerCompaniesId,
+          agreementType: '1',
+          handlingFeesStatus: '0',
+          ...this.pageDataDetail
+        })
+        .then(res => {
+          if (res.code == 200) {
+            this.formTableDatarecord = res.data.content;
+            this.pageDataDetail = {
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalSize: res.data.totalSize,
+            }
+            this.tableConfigDetailDetail.loading = false;
+          }
+          else {
+            this.tableConfigDetail.loading = false;
+            this.$message.error(res.msg)
+          }
+        });
+    },
+    getListDetail(data) {
+      this.findPageDetailDetail()
+    },
+    haldDetail(row) {
+      this.findPageDetailDetail(row)
+      this.dialogVisibleDetail = true
+    },
+    handleCloseDetail() {
+      this.dialogVisibleDetail = false
+    },
+
     haldRecord(row) {
       this.findPageDetailrecord(row)
       this.dialogVisiblerecord = true
@@ -241,10 +364,9 @@ export default {
   }
 };
 </script>
-    
+
 <style scoped>
 >>>.dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }
 </style>
-    

src/views/Letter/Wallet/AmountManagement.vue

@@ -18,7 +18,7 @@
                 MoneyData.handlingFee }}</span>
               <span v-else>0.00</span>
             </div>
-            <el-button type="primary" size="small" @click="withdrawalVisible = true">立即提现</el-button>
+            <el-button type="primary" size="small" @click="instantWithdrawal">立即提现</el-button>
           </div>
           <div class="flex f-c a-c j-s">
             <span>预收金额（元）</span>
@@ -44,7 +44,7 @@
                 MoneyData.documentary }}</span>
               <span v-else>0.00</span>
             </div>
-            <el-button type="primary" size="small" @click="withdrawalVisible = true">立即提现</el-button>
+            <el-button type="primary" size="small" @click="instantWithdrawal">立即提现</el-button>
           </div>
           <div class="flex f-c a-c j-s">
             <span>预收金额（元）</span>
@@ -73,7 +73,7 @@
               <span v-else>0.00</span>
 
             </div>
-            <el-button type="primary" size="small" @click="withdrawalVisible = true">立即提现</el-button>
+            <el-button type="primary" size="small" @click="instantWithdrawal">立即提现</el-button>
           </div>
           <div class="flex f-c a-c j-s">
             <span>预收金额（元）</span>
@@ -403,10 +403,38 @@ export default {
     this.datetime = this.transformTime();
     this.allamount();
     this.FindPage();
-    this.banklist();
   },
   // 方法函数
   methods: {
+    instantWithdrawal(){
+      this.$api.letter.getUserBankList({
+        auditStatus: '1',
+      }).then((res) => {
+        if (res.code == '200' && res.data.length) {
+          this.bankList.map(val => {
+            res.data.map(ele => {
+              if (val.bankName == ele.bankAccount) {
+                ele.logo = val.logo;
+                return ele;
+              }
+            })
+          })
+          this.cardPackList = res.data;
+          let bankinfo = res.data.find(val => val.isDefault == 1)
+          if (bankinfo) {
+            this.bankCardInfo = bankinfo;
+          } else {
+            this.bankCardInfo = res.data[0]
+          }
+          this.withdrawalVisible=true;
+        } else {
+          this.$message({
+            type: 'error',
+            message: "暂无审核通过的银行卡，不可提现",
+          });
+        }
+      });
+    },
     allwithdrawal() {
       this.extract =parseFloat(this.MoneyData[this.accountBalance]);
       this.checkMoney();
@@ -473,34 +501,6 @@ export default {
     bankselection(data) {
       this.bankCardInfo = data;
     },
-    banklist() {
-      this.$api.letter.getUserBankList({
-        auditStatus: '1',
-      }).then((res) => {
-        if (res.code == '200') {
-          this.bankList.map(val => {
-            res.data.map(ele => {
-              if (val.bankName == ele.bankAccount) {
-                ele.logo = val.logo;
-                return ele;
-              }
-            })
-          })
-          this.cardPackList = res.data;
-          let bankinfo = res.data.find(val => val.isDefault == 1)
-          if (bankinfo) {
-            this.bankCardInfo = bankinfo;
-          } else {
-            this.bankCardInfo = res.data[0]
-          }
-        } else {
-          this.$message({
-            type: 'error',
-            message: res.msg,
-          });
-        }
-      });
-    },
     regularDetails(index, row) {
       if (this.formQuery.amountStatus == "3" && [1, 2].includes(this.searchType)) {
         this.$api.letter.getSubOrderDetails(row.id).then((res) => {