From f266501a7b5ae895d9935c229f40008148032678 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 22 Nov 2024 14:31:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E8=A7=84=E6=A0=BC=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 3499939..38bbe20 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -189,11 +189,13 @@
               style="margin-left: 20px !important;">
               <el-button type="text" icon="el-icon-edit">编辑</el-button>
             </router-link> -->
-            <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)">编辑</el-button>
-            <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
-              <el-button type="text" icon="el-icon-delete" style="margin-left: 20px !important;"
-                slot="reference">删除</el-button>
-            </el-popconfirm>
+            <div style="display: flex;gap: 10px;">
+              <el-button type="text" icon="el-icon-edit" @click="toPath('/product/add_shop', scope.row)"
+                v-if="scope.row.typeEnum">编辑</el-button>
+              <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+                <el-button type="text" icon="el-icon-delete" slot="reference">删除</el-button>
+              </el-popconfirm>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
 import { hasPermission } from '@/utils/limits.js'
 
 export default {
-  name:'product',
+  name: 'product',
   components: {
     BindCons,
     StockHistory

From fe4d54440ea688d395973376b7d3c2a469910f10 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 23 Nov 2024 10:03:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/credit.js                             |  77 ++++++
 src/router/routers.js                         |   6 +
 src/views/home/components/credit_add.vue      | 238 ++++++++++++++++++
 .../home/components/credit_repayment.vue      | 236 +++++++++++++++++
 src/views/home/data_credit.vue                | 198 +++++++++++++++
 6 files changed, 757 insertions(+), 2 deletions(-)
 create mode 100644 src/api/credit.js
 create mode 100644 src/views/home/components/credit_add.vue
 create mode 100644 src/views/home/components/credit_repayment.vue
 create mode 100644 src/views/home/data_credit.vue

diff --git a/.env.development b/.env.development
index 98c3e63..fdeba2f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
 # 测试
-# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 #预发布
-VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
diff --git a/src/api/credit.js b/src/api/credit.js
new file mode 100644
index 0000000..42dce94
--- /dev/null
+++ b/src/api/credit.js
@@ -0,0 +1,77 @@
+import request from '@/utils/request'
+
+/**
+ * 获取挂账列表
+ * @returns
+ */
+export function getTbShopCoupon(params) {
+  return request({
+    url: '/api/credit/buyer/page',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取优惠券详情
+ * @returns
+ */
+export function getTbShopCouponInfo(id) {
+  return request({
+    url: '/api/tbShopCoupon/' + id,
+    method: 'get',
+    params: {}
+  })
+}
+
+/**
+ * 增加挂账人
+ * @returns
+ */
+export function addCreditBuyer(data) {
+  return request({
+    url: '/api/credit/buyer',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 删除优惠券
+ * @returns
+ */
+export function delTbShopCoupon(params) {
+  return request({
+    url: '/api/tbShopCoupon',
+    method: 'delete',
+    data: params
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function queryReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/queryReceive',
+    method: 'post',
+    data: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 获取领取列表
+ * @returns
+ */
+export function delReceive(params) {
+  return request({
+    url: '/api/tbShopCoupon/receive',
+    method: 'delete',
+    data: params
+  })
+}
diff --git a/src/router/routers.js b/src/router/routers.js
index 05c29e5..729d7fd 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -59,6 +59,12 @@ export const constantRouterMap = [
         name: 'data_tables',
         meta: { title: '桌台统计' }
       },
+      {
+        path: 'data_credit',
+        component: (resolve) => require(['@/views/home/data_credit'], resolve),
+        name: 'data_credit',
+        meta: { title: '挂账管理' }
+      },
       {
         path: 'data_record',
         component: (resolve) => require(['@/views/home/data_record'], resolve),
diff --git a/src/views/home/components/credit_add.vue b/src/views/home/components/credit_add.vue
new file mode 100644
index 0000000..6bc9a4e
--- /dev/null
+++ b/src/views/home/components/credit_add.vue
@@ -0,0 +1,238 @@
+<template>
+  <div>
+    <el-dialog
+      title="创建挂账人"
+      :visible.sync="addDialogVisible"
+      width="30%"
+      center
+    >
+      <div class="content">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+          <el-form-item label="状态" prop="status" style="width: 100%;">
+            <el-switch
+              v-model="form.status"
+              active-value="1"
+              inactive-value="0"
+            />
+          </el-form-item>
+          <el-form-item label="挂账人" prop="debtor" style="width: 100%;">
+            <el-input v-model="form.debtor" placeholder="请输入挂账人名称" />
+          </el-form-item>
+          <el-form-item label="手机号" prop="mobile" style="width: 100%;">
+            <el-input v-model="form.mobile" placeholder="请输入手机号" oninput="value= value.replace(/[^1-9]/g, '')" maxlength="11" />
+          </el-form-item>
+          <el-form-item label="职位" prop="position" style="width: 100%;">
+            <el-input v-model="form.position" placeholder="请输入职位" />
+          </el-form-item>
+          <el-form-item label="挂账额度" prop="creditAmount" style="width: 100%;">
+            <el-input v-model="form.creditAmount" placeholder="" oninput="value= value.replace(/[^\d|\.]/g, '')">
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="还款方式" style="width: 100%;">
+            <el-radio-group v-model="form.repaymentMethod" :disabled="isExist(form.id)">
+              <el-radio v-for="item in repaymentMethodList" :key="item.value" :label="item.value">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+            <div style="font-size: 12px;color: #999;">一经创建无法更改还款方式</div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addCreditBuyer } from '@/api/coupon'
+
+export default {
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['couponId'],
+  data() {
+    return {
+      addDialogVisible: false,
+      loading: false,
+      repaymentMethodList: [
+        { label: '按总金额还款', value: 'total' },
+        { label: '按订单还款', value: 'order' }
+      ],
+      form: {
+        id: '',
+        shopId: '',
+        status: '1',
+        debtor: '',
+        mobile: '',
+        position: '',
+        creditAmount: '',
+        repaymentMethod: 'total'
+      },
+      rules: {
+        debtor: [
+          {
+            required: true,
+            message: '请输入挂账人名称',
+            trigger: 'blur'
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            message: '请输入手机号',
+            trigger: 'blur'
+          }
+        ],
+        position: [
+          {
+            required: true,
+            message: '请输入职位',
+            trigger: 'blur'
+          }
+        ],
+        creditAmount: [
+          {
+            required: true,
+            message: '请输入挂账额度',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    /**
+     * 校验是否存在
+     */
+    isExist(val) {
+      if (val) {
+        return true
+      } else {
+        return false
+      }
+    },
+
+    /**
+     * 确定
+     */
+    async onSubmitHandle() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            this.loading = true
+            if (!this.form.shopId) { this.form.shopId = localStorage.getItem('shopId') }
+            // eslint-disable-next-line no-unused-vars, prefer-const
+            let res = await addCreditBuyer(this.form)
+            this.$notify({
+              title: '成功',
+              message: `${this.form.id ? '编辑' : '添加'}成功`,
+              type: 'success'
+            })
+            this.addDialogVisible = false
+            this.loading = false
+          } catch (error) {
+            this.loading = false
+            console.log(error)
+          }
+        }
+      })
+    },
+
+    /**
+     * 打开详情
+     * @param obj
+     */
+    show(obj) {
+      console.log(obj)
+      this.addDialogVisible = true
+      this.getTableData()
+    },
+
+    /**
+     * 关闭
+     */
+    close() {
+      this.addDialogVisible = false
+    },
+
+    reset() {
+      this.query = { ...this.resetQuery }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_list {
+    display: flex;
+    flex-wrap: wrap;
+
+    .item_wrap {
+        $size: 80px;
+
+        .item {
+            $radius: 4px;
+            width: $size;
+            height: $size;
+            border-radius: $radius;
+            overflow: hidden;
+            position: relative;
+            margin-right: 10px;
+            margin-top: 10px;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &::after {
+                content: attr(data-index);
+                font-size: 12px;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                border-radius: 0 0 $radius 0;
+                align-items: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: 10;
+            }
+
+            &::before {
+                content: '删除';
+                font-size: 12px;
+                width: 100%;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                align-items: center;
+                justify-content: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                transition: all .1s ease-in-out;
+            }
+        }
+
+        .name {
+            width: $size;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+}
+</style>
diff --git a/src/views/home/components/credit_repayment.vue b/src/views/home/components/credit_repayment.vue
new file mode 100644
index 0000000..a9ee59f
--- /dev/null
+++ b/src/views/home/components/credit_repayment.vue
@@ -0,0 +1,236 @@
+<template>
+  <div>
+    <el-dialog
+      title="挂账还款"
+      :visible.sync="addDialogVisible"
+      width="30%"
+      center
+    >
+      <div class="content">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+          <el-form-item label="还款方式" style="width: 100%;">
+            <el-radio-group v-model="form.repaymentMethod" :disabled="isExist(form.id)">
+              <el-radio v-for="item in repaymentMethodList" :key="item.value" :label="item.value">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+            <div style="font-size: 12px;color: #999;">一经创建无法更改还款方式</div>
+          </el-form-item>
+          <el-form-item label="还款金额" prop="creditAmount" style="width: 100%;">
+            <el-input v-model="form.creditAmount" placeholder="" oninput="value= value.replace(/[^\d|\.]/g, '')">
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="支付方式" prop="debtor" style="width: 100%;">
+            <el-input v-model="form.debtor" placeholder="请输入支付方式" />
+          </el-form-item>
+          <el-form-item label="备注" prop="debtor" style="width: 100%;">
+            <el-input v-model="form.debtor" placeholder="请输入备注" />
+          </el-form-item>
+          <el-form-item label="还款方式" style="width: 100%;">
+            <el-radio-group v-model="form.repaymentMethod" :disabled="isExist(form.id)">
+              <el-radio v-for="item in repaymentMethodList" :key="item.value" :label="item.value">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+            <div style="font-size: 12px;color: #999;">一经创建无法更改还款方式</div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addCreditBuyer } from '@/api/coupon'
+
+export default {
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['couponId'],
+  data() {
+    return {
+      addDialogVisible: false,
+      loading: false,
+      repaymentMethodList: [
+        { label: '按总金额还款', value: 'total' },
+        { label: '按订单还款', value: 'order' }
+      ],
+      form: {
+        id: '',
+        shopId: '',
+        status: '1',
+        debtor: '',
+        mobile: '',
+        position: '',
+        creditAmount: '',
+        repaymentMethod: 'total'
+      },
+      rules: {
+        debtor: [
+          {
+            required: true,
+            message: '请输入挂账人名称',
+            trigger: 'blur'
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            message: '请输入手机号',
+            trigger: 'blur'
+          }
+        ],
+        position: [
+          {
+            required: true,
+            message: '请输入职位',
+            trigger: 'blur'
+          }
+        ],
+        creditAmount: [
+          {
+            required: true,
+            message: '请输入挂账额度',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    /**
+     * 校验是否存在
+     */
+    isExist(val) {
+      if (val) {
+        return true
+      } else {
+        return false
+      }
+    },
+
+    /**
+     * 确定
+     */
+    async onSubmitHandle() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            this.loading = true
+            if (!this.form.shopId) { this.form.shopId = localStorage.getItem('shopId') }
+            // eslint-disable-next-line no-unused-vars, prefer-const
+            let res = await addCreditBuyer(this.form)
+            this.$notify({
+              title: '成功',
+              message: `${this.form.id ? '编辑' : '添加'}成功`,
+              type: 'success'
+            })
+            this.addDialogVisible = false
+            this.loading = false
+          } catch (error) {
+            this.loading = false
+            console.log(error)
+          }
+        }
+      })
+    },
+
+    /**
+     * 打开详情
+     * @param obj
+     */
+    show(obj) {
+      console.log(obj)
+      this.addDialogVisible = true
+      this.getTableData()
+    },
+
+    /**
+     * 关闭
+     */
+    close() {
+      this.addDialogVisible = false
+    },
+
+    reset() {
+      this.query = { ...this.resetQuery }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_list {
+    display: flex;
+    flex-wrap: wrap;
+
+    .item_wrap {
+        $size: 80px;
+
+        .item {
+            $radius: 4px;
+            width: $size;
+            height: $size;
+            border-radius: $radius;
+            overflow: hidden;
+            position: relative;
+            margin-right: 10px;
+            margin-top: 10px;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &::after {
+                content: attr(data-index);
+                font-size: 12px;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                border-radius: 0 0 $radius 0;
+                align-items: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: 10;
+            }
+
+            &::before {
+                content: '删除';
+                font-size: 12px;
+                width: 100%;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                align-items: center;
+                justify-content: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                transition: all .1s ease-in-out;
+            }
+        }
+
+        .name {
+            width: $size;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+}
+</style>
diff --git a/src/views/home/data_credit.vue b/src/views/home/data_credit.vue
new file mode 100644
index 0000000..1cf71ac
--- /dev/null
+++ b/src/views/home/data_credit.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <div class="head-container title">
+      挂账管理
+    </div>
+    <div class="head-container filtration">
+      <div class="l">
+        <el-button type="primary" icon="el-icon-plus" @click="addCredit">
+          创建挂账人
+        </el-button>
+      </div>
+      <div class="r">
+        <el-input v-model="tableData.keywords" placeholder="按挂账人或手机号" style="width: 138px;" />
+        <el-select v-model="tableData.status" placeholder="全部状态" clearable style="width: 123px;">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+    </div>
+    <div class="content">
+      <el-table v-loading="tableData.loading" :data="tableData.data">
+        <el-table-column label="挂账编码" prop="id" />
+        <el-table-column label="状态">
+          <template v-slot="scope">
+            {{ scope.row.status == '1' ? '启用' : '停用' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="挂账人" prop="debtor" />
+        <el-table-column label="手机号" prop="mobile" />
+        <el-table-column label="挂账额度(元)" prop="creditAmount" />
+        <el-table-column label="已挂账金额(元)" prop="owedAmount" />
+        <el-table-column label="剩余挂账额度(元)" prop="remainingAmount" />
+        <!-- <el-table-column label="账户余额" prop="title" /> -->
+        <el-table-column label="适用门店" prop="shopName" />
+        <el-table-column label="操作" width="150">
+          <template v-slot="scope">
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">查看明细</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">编辑</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">还款</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">还款记录</el-button>
+            <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
+              <el-button
+                slot="reference"
+                type="text"
+                icon="el-icon-delete"
+                style="margin-left: 20px !important;"
+              >删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="head-container">
+      <el-pagination
+        :total="tableData.total"
+        :current-page="tableData.page"
+        :page-size="tableData.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="paginationChange"
+        @size-change="sizeChange"
+      />
+    </div>
+
+    <!-- 创建挂账人 -->
+    <creditAdd ref="creditAdd" />
+
+    <!-- 还款 -->
+    <creditRepayment ref="creditRepayment" />
+
+  </div>
+</template>
+
+<script>
+import creditAdd from './components/credit_add.vue'
+import creditRepayment from './components/credit_repayment.vue'
+import { getTbShopCoupon, delTbShopCoupon } from '@/api/credit'
+export default {
+  // eslint-disable-next-line vue/no-unused-components
+  components: { creditAdd, creditRepayment },
+  filters: {
+
+    typeFilter(value) {
+      // eslint-disable-next-line eqeqeq
+    },
+    effectTypeFilter(value) {
+      // eslint-disable-next-line eqeqeq
+    }
+  },
+  data() {
+    return {
+      options: [
+        {
+          value: '启用',
+          label: '1'
+        },
+        {
+          value: '停用',
+          label: '0'
+        }
+      ],
+      tableData: {
+        keywords: '',
+        status: '',
+        data: [],
+        page: 1,
+        size: 10,
+        loading: false,
+        total: 0
+      },
+      couponId: null
+    }
+  },
+  mounted() {
+    this.getTableData()
+  },
+  methods: {
+    /**
+     * 创建挂账人
+     */
+    addCredit() {
+      // this.$refs.creditAdd.show()
+      this.$refs.creditRepayment.show()
+    },
+
+    // 重置查询
+    resetHandle() {
+      this.page = 1
+      this.getTableData()
+    },
+    // 分页大小改变
+    sizeChange(e) {
+      this.tableData.size = e
+      this.getTableData()
+    },
+    // 分页回调
+    paginationChange(e) {
+      console.log(e)
+      this.tableData.page = e
+      this.getTableData()
+    },
+    // 获取挂账列表
+    async getTableData() {
+      this.tableData.loading = true
+      try {
+        const res = await getTbShopCoupon({
+          page: this.tableData.page,
+          size: this.tableData.size,
+          shopId: localStorage.getItem('shopId')
+        })
+        this.tableData.loading = false
+        this.tableData.data = res.content
+        this.tableData.total = res.totalElements
+        console.log(this.tableData)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+
+    /**
+     * 查看领取详情
+     */
+    couponDetailsOpen(row) {
+      this.$refs.couponDetails.show(row)
+      this.couponId = row.id
+    },
+
+    /**
+     * 删除优惠券
+     * @param id
+     */
+    async delTableHandle(id) {
+      const delRes = await delTbShopCoupon(id)
+      console.log(delRes)
+      this.getTableData()
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .title{
+    font-weight: bold;
+    font-size: 16px;
+    color: #333333;
+  }
+  .filtration{
+    overflow: hidden;
+    .l{
+      float: left;
+    }
+    .r{
+      float: right;
+    }
+  }
+</style>

From c623a510efb7d6c8ec999a5cab451383dde92d72 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 23 Nov 2024 18:06:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/credit.js                             |   9 +-
 src/router/routers.js                         |   7 +
 src/views/coupon_manage/add_coupon.vue        |   1 -
 .../components/credit_RePaymentRecord.vue     | 203 ++++++++
 src/views/home/components/credit_add.vue      | 116 ++---
 .../home/components/credit_repayment.vue      | 151 ++----
 src/views/home/data_credit.vue                |  63 ++-
 src/views/home/data_creditDetail.vue          | 446 ++++++++++++++++++
 8 files changed, 771 insertions(+), 225 deletions(-)
 create mode 100644 src/views/home/components/credit_RePaymentRecord.vue
 create mode 100644 src/views/home/data_creditDetail.vue

diff --git a/src/api/credit.js b/src/api/credit.js
index 42dce94..3ef8b92 100644
--- a/src/api/credit.js
+++ b/src/api/credit.js
@@ -39,14 +39,13 @@ export function addCreditBuyer(data) {
 }
 
 /**
- * 删除优惠券
+ * 删除挂账人
  * @returns
  */
-export function delTbShopCoupon(params) {
+export function delCreditBuyer(id) {
   return request({
-    url: '/api/tbShopCoupon',
-    method: 'delete',
-    data: params
+    url: `/api/credit/buyer/${id}`,
+    method: 'delete'
   })
 }
 
diff --git a/src/router/routers.js b/src/router/routers.js
index 729d7fd..23f9cc7 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -65,6 +65,13 @@ export const constantRouterMap = [
         name: 'data_credit',
         meta: { title: '挂账管理' }
       },
+      {
+        path: 'data_creditDetail',
+        component: (resolve) => require(['@/views/home/data_creditDetail'], resolve),
+        name: 'data_creditDetail',
+        hidden: true,
+        meta: { title: '挂账明细' }
+      },
       {
         path: 'data_record',
         component: (resolve) => require(['@/views/home/data_record'], resolve),
diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index 33bf501..d4f9771 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -320,7 +320,6 @@ export default {
      * @param item
      */
     tabClick(item) {
-      console.log(this.form)
       this.form = this.resetForm
       this.form.number = ''
       this.form.type = item.type
diff --git a/src/views/home/components/credit_RePaymentRecord.vue b/src/views/home/components/credit_RePaymentRecord.vue
new file mode 100644
index 0000000..bcfb71d
--- /dev/null
+++ b/src/views/home/components/credit_RePaymentRecord.vue
@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <el-dialog title="账单还款记录" :visible.sync="dialogVisible" width="70%" @close="reset">
+      <div class="search">
+        <el-form :model="query" inline label-position="left">
+          <el-form-item>
+            <el-input v-model="query.value" placeholder="支付方式" style="" />
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="reset">重置</el-button>
+            <el-button type="primary" @click="getTableData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="head-container">
+        <el-table v-loading="tableData.loading" :data="tableData.data">
+
+          <el-table-column label="支付方式" prpo="name">
+            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          </el-table-column>
+          <el-table-column label="支付金额" prpo="name">
+            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          </el-table-column>
+          <el-table-column label="备注" prpo="name">
+            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          </el-table-column>
+          <el-table-column label="操作时间" prop="receiveTime" />
+        </el-table>
+      </div>
+      <div class="head-container">
+        <el-pagination
+          :total="tableData.total"
+          :current-page="query.page"
+          :page-size="query.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="paginationChange"
+          @size-change="sizeChange"
+        />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { queryReceive } from '@/api/coupon'
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      stateList: [
+        { label: '未使用', value: 0 },
+        { label: '已使用', value: 1 }
+      ],
+      query: {
+        couponId: '',
+        value: '',
+        status: 0,
+        page: 1,
+        size: 10
+      },
+      resetQuery: null,
+      tableData: {
+        data: [],
+        loading: false,
+        total: 0
+      }
+    }
+  },
+  mounted() {
+    this.resetQuery = { ...this.query }
+  },
+  methods: {
+    /**
+     * 查询
+     */
+    async getTableData() {
+      // eslint-disable-next-line no-unused-vars, prefer-const
+      let res = await queryReceive({
+        shopId: localStorage.getItem('shopId'),
+        value: this.query.value,
+        page: this.query.page,
+        size: this.query.size
+      })
+      this.tableData.loading = false
+      this.tableData.data = res.content
+      this.tableData.total = res.totalElements
+    },
+
+    /**
+     * 打开
+     * @param row
+     */
+    show(row) {
+      this.dialogVisible = true
+      this.query.couponId = row.id
+      this.getTableData()
+    },
+
+    /**
+     * 分页大小改变
+     * @param e
+     */
+    sizeChange(e) {
+      this.query.size = e
+      this.getTableData()
+    },
+
+    /**
+     * 分页回调
+     * @param e
+     */
+    paginationChange(e) {
+      this.query.page = e
+      this.getTableData()
+    },
+
+    /**
+     * 关闭
+     */
+    close() {
+      this.dialogVisible = false
+    },
+
+    /**
+     * 重置
+     */
+    reset() {
+      this.query = { ...this.resetQuery }
+      this.getTableData()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_list {
+    display: flex;
+    flex-wrap: wrap;
+
+    .item_wrap {
+        $size: 80px;
+
+        .item {
+            $radius: 4px;
+            width: $size;
+            height: $size;
+            border-radius: $radius;
+            overflow: hidden;
+            position: relative;
+            margin-right: 10px;
+            margin-top: 10px;
+
+            &:hover {
+                cursor: pointer;
+            }
+
+            &::after {
+                content: attr(data-index);
+                font-size: 12px;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                border-radius: 0 0 $radius 0;
+                align-items: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: 10;
+            }
+
+            &::before {
+                content: '删除';
+                font-size: 12px;
+                width: 100%;
+                height: 20px;
+                display: flex;
+                padding: 0 10px;
+                align-items: center;
+                justify-content: center;
+                background-color: rgba(0, 0, 0, 0.3);
+                backdrop-filter: blur(10px);
+                color: #fff;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                z-index: 10;
+                transition: all .1s ease-in-out;
+            }
+        }
+
+        .name {
+            width: $size;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+}
+</style>
diff --git a/src/views/home/components/credit_add.vue b/src/views/home/components/credit_add.vue
index 6bc9a4e..76431b1 100644
--- a/src/views/home/components/credit_add.vue
+++ b/src/views/home/components/credit_add.vue
@@ -1,18 +1,19 @@
 <template>
   <div>
     <el-dialog
-      title="创建挂账人"
-      :visible.sync="addDialogVisible"
+      :show-close="false"
+      :visible.sync="dialogVisible"
       width="30%"
       center
     >
+      <div slot="title" class="dialog-title">{{ form.id?'编辑':'创建' }}挂账人</div>
       <div class="content">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
           <el-form-item label="状态" prop="status" style="width: 100%;">
             <el-switch
               v-model="form.status"
-              active-value="1"
-              inactive-value="0"
+              :active-value="1"
+              :inactive-value="0"
             />
           </el-form-item>
           <el-form-item label="挂账人" prop="debtor" style="width: 100%;">
@@ -40,7 +41,7 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
       </span>
     </el-dialog>
@@ -48,14 +49,14 @@
 </template>
 
 <script>
-import { addCreditBuyer } from '@/api/coupon'
+import { addCreditBuyer } from '@/api/credit'
 
 export default {
   // eslint-disable-next-line vue/require-prop-types
   props: ['couponId'],
   data() {
     return {
-      addDialogVisible: false,
+      dialogVisible: false,
       loading: false,
       repaymentMethodList: [
         { label: '按总金额还款', value: 'total' },
@@ -64,7 +65,7 @@ export default {
       form: {
         id: '',
         shopId: '',
-        status: '1',
+        status: 0,
         debtor: '',
         mobile: '',
         position: '',
@@ -100,11 +101,13 @@ export default {
             trigger: 'blur'
           }
         ]
-      }
+      },
+      resetForm: null
+
     }
   },
   mounted() {
-
+    this.resetForm = { ...this.form }
   },
   methods: {
     /**
@@ -134,11 +137,11 @@ export default {
               message: `${this.form.id ? '编辑' : '添加'}成功`,
               type: 'success'
             })
-            this.addDialogVisible = false
+            this.dialogVisible = false
             this.loading = false
+            this.$emit('success', res)
           } catch (error) {
             this.loading = false
-            console.log(error)
           }
         }
       })
@@ -146,93 +149,32 @@ export default {
 
     /**
      * 打开详情
-     * @param obj
+     * @param row
      */
-    show(obj) {
-      console.log(obj)
-      this.addDialogVisible = true
-      this.getTableData()
+    show(row) {
+      if (row && row.id) {
+        this.form = row
+      } else {
+        this.form = this.resetForm
+      }
+      this.form.status = Number(this.form.status)
+      this.dialogVisible = true
+      this.$refs.form.resetFields()
     },
 
     /**
      * 关闭
      */
     close() {
-      this.addDialogVisible = false
-    },
-
-    reset() {
-      this.query = { ...this.resetQuery }
+      this.dialogVisible = false
     }
+
   }
 }
 </script>
 
 <style scoped lang="scss">
-.shop_list {
-    display: flex;
-    flex-wrap: wrap;
-
-    .item_wrap {
-        $size: 80px;
-
-        .item {
-            $radius: 4px;
-            width: $size;
-            height: $size;
-            border-radius: $radius;
-            overflow: hidden;
-            position: relative;
-            margin-right: 10px;
-            margin-top: 10px;
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            &::after {
-                content: attr(data-index);
-                font-size: 12px;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                border-radius: 0 0 $radius 0;
-                align-items: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 10;
-            }
-
-            &::before {
-                content: '删除';
-                font-size: 12px;
-                width: 100%;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                align-items: center;
-                justify-content: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                z-index: 10;
-                transition: all .1s ease-in-out;
-            }
-        }
-
-        .name {
-            width: $size;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
+.dialog-title{
+  text-align: left;
 }
 </style>
diff --git a/src/views/home/components/credit_repayment.vue b/src/views/home/components/credit_repayment.vue
index a9ee59f..1f310a0 100644
--- a/src/views/home/components/credit_repayment.vue
+++ b/src/views/home/components/credit_repayment.vue
@@ -1,20 +1,26 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
   <div>
     <el-dialog
-      title="挂账还款"
-      :visible.sync="addDialogVisible"
+      :show-close="false"
+      :visible.sync="dialogVisible"
       width="30%"
       center
     >
+      <div slot="title" class="dialog-title">挂账还款</div>
       <div class="content">
+        <div class="credit_info">
+          <div>挂账人：{{ form.debtor }}</div>
+          <div>挂账金额：￥{{ form.owedAmount || 0 }}</div>
+          <div>账户余额: ￥{{ form.accountBalance || 0 }}</div>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
           <el-form-item label="还款方式" style="width: 100%;">
-            <el-radio-group v-model="form.repaymentMethod" :disabled="isExist(form.id)">
-              <el-radio v-for="item in repaymentMethodList" :key="item.value" :label="item.value">
+            <el-radio-group v-model="form.repaymentMethod">
+              <el-radio v-for="item in repaymentMethodList" v-if="form.repaymentMethod == item.value" :key="item.value" :label="item.value">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
-            <div style="font-size: 12px;color: #999;">一经创建无法更改还款方式</div>
           </el-form-item>
           <el-form-item label="还款金额" prop="creditAmount" style="width: 100%;">
             <el-input v-model="form.creditAmount" placeholder="" oninput="value= value.replace(/[^\d|\.]/g, '')">
@@ -24,21 +30,13 @@
           <el-form-item label="支付方式" prop="debtor" style="width: 100%;">
             <el-input v-model="form.debtor" placeholder="请输入支付方式" />
           </el-form-item>
-          <el-form-item label="备注" prop="debtor" style="width: 100%;">
-            <el-input v-model="form.debtor" placeholder="请输入备注" />
-          </el-form-item>
-          <el-form-item label="还款方式" style="width: 100%;">
-            <el-radio-group v-model="form.repaymentMethod" :disabled="isExist(form.id)">
-              <el-radio v-for="item in repaymentMethodList" :key="item.value" :label="item.value">
-                {{ item.label }}
-              </el-radio>
-            </el-radio-group>
-            <div style="font-size: 12px;color: #999;">一经创建无法更改还款方式</div>
+          <el-form-item label="备注" prop="remark" style="width: 100%;">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
       </span>
     </el-dialog>
@@ -53,7 +51,7 @@ export default {
   props: ['couponId'],
   data() {
     return {
-      addDialogVisible: false,
+      dialogVisible: false,
       loading: false,
       repaymentMethodList: [
         { label: '按总金额还款', value: 'total' },
@@ -67,34 +65,20 @@ export default {
         mobile: '',
         position: '',
         creditAmount: '',
-        repaymentMethod: 'total'
+        repaymentMethod: ''
       },
       rules: {
         debtor: [
           {
             required: true,
-            message: '请输入挂账人名称',
+            message: '请输入还款金额',
             trigger: 'blur'
           }
         ],
         mobile: [
           {
             required: true,
-            message: '请输入手机号',
-            trigger: 'blur'
-          }
-        ],
-        position: [
-          {
-            required: true,
-            message: '请输入职位',
-            trigger: 'blur'
-          }
-        ],
-        creditAmount: [
-          {
-            required: true,
-            message: '请输入挂账额度',
+            message: '请输入支付方式',
             trigger: 'blur'
           }
         ]
@@ -132,7 +116,7 @@ export default {
               message: `${this.form.id ? '编辑' : '添加'}成功`,
               type: 'success'
             })
-            this.addDialogVisible = false
+            this.dialogVisible = false
             this.loading = false
           } catch (error) {
             this.loading = false
@@ -143,20 +127,19 @@ export default {
     },
 
     /**
-     * 打开详情
-     * @param obj
+     * 打开
+     * @param row
      */
-    show(obj) {
-      console.log(obj)
-      this.addDialogVisible = true
-      this.getTableData()
+    show(row) {
+      this.form = row
+      this.dialogVisible = true
     },
 
     /**
      * 关闭
      */
     close() {
-      this.addDialogVisible = false
+      this.dialogVisible = false
     },
 
     reset() {
@@ -167,70 +150,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.shop_list {
-    display: flex;
-    flex-wrap: wrap;
-
-    .item_wrap {
-        $size: 80px;
-
-        .item {
-            $radius: 4px;
-            width: $size;
-            height: $size;
-            border-radius: $radius;
-            overflow: hidden;
-            position: relative;
-            margin-right: 10px;
-            margin-top: 10px;
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            &::after {
-                content: attr(data-index);
-                font-size: 12px;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                border-radius: 0 0 $radius 0;
-                align-items: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: 10;
-            }
-
-            &::before {
-                content: '删除';
-                font-size: 12px;
-                width: 100%;
-                height: 20px;
-                display: flex;
-                padding: 0 10px;
-                align-items: center;
-                justify-content: center;
-                background-color: rgba(0, 0, 0, 0.3);
-                backdrop-filter: blur(10px);
-                color: #fff;
-                position: absolute;
-                bottom: 0;
-                left: 0;
-                z-index: 10;
-                transition: all .1s ease-in-out;
-            }
-        }
-
-        .name {
-            width: $size;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-    }
+.credit_info{
+  width: 100%;
+  background: #F7F7FA;
+  border-radius: 3px 3px 3px 3px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 15px 25px;
+  box-sizing: border-box;
+  margin-bottom: 30px;
+  view{
+    font-weight: 400;
+    font-size: 14px;
+    color: #000000;
+  }
+}
+.dialog-title{
+  text-align: left;
 }
 </style>
diff --git a/src/views/home/data_credit.vue b/src/views/home/data_credit.vue
index 1cf71ac..09d1334 100644
--- a/src/views/home/data_credit.vue
+++ b/src/views/home/data_credit.vue
@@ -1,11 +1,8 @@
 <template>
   <div class="app-container">
-    <div class="head-container title">
-      挂账管理
-    </div>
     <div class="head-container filtration">
       <div class="l">
-        <el-button type="primary" icon="el-icon-plus" @click="addCredit">
+        <el-button type="primary" icon="el-icon-plus" @click="openDialog(null,'add')">
           创建挂账人
         </el-button>
       </div>
@@ -19,12 +16,15 @@
             :value="item.value"
           />
         </el-select>
+        <el-button type="primary" @click="getTableData()">
+          查询
+        </el-button>
       </div>
     </div>
-    <div class="content">
+    <div class="head-container content">
       <el-table v-loading="tableData.loading" :data="tableData.data">
         <el-table-column label="挂账编码" prop="id" />
-        <el-table-column label="状态">
+        <el-table-column label="状态" width="90">
           <template v-slot="scope">
             {{ scope.row.status == '1' ? '启用' : '停用' }}
           </template>
@@ -34,20 +34,19 @@
         <el-table-column label="挂账额度(元)" prop="creditAmount" />
         <el-table-column label="已挂账金额(元)" prop="owedAmount" />
         <el-table-column label="剩余挂账额度(元)" prop="remainingAmount" />
-        <!-- <el-table-column label="账户余额" prop="title" /> -->
+        <el-table-column label="账户余额" prop="accountBalance" />
         <el-table-column label="适用门店" prop="shopName" />
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" width="300">
           <template v-slot="scope">
-            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">查看明细</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">编辑</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">还款</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'add_coupon', query: {type:scope.row.type ,id: scope.row.id}} )">还款记录</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'data_creditDetail', query: {id: scope.row.id}} )">查看明细</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'edit')">编辑</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'repayment')">还款</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'rePaymentRecord')">还款记录</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
               <el-button
                 slot="reference"
                 type="text"
                 icon="el-icon-delete"
-                style="margin-left: 20px !important;"
               >删除</el-button>
             </el-popconfirm>
           </template>
@@ -66,10 +65,13 @@
     </div>
 
     <!-- 创建挂账人 -->
-    <creditAdd ref="creditAdd" />
+    <creditAdd ref="creditAdd" @success="resetHandle" />
 
     <!-- 还款 -->
-    <creditRepayment ref="creditRepayment" />
+    <creditRepayment ref="creditRepayment" @success="resetHandle" />
+
+    <!-- 还款记录 -->
+    <creditRepaymentRecord ref="creditRepaymentRecord" @success="resetHandle" />
 
   </div>
 </template>
@@ -77,10 +79,11 @@
 <script>
 import creditAdd from './components/credit_add.vue'
 import creditRepayment from './components/credit_repayment.vue'
-import { getTbShopCoupon, delTbShopCoupon } from '@/api/credit'
+import creditRepaymentRecord from './components/credit_RePaymentRecord.vue'
+import { getTbShopCoupon, delCreditBuyer } from '@/api/credit'
 export default {
   // eslint-disable-next-line vue/no-unused-components
-  components: { creditAdd, creditRepayment },
+  components: { creditAdd, creditRepayment, creditRepaymentRecord },
   filters: {
 
     typeFilter(value) {
@@ -94,12 +97,12 @@ export default {
     return {
       options: [
         {
-          value: '启用',
-          label: '1'
+          value: '1',
+          label: '启用'
         },
         {
-          value: '停用',
-          label: '0'
+          value: '0',
+          label: '停用'
         }
       ],
       tableData: {
@@ -121,13 +124,21 @@ export default {
     /**
      * 创建挂账人
      */
-    addCredit() {
-      // this.$refs.creditAdd.show()
-      this.$refs.creditRepayment.show()
+    openDialog(row, type) {
+      if (type === 'add') {
+        this.$refs.creditAdd.show()
+      } else if (type === 'edit') {
+        this.$refs.creditAdd.show(row)
+      } else if (type === 'repayment') {
+        this.$refs.creditRepayment.show(row)
+      } else if (type === 'rePaymentRecord') {
+        this.$refs.creditRepaymentRecord.show(row)
+      }
     },
 
     // 重置查询
     resetHandle() {
+      console.log(123123)
       this.page = 1
       this.getTableData()
     },
@@ -149,6 +160,8 @@ export default {
         const res = await getTbShopCoupon({
           page: this.tableData.page,
           size: this.tableData.size,
+          keywords: this.tableData.keywords,
+          status: this.tableData.status,
           shopId: localStorage.getItem('shopId')
         })
         this.tableData.loading = false
@@ -173,7 +186,7 @@ export default {
      * @param id
      */
     async delTableHandle(id) {
-      const delRes = await delTbShopCoupon(id)
+      const delRes = await delCreditBuyer(id)
       console.log(delRes)
       this.getTableData()
     }
diff --git a/src/views/home/data_creditDetail.vue b/src/views/home/data_creditDetail.vue
new file mode 100644
index 0000000..352c2d3
--- /dev/null
+++ b/src/views/home/data_creditDetail.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-form :model="query" inline label-position="left">
+        <el-form-item>
+          <el-radio-group v-model="timeValue" @change="timeChange">
+            <el-radio-button label="">全部</el-radio-button>
+            <el-radio-button label="0">今天</el-radio-button>
+            <el-radio-button label="-1">昨天</el-radio-button>
+            <el-radio-button label="-7">最近7天</el-radio-button>
+            <el-radio-button label="-30">最近30天</el-radio-button>
+            <el-radio-button label="week">本周</el-radio-button>
+            <el-radio-button label="month">本月</el-radio-button>
+            <el-radio-button label="custom">自定义</el-radio-button>
+          </el-radio-group>
+          <el-date-picker
+            v-if="timeValue == 'custom'"
+            v-model="query.createdAt"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          />
+        </el-form-item>
+        <template>
+          <el-form-item>
+            <el-input v-model="query.proName" placeholder="商品名称" />
+          </el-form-item>
+          <el-form-item>
+            <el-select v-model="query.cateId" placeholder="全部状态" style="width: 140px;">
+              <el-option v-for="item in categorys" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </template>
+        <el-form-item>
+          <el-button type="primary" @click="getTableData">查询</el-button>
+          <el-button @click="resetHandle">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="head-container">
+      <div class="collect_wrap">
+        <div v-for="item in payCountList" :key="item.id" class="item">
+          <div class="icon_wrap" style="--bg-color:#C978EE">
+            <i class="icon" :class="item.icon" />
+          </div>
+          <div class="info">
+            <div class="m">
+              <template v-if="item.isAmount == 1">￥</template>
+              {{ item.payAmount }}
+            </div>
+            <div class="t">{{ item.payType }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="head-container">
+      <el-table v-loading="tableData.loading" :data="tableData.data">
+        <el-table-column label="创建日期" prop="name" />
+        <el-table-column label="订单号" prop="name" />
+        <el-table-column label="应付金额" prop="salesAmount">
+          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        </el-table-column>
+        <el-table-column label="已付款金额" prop="salesAmount">
+          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        </el-table-column>
+        <el-table-column label="待付款金额" prop="salesAmount">
+          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        </el-table-column>
+        <el-table-column label="状态" prop="salesAmount">
+          <template v-slot="scope">
+            ￥{{ scope.row.salesAmount }}
+          </template>
+        </el-table-column>
+        <el-table-column label="付款方式" prop="salesAmount">
+          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="salesAmount">
+          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        </el-table-column>
+        <el-table-column label="付款时间" prop="name" />
+        <el-table-column label="操作" width="350">
+          <template v-slot="scope">
+            <el-button type="text" icon="el-icon-edit" @click="addCredit(scope.row,'repayment')">付款</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="addCredit(scope.row,'edit')">账单付款记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="head-container">
+      <el-pagination
+        :total="tableData.total"
+        :current-page="tableData.page"
+        :page-size="tableData.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="paginationChange"
+        @size-change="sizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { daycount, summaryday } from '@/api/home'
+import { tbShopCategoryGet } from '@/api/shop'
+import dayjs from 'dayjs'
+
+export default {
+  filters: {
+  },
+  data() {
+    return {
+      timeValue: '',
+      resetQuery: null,
+      categorys: [],
+      query: {
+        createdAt: [],
+        proName: '',
+        cateId: ''
+      },
+      tableData: {
+        data: [],
+        page: 1,
+        size: 10,
+        loading: false,
+        total: 0
+      },
+      downloadLoading: false,
+      payCountList: '',
+      payCountTotal: 0
+    }
+  },
+  mounted() {
+    this.resetQuery = { ...this.query }
+    this.getTableData()
+    this.tbShopCategoryGet()
+  },
+  methods: {
+    /**
+     * 获取明细数据
+     */
+    async getTableData() {
+      this.tableData.loading = true
+      try {
+        this.daycount()
+        const res = await summaryday({
+          page: this.tableData.page,
+          size: this.tableData.size,
+          startTime: this.query.createdAt[0],
+          endTime: this.query.createdAt[1],
+          proName: this.query.proName,
+          cateId: this.query.cateId
+        })
+        this.tableData.loading = false
+        this.tableData.data = res.content
+        this.tableData.total = res.totalElements
+      } catch (error) {
+        console.log(error)
+      }
+    },
+
+    /**
+     * 切换时间
+     * @param e
+     */
+    timeChange(e) {
+      const format = ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59']
+      switch (e) {
+        case '':
+          // 全部
+          this.query.createdAt = []
+          break
+        case '0':
+          // 今天
+          this.query.createdAt = [
+            dayjs().format(format[0]),
+            dayjs().format(format[1])
+          ]
+          break
+        case '-1':
+          // 昨天
+          this.query.createdAt = [
+            dayjs()
+              .add(-1, 'd')
+              .format(format[0]),
+            dayjs()
+              .add(-1, 'd')
+              .format(format[1])
+          ]
+          break
+        case '-7':
+          // 最近7天
+          this.query.createdAt = [
+            dayjs()
+              .add(-7, 'd')
+              .format(format[0]),
+            dayjs().format(format[1])
+          ]
+          break
+        case '-30':
+          // 最近7天
+          this.query.createdAt = [
+            dayjs()
+              .add(-30, 'd')
+              .format(format[0]),
+            dayjs().format(format[1])
+          ]
+          break
+        case 'week':
+          // 本周
+          this.query.createdAt = [
+            dayjs()
+              .startOf('week')
+              .format(format[0]),
+            dayjs()
+              .endOf('week')
+              .format(format[1])
+          ]
+          break
+        case 'month':
+          // 本周
+          this.query.createdAt = [
+            dayjs()
+              .startOf('month')
+              .format(format[0]),
+            dayjs()
+              .endOf('month')
+              .format(format[1])
+          ]
+          break
+        case 'custom':
+          // 自定义
+          this.query.createdAt = []
+          break
+        default:
+          break
+      }
+      console.log(this.timeValue)
+    },
+
+    /**
+     * 重置查询
+     */
+    resetHandle() {
+      this.timeValue = ''
+      this.query = { ...this.resetQuery }
+      this.page = 1
+      this.getTableData()
+    },
+
+    /**
+     * 分页大小改变
+     * @param e
+     */
+    sizeChange(e) {
+      this.tableData.size = e
+      this.getTableData()
+    },
+
+    /**
+     * 分页回调
+     * @param e
+     */
+    paginationChange(e) {
+      this.tableData.page = e
+      this.getTableData()
+    },
+
+    // 获取商品分类
+    async tbShopCategoryGet() {
+      try {
+        const res = await tbShopCategoryGet({
+          page: 1,
+          size: 200,
+          sort: 'id,desc',
+          shopId: localStorage.getItem('shopId')
+        })
+        let categorys = []
+        for (let item of res.content) {
+          categorys.push({
+            name: `|----${item.name}`,
+            id: item.id
+          })
+          if (item.childrenList.length) {
+            for (let val of item.childrenList) {
+              categorys.push({
+                name: `|----|----${val.name}`,
+                id: val.id
+              })
+            }
+          }
+        }
+        this.categorys = categorys
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    // 获取订单汇总
+    async daycount() {
+      try {
+        const res = await daycount({
+          startTime: this.query.createdAt[0],
+          endTime: this.query.createdAt[1],
+          cateId: this.query.cateId,
+          proName: this.query.proName,
+
+          type: this.orderType,
+        });
+        this.payCountList = res;
+      } catch (error) {
+        console.log(error);
+      }
+    }
+    
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.collect_wrap {
+  display: flex;
+  gap: 14px;
+  justify-content: space-between;
+
+  .item:nth-child(1) {
+    background-image: url(../../assets/images/home/data_forms4.png);
+  }
+
+  .item:nth-child(2) {
+    background-image: url(../../assets/images/home/data_forms3.png);
+  }
+
+  .item:nth-child(3) {
+    background-image: url(../../assets/images/home/data_forms2.png);
+  }
+
+  .item:nth-child(4) {
+    background-image: url(../../assets/images/home/data_forms1.png);
+  }
+
+  .item {
+    background-size: 100% 100%;
+    width: 255px;
+    display: flex;
+    align-items: center;
+    background-color: #f5f5f5;
+    padding: 20px;
+
+    .icon_wrap {
+      $size: 34px;
+      $border: 6px;
+      width: $size;
+      height: $size;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: var(--bg-color);
+      border-radius: 50%;
+      position: relative;
+
+      &::after {
+        content: "";
+        width: $size + $border;
+        height: $size + $border;
+        border-radius: 50%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        background-color: var(--bg-color);
+        opacity: 0.3;
+      }
+
+      .icon {
+        font-size: 16px;
+        color: #fff;
+      }
+
+      .img {
+        width: 20px;
+        height: 20px;
+      }
+    }
+
+    .info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding-left: 10px;
+
+      .m {
+        font-weight: bold;
+      }
+
+      .t {
+        font-size: 12px;
+        color: #999;
+        padding-top: 4px;
+      }
+    }
+  }
+}
+
+.refund {
+  color: #ff9731;
+  font-weight: bold;
+}
+
+.table_order_info {
+  .order_no {
+    color: #999;
+  }
+
+  .type {
+    color: #e6a23c;
+  }
+}
+
+.goods_info {
+  .row {
+    display: flex;
+
+    &:not(:first-child) {
+      margin-top: 10px;
+    }
+
+    .cover {
+      width: 40px;
+      height: 40px;
+    }
+
+    .info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      padding-left: 10px;
+
+      .sku {
+        color: #999;
+      }
+    }
+  }
+}
+</style>

From d52a7553389802611c641a7720c7242d4a4a58e6 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 25 Nov 2024 16:23:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/credit.js                             |  66 +++--
 .../components/credit_RePaymentRecord.vue     |  49 ++--
 src/views/home/components/credit_add.vue      |   1 +
 .../home/components/credit_repayment.vue      |  71 ++---
 src/views/home/data_credit.vue                |  22 +-
 src/views/home/data_creditDetail.vue          | 255 ++++++++++--------
 6 files changed, 260 insertions(+), 204 deletions(-)

diff --git a/src/api/credit.js b/src/api/credit.js
index 3ef8b92..0010803 100644
--- a/src/api/credit.js
+++ b/src/api/credit.js
@@ -4,7 +4,7 @@ import request from '@/utils/request'
  * 获取挂账列表
  * @returns
  */
-export function getTbShopCoupon(params) {
+export function getCreditBuyerList(params) {
   return request({
     url: '/api/credit/buyer/page',
     method: 'get',
@@ -15,12 +15,12 @@ export function getTbShopCoupon(params) {
 }
 
 /**
- * 获取优惠券详情
+ * 获取挂账详情
  * @returns
  */
-export function getTbShopCouponInfo(id) {
+export function getCreditBuyerInfo(id) {
   return request({
-    url: '/api/tbShopCoupon/' + id,
+    url: '/api/credit/buyer/' + id,
     method: 'get',
     params: {}
   })
@@ -38,6 +38,30 @@ export function addCreditBuyer(data) {
   })
 }
 
+/**
+ * 还款
+ * @returns
+ */
+export function creditRePayment(data) {
+  return request({
+    url: '/api/credit/buyer/repayment',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 获取还款记录
+ * @returns
+ */
+export function creditRePaymentRecord(params) {
+  return request({
+    url: '/api/credit/payment-record/page',
+    method: 'get',
+    params
+  })
+}
+
 /**
  * 删除挂账人
  * @returns
@@ -50,27 +74,37 @@ export function delCreditBuyer(id) {
 }
 
 /**
- * 获取领取列表
+ * 挂账人-查看明细
  * @returns
  */
-export function queryReceive(params) {
+export function creditBuyerOrderList(params) {
   return request({
-    url: '/api/tbShopCoupon/queryReceive',
-    method: 'post',
-    data: {
-      ...params
-    }
+    url: '/api/credit/buyer-order/page',
+    method: 'get',
+    params
   })
 }
 
 /**
- * 获取领取列表
+ * 挂账人-查看明细-统计
  * @returns
  */
-export function delReceive(params) {
+export function creditBuyerOrderSummary(params) {
   return request({
-    url: '/api/tbShopCoupon/receive',
-    method: 'delete',
-    data: params
+    url: '/api/credit/buyer-order/summary',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 挂账人-查看明细-付款
+ * @returns
+ */
+export function creditPayment(data) {
+  return request({
+    url: '/api/credit/buyer-order/pay',
+    method: 'post',
+    data
   })
 }
diff --git a/src/views/home/components/credit_RePaymentRecord.vue b/src/views/home/components/credit_RePaymentRecord.vue
index bcfb71d..a5c667d 100644
--- a/src/views/home/components/credit_RePaymentRecord.vue
+++ b/src/views/home/components/credit_RePaymentRecord.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <el-dialog title="账单还款记录" :visible.sync="dialogVisible" width="70%" @close="reset">
+    <el-dialog title="账单还款记录" :visible.sync="dialogVisible" :close-on-click-modal="false" width="70%" @close="reset">
       <div class="search">
         <el-form :model="query" inline label-position="left">
           <el-form-item>
-            <el-input v-model="query.value" placeholder="支付方式" style="" />
+            <el-input v-model="query.paymentMethod" placeholder="支付方式" style="" />
           </el-form-item>
           <el-form-item>
             <el-button @click="reset">重置</el-button>
@@ -14,17 +14,16 @@
       </div>
       <div class="head-container">
         <el-table v-loading="tableData.loading" :data="tableData.data">
-
-          <el-table-column label="支付方式" prpo="name">
-            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          <el-table-column label="支付方式" prpo="paymentMethod">
+            <template v-slot="scope"> <div>{{ scope.row.paymentMethod ? scope.row.paymentMethod : '-' }}</div> </template>
           </el-table-column>
-          <el-table-column label="支付金额" prpo="name">
-            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          <el-table-column label="支付金额" prpo="repaymentAmount">
+            <template v-slot="scope"> <div>{{ scope.row.repaymentAmount ? scope.row.repaymentAmount : '-' }}</div> </template>
           </el-table-column>
-          <el-table-column label="备注" prpo="name">
-            <template v-slot="scope"> <div>{{ scope.row.name ? scope.row.name : '-' }}</div> </template>
+          <el-table-column label="备注" prpo="remark">
+            <template v-slot="scope"> <div>{{ scope.row.remark ? scope.row.remark : '-' }}</div> </template>
           </el-table-column>
-          <el-table-column label="操作时间" prop="receiveTime" />
+          <el-table-column label="操作时间" prop="createTime" />
         </el-table>
       </div>
       <div class="head-container">
@@ -42,20 +41,16 @@
 </template>
 
 <script>
-import { queryReceive } from '@/api/coupon'
+import { creditRePaymentRecord } from '@/api/credit'
 
 export default {
   data() {
     return {
       dialogVisible: false,
-      stateList: [
-        { label: '未使用', value: 0 },
-        { label: '已使用', value: 1 }
-      ],
       query: {
-        couponId: '',
-        value: '',
-        status: 0,
+        creditBuyerId: '',
+        paymentMethod: '',
+        orderId: '',
         page: 1,
         size: 10
       },
@@ -76,12 +71,16 @@ export default {
      */
     async getTableData() {
       // eslint-disable-next-line no-unused-vars, prefer-const
-      let res = await queryReceive({
-        shopId: localStorage.getItem('shopId'),
+      let params = {
+        creditBuyerId: this.query.creditBuyerId,
         value: this.query.value,
         page: this.query.page,
-        size: this.query.size
-      })
+        size: this.query.size,
+        paymentMethod: this.query.paymentMethod
+      }
+      if (this.query.orderId) { params.orderId = this.query.orderId }
+      // eslint-disable-next-line prefer-const
+      let res = await creditRePaymentRecord(params)
       this.tableData.loading = false
       this.tableData.data = res.content
       this.tableData.total = res.totalElements
@@ -91,9 +90,11 @@ export default {
      * 打开
      * @param row
      */
-    show(row) {
+    show(row, orderId) {
+      this.query = { ...this.resetQuery }
       this.dialogVisible = true
-      this.query.couponId = row.id
+      this.query.creditBuyerId = row.id
+      this.query.orderId = orderId
       this.getTableData()
     },
 
diff --git a/src/views/home/components/credit_add.vue b/src/views/home/components/credit_add.vue
index 76431b1..e12c4c0 100644
--- a/src/views/home/components/credit_add.vue
+++ b/src/views/home/components/credit_add.vue
@@ -2,6 +2,7 @@
   <div>
     <el-dialog
       :show-close="false"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       center
diff --git a/src/views/home/components/credit_repayment.vue b/src/views/home/components/credit_repayment.vue
index 1f310a0..24877b6 100644
--- a/src/views/home/components/credit_repayment.vue
+++ b/src/views/home/components/credit_repayment.vue
@@ -4,31 +4,32 @@
     <el-dialog
       :show-close="false"
       :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
       width="30%"
       center
     >
       <div slot="title" class="dialog-title">挂账还款</div>
       <div class="content">
-        <div class="credit_info">
+        <div v-if="form.repaymentMethod == 'total' && !form.creditBuyerId" class="credit_info">
           <div>挂账人：{{ form.debtor }}</div>
           <div>挂账金额：￥{{ form.owedAmount || 0 }}</div>
           <div>账户余额: ￥{{ form.accountBalance || 0 }}</div>
         </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-          <el-form-item label="还款方式" style="width: 100%;">
+          <el-form-item v-if="form.repaymentMethod == 'total' && !form.creditBuyerId" label="还款方式" style="width: 100%;">
             <el-radio-group v-model="form.repaymentMethod">
               <el-radio v-for="item in repaymentMethodList" v-if="form.repaymentMethod == item.value" :key="item.value" :label="item.value">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="还款金额" prop="creditAmount" style="width: 100%;">
-            <el-input v-model="form.creditAmount" placeholder="" oninput="value= value.replace(/[^\d|\.]/g, '')">
+          <el-form-item label="还款金额" prop="repaymentAmount" style="width: 100%;">
+            <el-input v-model="form.repaymentAmount" placeholder="" oninput="value= value.replace(/[^\d|\.]/g, '')">
               <template slot="prepend">￥</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="支付方式" prop="debtor" style="width: 100%;">
-            <el-input v-model="form.debtor" placeholder="请输入支付方式" />
+          <el-form-item label="支付方式" prop="paymentMethod" style="width: 100%;">
+            <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
           </el-form-item>
           <el-form-item label="备注" prop="remark" style="width: 100%;">
             <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -44,7 +45,7 @@
 </template>
 
 <script>
-import { addCreditBuyer } from '@/api/coupon'
+import { creditRePayment, creditPayment } from '@/api/credit'
 
 export default {
   // eslint-disable-next-line vue/require-prop-types
@@ -59,46 +60,36 @@ export default {
       ],
       form: {
         id: '',
-        shopId: '',
-        status: '1',
-        debtor: '',
-        mobile: '',
-        position: '',
-        creditAmount: '',
-        repaymentMethod: ''
+        creditBuyerId: '',
+        orderId: '',
+        repaymentMethod: '',
+        repaymentAmount: '',
+        paymentMethod: '',
+        remark: ''
       },
       rules: {
-        debtor: [
+        repaymentAmount: [
           {
             required: true,
             message: '请输入还款金额',
             trigger: 'blur'
           }
         ],
-        mobile: [
+        paymentMethod: [
           {
             required: true,
             message: '请输入支付方式',
             trigger: 'blur'
           }
         ]
-      }
+      },
+      resetForm: null
     }
   },
   mounted() {
-
+    this.resetForm = { ...this.form }
   },
   methods: {
-    /**
-     * 校验是否存在
-     */
-    isExist(val) {
-      if (val) {
-        return true
-      } else {
-        return false
-      }
-    },
 
     /**
      * 确定
@@ -108,16 +99,21 @@ export default {
         if (valid) {
           try {
             this.loading = true
-            if (!this.form.shopId) { this.form.shopId = localStorage.getItem('shopId') }
-            // eslint-disable-next-line no-unused-vars, prefer-const
-            let res = await addCreditBuyer(this.form)
+            // if (!this.form.shopId) { this.form.shopId = localStorage.getItem('shopId') }
+            let res
+            if (this.form.repaymentMethod === 'total') {
+              res = await creditRePayment(this.form)
+            } else {
+              res = await creditPayment(this.form)
+            }
             this.$notify({
               title: '成功',
-              message: `${this.form.id ? '编辑' : '添加'}成功`,
+              message: res.repaymentMsg,
               type: 'success'
             })
             this.dialogVisible = false
             this.loading = false
+            this.$emit('success', res)
           } catch (error) {
             this.loading = false
             console.log(error)
@@ -130,8 +126,15 @@ export default {
      * 打开
      * @param row
      */
-    show(row) {
-      this.form = row
+    show(row, order) {
+      this.form = { ...this.resetForm }
+      if (row.creditBuyerId) {
+        this.form.creditBuyerId = row.creditBuyerId
+        this.form.orderId = order.id
+      } else {
+        this.form.id = row.id
+      }
+      this.form.repaymentMethod = row.repaymentMethod
       this.dialogVisible = true
     },
 
diff --git a/src/views/home/data_credit.vue b/src/views/home/data_credit.vue
index 09d1334..847b906 100644
--- a/src/views/home/data_credit.vue
+++ b/src/views/home/data_credit.vue
@@ -24,7 +24,7 @@
     <div class="head-container content">
       <el-table v-loading="tableData.loading" :data="tableData.data">
         <el-table-column label="挂账编码" prop="id" />
-        <el-table-column label="状态" width="90">
+        <el-table-column label="状态">
           <template v-slot="scope">
             {{ scope.row.status == '1' ? '启用' : '停用' }}
           </template>
@@ -36,17 +36,16 @@
         <el-table-column label="剩余挂账额度(元)" prop="remainingAmount" />
         <el-table-column label="账户余额" prop="accountBalance" />
         <el-table-column label="适用门店" prop="shopName" />
-        <el-table-column label="操作" width="300">
+        <el-table-column label="操作" width="250">
           <template v-slot="scope">
-            <el-button type="text" icon="el-icon-edit" @click="$router.push({name: 'data_creditDetail', query: {id: scope.row.id}} )">查看明细</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'edit')">编辑</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'repayment')">还款</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="openDialog(scope.row,'rePaymentRecord')">还款记录</el-button>
+            <el-button type="text" @click="$router.push({name: 'data_creditDetail', query: {id: scope.row.id, repaymentMethod: scope.row.repaymentMethod}} )">查看明细</el-button>
+            <el-button type="text" @click="openDialog(scope.row,'edit')">编辑</el-button>
+            <el-button :style="{ color: scope.row.repaymentMethod == 'order' ? '#999' :''}" type="text" @click="openDialog(scope.row,'repayment')">还款</el-button>
+            <el-button type="text" @click="openDialog(scope.row,'rePaymentRecord')">还款记录</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
               <el-button
                 slot="reference"
                 type="text"
-                icon="el-icon-delete"
               >删除</el-button>
             </el-popconfirm>
           </template>
@@ -80,7 +79,7 @@
 import creditAdd from './components/credit_add.vue'
 import creditRepayment from './components/credit_repayment.vue'
 import creditRepaymentRecord from './components/credit_RePaymentRecord.vue'
-import { getTbShopCoupon, delCreditBuyer } from '@/api/credit'
+import { getCreditBuyerList, delCreditBuyer } from '@/api/credit'
 export default {
   // eslint-disable-next-line vue/no-unused-components
   components: { creditAdd, creditRepayment, creditRepaymentRecord },
@@ -122,14 +121,14 @@ export default {
   },
   methods: {
     /**
-     * 创建挂账人
+     * 操作
      */
     openDialog(row, type) {
       if (type === 'add') {
         this.$refs.creditAdd.show()
       } else if (type === 'edit') {
         this.$refs.creditAdd.show(row)
-      } else if (type === 'repayment') {
+      } else if (type === 'repayment' && row.repaymentMethod === 'total') {
         this.$refs.creditRepayment.show(row)
       } else if (type === 'rePaymentRecord') {
         this.$refs.creditRepaymentRecord.show(row)
@@ -138,7 +137,6 @@ export default {
 
     // 重置查询
     resetHandle() {
-      console.log(123123)
       this.page = 1
       this.getTableData()
     },
@@ -157,7 +155,7 @@ export default {
     async getTableData() {
       this.tableData.loading = true
       try {
-        const res = await getTbShopCoupon({
+        const res = await getCreditBuyerList({
           page: this.tableData.page,
           size: this.tableData.size,
           keywords: this.tableData.keywords,
diff --git a/src/views/home/data_creditDetail.vue b/src/views/home/data_creditDetail.vue
index 352c2d3..56d9bec 100644
--- a/src/views/home/data_creditDetail.vue
+++ b/src/views/home/data_creditDetail.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/valid-v-bind -->
 <template>
   <div class="app-container">
     <div class="head-container">
@@ -26,11 +27,8 @@
         </el-form-item>
         <template>
           <el-form-item>
-            <el-input v-model="query.proName" placeholder="商品名称" />
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="query.cateId" placeholder="全部状态" style="width: 140px;">
-              <el-option v-for="item in categorys" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select v-model="query.status" placeholder="全部状态" style="width: 140px;">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </template>
@@ -42,49 +40,53 @@
     </div>
     <div class="head-container">
       <div class="collect_wrap">
-        <div v-for="item in payCountList" :key="item.id" class="item">
-          <div class="icon_wrap" style="--bg-color:#C978EE">
-            <i class="icon" :class="item.icon" />
+        <div v-for="(item,index) in payCountList" :key="index" class="item">
+          <div class="icon_wrap" :style="{ backgroundColor: `rgba(${item.color},0.5)` }">
+            <div />
+            <i class="icon" :class="item.icon" :style="{ color: `rgba(${item.color},1)` }" />
           </div>
           <div class="info">
             <div class="m">
-              <template v-if="item.isAmount == 1">￥</template>
-              {{ item.payAmount }}
+              ￥{{ item.amount }}
             </div>
-            <div class="t">{{ item.payType }}</div>
+            <div class="t">{{ item.label }}{{ index == 0 ? item.count+'笔' : '' }}</div>
           </div>
         </div>
       </div>
     </div>
     <div class="head-container">
       <el-table v-loading="tableData.loading" :data="tableData.data">
-        <el-table-column label="创建日期" prop="name" />
-        <el-table-column label="订单号" prop="name" />
-        <el-table-column label="应付金额" prop="salesAmount">
-          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        <el-table-column label="创建日期" prop="createTime" />
+        <el-table-column label="订单号" prop="orderId" />
+        <el-table-column label="应付金额" prop="payAmount">
+          <template v-slot="scope"> {{ '￥'+scope.row.payAmount || '-' }} </template>
         </el-table-column>
-        <el-table-column label="已付款金额" prop="salesAmount">
-          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        <el-table-column label="已付款金额" prop="paidAmount">
+          <template v-slot="scope"> {{ '￥'+scope.row.paidAmount || '-' }} </template>
         </el-table-column>
-        <el-table-column label="待付款金额" prop="salesAmount">
-          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        <el-table-column label="待付款金额" prop="unpaidAmount">
+          <template v-slot="scope"> {{ '￥'+scope.row.unpaidAmount || '-' }} </template>
         </el-table-column>
         <el-table-column label="状态" prop="salesAmount">
           <template v-slot="scope">
-            ￥{{ scope.row.salesAmount }}
+            {{
+              scope.row.status == 'unpaid' ? '未付款' :
+              scope.row.status == 'partial' ? '部分支付' :
+              scope.row.status == 'paid' ? '已付款' : ''
+            }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" prop="salesAmount">
-          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        <el-table-column label="付款方式" prop="lastPaymentMethod">
+          <template v-slot="scope"> {{ scope.row.lastPaymentMethod }} </template>
         </el-table-column>
-        <el-table-column label="备注" prop="salesAmount">
-          <template v-slot="scope"> ￥{{ scope.row.salesAmount }} </template>
+        <el-table-column label="备注" prop="remark">
+          <template v-slot="scope"> {{ scope.row.remark }} </template>
         </el-table-column>
-        <el-table-column label="付款时间" prop="name" />
-        <el-table-column label="操作" width="350">
+        <el-table-column label="付款时间" prop="lastPaymentTime" />
+        <el-table-column label="操作" width="200">
           <template v-slot="scope">
-            <el-button type="text" icon="el-icon-edit" @click="addCredit(scope.row,'repayment')">付款</el-button>
-            <el-button type="text" icon="el-icon-edit" @click="addCredit(scope.row,'edit')">账单付款记录</el-button>
+            <el-button type="text" :style="{ color: repaymentMethod == 'total' ? '#999' :''}" @click="openDialog(scope.row,'payment')">付款</el-button>
+            <el-button type="text" @click="openDialog(scope.row,'paymentRecord')">账单付款记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -92,50 +94,71 @@
     <div class="head-container">
       <el-pagination
         :total="tableData.total"
-        :current-page="tableData.page"
-        :page-size="tableData.size"
+        :current-page="query.page"
+        :page-size="query.size"
         layout="total, sizes, prev, pager, next, jumper"
         @current-change="paginationChange"
         @size-change="sizeChange"
       />
     </div>
+
+    <!-- 还款 -->
+    <creditRepayment ref="creditRepayment" @success="resetHandle" />
+
+    <!-- 还款记录 -->
+    <creditRepaymentRecord ref="creditRepaymentRecord" @success="resetHandle" />
   </div>
 </template>
 
 <script>
-import { daycount, summaryday } from '@/api/home'
-import { tbShopCategoryGet } from '@/api/shop'
+import creditRepayment from './components/credit_repayment.vue'
+import creditRepaymentRecord from './components/credit_RePaymentRecord.vue'
+import { creditBuyerOrderList, creditBuyerOrderSummary } from '@/api/credit'
 import dayjs from 'dayjs'
 
 export default {
+  components: { creditRepayment, creditRepaymentRecord },
   filters: {
   },
   data() {
     return {
       timeValue: '',
       resetQuery: null,
-      categorys: [],
+      repaymentMethod: '',
+      statusList: [
+        { label: '未付款', value: 'unpaid' },
+        { label: '部分支付', value: 'partial' },
+        { label: '已付款', value: 'paid' }
+      ],
       query: {
+        page: 1,
+        size: 10,
+        creditBuyerId: '',
         createdAt: [],
-        proName: '',
-        cateId: ''
+        status: ''
       },
       tableData: {
         data: [],
-        page: 1,
-        size: 10,
         loading: false,
         total: 0
       },
       downloadLoading: false,
-      payCountList: '',
+      payCountList: [
+        { label: '总交易', icon: 'el-icon-info', color: '201, 120, 236', amount: 0, count: 0 },
+        { label: '已支付金额', icon: 'el-icon-success', color: '70, 181, 24', amount: 0 },
+        { label: '待支付金额', icon: 'el-icon-circle-plus', color: '248, 110, 16', amount: 0 },
+        { label: '待支付笔数', icon: 'el-icon-warning', color: '254, 180, 38', amount: 0 }
+      ],
       payCountTotal: 0
     }
   },
   mounted() {
+    this.query.creditBuyerId = this.$route.query.id
+    this.repaymentMethod = this.$route.query.repaymentMethod
     this.resetQuery = { ...this.query }
+    // repaymentMethod
     this.getTableData()
-    this.tbShopCategoryGet()
+    // this.tbShopCategoryGet()
   },
   methods: {
     /**
@@ -144,15 +167,19 @@ export default {
     async getTableData() {
       this.tableData.loading = true
       try {
-        this.daycount()
-        const res = await summaryday({
-          page: this.tableData.page,
-          size: this.tableData.size,
-          startTime: this.query.createdAt[0],
-          endTime: this.query.createdAt[1],
-          proName: this.query.proName,
-          cateId: this.query.cateId
-        })
+        this.creditDetailSummary()
+        // eslint-disable-next-line prefer-const
+        let params = {
+          page: this.query.page,
+          size: this.query.size,
+          creditBuyerId: this.query.creditBuyerId
+        }
+        if (this.query.createdAt.length > 0) {
+          params.beginDate = this.query.createdAt[0].substring(0, 10)
+          params.endDate = this.query.createdAt[1].substring(0, 10)
+        }
+        // eslint-disable-next-line prefer-const
+        let res = await creditBuyerOrderList(params)
         this.tableData.loading = false
         this.tableData.data = res.content
         this.tableData.total = res.totalElements
@@ -161,6 +188,44 @@ export default {
       }
     },
 
+    /**
+     * 获取明细统计
+     */
+    async creditDetailSummary() {
+      try {
+        // eslint-disable-next-line prefer-const
+        let params = {
+          page: this.query.page,
+          size: this.query.size,
+          creditBuyerId: this.query.creditBuyerId
+        }
+        if (this.query.createdAt.length > 0) {
+          params.beginDate = this.query.createdAt[0].substring(0, 10)
+          params.endDate = this.query.createdAt[1].substring(0, 10)
+        }
+        // eslint-disable-next-line prefer-const
+        let res = await creditBuyerOrderSummary(params)
+        this.payCountList[0].amount = res.payAmountTotal
+        this.payCountList[0].count = res.count
+        this.payCountList[1].amount = res.paidAmountTotal
+        this.payCountList[2].amount = res.unpaidAmountTotal
+        this.payCountList[3].amount = res.unpaidCount
+      } catch (error) {
+        console.log(error)
+      }
+    },
+
+    /**
+     * 操作
+     */
+    openDialog(row, type) {
+      if (type === 'payment' && this.repaymentMethod === 'order') {
+        this.$refs.creditRepayment.show({ creditBuyerId: this.query.creditBuyerId, repaymentMethod: this.repaymentMethod }, row)
+      } else if (type === 'paymentRecord') {
+        this.$refs.creditRepaymentRecord.show({ creditBuyerId: this.query.creditBuyerId, repaymentMethod: this.repaymentMethod }, row.id)
+      }
+    },
+
     /**
      * 切换时间
      * @param e
@@ -246,7 +311,6 @@ export default {
     resetHandle() {
       this.timeValue = ''
       this.query = { ...this.resetQuery }
-      this.page = 1
       this.getTableData()
     },
 
@@ -264,58 +328,12 @@ export default {
      * @param e
      */
     paginationChange(e) {
-      this.tableData.page = e
+      this.query.page = e
       this.getTableData()
-    },
-
-    // 获取商品分类
-    async tbShopCategoryGet() {
-      try {
-        const res = await tbShopCategoryGet({
-          page: 1,
-          size: 200,
-          sort: 'id,desc',
-          shopId: localStorage.getItem('shopId')
-        })
-        let categorys = []
-        for (let item of res.content) {
-          categorys.push({
-            name: `|----${item.name}`,
-            id: item.id
-          })
-          if (item.childrenList.length) {
-            for (let val of item.childrenList) {
-              categorys.push({
-                name: `|----|----${val.name}`,
-                id: val.id
-              })
-            }
-          }
-        }
-        this.categorys = categorys
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    // 获取订单汇总
-    async daycount() {
-      try {
-        const res = await daycount({
-          startTime: this.query.createdAt[0],
-          endTime: this.query.createdAt[1],
-          cateId: this.query.cateId,
-          proName: this.query.proName,
-
-          type: this.orderType,
-        });
-        this.payCountList = res;
-      } catch (error) {
-        console.log(error);
-      }
     }
-    
+
   }
-};
+}
 </script>
 
 <style scoped lang="scss">
@@ -324,29 +342,14 @@ export default {
   gap: 14px;
   justify-content: space-between;
 
-  .item:nth-child(1) {
-    background-image: url(../../assets/images/home/data_forms4.png);
-  }
-
-  .item:nth-child(2) {
-    background-image: url(../../assets/images/home/data_forms3.png);
-  }
-
-  .item:nth-child(3) {
-    background-image: url(../../assets/images/home/data_forms2.png);
-  }
-
-  .item:nth-child(4) {
-    background-image: url(../../assets/images/home/data_forms1.png);
-  }
-
   .item {
     background-size: 100% 100%;
     width: 255px;
     display: flex;
     align-items: center;
-    background-color: #f5f5f5;
+    background-color: #F7F7FA;
     padding: 20px;
+    border-radius: 7px 7px 7px 7px;
 
     .icon_wrap {
       $size: 34px;
@@ -359,7 +362,18 @@ export default {
       background-color: var(--bg-color);
       border-radius: 50%;
       position: relative;
-
+      >div{
+        width: 24px;
+        height: 24px;
+        background-color: #fff;
+        border-radius: 50%;
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        margin: auto;
+      }
       &::after {
         content: "";
         width: $size + $border;
@@ -374,8 +388,13 @@ export default {
       }
 
       .icon {
-        font-size: 16px;
-        color: #fff;
+        font-size: 32px;
+        position: absolute;
+        left: 1px;
+        right: 0;
+        top: 1px;
+        bottom: 0;
+        margin: auto;
       }
 
       .img {

From 952574e92de924971015f822b03629da8f62f4cf Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 25 Nov 2024 16:26:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/data_credit.vue       | 73 +++++++++++++---------------
 src/views/home/data_creditDetail.vue |  1 -
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/views/home/data_credit.vue b/src/views/home/data_credit.vue
index 847b906..a106ba5 100644
--- a/src/views/home/data_credit.vue
+++ b/src/views/home/data_credit.vue
@@ -112,14 +112,45 @@ export default {
         size: 10,
         loading: false,
         total: 0
-      },
-      couponId: null
+      }
     }
   },
   mounted() {
     this.getTableData()
   },
   methods: {
+
+    /**
+     * 获取挂账人列表
+     */
+    async getTableData() {
+      this.tableData.loading = true
+      try {
+        const res = await getCreditBuyerList({
+          page: this.tableData.page,
+          size: this.tableData.size,
+          keywords: this.tableData.keywords,
+          status: this.tableData.status,
+          shopId: localStorage.getItem('shopId')
+        })
+        this.tableData.loading = false
+        this.tableData.data = res.content
+        this.tableData.total = res.totalElements
+      } catch (error) {
+        console.log(error)
+      }
+    },
+
+    /**
+     * 删除挂账人
+     * @param id
+     */
+    async delTableHandle(id) {
+      // eslint-disable-next-line no-unused-vars
+      const res = await delCreditBuyer(id)
+      this.getTableData()
+    },
+
     /**
      * 操作
      */
@@ -147,46 +178,8 @@ export default {
     },
     // 分页回调
     paginationChange(e) {
-      console.log(e)
       this.tableData.page = e
       this.getTableData()
-    },
-    // 获取挂账列表
-    async getTableData() {
-      this.tableData.loading = true
-      try {
-        const res = await getCreditBuyerList({
-          page: this.tableData.page,
-          size: this.tableData.size,
-          keywords: this.tableData.keywords,
-          status: this.tableData.status,
-          shopId: localStorage.getItem('shopId')
-        })
-        this.tableData.loading = false
-        this.tableData.data = res.content
-        this.tableData.total = res.totalElements
-        console.log(this.tableData)
-      } catch (error) {
-        console.log(error)
-      }
-    },
-
-    /**
-     * 查看领取详情
-     */
-    couponDetailsOpen(row) {
-      this.$refs.couponDetails.show(row)
-      this.couponId = row.id
-    },
-
-    /**
-     * 删除优惠券
-     * @param id
-     */
-    async delTableHandle(id) {
-      const delRes = await delCreditBuyer(id)
-      console.log(delRes)
-      this.getTableData()
     }
   }
 }
diff --git a/src/views/home/data_creditDetail.vue b/src/views/home/data_creditDetail.vue
index 56d9bec..9bd7d62 100644
--- a/src/views/home/data_creditDetail.vue
+++ b/src/views/home/data_creditDetail.vue
@@ -302,7 +302,6 @@ export default {
         default:
           break
       }
-      console.log(this.timeValue)
     },
 
     /**