Jelajahi Sumber

1.修改人员管理树处理方法
2.账户信息管理页面和逻辑重新调整

haizhouwang 2 tahun lalu
induk
melakukan
36ee9fd925

+ 2 - 2
config/dev.env.js

@@ -5,11 +5,11 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
-  // BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙
+  BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙
 })
 
 

+ 15 - 0
src/http/moudules/expense.js

@@ -52,6 +52,21 @@ export const getAccountByAccountName = () => {
     })
 }
 
+/**
+ * 
+ * 费用申请
+ * 
+ */
+//插入账户卡信息
+export const insertAccountCard = (data) => {
+    return axios({
+        url: '/invAccount/insertAccountCard',
+        method: "post",
+        data
+    })
+}
+
+
 /**
  * 
  * 费用申请

+ 90 - 53
src/views/FinancialManagement/ExpenseManagement/ExpenseComponent.vue

@@ -17,7 +17,7 @@
         size="small"
         class="frame"
       >
-        <el-row>
+        <el-row v-if="type==1">
           <el-col :span="12">
             <el-form-item label="账户类别" prop="outerFlag">
               <el-select
@@ -39,7 +39,70 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="type==1">
+          <el-col :span="12">
+            <el-form-item label="营业性质" prop="businessQuality">
+              <el-select v-model="formData.businessQuality" placeholder="请选择营业性质">
+                <el-option label="一般纳税" value="0"></el-option>
+                <el-option label="小规模" value="1"></el-option>
+                <el-option label="个体户" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成立日期" prop="clrq">
+              <el-date-picker
+                v-model="formData.establishTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="type==1">
+          <el-col :span="12">
+            <el-form-item label="所属地" prop="ssd">
+              <el-input v-model="formData.owned" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法人" prop="fr">
+              <el-input v-model="formData.juridicalPerson" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="type==1">
+          <el-col :span="12">
+            <el-form-item label="开票员" prop="ssd">
+              <el-input v-model="formData.biller" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票额度" prop="fr">
+              <el-input-number
+                v-model="formData.invoicingAmount"
+                :min="0"
+                :max="99999999999999999"
+                label=""
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formDataId&&type==1">
+          <el-col :span="12">
+            <el-form-item label="剩余开票额度" prop="ssd">
+              <el-input-number
+                v-model="formData.invoicingAmountExcess"
+                :min="0"
+                :max="99999999999999999"
+                label=""
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="type==2">
           <el-col :span="12">
             <el-form-item label="账户性质" prop="accountQuality">
               <el-select
@@ -64,46 +127,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="营业性质" prop="yyxz">
-              <el-select v-model="formData.yyxz" placeholder="请选择营业性质">
-                <el-option label="一般纳税" value="0"></el-option>
-                <el-option label="小规模" value="1"></el-option>
-                <el-option label="个体户" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属地" prop="ssd">
-              <el-input v-model="formData.ssd" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="法人" prop="fr">
-              <el-input v-model="formData.fr" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="成立日期" prop="clrq">
-              <el-date-picker
-                v-model="formData.clrq"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
+        <el-row  v-if="type==2">
           <el-col :span="12">
             <el-form-item label="开户行" prop="bank">
               <el-input v-model="formData.bank" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
-          <el-col v-show="formData.outerFlag == 0" :span="12">
+          <el-col v-if="formData.outerFlag == 0" :span="12">
             <el-form-item label="开户行名称" prop="bankName">
               <el-input
                 v-model="formData.bankName"
@@ -112,7 +142,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="开户行号" prop="bankNum">
               <el-input
@@ -137,7 +167,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="结算卡" prop="clearingProfit">
               <el-input-number
@@ -159,7 +189,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="外部过账金额" prop="exteriorProfit">
               <el-input-number
@@ -181,7 +211,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="保险公司回款" prop="insuranceProfit">
               <el-input-number
@@ -203,7 +233,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="园区利润" prop="parkProfit">
               <el-input-number
@@ -225,7 +255,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="对私单笔限额" prop="priSingleLines">
               <el-input-number
@@ -247,7 +277,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="对公单日限额" prop="pubDayLines">
               <el-input-number
@@ -269,7 +299,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0">
+        <el-row v-if="formData.outerFlag == 0&&type==2">
           <el-col :span="12">
             <el-form-item label="对公年额度" prop="pubYearLines">
               <el-input-number
@@ -291,7 +321,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0 && formDataId">
+        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
           <el-col :span="12">
             <el-form-item label="单日转账笔数剩余" prop="dayStrokeNumExcess">
               <el-input-number
@@ -313,7 +343,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0 && formDataId">
+        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
           <el-col :span="12">
             <el-form-item label="对私年剩余额度" prop="priYearExcess">
               <el-input-number
@@ -335,7 +365,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="formData.outerFlag == 0 && formDataId">
+        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
           <el-col :span="12">
             <el-form-item label="对公年剩余额度" prop="pubYearExcess">
               <el-input-number
@@ -371,6 +401,10 @@
 export default {
   name: "ExpenseComponent",
   props: {
+    type: {
+      type: Number,
+      default: 1,
+    },
     dialogFormVisible: {
       type: Boolean,
       default: false,
@@ -388,6 +422,12 @@ export default {
       default: {
         outerFlag: "0", //账户类别
         accountName: "", //户名
+        businessQuality:'0',//营业性质
+        establishTime:"",//成立日期
+        invoicingAmount: 0, //开票额度
+        // invoicingAmountExcess:0,//剩余开票额度
+        juridicalPerson:'',//法人
+        owned: "", //所属地
         accountQuality: "", //账户性质
         bankCardNum: "", //银行卡号
         bank: "", //开户行
@@ -414,10 +454,6 @@ export default {
         priDayLinesExcess: "", //对私单日限额剩余
         pubDayLinesExcess: "", //对公单日限额剩余
         spend: "", //	支出金额
-        yyxz: "", //营业性质
-        ssd: "", //所属地
-        fr: "", //法人
-        clrq: "", //成立日期
       },
     },
   },
@@ -522,7 +558,8 @@ export default {
   overflow-y: scroll;
   max-height: 500px;
 }
-.el-input-number,.el-date-editor {
+.el-input-number,
+.el-date-editor {
   width: 100%;
 }
 </style>

+ 324 - 98
src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -61,7 +61,141 @@
       >新增账户</el-button
     >
     <!-- 表格 -->
-    <kt-common-table
+    <el-table
+      :data="accountData"
+      border
+      size="small"
+      :header-cell-style="{
+        background: '#F2F7FC',
+        fontWeight: '900',
+        color: '#606266',
+      }"
+      height="600px"
+      style="width: 100%; margin-top: 30px"
+    >
+      <el-table-column type="expand">
+        <template slot-scope="scope">
+          <el-table
+            :data="scope.row.invAccountCardList"
+            size="small"
+            :header-cell-style="{
+              background: '#ccc',
+              fontWeight: '900',
+              color: '#606266',
+            }"
+            style="width: 100%"
+          >
+            <el-table-column
+              type="index"
+              width="50"
+              align="center"
+              label="序号"
+            >
+            </el-table-column>
+            <el-table-column
+              v-for="(childItem, index) in childColums"
+              :key="'child' + index"
+              :prop="childItem.prop"
+              align="center"
+              :label="childItem.label"
+              :min-width="childItem.minWidth"
+            >
+              <!-- <template slot-scope="scope">
+                {{ scope.row.businessQuality }}
+                <span v-if="scope.row.businessQuality==0">一般纳税</span>
+                <span v-if="scope.row.businessQuality==1">小规模</span>
+                <span v-if="scope.row.businessQuality==2">个体户</span>
+              </template> -->
+            </el-table-column>
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="300"
+            >
+              <template slot-scope="scope">
+                <el-button size="mini" @click="handleTableEdit(scope.row)"
+                  >编辑</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleTableDelete(scope.row)"
+                  >删除</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleTableExpend(scope.row)"
+                  >支出</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleTableIncome(scope.row)"
+                  >收入</el-button
+                >
+              </template>
+            </el-table-column>
+            <!-- <el-form v-for="(scopeItem,scopeIndex) in scope.row.invAccountCardList" :key="'scope'+scopeIndex" label-position="left" inline class="demo-table-expand">
+            <el-form-item v-for="(childItem,index) in childColums" :key="'child'+index" :label="childItem.label+':'">
+              <span>{{ scopeItem[childItem.prop] }}</span>
+            </el-form-item>
+          </el-form> -->
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(dataItem, dataIndex) in columns"
+        :key="dataIndex"
+        :label="dataItem.label"
+        :prop="dataItem.prop"
+        :min-width="dataItem.minWidth"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" width="240">
+        <template slot-scope="scope">
+          <!-- @click.native.prevent="deleteRow(scope.$index, tableData)" -->
+          <el-button
+            size="mini"
+            @click.native.prevent="handleTableEdit(scope.row)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            @click.native.prevent="handleTableDelete(scope.row)"
+            >删除</el-button
+          >
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="新增卡信息"
+            placement="bottom-end"
+          >
+            <el-button
+              size="mini"
+              type="success"
+              @click.native.prevent="handleTableAdd(scope.row)"
+              >新增</el-button
+            >
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="handleSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+      @current-change="refreshPageRequest"
+      :current-page="pageRequest.pageNo"
+      :page-size="pageRequest.pageSize"
+      :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
+      :total="pageRequest.totalSize"
+      style="float: left; margin-left: 20px; margin-top: 20px"
+    >
+    </el-pagination>
+    <!-- <kt-common-table
       :operationWidth="operationWidth"
       class="ktTable"
       permsEdit="sys:agent:view"
@@ -85,11 +219,12 @@
       @findPage="findPage"
       @handleEdit="handleTableEdit"
       :isshowpagination="true"
-    ></kt-common-table>
+    ></kt-common-table> -->
     <!-- 新增修改弹框 -->
     <expense-component
       ref="expenseComponent"
-      :formData="formData"
+      :type="type"
+      :formData="type==1?accountFormData:accountCardFormData"
       :formDataId="formDataId"
       :title="title"
       :dialogFormVisible="dialogFormVisible"
@@ -241,7 +376,7 @@
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import ExpenseComponent from "./ExpenseComponent.vue"; //新增账户信息弹框
-import {toChies} from '../../../utils/moneyTransition';
+import { toChies } from "../../../utils/moneyTransition";
 
 export default {
   name: "ExpenseManagement",
@@ -250,9 +385,12 @@ export default {
     this.business("account_quality"); //账户性质字典;
     this.business("use_funds"); //备注字典
   },
-  mounted() {},
+  mounted() {
+    this.findPage();
+  },
   data() {
     return {
+      type: 1, //1为账户信息,2为卡信息
       /**
        * 账户收入模块
        */
@@ -279,11 +417,13 @@ export default {
       /**
        * 账户模块
        */
-      title: "新增账户信息", 
+      title: "新增账户信息",
+      accountData: [], //账户信息数据
       dialogFormVisible: false, //弹出框状态
       operationWidth: 200, //操作列宽度
       account_qualityData: [], //账户性质数据字典
-      queryFrom: {//查询条件
+      queryFrom: {
+        //查询条件
         accountQuality: "", //账户性质查询
         bankCardNum: "", //银行卡号查询
         accountName: "", //户名查询
@@ -304,43 +444,64 @@ export default {
         {
           prop: "outerFlagName",
           label: "账户类别",
-          minWidth: 70,
+          minWidth: 80,
           sortable: false,
         },
         {
-          prop: "accountQualityName",
-          label: "账户性质",
-          minWidth: 70,
+          prop: "businessQualityName",
+          label: "营业性质",
+          minWidth: 80,
           sortable: false,
         },
         {
-          prop: "yy",
-          label: "营业性质",
-          minWidth: 70,
+          prop: "accountName",
+          label: "户名",
+          minWidth: 160,
           sortable: false,
         },
         {
-          prop: "ss",
+          prop: "juridicalPerson",
+          label: "法人",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "owned",
           label: "所属地",
-          minWidth: 70,
+          minWidth: 80,
           sortable: false,
         },
         {
-          prop: "fr",
-          label: "法人",
-          minWidth: 70,
+          prop: "biller",
+          label: "开票员",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "invoicingAmount",
+          label: "开票额度",
+          minWidth: 80,
           sortable: false,
         },
         {
-          prop: "clrq",
+          prop: "invoicingAmountExcess",
+          label: "剩余开票额度",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "establishTime",
           label: "成立日期",
-          minWidth: 70,
+          minWidth: 80,
           sortable: false,
         },
+      ],
+      //子部数据列
+      childColums: [
         {
-          prop: "accountName",
-          label: "户名",
-          minWidth: 160,
+          prop: "accountQualityName",
+          label: "账户性质",
+          minWidth: 80,
           sortable: false,
         },
         {
@@ -472,9 +633,46 @@ export default {
           sortable: false,
         },
       ],
-      formData: {//账户form表单
+      formData: {
+        //账户form表单
+        // outerFlag: "0", //账户类别
+        // accountName: "", //户名
+        // accountQuality: "", //账户性质
+        // bankCardNum: "", //银行卡号
+        // bank: "", //开户行
+        // bankName: "", //开户行名称
+        // bankNum: "", //开户行号
+        // certExpirationDate: "", //证书有效期
+        // clearingProfit: "", //结算卡
+        // dayStrokeNum: "", //单日转账笔数限制
+        // exteriorProfit: "", //外部过账金额
+        // fiscalProfit: "", //财税公司利润
+        // insuranceProfit: "", //保险公司回款
+        // otherProfit: "", //其他利润
+        // parkProfit: "", //园区利润
+        // priDayLines: "", //对私单日限额
+        // priSingleLines: "", //对私单笔限额
+        // priYearExcess: "", //对私年剩余额度
+        // priYearLines: "", //对私年额度
+        // pubDayLines: "", //对公单日限额
+        // pubSingleLines: "", //对公单笔限额
+        // pubYearExcess: "", //对公年剩余额度
+        // pubYearLines: "", //对公年额度
+        // tianqinProfit: "", //天勤利润
+      },
+      //账户信息form
+      accountFormData: {
         outerFlag: "0", //账户类别
         accountName: "", //户名
+        businessQuality: "0", //营业性质
+        establishTime: "", //成立日期
+        invoicingAmount: 0, //开票额度
+        // invoicingAmountExcess:0,//剩余开票额度
+        juridicalPerson: "", //法人
+        owned: "", //所属地
+      },
+      //账户卡信息form
+      accountCardFormData: {
         accountQuality: "", //账户性质
         bankCardNum: "", //银行卡号
         bank: "", //开户行
@@ -483,25 +681,30 @@ export default {
         certExpirationDate: "", //证书有效期
         clearingProfit: "", //结算卡
         dayStrokeNum: "", //单日转账笔数限制
+        dayStrokeNumExcess: "", //单日转账笔数剩余
         exteriorProfit: "", //外部过账金额
-        fiscalProfit: "", //财税公司利润
+        fiscalProfit: "", //	财务公司利润
         insuranceProfit: "", //保险公司回款
         otherProfit: "", //其他利润
         parkProfit: "", //园区利润
         priDayLines: "", //对私单日限额
+        priDayLinesExcess: "", //对私单日限额剩余
         priSingleLines: "", //对私单笔限额
         priYearExcess: "", //对私年剩余额度
         priYearLines: "", //对私年额度
         pubDayLines: "", //对公单日限额
+        pubDayLinesExcess: "", //对公单日限额剩余
         pubSingleLines: "", //对公单笔限额
         pubYearExcess: "", //对公年剩余额度
         pubYearLines: "", //对公年额度
+        spend: "", //支出金额
         tianqinProfit: "", //天勤利润
       },
       /**
        * 支出模块
        */
-      expendColumns: [// 支出数据列
+      expendColumns: [
+        // 支出数据列
         {
           prop: "company",
           label: "转账方",
@@ -541,6 +744,7 @@ export default {
       expendDialogVisible: false, //支出弹出框状态
       expendOutAccountId: "", //点击支出按钮当条数据支出id
       companyItem: {}, //选择单位整条数据
+      typeName: "card", //账户信息 跟 卡信息
     };
   },
   watch: {
@@ -567,6 +771,16 @@ export default {
     },
   },
   methods: {
+    // 换页刷新
+    refreshPageRequest: function (pageNum) {
+      this.pageRequest.pageNo = pageNum;
+      this.findPage();
+    },
+    // 每页条数发生改变
+    handleSizeChange(pageSize) {
+      this.pageRequest.pageSize = pageSize;
+      this.findPage();
+    },
     //申请金额填写完成后
     chageAppl(e) {
       this.inComeFormData.bigApplyAmount = toChies(
@@ -755,19 +969,27 @@ export default {
       this.$api.expense
         .getAccount(obj)
         .then((res) => {
-          console.log(res)
-          res.data.records.forEach((element) => {
-            element.outerFlagName =
-              element.outerFlag == 0 ? "内部账户" : "外部账户";
-            element.accountQualityName = this.dictFn(element, 1); //转化账户性质跟账户性别
-          });
-          this.pageResult = {
-            content: res.data.records,
-            pageNum: res.data.current,
-            pageSize: res.data.size,
-            totalPages: res.data.pages,
-            totalSize: res.data.total,
-          };
+          console.log(res);
+          if (res.code == 200) {
+            res.data.records.forEach((element) => {
+              //转化营业性质
+              if (element.businessQuality == 0) {
+                element.businessQualityName = "一般纳税";
+              } else if (element.businessQuality == 1) {
+                element.businessQualityName = "小规模";
+              } else {
+                element.businessQualityName = "个体户";
+              }
+              element.outerFlagName =
+                element.outerFlag == 0 ? "内部账户" : "外部账户";
+              element.accountQualityName = this.dictFn(element, 1); //转化账户性质跟账户性别
+            });
+            this.accountData = res.data.records;
+            this.pageRequest.pageNo = res.data.current;
+            this.pageRequest.pageSize = res.data.size;
+            this.pageRequest.totalPages = res.data.pages;
+            this.pageRequest.totalSize = res.data.total;
+          }
         })
         .then(data != null ? data.callback : "");
     },
@@ -780,8 +1002,8 @@ export default {
     },
     //用户性质转换
     dictFn(obj, type) {
-      if(obj.accountQuality==null){
-        return
+      if (obj.accountQuality == null) {
+        return;
       }
       if (type == 1) {
         return this.account_qualityData.find(
@@ -800,15 +1022,16 @@ export default {
     //新增事件
     addAmount() {
       this.title = "新增账户信息";
+      this.type == 1;
       this.dialogFormVisible = true;
     },
-    //删除数据事件
-    handleTableDelete(index) {
+    //账户删除数据事件
+    handleTableDelete(row) {
       this.$confirm("确认删除该记录吗?", "提示", {
         type: "warning",
       })
         .then(() => {
-          this.$api.expense.deleteAccount(index.row.accountId).then((res) => {
+          this.$api.expense.deleteAccount(row.accountId).then((res) => {
             if (res.code == 200) {
               this.$message.success("删除成功");
               this.findPage();
@@ -858,69 +1081,72 @@ export default {
         tianqinProfit: "", //天勤利润
       };
     },
-    //修改
-    handleTableEdit(index) {
-      let row = index.row;
+    //账户卡信息增加
+    handleTableAdd(row) {
+      this.type = 2; //卡信息
+      this.title = "新增账户卡信息";
+      this.dialogFormVisible = true;
+      this.accountCardFormData.outerFlag = row.outerFlag
+    },
+    //账户信息修改
+    handleTableEdit(row) {
+      this.type = 1; //账户类型
       this.formDataId = row.accountId;
       this.$api.expense.getAccountById(this.formDataId).then((res) => {
+        console.log(res);
         if (res.code == 200) {
-          this.formData = JSON.parse(JSON.stringify(res.data));
-          if (
-            res.data.startCertExpirationDate &&
-            res.data.endCertExpirationDate
-          ) {
-            this.formData.certExpirationDate = [
-              res.data.startCertExpirationDate,
-              res.data.endCertExpirationDate,
-            ];
-          }
+          this.accountFormData = JSON.parse(JSON.stringify(res.data[0]));
         } else {
           this.$message.error(res.msg);
         }
       });
-
       this.title = "编辑账户信息";
       this.dialogFormVisible = true;
     },
     //提交
     submitForm() {
-      let params = JSON.parse(JSON.stringify(this.formData));
-      delete params.certExpirationDate;
-      if (this.formDataId) {
-        //修改
-        params.accountId = this.formDataId;
-        this.$api.expense.updateAccoount(params).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              message: "修改成功",
-              type: "success",
-            });
-          } else {
-            this.$message({
-              message: `修改失败, ${res.msg}`,
-              type: "error",
-            });
-          }
-          this.findPage();
-          this.resetForm();
-        });
-      } else {
-        //新增
-        this.$api.expense.insertAccount(params).then((res) => {
-          if (res.code == 200) {
-            this.$message({
-              message: "添加成功",
-              type: "success",
-            });
-          } else {
-            this.$message({
-              message: `添加失败, ${res.msg}`,
-              type: "error",
-            });
-          }
-          this.findPage();
-          this.resetForm();
-        });
+      let params = JSON.parse(JSON.stringify(this.accountFormData));
+      if (this.type == 1) { //新增修改账户信息
+        if (this.formDataId) {
+          //修改
+          params.accountId = this.formDataId;
+          // delete params.invAccountCardList;
+          this.$api.expense.updateAccoount(params).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                message: "修改成功",
+                type: "success",
+              });
+            } else {
+              this.$message({
+                message: `修改失败, ${res.msg}`,
+                type: "error",
+              });
+            }
+            this.findPage();
+            this.resetForm();
+          });
+        } else {
+          //新增
+          this.$api.expense.insertAccount(params).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                message: "添加成功",
+                type: "success",
+              });
+            } else {
+              this.$message({
+                message: `添加失败, ${res.msg}`,
+                type: "error",
+              });
+            }
+            this.findPage();
+            this.resetForm();
+          });
+        }
+      }else{  //新增修改卡信息
+        console.log(params)
+        delete params.certExpirationDate;
       }
     },
   },
@@ -1045,10 +1271,10 @@ export default {
   margin: 0 10px;
   font-size: 20px;
 }
-.ktTable >>> .cell .el-button{
+.ktTable >>> .cell .el-button {
   width: 80px;
 }
-.expendDialog >>> .cell .el-button{
+.expendDialog >>> .cell .el-button {
   width: auto;
 }
 </style>

+ 0 - 3
src/views/PeopleManage/Agent/AgentExamine.vue

@@ -730,9 +730,6 @@ export default {
         if (data[i].comlevel == 5 && data[i].managementSource != num) {
           data.splice(i, 1);
           i = i - 1;
-        } else if (one > 5 && data[i].comlevel == null) {
-          data.splice(i, 1);
-          i = i - 1;
         } else {
           this.treeDataRecursion(data[i].children, num, one);
         }

+ 0 - 3
src/views/PeopleManage/Agent/AgentManage.vue

@@ -796,9 +796,6 @@ export default {
         if (data[i].comlevel == 5 && data[i].managementSource != num) {
           data.splice(i, 1);
           i = i - 1;
-        } else if (one > 5 && data[i].comlevel == null) {
-          data.splice(i, 1);
-          i = i - 1;
         } else {
           this.treeDataRecursion(data[i].children, num, one);
         }

+ 1 - 4
src/views/PeopleManage/Player/PlayerManage.vue

@@ -376,10 +376,7 @@ export default {
         if (data[i].comlevel == 5 && data[i].managementSource != num) {
           data.splice(i, 1);
           i = i - 1;
-        } else if (one > 5 && data[i].comlevel == null) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
+        }  else {
           this.treeDataRecursion(data[i].children, num, one);
         }
       }

+ 0 - 3
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -556,9 +556,6 @@ export default {
         if (data[i].comlevel == 5 && data[i].managementSource != num) {
           data.splice(i, 1);
           i = i - 1;
-        } else if (one > 5 && data[i].comlevel == null) {
-          data.splice(i, 1);
-          i = i - 1;
         } else {
           this.treeDataRecursion(data[i].children, num, one);
         }

+ 0 - 3
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -741,9 +741,6 @@ export default {
           // console.log(data[i].managementSource!=num)
           data.splice(i, 1);
           i = i - 1;
-        } else if (one > 5 && data[i].comlevel == null) {
-          data.splice(i, 1);
-          i = i - 1;
         } else {
           this.treeDataRecursion(data[i].children, num, one);
         }