Explorar el Código

Finish Hotfix-94

chen hace 3 años
padre
commit
7d1044d2e7
Se han modificado 1 ficheros con 67 adiciones y 63 borrados
  1. 67 63
      src/views/finance/standbook_list.vue

+ 67 - 63
src/views/finance/standbook_list.vue

@@ -200,11 +200,11 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="120" show-overflow-tooltip>
+            <!-- <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
         <!-- 分页
@@ -324,9 +324,13 @@
 
 <script>
 // import { mapGetters } from "vuex";
-import { getWalletCustomerList } from '@/api/finance/change_apply'
-import { getAmountCount, getCustomerList, getStandbookList } from '@/api/finance/standbook_list'
-import { numToFixed } from '@/filters'
+import { getWalletCustomerList } from "@/api/finance/change_apply";
+import {
+  getAmountCount,
+  getCustomerList,
+  getStandbookList,
+} from "@/api/finance/standbook_list";
+import { numToFixed } from "@/filters";
 
 export default {
   data() {
@@ -350,8 +354,8 @@ export default {
         billNo: "",
         startTime: "",
         endTime: "",
-        customerNumber:'',
-        billType: '',
+        customerNumber: "",
+        billType: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
 
@@ -360,35 +364,37 @@ export default {
       isDisabled: false,
       isCustomerList: {
         customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
-        customerName: JSON.parse(localStorage.getItem("supply_user")).customerName,
-        customerNumber: JSON.parse(localStorage.getItem("supply_user")).customerNumber,
+        customerName: JSON.parse(localStorage.getItem("supply_user"))
+          .customerName,
+        customerNumber: JSON.parse(localStorage.getItem("supply_user"))
+          .customerNumber,
       },
       typeList: [
-        '收款单',
-        '退款单',
-        '返利单',
-        '零售单扣款',
-        '申请发货单',
-        '零售订单退款',
-        '退货单退单',
-        '家用工程订单扣款-审批',
-        '家用工程订单押金',
-        '家用工程订单退押金',
-        '家用工程订单返利退款-退订',
-        '零售单返利扣款',
-        '零售单返利退款',
-        '直接调拨单销售退库单订单返利退款-退货单',
-        '直接调拨单销售退库单订单退款-退货单',
-        '商用工程订单扣款-审批',
-        '商用工程订单返利扣款-审批',
-        '商用工程申请发货订单返利退款-退货单',
-        '商用工程发货申请发货订单退款-退货单',
-        '商用工程销售退库单单返利退款-退货单',
-        '商用工程发货销售退库单订单退款-退货单',
-        '家用工程订单退款-弃审',
-        '家用工程订单返利扣款-审批',
-        '家用工程订单返利退款-弃审'
-      ]
+        "收款单",
+        "退款单",
+        "返利单",
+        "零售单扣款",
+        "申请发货单",
+        "零售订单退款",
+        "退货单退单",
+        "家用工程订单扣款-审批",
+        "家用工程订单押金",
+        "家用工程订单退押金",
+        "家用工程订单返利退款-退订",
+        "零售单返利扣款",
+        "零售单返利退款",
+        "直接调拨单销售退库单订单返利退款-退货单",
+        "直接调拨单销售退库单订单退款-退货单",
+        "商用工程订单扣款-审批",
+        "商用工程订单返利扣款-审批",
+        "商用工程申请发货订单返利退款-退货单",
+        "商用工程发货申请发货订单退款-退货单",
+        "商用工程销售退库单单返利退款-退货单",
+        "商用工程发货销售退库单订单退款-退货单",
+        "家用工程订单退款-弃审",
+        "家用工程订单返利扣款-审批",
+        "家用工程订单返利退款-弃审",
+      ],
     };
   },
   computed: {
@@ -515,31 +521,28 @@ export default {
 
   // },
   created() {
-
-
-    if (this.$route.query && this.$route.query.status){
-
-this.bill = this.$route.query.status
-this.changeFn(this.bill)
-//只有是从A进到B页面才执行
-  // 将要执行的逻辑
-  this.isShow = true;
-  this.isDisabled = true;
-  this.searchForm.customerId = this.$route.query.customerId;
-  this.changeFn(this.$route.query.customerId);
-  this.getDataList({
-    pageSize: this.pageSize,
-    pageNum: this.currentPage,
-    type: this.bill,
-    customerName: this.$route.query.customerName,
-    customerNumber: this.$route.query.customerNumber,
-  });
-  this.getAmountList({
-    type: this.bill,
-    customerName: this.$route.query.customerName,
-    customerNumber: this.$route.query.customerNumber,
-  });
-}
+    if (this.$route.query && this.$route.query.status) {
+      this.bill = this.$route.query.status;
+      this.changeFn(this.bill);
+      //只有是从A进到B页面才执行
+      // 将要执行的逻辑
+      this.isShow = true;
+      this.isDisabled = true;
+      this.searchForm.customerId = this.$route.query.customerId;
+      this.changeFn(this.$route.query.customerId);
+      this.getDataList({
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+        type: this.bill,
+        customerName: this.$route.query.customerName,
+        customerNumber: this.$route.query.customerNumber,
+      });
+      this.getAmountList({
+        type: this.bill,
+        customerName: this.$route.query.customerName,
+        customerNumber: this.$route.query.customerNumber,
+      });
+    }
 
     // console.log(
 
@@ -898,13 +901,14 @@ this.changeFn(this.bill)
           pageNum: this.currentPage,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber || this.searchForm.customerNumber,
+          customerNumber:
+            this.$route.query.customerNumber || this.searchForm.customerNumber,
         });
         this.getAmountList({
           ...this.searchForm,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber  ,
+          customerNumber: this.$route.query.customerNumber,
         });
       } else if (this.isCustomer) {
         this.getDataList({
@@ -923,7 +927,7 @@ this.changeFn(this.bill)
         this.getDataList({
           ...this.searchForm,
           customerName: this.customerName,
-          customerNumber: this.customerNumber  || this.searchForm.customerNumber,
+          customerNumber: this.customerNumber || this.searchForm.customerNumber,
 
           pageSize: this.pageSize,
           pageNum: this.currentPage,
@@ -933,7 +937,7 @@ this.changeFn(this.bill)
           ...this.searchForm,
           type: this.bill,
           customerName: this.customerName,
-          customerNumber: this.customerNumber  ,
+          customerNumber: this.customerNumber,
         });
       }
     },