Procházet zdrojové kódy

钱包预收明细和收支明细页面独立

lihongxiao před 2 roky
rodič
revize
94d2df6b7a

+ 2 - 2
config/dev.env.js

@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
@@ -18,7 +18,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
-  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
+  // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 
 

+ 1 - 1
src/router/index.js

@@ -73,7 +73,7 @@ const router = new Router({
       name: 'notFound',
       component: NotFound
     },
-
+    
   ]
 })
 router.beforeEach((to, from, next) => {

+ 2 - 1
src/store/modules/menu.js

@@ -7,7 +7,8 @@ export default {
       "agreementManage/carInsurance/agreementProductFee",
       "agreementManage/carInsurance/agreementUnderwritingRule",
       "agreementManage/carInsurance/agreementNonVehicleConfig",
-      "letter/wallet/amountManagement"
+      "letter/wallet/amountManagement",
+      "letter/wallet/expenditureDetails",
     ]
   },
   getters: {

+ 8 - 65
src/views/Letter/Wallet/AmountManagement.vue

@@ -7,33 +7,22 @@
         返回
       </el-button>
       <div class="amount-money">
-        <span v-if="amountType == 2">收入:¥{{ pageResult.sumAmountSR || 0 }}</span>
-        <span v-if="amountType == 2">支出:¥{{ pageResult.sumAmountZC || 0 }}</span>
-        <span v-if="amountType == 1">预收:¥{{ pageResult.sumAmountYS || 0 }}</span>
+        <span >预收:¥{{ pageResult.sumAmountYS || 0 }}</span>
       </div>
     </div>
     <div class="content">
       <el-form :inline="true" :model="formQuery" class="demo-form-inline" size="small" style="margin: 15px 0;">
         <el-row>
-          <el-col :span="6" v-if="amountType == 2">
-            <el-form-item label="收支状态:">
-              <el-radio-group v-model="formQuery.incomeAndExpensesType" @input="getMoneyAttrType">
-                <el-radio v-for="val in incomeAndExpensesTypeoptions" :key="val.dictValue" :label="val.dictValue">{{
-                  val.dictTag
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="业务板块:">
-              <el-radio-group v-model="formQuery.businessSegmentsType" @input="getbusinessSegmentsTypeType">
-                <el-radio v-for="val in amountType == 1 ? businessSegmentsTypeoptions : businessSegmentsSZTypeoptions"
+              <el-radio-group v-model="formQuery.businessSegmentsType">
+                <el-radio v-for="val in  businessSegmentsTypeoptions "
                   :key="val.dictValue" :label="val.dictValue">{{ val.dictTag
                   }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="amountType == 1">
+          <el-col :span="6" >
             <el-form-item label="交易类型:">
               <el-select v-model="formQuery.transactionType" size="small" clearable placeholder="请选择">
                 <el-option v-for="item in transactionTypeoptions" :key="item.dictValue" :label="item.dictTag"
@@ -42,15 +31,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="amountType == 2">
-            <el-form-item label="交易类型:">
-              <el-select v-model="formQuery.transactionType" size="small" clearable placeholder="请选择">
-                <el-option v-for="item in moneyAttrTypeoptions" :key="item.dictValue" :disabled="item.disabled"
-                  :label="item.dictTag" :value="item.dictValue">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="时间筛选类型:">
               <el-select v-model="formQuery.dateQueryType" clearable size="small" placeholder="请选择">
@@ -85,7 +65,7 @@
           <el-table-column prop="licenseNo" label="车牌号" align="center"></el-table-column>
           <el-table-column prop="businessSegmentsType" label="业务板块" align="center">
             <template slot-scope="scope">
-              <span>{{ screenType(amountType == 1 ? 'businessSegmentsType' : 'businessSegmentsSZType', scope.row.businessSegmentsType) }}</span>
+              <span>{{ screenType('businessSegmentsType', scope.row.businessSegmentsType) }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="transactionType" label="交易类型" align="center">
@@ -240,7 +220,6 @@ export default {
         transactionType: ''
       },
       searchType: "",
-      amountType: "1",
       userId: Cookies.get("user"),
       orderInfo: {
         //选中的订单
@@ -256,8 +235,6 @@ export default {
       },
       businessSegmentsTypeoptions: [],
       transactionTypeoptions: [],
-      incomeAndExpensesTypeoptions: [],
-      businessSegmentsSZTypeoptions: [],
       moneyAttrTypeoptions: [],
       Timefilteringtype: [
         {
@@ -282,21 +259,12 @@ export default {
 
   // 生命周期函数
   created() {
-    this.amountType = this.$route.query.type;
     this.FindPage();
     this.getDicType("businessSegmentsType"); //业务板块
     this.getDicType("transactionType"); //预收收入类型
     this.getDicType("incomeAndExpensesType"); //收支类型
     this.getDicType("moneyAttrType"); //交易类型
-    this.getDicType("businessSegmentsSZType"); // 收支业务板块
-    if (this.amountType == 2) {
-      this.formQuery = {
-        businessSegmentsType: '0',
-        incomeAndExpensesType: '0',
-        transactionType: '0'
-
-      }
-    }
+   
   },
   // 方法函数
   methods: {
@@ -407,12 +375,6 @@ export default {
         })
       }
     },
-    getbusinessSegmentsTypeType(val) {
-      if (this.amountType == 2 && val == 2) {
-        this.formQuery.transactionType = '4'
-        this.formQuery.incomeAndExpensesType = '1'
-      }
-    },
     regularDetails(index, row) {
       let obj = Object.assign({}, row);
       this.orderDetail = obj;
@@ -498,7 +460,6 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      if (this.amountType == 1) {
         this.$api.letter.findMyCollectInAdvanceByUserId({ ...this.formQuery, userId: this.userId }).then((res) => {
           if (res.code == '200') {
             this.pageResult = res.data;
@@ -516,26 +477,8 @@ export default {
             });
           }
         });
-      }
-      else {
-        this.$api.letter.findMyIncomeAndExpensesByUserId({ ...this.formQuery, userId: this.userId }).then((res) => {
-          if (res.code == '200') {
-            this.pageResult = res.data;
-            this.tableData=res.data.data.content
-            this.formQuery.pageNum = res.data.data.pageNum,
-              this.formQuery.pageSize = res.data.data.pageSize,
-              this.formQuery.totalSize = res.data.data.totalSize,
-              loading.close();
-          } else {
-            loading.close();
-            this.tableData=[]
-            this.$message({
-              type: 'error',
-              message: res.msg,
-            });
-          }
-        });
-      }
+      
+   
 
     },
     back() {

+ 680 - 0
src/views/Letter/Wallet/ExpenditureDetails.vue

@@ -0,0 +1,680 @@
+<!-- 模板区域 -->
+<template>
+    <div id="body">
+        <!-- 模板内容 -->
+        <div class="flex a-c u-f-jsb">
+            <el-button size="small" type="primary" icon="el-icon-arrow-left" @click="back">
+                返回
+            </el-button>
+            <div class="amount-money">
+                <span>收入:¥{{ pageResult.sumAmountSR || 0 }}</span>
+                <span>支出:¥{{ pageResult.sumAmountZC || 0 }}</span>
+            </div>
+        </div>
+        <div class="content">
+            <el-form :inline="true" :model="formQuery" class="demo-form-inline" size="small" style="margin: 15px 0;">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="收支状态:">
+                            <el-radio-group v-model="formQuery.incomeAndExpensesType" @input="getMoneyAttrType">
+                                <el-radio v-for="val in incomeAndExpensesTypeoptions" :key="val.dictValue"
+                                    :label="val.dictValue">{{
+                                        val.dictTag
+                                    }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="业务板块:">
+                            <el-radio-group v-model="formQuery.businessSegmentsType" @input="getbusinessSegmentsTypeType">
+                                <el-radio v-for="val in  businessSegmentsSZTypeoptions" :key="val.dictValue"
+                                    :label="val.dictValue">{{ val.dictTag
+                                    }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="6">
+                        <el-form-item label="交易类型:">
+                            <el-select v-model="formQuery.transactionType" size="small" clearable placeholder="请选择">
+                                <el-option v-for="item in moneyAttrTypeoptions" :key="item.dictValue"
+                                    :disabled="item.disabled" :label="item.dictTag" :value="item.dictValue">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="时间筛选类型:">
+                            <el-select v-model="formQuery.dateQueryType" clearable size="small" placeholder="请选择">
+                                <el-option v-for="item in Timefilteringtype" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="筛选日期:">
+                            <el-date-picker v-model="formQuery.datetime" type="datetimerange" range-separator="至"
+                                style="width:230px" value-format="yyyy-MM-dd" start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="onSubmit">查询</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <el-table size="small" :data="tableData" height="500" border highlight-current-row stripe :header-cell-style="{
+                background: '#F2F7FC',
+                fontWeight: '700',
+                color: '#606266',
+            }">
+                <template>
+                    <el-table-column prop="subOrderNo" label="订单编号" align="center"></el-table-column>
+                    <el-table-column prop="createTime" label="交易时间" align="center"></el-table-column>
+                    <el-table-column prop="auditiingId" label="交易号" align="center"></el-table-column>
+                    <el-table-column prop="auditingStatus" label="提现状态" align="center"></el-table-column>
+                    <el-table-column prop="licenseNo" label="车牌号" align="center"></el-table-column>
+                    <el-table-column prop="businessSegmentsType" label="业务板块" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ screenType('businessSegmentsSZType',
+                                scope.row.businessSegmentsType) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="transactionType" label="交易类型" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ screenType('moneyAttrType', scope.row.transactionType) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="incomeAndExpensesType" label="收支类型" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ screenType('incomeAndExpensesType', scope.row.incomeAndExpensesType) }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="amount" label="交易金额" align="center"></el-table-column>
+                </template>
+                <el-table-column label="操作" align="center" width="200" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button v-if="scope.row.transactionType == '1'" size="small" type="primary"
+                            @click="OrderDetails(scope.$index, scope.row)">详情</el-button>
+                        <el-button v-else size="small" type="primary"
+                            @click="regularDetails(scope.$index, scope.row)">详情</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination @size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
+                @current-change="refreshPageRequest" :current-page="formQuery.pageNum" :page-size="formQuery.pageSize"
+                :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]" :total="formQuery.totalSize">
+            </el-pagination>
+        </div>
+        <!-- 车辆报价新页面 -->
+        <detailsDialog ref="detailsDialog" :orderInfo.sync="orderInfo" :Feepermissions="false"></detailsDialog>
+        <el-dialog title="账单详情" :visible.sync="detailsVisible" width="25%">
+            <div class="flex f-c j-s">
+                <template v-if="orderDetail.transactionType == '3'">
+                    <div class="dialogCentent flex f-c">
+                        <h2>业务收入提现到银行卡</h2>
+                        <p class="withdraw-alAmount">¥{{ tixianDetails.withdrawalAmount }}</p>
+                        <div style="height: 170px;" v-if="tixianDetails.record && tixianDetails.record.length > 0">
+                            <el-steps direction="vertical" :active="tixianDetails.active" class="tixianDetails-steps">
+                                <el-step :icon="val.processingStatus == '3' ? 'el-icon-error' : 'el-icon-success'"
+                                    :description="val.processingDate" :title="val.processingStatusName"
+                                    v-for="val in tixianDetails.record" :key="val.processingStatus"></el-step>
+                            </el-steps>
+                        </div>
+                    </div>
+                    <div class="dialogCentent flex f-c" style="margin-top:10px">
+                        <span v-if="tixianDetails.transactionNumber">交易编号: <span style="color: #333;">{{
+                            tixianDetails.transactionNumber }}</span> </span>
+                        <span v-if="tixianDetails.applicationDate">申请时间: <span style="color: #333;">{{
+                            tixianDetails.applicationDate
+                        }}</span> </span>
+                        <span v-if="tixianDetails.paymentDate">到账时间: <span style="color: #333;">{{ tixianDetails.paymentDate
+                        }}</span>
+                        </span>
+                        <span v-if="tixianDetails.bankNumber">提现账户: <span style="color: #333;">{{ tixianDetails.bankNumber
+                        }}</span>
+                        </span>
+                        <span v-if="tixianDetails.bankAccount">提现银行 <span style="color: #333;">{{ tixianDetails.bankAccount
+                        }}</span>
+                        </span>
+                    </div>
+                </template>
+                <template v-if="orderDetail.transactionType == '2'">
+                    <div>
+                        <div class="dialogCentent flex f-c  totalsum">
+                            <span>推广费</span>
+                            <span>{{ tuiguangDetails.amount }}</span>
+                        </div>
+                        <div class=" flex f-c  dialogCentent" style="margin-top:10px">
+                            <span v-if="tuiguangDetails.subOrderId">订单编号: <span style="color: #333;">{{
+                                tuiguangDetails.subOrderId
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.signingTime">承保时间: <span style="color: #333;">{{
+                                tuiguangDetails.signingTime
+                            }}</span> </span>
+                            <span v-if="tuiguangDetails.licenseNo">车牌号: <span style="color: #333;">{{
+                                tuiguangDetails.licenseNo
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.jypremium">驾意险: <span style="color: #333;">¥{{
+                                tuiguangDetails.jypremium
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.jqpremium">交强险: <span style="color: #333;">¥{{
+                                tuiguangDetails.jqpremium
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.sypremium">商业险: <span style="color: #333;">¥{{
+                                tuiguangDetails.sypremium
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.agentName">代理人姓名: <span style="color: #333;">{{
+                                tuiguangDetails.agentName
+                            }}</span>
+                            </span>
+                            <span v-if="tuiguangDetails.agentLevel">代理人级别: <span style="color: #333;">{{
+                                tuiguangDetails.agentLevel
+                            }}</span> </span>
+                        </div>
+                    </div>
+                </template>
+                <template v-if="orderDetail.transactionType == '4'">
+                    <div>
+                        <div class="dialogCentent flex f-c  totalsum">
+                            <span>退款</span>
+                            <span>{{ tuikuanDetails.refundAmount }}</span>
+                        </div>
+                        <div class=" flex f-c  dialogCentent" style="margin-top:10px">
+                            <span v-if="tuikuanDetails.transactionNumber">订单编号: <span style="color: #333;">{{
+                                tuikuanDetails.transactionNumber
+                            }}</span>
+                            </span>
+                            <span v-if="tuikuanDetails.refundTime">退款时间: <span style="color: #333;">{{
+                                tuikuanDetails.refundTime
+                            }}</span> </span>
+                        </div>
+                    </div>
+                </template>
+
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="detailsVisible = false">取 消</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+  <!-- 行为区域 -->
+<script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import Cookies from "js-cookie";
+import detailsDialog from "@/views/Core/components/detailsDialog.vue";
+
+export default {
+    components: {
+        KtCommonTable,
+        detailsDialog
+    },
+    // 数据存放区域
+    data() {
+        return {
+            orderInfo: {
+                //选中的订单
+                ownerinfo: {},
+                carinfo: {},
+                applyinfo: {},
+                insureinfo: {},
+                kindinfo: [],
+                riskinfo: [],
+                ownerinfo: {},
+                orderCommissionVo: {},
+                extendInfo: {}
+            },
+            is_post: false,
+            lowest: 20,
+            detailsVisible: false,//详情弹窗
+            pageResult: {},
+            tableData: [],
+            orderDetail: {},//提现详情
+            tuiguangDetails: {},//推广预收/实收详情
+            tixianDetails: {},//提现详情
+            tuikuanDetails: {},
+            formQuery: {
+                pageNum: 1,
+                pageSize: 20,
+                totalSize: 0,
+                businessSegmentsType: '0',
+                incomeAndExpensesType: '0',
+                transactionType: '0'
+            },
+            searchType: "",
+            userId: Cookies.get("user"),
+            orderInfo: {
+                //选中的订单
+                ownerinfo: {},
+                carinfo: {},
+                applyinfo: {},
+                insureinfo: {},
+                kindinfo: [],
+                riskinfo: [],
+                ownerinfo: {},
+                orderCommissionVo: {},
+                extendInfo: {}
+            },
+            incomeAndExpensesTypeoptions: [],
+            businessSegmentsSZTypeoptions: [],
+            moneyAttrTypeoptions: [],
+            Timefilteringtype: [
+                {
+                    value: '0',
+                    label: '全部'
+                }, {
+                    value: '1',
+                    label: '一周内'
+                }, {
+                    value: '2',
+                    label: '一月内'
+                }, {
+                    value: '3',
+                    label: '三月内'
+                }, {
+                    value: '4',
+                    label: '六月内'
+                },
+            ]
+        }
+    },
+
+    // 生命周期函数
+    created() {
+        this.FindPage();
+        this.getDicType("businessSegmentsType"); //业务板块
+        this.getDicType("transactionType"); //预收收入类型
+        this.getDicType("incomeAndExpensesType"); //收支类型
+        this.getDicType("moneyAttrType"); //交易类型
+        this.getDicType("businessSegmentsSZType"); // 收支业务板块
+
+    },
+    // 方法函数
+    methods: {
+        OrderDetails(index, row) {
+            for (let i = 0; i < this.global.insureList.length; i++) {
+                this.global.insureList[i].coveragePremium = "";
+                this.global.insureList[i].amount = 0;
+            }
+            let params = {
+                companyId: row.subOrderNo
+            };
+            this.$api.letter.getByCompanyId(params).then(res => {
+                if (res.code == 200) {
+                    this.licenseNo = res.data.licenseno; //车牌号
+                    this.inscompany = res.data.inscompany; //保险公司
+                    if (res.data.accidentInfo) {
+                        res.data.accidentInfo.constructor === Object
+                            ? [res.data.accidentInfo]
+                            : res.data.accidentInfo;
+                    }
+                    Object.assign(this.orderInfo, res.data);
+                    if (this.orderInfo.riskinfo && this.orderInfo.riskinfo.length > 0) {
+                        for (let i = 0; i < this.orderInfo.riskinfo.length; i++) {
+                            if (this.orderInfo.riskinfo[i].riskCode == "0510") {
+                                for (let j = 0; j < this.orderInfo.kindinfo.length; j++) {
+                                    for (let m = 0; m < this.global.insureList.length; m++) {
+                                        if (
+                                            this.orderInfo.kindinfo[j].kindCode ==
+                                            this.global.insureList[m].kindCode
+                                        ) {
+                                            this.global.insureList[
+                                                m
+                                            ].coveragePremium = this.orderInfo.kindinfo[
+                                                j
+                                            ].coveragePremium;
+                                            if (this.orderInfo.kindinfo[j].kindCode == "B") {
+                                                this.global.insureList[9].amtList[0].value = this.orderInfo.kindinfo[
+                                                    j
+                                                ].amount;
+                                            }
+                                            if (this.orderInfo.kindinfo[j].kindCode == "A") {
+                                                this.global.insureList[m].amount = "1";
+                                            } else if (this.global.insureList[m].kindCode == "D4") {
+                                                this.global.insureList[
+                                                    m
+                                                ].amount = this.orderInfo.kindinfo[j].unitAmount;
+                                            } else if (
+                                                this.global.insureList[m].isMainRisk ||
+                                                this.global.insureList[m].kindCode == "BD" ||
+                                                this.global.insureList[m].kindCode == "L"
+                                            ) {
+                                                this.global.insureList[
+                                                    m
+                                                ].amount = this.orderInfo.kindinfo[j].amount;
+                                            } else {
+                                                this.global.insureList[
+                                                    m
+                                                ].amount = this.orderInfo.kindinfo[j].deductibleRate;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    this.$refs.detailsDialog.setBackupVisible(true);
+                } else {
+                    this.$message.error("订单获取失败");
+                }
+            });
+        },
+        getDicType(type) {
+            this.$api.insCompany.dicType(type).then((res) => {
+                if (res.code == 200 && res.data) {
+                    this[type + "options"] = res.data.ddList;
+                    if (type == 'moneyAttrType') {
+                        this.getMoneyAttrType('0')
+                    }
+                }
+                else {
+                    this[type + "options"] = []
+                }
+            });
+        },
+        getMoneyAttrType(e) {
+            this.formQuery.transactionType = ''
+            if (e == 0) {
+                this.moneyAttrTypeoptions.map(val => val.disabled = false)
+            }
+            if (e == 1) {
+                this.moneyAttrTypeoptions.map(val => {
+                    if (val.dictValue == '0' || val.dictValue == '3') {
+                        val.disabled = true
+                    }
+                    else {
+                        val.disabled = false
+                    }
+                })
+            }
+            if (e == 2) {
+                this.moneyAttrTypeoptions.map(val => {
+                    if (val.dictValue == '3') {
+                        val.disabled = false
+                    }
+                    else {
+                        val.disabled = true
+                    }
+                })
+            }
+        },
+        getbusinessSegmentsTypeType(val) {
+            if (val == 2) {
+                this.formQuery.transactionType = '4'
+                this.formQuery.incomeAndExpensesType = '1'
+            }
+        },
+        regularDetails(index, row) {
+            let obj = Object.assign({}, row);
+            this.orderDetail = obj;
+            if (row.transactionType == "2") {
+                this.$api.letter.getSubOrderDetails(row.subOrderNo).then((res) => {
+                    if (res.code == '200') {
+                        this.tuiguangDetails = res.data;
+                        this.tuiguangDetails.amount = row.amount;
+                        this.detailsVisible = true;
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg,
+                        });
+                    }
+                });
+            }
+            if (row.transactionType == "3") {
+                this.$api.letter.findDetailById(row.id).then((res) => {
+                    if (res.code == '200') {
+                        res.data.record.forEach((val, index) => {
+                            if (!val.processingStatusFlag) {
+                                res.data.active = index
+                            }
+                            else {
+                                res.data.active = res.data.record.length
+                            }
+                        })
+                        this.tixianDetails = res.data;
+                        this.detailsVisible = true;
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg,
+                        });
+                    }
+                });
+            }
+            if (row.transactionType == "4") {
+                this.$api.letter.findRefundDetailById(row.id).then((res) => {
+                    if (res.code == '200') {
+                        this.tuikuanDetails = res.data;
+                        this.detailsVisible = true;
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg,
+                        });
+                    }
+                });
+            }
+        },
+
+        onSubmit() {
+            if (
+                this.formQuery.datetime == undefined ||
+                this.formQuery.datetime == null ||
+                this.formQuery.datetime == ""
+            ) {
+                (this.formQuery.startDate = ""),
+                    (this.formQuery.endDate = "");
+            } else {
+                this.formQuery.startDate = this.formQuery.datetime[0];
+                this.formQuery.endDate = this.formQuery.datetime[1];
+            }
+            this.formQuery.pageNum = 1
+            this.FindPage()
+        },
+
+        screenType(option, val) {
+            if (val) {
+                return this[option + "options"].find(item => {
+                    return item.dictValue === val;
+                }).dictTag;
+            }
+
+        },
+        //产品分页json
+        FindPage() {
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+
+            this.$api.letter.findMyIncomeAndExpensesByUserId({ ...this.formQuery, userId: this.userId }).then((res) => {
+                if (res.code == '200') {
+                    this.pageResult = res.data;
+                    this.tableData = res.data.data.content
+                    this.formQuery.pageNum = res.data.data.pageNum,
+                        this.formQuery.pageSize = res.data.data.pageSize,
+                        this.formQuery.totalSize = res.data.data.totalSize,
+                        loading.close();
+                } else {
+                    loading.close();
+                    this.tableData = []
+                    this.$message({
+                        type: 'error',
+                        message: res.msg,
+                    });
+                }
+            });
+
+
+        },
+        back() {
+            this.$router.push({
+                path: "fundsWallet",
+            });
+        },
+        transformTime(day) {
+            var date = new Date();
+            date.setFullYear(date.getFullYear());
+            date.setTime(date.getTime());
+            var strYear = date.getFullYear();
+            var strDay = day ? date.getDate() - day : date.getDate();
+            var strMonth = date.getMonth() + 1;
+            if (strMonth < 10) {
+                strMonth = "0" + strMonth;
+            }
+            if (strDay < 10) {
+                strDay = "0" + strDay;
+            }
+            var datastr = strYear + "-" + strMonth + "-" + strDay;
+            return datastr;
+        },
+        refreshPageRequest(val) {
+            this.formQuery.pageNum = val
+            this.FindPage()
+        },
+        handleSizeChange(val) {
+            this.formQuery.pageSize = val
+            this.FindPage()
+        },
+    },
+    // 计算属性
+    computed: {
+    }
+}
+</script>
+  <!-- 样式区域 -->
+<style lang='scss' scoped>
+/deep/ {
+    .el-dialog__body {
+        background: #F2F2F2;
+    }
+
+    .el-dialog__footer {
+        padding: 10px;
+    }
+
+    .tixianDetails-steps {
+        .el-step__head.is-finish {
+            color: #229805;
+            border-color: #ccc;
+
+            .el-step__icon>.el-icon-error {
+                color: red
+            }
+        }
+
+        .el-step__title.is-finish,
+        .el-step__description.is-finish {
+            color: #333;
+            font-size: 14px;
+        }
+
+    }
+}
+
+.withdrawalinput {
+    border: none;
+}
+
+#body {
+    padding: 0 24px;
+}
+
+.content {
+    padding: 5px 24px 20px 24px;
+
+    .header {
+        width: 100%;
+        height: 108px;
+        background: #F5F6F8;
+        border-radius: 12px 12px 12px 12px;
+        padding: 15px 40px;
+        box-sizing: border-box;
+
+        >div {
+            width: 25%;
+            height: 100%;
+
+            span:nth-child(2) {
+                font-family: DIN, DIN;
+                font-size: 28px;
+                font-weight: bold;
+            }
+        }
+
+        .sum {
+            border-right: 1px solid #D7DBE7;
+            box-sizing: border-box;
+            padding-right: 80px;
+
+            span:nth-child(1) {
+                font-family: DIN, DIN;
+                font-size: 20px;
+                color: rgba(51, 51, 51, 0.8);
+            }
+        }
+    }
+}
+
+.dialogCentent,
+.dialoglist,
+.dialoginput {
+    background: #FFFFFF;
+    border-radius: 4px 4px 4px 4px;
+    padding: 10px;
+
+    >span {
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 500;
+        font-size: 13px;
+        margin-bottom: 10px;
+        color: rgba(51, 51, 51, 0.8);
+    }
+}
+
+.totalsum {
+    margin-bottom: 15px;
+
+    >span {
+        font-weight: bold;
+        font-size: 16px;
+        color: #333333;
+    }
+
+    >span:nth-child(2) {
+        font-size: 30px;
+        color: #FF5600;
+        font-weight: bold;
+    }
+}
+
+.amount-money {
+    padding: 5px 0 5px 15px;
+    font-size: 14px;
+    background: #F2F5FD;
+
+    span {
+        margin-right: 15px;
+
+    }
+}
+
+.withdraw-alAmount {
+    font-weight: 700;
+    font-size: 28px;
+    color: #229805;
+    margin: 0 0 30px 0;
+}
+</style>
+  

+ 10 - 4
src/views/Letter/Wallet/FundsWallet.vue

@@ -249,10 +249,16 @@ export default {
       });
     },
     toBillDetails(type) {
-      this.$router.push({
-        path: "amountManagement",
-        query: { type: type },
-      });
+      if(type==1){
+        this.$router.push({
+          path: "amountManagement",
+        });
+      }
+      if(type==2){
+        this.$router.push({
+          path: "expenditureDetails",
+        });
+      }
     },
     allamount() {
       let userId = Cookies.get("user");