Finish Hotfix-chen-1

src/api/finance/receivable_list.js

@@ -1,68 +1,75 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 其他应收单-新增
 export function getFinanceOtherReceAdd(data) {
-    return request({
-      url: '/finance/other/rece/add',
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: "/finance/other/rece/add",
+    method: "post",
+    data,
+  });
+}
 // 经销商列表
 export function getCustomerList(params) {
-    return request({
-      url: '/customer/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/customer/list",
+    method: "get",
+    params,
+  });
+}
 // 经销商钱包列表
 export function getFinanceCustomerList(params) {
-    return request({
-      url: '/finance/customer/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/finance/customer/list",
+    method: "get",
+    params,
+  });
+}
 // 其他应收单-列表
 export function getFinanceOtherReceList(params) {
-    return request({
-      url: '/finance/other/rece/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/finance/other/rece/list",
+    method: "get",
+    params,
+  });
+}
 
 // 其他应收单-提审
 export function getFinanceOtherReceApply(params) {
-    return request({
-      url: '/finance/other/rece/apply',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: "/finance/other/rece/apply",
+    method: "post",
+    params,
+  });
+}
 // 其他应收单-详情
 export function getFinanceOtherReceDetail(params) {
-    return request({
-      url: '/finance/other/rece/detail',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/finance/other/rece/detail",
+    method: "get",
+    params,
+  });
+}
 // 其他应收单-审核
 export function getFinanceOtherReceExamine(params) {
-    return request({
-      url: '/finance/other/rece/examine',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: "/finance/other/rece/examine",
+    method: "post",
+    params,
+  });
+}
 // 其他应收单-删除
 export function getFinanceOtherReceDelete(params) {
-    return request({
-      url: '/finance/other/rece/delete',
-      method: 'post',
-      params
-    })
-  }
-
+  return request({
+    url: "/finance/other/rece/delete",
+    method: "post",
+    params,
+  });
+}
+// // 其他应收单-弃审
+// export function getFinanceOtherReceAbandon(params) {
+//   return request({
+//     url: "/finance/other/rece/abandon",
+//     method: "post",
+//     params,
+//   });
+// }

src/views/basic_data/dealer/dealer_apply.vue

@@ -45,7 +45,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="24" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="clearFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"

src/views/basic_data/dealer/dealer_deposit.vue

@@ -147,7 +147,7 @@
           <el-table-column
             align="center"
             label="操作"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
             fixed="right"
           >
@@ -159,6 +159,12 @@
                 @click="editFn(scope.row.id)"
                 >编辑</el-button
               >
+              <el-button
+                type="text"
+                class="textColor"
+                @click="logFn(scope.row.id)"
+                >记录</el-button
+              >
               <el-popconfirm
                 @onConfirm="deleFn(scope.row.id)"
                 v-if="$checkBtnRole('del', $route.meta.roles)"
@@ -410,6 +416,9 @@ export default {
     //     this.$message.warning("已选定额押金,如需选择押金比例,请把定额押金归零");
     //   }
     // },
+
+    //记录
+    logFn() {},
     //取消
     async cancelFn() {
       this.dialogForm = {

src/views/basic_data/wallet/wallet_list.vue

@@ -37,7 +37,7 @@
             </el-form-item>
           </el-col> -->
 
-          <el-col :xs="24" :sm="24" :lg="18" class="tr">
+          <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="clearFn">清空</el-button>
               <el-button size="small" type="primary" @click="searchFn"

src/views/engin_deposit/refund_list.vue

@@ -88,7 +88,7 @@
               </el-form-item>
             </el-col> -->
 
-            <el-col :xs="24" :sm="24" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="resetFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"

src/views/finance/account_list.vue

@@ -36,6 +36,7 @@
                   v-model="searchForm.customerWalletId"
                   class="selectStyle"
                   placeholder="请选择"
+                  filterable
                 >
                   <el-option
                     v-for="(v, i) in walletList"
@@ -81,7 +82,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="18">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="clearFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"

src/views/finance/balance_sum.vue

@@ -26,7 +26,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="24">
+          <el-col :xs="24" :sm="24" :lg="12">
             <el-form-item label="" class="fr">
               <el-button size="small">清空</el-button>
               <el-button size="small" type="primary" @click="searchFn"

src/views/finance/credit_list.vue

@@ -29,7 +29,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="18">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="clearFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"

src/views/finance/receivable_list.vue

@@ -75,7 +75,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="18">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="clearFn">清空</el-button>
                 <el-button size="small" type="primary" @click="searchFn"
@@ -233,6 +233,13 @@
                   @click="approvalFn(scope.row.id)"
                   >审批</el-button
                 >
+                <!-- <el-button
+                  type="text"
+                  class="textColor"
+                  v-show="scope.row.examineStatus == 'OK'"
+                  @click="unApprovalFn(scope.row.id)"
+                  >弃审</el-button
+                > -->
                 <el-button
                   type="text"
                   class="textColor"
@@ -272,6 +279,7 @@
 import {
   getFinanceOtherReceList,
   getFinanceOtherReceDelete,
+  getFinanceOtherReceAbandon,
 } from "@/api/finance/receivable_list";
 import ReceivableListAdd from "./components/receivable_list-add";
 import ReceivableListApproval from "./components/receivable_list-approval";
@@ -318,6 +326,16 @@ export default {
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
   },
   methods: {
+    // //弃审
+    // async unApprovalFn(id) {
+    //   await getFinanceOtherReceAbandon({ id });
+    //   this.$message.success("弃审成功");
+    //   this.getDataList({
+    //     pageNum: 1,
+    //     pageSize: this.pageSize,
+    //     examineStatus: this.examine,
+    //   });
+    // },
     //radio切换'
     changeRadioGroupFn(v) {
       this.getDataList({

src/views/finance/standbook_list.vue

@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="24" :lg="18">
+          <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
               <el-button size="small" @click="resetFn">清空</el-button>
               <el-button size="small" type="primary" @click="searchFn"
@@ -450,7 +450,7 @@ import {
   getDictList,
   getCustomerList,
 } from "@/api/finance/standbook_list";
-import { number } from "echarts";
+
 export default {
   data() {
     return {
@@ -501,6 +501,35 @@ export default {
     // this.getDataDict();
   },
   methods: {
+    //合计
+    getSummaries(param) {
+      // console.log(this.$getSummaries, 333333333);
+      console.log(param, "param");
+      // const { columns, data } = param;
+      // const sums = [];
+      // columns.forEach((column, index) => {
+      //   if (index === 0) {
+      //     sums[index] = "总价";
+      //     return;
+      //   }
+      //   const values = data.map((item) => Number(item[column.property]));
+      //   if (!values.every((value) => isNaN(value))) {
+      //     sums[index] = values.reduce((prev, curr) => {
+      //       const value = Number(curr);
+      //       if (!isNaN(value)) {
+      //         return prev + curr;
+      //       } else {
+      //         return prev;
+      //       }
+      //     }, 0);
+      //     sums[index] += " 元";
+      //   } else {
+      //     sums[index] = "N/A";
+      //   }
+      // });
+
+      // return sums;
+    },
     //改变经销商
     async changeFn(v) {
       this.searchForm.customerWalletId = "";

src/views/finance/wallet.vue

@@ -34,7 +34,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="24" :lg="18">
+          <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
               <el-button size="small" @click="resetFn">清空</el-button>
               <el-button size="small" type="primary" @click="searchFn"