一经创建无法更改还款方式
+ 一经创建无法更改还款方式
+ {{ item.label }}
@@ -13,7 +12,7 @@
注：第一张图为商品封面图，图片尺寸为750×750
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- x{{ item.groupNum }}
-
+
+ 固定套餐
+ 可选套餐
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加商品
+
+
+ 设置规格
+ 删除
+
+
+
+
+
+ 添加套餐组
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 添加商品
+
+
+ 设置规格
+ 删除
+
+
+
+
+ 用于快递或配送运费计重
+
+
+
+
+
+
+
+
+ 选项值
+
+ {{ item.specSnap }}
+
+ 请谨慎修改！！！
请谨慎修改！！！
+ 请谨慎修改！！！
+ 请谨慎修改！！！
+ 请谨慎修改！！！
请谨慎修改！！！
-
- ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17,6 +48,9 @@
+
+
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 @@
+
+
+ ![]()
+ {{ shopName }}
+
+
+
+
+
+ (主)
+ {{ item.shopName }}
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+ ￥
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
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 06/16] =?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 @@
+
+
+ 挂账管理
+
+
+
+
+
+ 创建挂账人
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status == '1' ? '启用' : '停用' }}
+
+
+
+
+ 查看明细
+ 编辑
+ 还款
+ 还款记录
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+ 重置
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.name ? scope.row.name : '-' }}
+ {{ scope.row.name ? scope.row.name : '-' }}
+ {{ scope.row.name ? scope.row.name : '-' }}
+
+
+ {{ form.id?'编辑':'创建' }}挂账人
挂账还款
+
-
-
+
+
{{ item.label }}
-
@@ -24,21 +30,13 @@
-
-
-
-
-
- {{ item.label }}
-
-
-
+
+
挂账人：{{ form.debtor }}
+ 挂账金额：￥{{ form.owedAmount || 0 }}
+ 账户余额: ￥{{ form.accountBalance || 0 }}
+ 一经创建无法更改还款方式
一经创建无法更改还款方式
+
-
+ 查询
+
-
- 挂账管理
-
-
+
创建挂账人
@@ -19,12 +16,15 @@
:value="item.value"
/>
+
+
+
{{ scope.row.status == '1' ? '启用' : '停用' }}
@@ -34,20 +34,19 @@
+
- 查看明细
- 编辑
- 还款
- 还款记录
+ 查看明细
+ 编辑
+ 还款
+ 还款记录
删除
@@ -66,10 +65,13 @@
-
@@ -77,10 +79,11 @@
+
+
From 161caeeabe06552bc6be2f0c4ae103cb39e8d9c4 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 25 Nov 2024 10:59:20 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/application.js | 24 ++++-
src/views/application/index.vue | 96 ++++++++++++-------
.../order_manage/components/Invoicing.vue | 34 +++++++
src/views/order_manage/order_list.vue | 7 +-
4 files changed, 125 insertions(+), 36 deletions(-)
create mode 100644 src/views/order_manage/components/Invoicing.vue
diff --git a/src/api/application.js b/src/api/application.js
index 22e3b3f..bfc2842 100644
--- a/src/api/application.js
+++ b/src/api/application.js
@@ -18,7 +18,29 @@ export function tbPrintMachine(data, method = "post") {
// 开票
export function getbinding(data) {
return request({
- url: "/api/tbShopInfo/binding",
+ url: "/api/invoice/binding",
+ method: "post",
+ data: {
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+// 获取数电发票类型
+export function getdigitalInvoice(data) {
+ return request({
+ url: "/api/invoice/digitalInvoice",
+ method: "post",
+ data: {
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+// 获取项目分类
+export function getindustry(data) {
+ return request({
+ url: "/api/invoice/industry",
method: "post",
data: {
shopId: localStorage.getItem("shopId"),
diff --git a/src/views/application/index.vue b/src/views/application/index.vue
index ebb48f2..585417c 100644
--- a/src/views/application/index.vue
+++ b/src/views/application/index.vue
@@ -2,15 +2,6 @@
应用中心
-
![]()
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
- 
-
-
-
- 开票
-
-
-
-
@@ -22,28 +13,35 @@
联系区域经理开通
- 更换绑定
-
+ 联系区域经理开通
+ 更换绑定
+
@@ -150,7 +150,8 @@
详情
- 结账
+ 结账
@@ -207,24 +208,24 @@ export default {
filters: {
orderTypeFilter(t) {
if (t) {
- const item= orderEnum.orderType.find(item => item.key == t);
- return t && item?item.label:'';
+ const item = orderEnum.orderType.find(item => item.key == t);
+ return t && item ? item.label : '';
} else {
return t;
}
},
sendTypeFilter(t) {
if (t) {
- const item= orderEnum.sendType.find(item => item.key == t);
- return item?item.label:'';
+ const item = orderEnum.sendType.find(item => item.key == t);
+ return item ? item.label : '';
} else {
return t;
}
},
statusFilter(t) {
if (t) {
- const item= orderEnum.status.find(item => item.key == t);
- return t && item?item.label:'';
+ const item = orderEnum.status.find(item => item.key == t);
+ return t && item ? item.label : '';
} else {
return t;
}
@@ -245,7 +246,7 @@ export default {
this.query.orderNo = this.$route.query.orderNo
}
this.resetQuery = { ...this.query };
- this.tbShopPayTypeGet();
+ // this.tbShopPayTypeGet();
this.getTableData();
// 从商品库存-库存记录-点击订单号跳转过来
if (this.$route.query.orderNo) {
@@ -254,11 +255,11 @@ export default {
this.getTableData();
}, 200);
}
-
+
},
methods: {
//结账
- payOrder(order){
+ payOrder(order) {
console.log(order);
this.$router.push({
path: "/tool/Instead/index",
@@ -268,7 +269,7 @@ export default {
useType: order.useType,
masterId: order.masterId,
orderId: order.id,
- key:'isJieZhang'
+ key: 'isJieZhang'
},
});
},
@@ -324,7 +325,7 @@ export default {
async getTableData(switchs = false) {
this.tableData.loading = true;
try {
- this.payCount();
+ // this.payCount();
const productName = this.query.productName.replace(/\s+/g, '')
const res = await tbOrderInfoData({
page: this.tableData.page,
From 0cec66ef278f361cb3955bb34bbb2c9ba049d46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Mon, 25 Nov 2024 14:42:04 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=B8=80=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order_manage/order_list.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index f0fb295..d5fdbf4 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -246,7 +246,7 @@ export default {
this.query.orderNo = this.$route.query.orderNo
}
this.resetQuery = { ...this.query };
- // this.tbShopPayTypeGet();
+ this.tbShopPayTypeGet();
this.getTableData();
// 从商品库存-库存记录-点击订单号跳转过来
if (this.$route.query.orderNo) {
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 12/16] =?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 @@
-
+
-
重置
@@ -14,17 +14,16 @@
-
-
-
+
-
-
+
-
-
+
-
{{ scope.row.name ? scope.row.name : '-' }}
+ {{ scope.row.paymentMethod ? scope.row.paymentMethod : '-' }}
{{ scope.row.name ? scope.row.name : '-' }}
+ {{ scope.row.repaymentAmount ? scope.row.repaymentAmount : '-' }}
{{ scope.row.name ? scope.row.name : '-' }}
+ {{ scope.row.remark ? scope.row.remark : '-' }}
@@ -42,20 +41,16 @@
From e62ff19b5fe2b591a7134843318a18a80624e52c Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 27 Nov 2024 11:35:33 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E6=8C=82=E8=B4=A6=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E9=98=B2=E6=8A=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/credit.js | 4 ++--
src/views/home/components/credit_repayment.vue | 9 ++++++---
src/views/home/data_creditDetail.vue | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/api/credit.js b/src/api/credit.js
index 0010803..f95b9d4 100644
--- a/src/api/credit.js
+++ b/src/api/credit.js
@@ -1,7 +1,7 @@
import request from '@/utils/request'
/**
- * 获取挂账列表
+ * 获取挂账人列表
* @returns
*/
export function getCreditBuyerList(params) {
@@ -15,7 +15,7 @@ export function getCreditBuyerList(params) {
}
/**
- * 获取挂账详情
+ * 获取挂账人详情
* @returns
*/
export function getCreditBuyerInfo(id) {
diff --git a/src/views/home/components/credit_repayment.vue b/src/views/home/components/credit_repayment.vue
index 24877b6..bff019e 100644
--- a/src/views/home/components/credit_repayment.vue
+++ b/src/views/home/components/credit_repayment.vue
@@ -90,11 +90,11 @@ export default {
this.resetForm = { ...this.form }
},
methods: {
-
/**
* 确定
*/
- async onSubmitHandle() {
+ // eslint-disable-next-line no-undef
+ onSubmitHandle: _.debounce(function async() {
this.$refs.form.validate(async valid => {
if (valid) {
try {
@@ -120,7 +120,7 @@ export default {
}
}
})
- },
+ }, 1000),
/**
* 打开
@@ -135,6 +135,9 @@ export default {
this.form.id = row.id
}
this.form.repaymentMethod = row.repaymentMethod
+ this.form.debtor = row.debtor
+ this.form.owedAmount = row.owedAmount
+ this.form.accountBalance = row.accountBalance
this.dialogVisible = true
},
diff --git a/src/views/home/data_creditDetail.vue b/src/views/home/data_creditDetail.vue
index 9bd7d62..496c012 100644
--- a/src/views/home/data_creditDetail.vue
+++ b/src/views/home/data_creditDetail.vue
@@ -222,7 +222,7 @@ export default {
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)
+ this.$refs.creditRepaymentRecord.show({ id: this.query.creditBuyerId, repaymentMethod: this.repaymentMethod }, row.orderId)
}
},
From 9465d660ade174288966611701f364e85a1786fe Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 27 Nov 2024 13:28:41 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.production b/.env.production
index 7f079f7..2a4f841 100644
--- a/.env.production
+++ b/.env.production
@@ -3,10 +3,10 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# 测试
-# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
# 生产
-VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# 预发布接口
# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'