返利单完成,收款单部分,修复bug

src/api/finance/credit_list.js

@@ -57,4 +57,12 @@ export function getWalletCustomerList(params) {
       params
     })
   }
+// 经销商列表
+export function getCustomerList(params) {
+    return request({
+      url: '/customer/list',
+      method: 'get',
+      params
+    })
+  }
 

src/api/finance/receipt_list.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 收款单列表
+export function getK3ReceiptList(params) {
+    return request({
+      url: '/k3/receipt/list',
+      method: 'get',
+      params
+    })
+  }

src/views/finance/change_apply.vue

@@ -6,6 +6,7 @@
     <div>
       <el-form
         ref="searchForm"
+        :rules="rules"
         :model="searchForm"
         label-width="100px"
         size="small"
@@ -18,8 +19,15 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="单据日期" prop="theTime">
+              <el-date-picker
+                class="dateStyle"
+                v-model="searchForm.theTime"
+                placeholder="选择日期"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -188,9 +196,19 @@ export default {
       searchForm: {
         customerId: "",
         customerName: "",
+        theTime: null,
       },
       customerData: [], //经销商数据
       typeList: [], //返利类型数据
+      rules: {
+        theTime: [
+          {
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
+      },
     };
   },
   computed: {
@@ -278,7 +296,8 @@ export default {
       //   initiatorRemark,
       //   amount: amount * 1,
       // });
-      console.log(this.dataList);
+
+      await this.$refs.searchForm.validate(["theTime"]);
       if (this.dataList[0].money > 0) {
         receiverWalletRebateId = this.dataList[0].name;
         initiatorWalletRebateId = this.dataList[1].name;
@@ -293,6 +312,7 @@ export default {
         amount = this.dataList[1].money;
       }
       await getTransferAdd({
+        theTime: this.theTime,
         receiverWalletRebateId,
         initiatorWalletRebateId,
         receiverRemark,
@@ -323,5 +343,8 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+.dateStyle {
+  width: 100%;
+}
 </style>

src/views/finance/components/rebate_list-apply.vue

@@ -14,27 +14,42 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利单号" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.rebateOrderId"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.theTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.remark"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.createBy"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.createTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -75,55 +90,112 @@
           <el-table-column
             label="序号"
             align="center"
-            min-width="100"
+            width="100"
+            type="index"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="经销商简称"
-            prop=""
+            label="返利类型"
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利类型"
-            prop=""
+            label="返利总金额"
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利金额"
-            prop=""
+            label="暂扣返利"
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="暂扣返利"
-            prop=""
+            label="政策文件流水号"
+            prop="policyFileNo"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="备注"
-            prop=""
+            label="政策文号"
+            prop="policyDocNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策年份"
+            prop="policyYear"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策月份"
+            prop="policyMonth"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策归属部门"
+            prop="policyOrg"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户区域"
+            prop="customerArea"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户属性"
+            prop="customerAttr"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="奖励实际归属客户"
+            prop="rewardActualCustomers"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注1"
+            prop="remark1"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注2"
+            prop="remark2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -137,7 +209,7 @@
       <div class="table">
         <el-table
           v-loading="listLoading"
-          :data="dataList"
+          :data="dataList2"
           element-loading-text="Loading"
           border
           fit
@@ -154,35 +226,35 @@
           <el-table-column
             align="center"
             label="返利单号"
-            prop=""
+            prop="rebateOrderId"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="返利类型"
-            prop=""
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="总返利金额"
-            prop=""
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -196,87 +268,158 @@
           <el-table-column
             align="center"
             label="折让金额"
-            prop=""
+            prop="allowanceAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="暂扣返利"
-            prop=""
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="折让编号"
-            prop=""
+            prop="allowanceCode"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.allowanceCode"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="折让账号"
-            prop=""
+            prop="allowanceAccount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.allowanceAccount"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="已办理折让金额"
-            prop=""
+            prop="handledAllowanceAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="折让对应收款单号"
-            prop=""
+            prop="allowanceOrderNo"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="确认人"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="确认日期"
-            prop=""
+            prop="customerConfirmTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="复核人"
-            prop=""
+            prop="secondExamineBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="复核日期"
-            prop=""
+            prop="secondExamineTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
         </el-table>
       </div>
     </div>
-    <el-button type="primary" size="small">确定</el-button>
-    <el-button type="primary" size="small">重置</el-button>
+    <span>审批记录</span>
+    <el-divider></el-divider>
+    <div class="diy-table-1">
+      <el-row :gutter="0">
+        <el-col :span="12" class="item">
+          <div class="label">审批人</div>
+          <div class="value">{{ examineBy }}</div>
+        </el-col>
+        <el-col :span="12" class="item">
+          <div class="label">审批结果</div>
+          <div class="value">
+            <el-radio v-model="examineStatus" label="OK">通过</el-radio>
+            <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
+          </div>
+        </el-col>
+        <el-col :span="24" class="item">
+          <div class="label">审批说明</div>
+          <div class="value">
+            <el-input
+              v-model="examineRemark"
+              placeholder="请输入内容"
+            ></el-input>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
+import { getRebateOrderDetail } from "@/api/finance/rebate_list";
 export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: [], // 列表数据
+      dataList2: [], // 列表数据
+      searchForm: {}, //搜索表单
+      listLoading: false, // 列表加载loading
+      examineBy: "",
+      examineRemark: "",
+      examineStatus: "",
+    };
+  },
+  created() {
+    this.getDataList();
+  },
   methods: {
     goBack() {
       this.$parent.showPage = 1;
     },
+    //获取详情数据
+    async getDataList() {
+      let res = await getRebateOrderDetail({ id: this.detailId });
+      console.log(res, 11111);
+      this.searchForm.rebateOrderId = res.data.id;
+      this.searchForm.theTime = res.data.theTime;
+      this.searchForm.createBy = res.data.createBy;
+      this.searchForm.createTime = res.data.createTime;
+      this.searchForm.remark = res.data.remark;
+      this.dataList = res.data.items;
+      this.dataList2 = res.data.items;
+      this.examineBy = res.data.examineBy;
+      this.examineRemark = res.data.examineRemark;
+      this.examineStatus = res.data.examineStatus;
+    },
   },
 };
 </script>

src/views/finance/components/rebate_list-confirm.vue

@@ -156,7 +156,10 @@
 </template>
 
 <script>
-import { getRebateOrderDetail } from "@/api/finance/rebate_list";
+import {
+  getRebateOrderDetail,
+  getRebateOrderAck,
+} from "@/api/finance/rebate_list";
 export default {
   props: {
     detailId: {
@@ -182,20 +185,23 @@ export default {
   },
   methods: {
     //确定
-    btnFn() {
+    async btnFn() {
       console.log(this.dataList);
       const res = this.dataList.map((v) => {
         return {
           allowanceAmount: v.allowanceAmount,
           rebateAmount: v.amount,
+          itemId: v.id,
         };
       });
       console.log(res, 888);
+      await getRebateOrderAck([{ ...res[0] }]);
+      this.$message.success("确认成功");
     },
     //获取详情数据
     async getDataList() {
       let res = await getRebateOrderDetail({ id: this.detailId });
-
+      this.okId = res.data.id;
       this.searchForm.rebateOrderId = res.data.id;
       this.searchForm.theTime = res.data.theTime;
       this.searchForm.createBy = res.data.createBy;

src/views/finance/components/rebate_list-detail.vue

@@ -16,27 +16,42 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利单号" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.rebateOrderId"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.theTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.remark"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.createBy"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单日期" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                v-model="searchForm.createTime"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -77,55 +92,112 @@
           <el-table-column
             label="序号"
             align="center"
-            min-width="100"
+            width="100"
+            type="index"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商编码"
-            prop=""
+            prop="customerNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="经销商名称"
-            prop=""
+            prop="customerName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="经销商简称"
-            prop=""
+            label="返利类型"
+            prop="walletName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利类型"
-            prop=""
+            label="返利总金额"
+            prop="amount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利金额"
-            prop=""
+            label="暂扣返利"
+            prop="withholdAmount"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="暂扣返利"
-            prop=""
+            label="政策文件流水号"
+            prop="policyFileNo"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策文号"
+            prop="policyDocNo"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="备注"
-            prop=""
+            label="政策年份"
+            prop="policyYear"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策月份"
+            prop="policyMonth"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="政策归属部门"
+            prop="policyOrg"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户区域"
+            prop="customerArea"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="客户属性"
+            prop="customerAttr"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="奖励实际归属客户"
+            prop="rewardActualCustomers"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注1"
+            prop="remark1"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注2"
+            prop="remark2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -138,21 +210,22 @@
       <el-row :gutter="0">
         <el-col :span="12" class="item">
           <div class="label">审批人</div>
-          <div class="value">2022123233435342</div>
+          <div class="value">{{ examineBy }}</div>
         </el-col>
         <el-col :span="12" class="item">
           <div class="label">审批结果</div>
           <div class="value">
-            <el-radio-group>
-              <el-radio :label="true">通过</el-radio>
-              <el-radio :label="false">弃审</el-radio>
-            </el-radio-group>
+            <el-radio v-model="examineStatus" label="OK">通过</el-radio>
+            <el-radio v-model="examineStatus" label="FAIL">驳回</el-radio>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">审批说明</div>
           <div class="value">
-            <el-input placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="examineRemark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
       </el-row>
@@ -161,7 +234,14 @@
 </template>
 
 <script>
+import { getRebateOrderDetail } from "@/api/finance/rebate_list";
 export default {
+  props: {
+    detailId: {
+      type: String,
+      required: true,
+    },
+  },
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -170,12 +250,37 @@ export default {
       dataList: [], // 列表数据
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
+      examineBy: "",
+      examineRemark: "",
+      examineStatus: "",
     };
   },
+  created() {
+    this.getDataList();
+  },
   methods: {
     goBack() {
       this.$parent.showPage = 1;
     },
+    //获取详情数据
+    async getDataList() {
+      let res = await getRebateOrderDetail({ id: this.detailId });
+      console.log(res, 11111);
+      this.searchForm.rebateOrderId = res.data.id;
+      this.searchForm.theTime = res.data.theTime;
+      this.searchForm.createBy = res.data.createBy;
+      this.searchForm.createTime = res.data.createTime;
+      this.searchForm.remark = res.data.remark;
+      this.dataList = res.data.items;
+      this.examineBy = res.data.examineBy;
+      this.examineRemark = res.data.examineRemark;
+      if (res.data.examineStatus == "OK_ONE") {
+        this.examineStatus = "OK";
+      }
+      if (res.data.examineStatus == "FAIL_ONE") {
+        this.examineStatus = "FAIL";
+      }
+    },
   },
 };
 </script>

src/views/finance/components/rebate_list-review.vue

@@ -217,6 +217,7 @@
           fit
           highlight-current-row
           stripe
+          @selection-change="selectionChangeFn"
         >
           <el-table-column
             align="center"
@@ -401,6 +402,7 @@ export default {
       },
       dataList: [],
       dataList2: [],
+      selectArr: null,
       listLoading: false, // 列表加载loading
     };
   },
@@ -408,12 +410,18 @@ export default {
     this.getDataList();
   },
   methods: {
+    //选择项发生改变
+    selectionChangeFn(row) {
+      console.log(row);
+      this.selectArr = row;
+    },
     //确定
     async btnFn() {
       await getRebateOrderExamine2({
         id: this.detailId,
         examineRemark: this.examineRemark,
         examineStatus: this.examineStatus,
+        items: this.selectArr,
       });
       this.$message.success("复核成功");
     },

src/views/finance/components/receivable_list-add.vue

@@ -208,7 +208,11 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.afterTaxAmount"></el-input>
+              <el-input
+                :min="0"
+                oninput="if(value<0)value=0"
+                v-model="scope.row.afterTaxAmount"
+              ></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -219,7 +223,11 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.tax"></el-input>
+              <el-input
+                :min="0"
+                oninput="if(value<0)value=0"
+                v-model="scope.row.tax"
+              ></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -230,7 +238,11 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.totalAmount"></el-input>
+              <el-input
+                :min="0"
+                oninput="if(value<0)value=0"
+                v-model="scope.row.totalAmount"
+              ></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -331,6 +343,7 @@ export default {
       await getFinanceOtherReceApply({ id: res.data.records[0].id });
       this.$message.success("提审成功");
       this.$emit("updateList");
+      this.$parent.showPage = 1;
       this.resetFn();
     },
     //选择经销商名称事件

src/views/finance/components/receivable_list-approval.vue

@@ -303,6 +303,7 @@ export default {
         examineStatus: this.examineStatus,
       });
       this.$emit("updateList");
+      this.$parent.showPage = 1;
       this.$message.success("审核成功");
     },
     async getDataList() {

src/views/finance/credit_list.vue

@@ -12,38 +12,23 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="customerNumber">
-                <el-input
-                  v-model="searchForm.customerNumber"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerName">
-                <el-input
-                  v-model="searchForm.customerName"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关联钱包" prop="walletName">
-                <el-input
-                  v-model="searchForm.walletName"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="总信用额度" prop="amount">
-                <el-input
-                  v-model="searchForm.amount"
-                  placeholder="请输入"
-                ></el-input>
+              <el-form-item label="经销商名称" prop="customerId">
+                <el-select
+                  class="selectStyle"
+                  v-model="searchForm.customerId"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="v in customerList"
+                    :key="v.id"
+                    :label="v.name"
+                    :value="v.id"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
                 <el-button size="small" @click="clearFn">清空</el-button>
@@ -207,6 +192,7 @@
 import {
   getCreditListEdit,
   getWalletCustomerList,
+  getCustomerList,
 } from "@/api/finance/credit_list";
 import CreditListDetail from "./components/credit_list-detail";
 import { downloadFiles } from "@/utils/util";
@@ -221,10 +207,7 @@ export default {
       // listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       searchForm: {
-        customerNumber: "",
-        customerName: "",
-        amount: "",
-        walletName: "",
+        customerId: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
       showRecord: true,
@@ -236,6 +219,7 @@ export default {
       },
       data: null,
       recordsListId: {}, //记录
+      customerList: null,
 
       rules: {
         startTime: [
@@ -263,8 +247,15 @@ export default {
   },
   created() {
     this.getDataList({ type: "COMMONLY" });
+    this.getCustomerData({ pageSize: -1, pageNum: 1 });
   },
   methods: {
+    //获取经销商列表
+    async getCustomerData(data) {
+      const res = await getCustomerList(data);
+      console.log(res);
+      this.customerList = res.data.records;
+    },
     //设置额度
     editFn(value) {
       this.data = {
@@ -288,7 +279,9 @@ export default {
       this.$refs.searchForm.resetFields();
     },
     //搜索
-    searchFn() {},
+    searchFn() {
+      this.getDataList({ ...this.searchForm, type: "COMMONLY" });
+    },
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;

src/views/finance/rebate_form.vue

@@ -79,6 +79,8 @@
           fit
           highlight-current-row
           stripe
+          :row-class-name="rouClassNameFn"
+          @row-click="onRowClick"
         >
           <el-table-column
             align="center"
@@ -135,9 +137,9 @@
               >
                 <el-option
                   v-for="item in scope.row.walletList"
-                  :key="item.walletRebateId"
+                  :key="item.customerWalletId"
                   :label="item.name"
-                  :value="item.walletRebateId"
+                  :value="item.customerWalletId"
                 >
                 </el-option>
               </el-select>
@@ -287,13 +289,17 @@
         <el-button type="primary" size="small" @click="submitFn"
           >提交审批</el-button
         >
-        <el-button type="primary" size="small">重置</el-button>
+        <el-button type="primary" size="small" @click="cancelFn"
+          >重置</el-button
+        >
       </div>
       <div class="fr">
         <el-button type="primary" size="small" @click="addRowFn"
           >添加行</el-button
         >
-        <el-button type="primary" size="small">删除行</el-button>
+        <el-button type="primary" size="small" @click="delRowFn"
+          >删除行</el-button
+        >
       </div>
     </div>
   </div>
@@ -319,19 +325,41 @@ export default {
         remark: "",
         createBy: "",
       },
+      delIndex: null,
     };
   },
   created() {
     this.getCustomerData();
   },
   methods: {
+    //重置
+    cancelFn() {
+      this.searchForm = {
+        theTime: "",
+        createTime: "",
+        remark: "",
+        createBy: "",
+      };
+      this.dataList = [];
+    },
+    rouClassNameFn({ row, rowIndex }) {
+      //把每一行的索引放进row
+      row.index = rowIndex;
+    },
+    onRowClick(row, event, column) {
+      this.delIndex = row.index;
+    },
+    //删除行
+    delRowFn() {
+      this.dataList.splice(this.delIndex, 1);
+    },
     //提交审批
     async submitFn() {
       let res = await getRebateOrderList({ pageSize: -1, pageNum: 1 });
       console.log(res);
       let index = res.data.records.length - 1;
       let arr = res.data.records;
-      await getRebateOrderApply({ id: arr[index].id });
+      await getRebateOrderApply({ id: arr[index].rebateOrderId });
       this.$message.success("提交审批成功");
     },
     //新增

src/views/finance/rebate_list.vue

@@ -12,32 +12,60 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="">
-                <el-input placeholder="请输入经销商名称"></el-input>
+              <el-form-item label="经销商名称" prop="customerName">
+                <el-input
+                  v-model="searchForm.customerName"
+                  placeholder="请输入经销商名称"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利类型" prop="">
-                <el-input placeholder="请输入"></el-input>
+              <el-form-item label="返利类型" prop="walletName">
+                <el-input
+                  v-model="searchForm.walletName"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="">
-                <el-input placeholder="请输入"></el-input>
+              <el-form-item label="经销商编码" prop="customerNumber">
+                <el-input
+                  v-model="searchForm.customerNumber"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利日期" prop="">
-                <el-select class="selectStyle" placeholder="请选择">
-                  <el-option> </el-option>
-                </el-select>
+              <el-form-item label="开始时间" prop="startTime">
+                <el-date-picker
+                  class="selectStyle"
+                  v-model="searchForm.startTime"
+                  placeholder="选择日期"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束时间" prop="endTime">
+                <el-date-picker
+                  class="selectStyle"
+                  v-model="searchForm.endTime"
+                  placeholder="选择日期"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="24">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
+                <el-button size="small" @click="cancelFn">清空</el-button>
+                <el-button size="small" type="primary" @click="searchFn"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -62,7 +90,29 @@
               prop="examineStatus"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <el-tag v-show="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+                <el-tag v-show="scope.row.examineStatus == 'WAIT'"
+                  >待审核</el-tag
+                >
+                <el-tag v-show="scope.row.examineStatus == 'OK_ONE'"
+                  >初审通过</el-tag
+                >
+                <el-tag v-show="scope.row.examineStatus == 'FAIL_ONE'"
+                  >初审不通过</el-tag
+                >
+                <el-tag v-show="scope.row.examineStatus == 'OK'"
+                  >复核通过</el-tag
+                >
+                <el-tag v-show="scope.row.examineStatus == 'FALL'"
+                  >不通过</el-tag
+                >
+                <el-tag v-show="scope.row.examineStatus == 'CLOSE'"
+                  >已关闭</el-tag
+                >
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="返利单号"
@@ -287,7 +337,7 @@
             <el-table-column
               align="center"
               label="操作"
-              min-width="300"
+              min-width="160"
               show-overflow-tooltip
               fixed="right"
             >
@@ -295,30 +345,50 @@
                 <el-button
                   type="text"
                   class="textColor"
+                  v-show="scope.row.examineStatus == 'SAVE' && !isCustomer"
                   @click="applyFn(scope.row.rebateOrderId)"
                   >申请</el-button
                 >
                 <el-button
                   type="text"
                   class="textColor"
+                  v-show="scope.row.examineStatus == 'WAIT' && !isCustomer"
                   @click="examineFn(scope.row.rebateOrderId)"
                   >审核</el-button
                 >
                 <el-button
                   type="text"
                   class="textColor"
+                  v-show="scope.row.examineStatus == 'OK_ONE' && !isCustomer"
                   @click="reviewFn(scope.row.rebateOrderId)"
                   >复核</el-button
                 >
-                <el-button type="text" class="textColor" @click="infoFn"
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-show="
+                    (scope.row.examineStatus == 'WAIT' ||
+                      scope.row.examineStatus == 'SAVE') &&
+                    !isCustomer
+                  "
+                  @click="infoFn(scope.row.rebateOrderId)"
                   >详情</el-button
                 >
-                <el-button type="text" class="textColor" @click="detail2"
-                  >详情2</el-button
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-show="
+                    (scope.row.examineStatus == 'OK_ONE' ||
+                      scope.row.examineStatus == 'OK') &&
+                    !isCustomer
+                  "
+                  @click="detail2(scope.row.rebateOrderId)"
+                  >详情</el-button
                 >
                 <el-button
                   type="text"
                   class="textColor"
+                  v-if="isCustomer"
                   @click="confirmFn(scope.row.rebateOrderId)"
                   >确认</el-button
                 >
@@ -329,6 +399,8 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
@@ -339,7 +411,7 @@
         </div>
       </div>
     </div>
-    <RebateListApply v-else-if="showPage == 2" />
+    <RebateListApply :detailId="detailId" v-else-if="showPage == 2" />
     <RebateListExamine
       @updateList="updateList"
       :detailId="detailId"
@@ -347,7 +419,7 @@
     />
     <RebateListReview :detailId="detailId" v-else-if="showPage == 4" />
     <!-- 详情 -->
-    <RebateListDetail v-else-if="showPage == 5" />
+    <RebateListDetail :detailId="detailId" v-else-if="showPage == 5" />
     <!-- 确定 -->
     <RebateListConfirm :detailId="detailId" v-else-if="showPage == 6" />
   </div>
@@ -377,10 +449,17 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      searchForm: {}, //搜索表单
+      searchForm: {
+        customerName: "",
+        walletName: "",
+        customerNumber: "",
+        startTime: "",
+        endTime: "",
+      }, //搜索表单
       listLoading: false, // 列表加载loading
       showPage: 1,
       detailId: null,
+      isCustomer: null,
     };
   },
   created() {
@@ -388,8 +467,34 @@ export default {
       pageSize: this.pageSize,
       pageNum: this.currentPage,
     });
+    const res = JSON.parse(localStorage.getItem("supply_user"));
+
+    this.isCustomer = res.isCustomer;
   },
   methods: {
+    //清除
+    cancelFn() {
+      this.$refs.searchForm.resetFields();
+    },
+    //搜索
+    searchFn() {
+      this.getDataList({
+        ...this.searchForm,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+      });
+    },
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getDataList({ pageNum: 1, pageSize: this.pageSize });
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getDataList({ pageNum: val, pageSize: this.pageSize });
+    },
     //更新列表数据
     updateList() {
       this.getDataList({
@@ -421,14 +526,21 @@ export default {
     //申请
     async applyFn(id) {
       await getRebateOrderApply({ id });
+
+      this.getDataList({
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+      });
       this.$message.success("申请成功");
     },
     //详情2
-    detail2() {
+    detail2(id) {
+      this.detailId = id;
       this.showPage = 2;
     },
     //详情
-    infoFn() {
+    infoFn(id) {
+      this.detailId = id;
       this.showPage = 5;
     },
   },

src/views/finance/receipt_list.vue

@@ -78,28 +78,28 @@
             <el-table-column
               align="center"
               label="单据类型"
-              prop=""
+              prop="billType"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="单据编码"
-              prop=""
+              prop="billNo"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="业务日期"
-              prop=""
+              prop="theTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="币别"
-              prop=""
+              prop="bibie"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -113,14 +113,14 @@
             <el-table-column
               align="center"
               label="往来单位"
-              prop=""
+              prop="wlCompanyType"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="表头·实收金额"
-              prop=""
+              prop="amount"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -134,7 +134,7 @@
             <el-table-column
               align="center"
               label="结算方式"
-              prop=""
+              prop="settleType"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -148,14 +148,14 @@
             <el-table-column
               align="center"
               label="付款单位"
-              prop=""
+              prop="customerId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="表体·实收金额"
-              prop=""
+              prop="amount"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -169,14 +169,14 @@
             <el-table-column
               align="center"
               label="单据状态"
-              prop=""
+              prop="status"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="备注"
-              prop=""
+              prop="remark"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -212,6 +212,7 @@
 </template>
 
 <script>
+import { getK3ReceiptList } from "@/api/finance/receipt_list";
 import ReceiptListDetail from "./components/receipt_list-detail";
 export default {
   components: {
@@ -228,7 +229,15 @@ export default {
       showDetail: true,
     };
   },
+  created() {
+    this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
+  },
   methods: {
+    async getDataList(data) {
+      const res = await getK3ReceiptList(data);
+      console.log(res);
+      this.dataList = res.data.records;
+    },
     seeFn() {
       this.showDetail = false;
     },

src/views/finance/receivable_list.vue

@@ -88,7 +88,11 @@
         <div class="fl">
           <el-button type="primary" size="small" @click="addFn">新建</el-button>
 
-          <el-popconfirm @onConfirm="deleFn" title="这是一段内容确定删除吗？">
+          <el-popconfirm
+            class="delClass"
+            @onConfirm="deleFn"
+            title="这是一段内容确定删除吗？"
+          >
             <el-button slot="reference" type="primary" size="small"
               >批量删除</el-button
             >
@@ -200,7 +204,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  v-if="
+                  v-show="
                     scope.row.examineStatus == 'WAIT' ||
                     scope.row.examineStatus == 'FAIL'
                   "
@@ -222,6 +226,8 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
@@ -278,6 +284,17 @@ export default {
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
   },
   methods: {
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getDataList({ pageNum: 1, pageSize: this.pageSize });
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getDataList({ pageNum: val, pageSize: 10 });
+    },
     //清除
     async clearFn() {
       await this.$refs.searchForm.resetFields();
@@ -341,4 +358,7 @@ export default {
 .dateStyle {
   width: 100%;
 }
+.delClass {
+  margin-left: 10px;
+}
 </style>

src/views/finance/standbook_list.vue

@@ -37,7 +37,7 @@
                   v-for="(v, i) in selectList"
                   :key="i"
                   :label="v.name"
-                  :value="v.walletRebateId"
+                  :value="v.customerWalletId"
                 >
                 </el-option>
               </el-select>
@@ -503,7 +503,7 @@ export default {
     },
     //切换列表
     checkFn(v) {
-      console.log(v);
+      this.resetFn();
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,