Browse Source

解决开票管理分页问题

haizhouwang 2 years ago
parent
commit
6f603788ac

+ 2 - 30
src/views/FinancialManagement/ExpenseManagement/ExpenseComponent.vue

@@ -390,7 +390,6 @@ export default {
         businessQuality: "0", //营业性质
         establishTime: "", //成立日期
         invoicingAmount: 0, //开票额度
-        // invoicingAmountExcess:0,//剩余开票额度
         juridicalPerson: "", //法人
         owned: "", //所属地
         accountQuality: "", //账户性质
@@ -427,29 +426,6 @@ export default {
         accountName: [
           { required: true, message: "户名不能为空", trigger: "blur" },
         ],
-        // businessQuality: [
-        //   { required: true, message: "请选择营业性质", trigger: "change" },
-        // ],
-        // owned: [
-        //   { required: true, message: "所属地不能为空", trigger: "change" },
-        // ],
-        // juridicalPerson: [
-        //   { required: true, message: "法人不能为空", trigger: "change" },
-        // ],
-        // establishTime: [
-        //   {
-        //     required: true,
-        //     message: "请选择成立日期",
-        //     trigger: "change",
-        //   },
-        // ],
-        // biller: [
-        //   {
-        //     required: true,
-        //     message: "开票员不能为空",
-        //     trigger: "blur",
-        //   },
-        // ],
       },
       interiorRules: {
         //卡表单规则
@@ -493,18 +469,14 @@ export default {
   },
   mounted() {},
   methods: {
-    addYear() {
-      this.$emit("addYear");
-    },
-    removeYear() {
-      this.$emit("removeYear");
-    },
+    //账户类别change事件
     outChange(e) {
       this.$nextTick(() => {
         this.$refs.formData.clearValidate();
       });
       this.$emit("outChange", e);
     },
+    //证书有效期change事件
     setDateInterval(e) {
       this.$emit("setDateInterval", e);
     },

+ 25 - 47
src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -14,20 +14,6 @@
             <el-option label="外部账户" value="1"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="账户性质" label-width="95px" prop="accountQuality">
-          <el-select
-            v-model="queryFrom.accountQuality"
-            placeholder="请选择账户性质"
-            clearable
-          >
-            <el-option
-              v-for="item in account_qualityData"
-              :key="item.value + 'aa'"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="户名" label-width="95px" prop="invCompanyName">
           <el-input
             v-model="queryFrom.accountName"
@@ -439,7 +425,7 @@ export default {
   mounted() {},
   data() {
     return {
-      type: 1, //1为账户信息,2为卡信息
+      type: 1, //1为账户信息,2为卡信息 账户和卡判断条件
       /**
        * 账户收入模块
        */
@@ -447,8 +433,7 @@ export default {
       collectionData: [], //收入  转账方下拉菜单数组
       fundFlowData: [], //资金用途字典数据
       payment_methodsData: [], //收入  支付方式字典数据
-      inComeFormData: {
-        //收入form表单
+      inComeFormData: {//收入form表单
         collectionMessage: "", //收款名字
         fundFlow: "", //资金流向
         applyAmount: "", //金额
@@ -457,8 +442,7 @@ export default {
         payMethod: [], //转账方
         fundUse: "", //资金用途
       },
-      inComeFormRules: {
-        //收入规则
+      inComeFormRules: {//收入规则
         company: [
           { required: true, message: "转账方不能为空", trigger: "change" },
         ],
@@ -476,9 +460,7 @@ export default {
       operationWidth: 200, //操作列宽度
       account_qualityData: [], //账户性质数据字典
       nature_businessData: [], //营业性质数据字典
-      queryFrom: {
-        //查询条件
-        // accountQuality: "", //账户性质查询
+      queryFrom: {//查询条件
         bankCardNum: "", //银行卡号查询
         accountName: "", //户名查询
       },
@@ -487,12 +469,11 @@ export default {
       button2Name: "收入",
       expendButton1Name: "确认已转账",
       formDataId: "", //数据Id
-      pageRequest: {
-        // 列表查询条件
+      pageRequest: {// 列表查询条件
         pageNo: 1,
         pageSize: 10,
       },
-      // 数据列
+      // 账户表格数据列
       columns: [
         {
           prop: "outerFlagName",
@@ -567,8 +548,7 @@ export default {
           sortable: false,
         },
       ],
-      //子部数据列
-      childColums: [
+      childColums: [//卡表格数据列
         {
           prop: "accountQualityName",
           label: "账户性质",
@@ -581,14 +561,24 @@ export default {
           minWidth: 170,
           sortable: false,
         },
-        { prop: "bank", label: "开户行", minWidth: 300, sortable: false },
+        { 
+         prop: "bank",
+         label: "开户行", 
+         minWidth: 300, 
+         sortable: false 
+        },
         {
           prop: "bankName",
           label: "开户行名称",
           minWidth: 300,
           sortable: false,
         },
-        { prop: "bankNum", label: "开户行号", minWidth: 150, sortable: false },
+        { 
+          prop: "bankNum",
+          label: "开户行号",
+          minWidth: 150,
+          sortable: false
+        },
         {
           prop: "balance",
           label: "余额",
@@ -619,12 +609,6 @@ export default {
           minWidth: 120,
           sortable: false,
         },
-        {
-          prop: "insuranceProfit",
-          label: "保险公司回款",
-          minWidth: 120,
-          sortable: false,
-        },
         {
           prop: "priDayLines",
           label: "对私单日限额",
@@ -699,7 +683,6 @@ export default {
         businessQuality: "", //营业性质
         establishTime: "", //成立日期
         invoicingAmount: 0, //开票额度
-        // invoicingAmountExcess:0,//剩余开票额度
         juridicalPerson: "", //法人
         owned: "", //所属地
         biller: "", //开票员
@@ -717,7 +700,6 @@ export default {
         dayStrokeNum: 0, //单日转账笔数限制
         dayStrokeNumExcess: 0, //单日转账笔数剩余
         fiscalProfit: 0, //	财务公司利润
-        insuranceProfit: 0, //保险公司回款
         priDayLines: 0, //对私单日限额
         priDayLinesExcess: 0, //对私单日限额剩余
         priSingleLines: 0, //对私单笔限额
@@ -733,8 +715,7 @@ export default {
       /**
        * 支出模块
        */
-      expendColumns: [
-        // 支出数据列
+      expendColumns: [//支出表格数据列
         {
           prop: "company",
           label: "转账方",
@@ -766,8 +747,7 @@ export default {
           sortable: false,
         },
       ],
-      expendPageResult: {
-        //支出表格参数
+      expendPageResult: {//支出表格参数
         pageNo: 1,
         pageSize: 10,
       },
@@ -918,7 +898,7 @@ export default {
       this.$api.expense.getAccountByAccountName().then((res) => {
         if (res.code == 200) {
           let arr = [];
-          /**获取所有外部用户 */
+          /**获取所有用户信息 */
           // let outArr = res.data.filter((item) => item.outerFlag == 1);
           res.data.forEach((item) => {
             if (item.invAccountCardList != null) {
@@ -1035,7 +1015,7 @@ export default {
           this.expendPageResult = {
             content: res.data.records,
             pageNum: res.data.current,
-            pageSize: res.data.size,
+            pageSize: res.data.size, 
             totalPages: res.data.pages,
             totalSize: res.data.total,
           };
@@ -1118,7 +1098,6 @@ export default {
     //数据字典
     business(typeName) {
       this.$api.dict.findByLableName(typeName).then((res) => {
-        // this.account_qualityData = res.data;
         this[typeName + "Data"] = res.data;
         if (typeName == "account_quality" && this.accountData.length == 0) {
           this.findPage();
@@ -1196,14 +1175,14 @@ export default {
     resetForm() {
       this.dialogFormVisible = false;
       this.formDataId = "";
-      if (this.type == 1) {
+      //账户信息form值清空
+      if (this.type == 1) { 
         this.accountFormData = {
           outerFlag: "0", //账户类别
           accountName: "", //户名
           businessQuality: "", //营业性质
           establishTime: "", //成立日期
           invoicingAmount: 0, //开票额度
-          // invoicingAmountExcess:0,//剩余开票额度
           juridicalPerson: "", //法人
           owned: "", //所属地
           tentativeEstimates: "", //暂估值
@@ -1220,7 +1199,6 @@ export default {
           dayStrokeNum: 0, //单日转账笔数限制
           dayStrokeNumExcess: 0, //单日转账笔数剩余
           fiscalProfit: 0, //	财务公司利润
-          insuranceProfit: 0, //保险公司回款
           priDayLines: 0, //对私单日限额
           priDayLinesExcess: 0, //对私单日限额剩余
           priSingleLines: 0, //对私单笔限额

+ 2 - 2
src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -496,7 +496,7 @@ export default {
       pageRequest: {
         // 列表查询条件
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
         invoiceTime: "", //开票日期
         invoiceBy: "", //开票方
         biller: "", //开票员
@@ -1028,7 +1028,7 @@ export default {
     // 查询
     queryStaffInfo() {
       this.pageRequest.pageNo = 1;
-      this.pageRequest.pageSize = 10;
+      this.pageRequest.pageSize = 20;
       this.findPage();
     },
   },