From 83658f712c4f8961f99718018d814bee19386b0d Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Fri, 21 Jun 2024 17:48:39 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/data_forms.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue index 2da8c3c..64be13e 100644 --- a/src/views/home/data_forms.vue +++ b/src/views/home/data_forms.vue @@ -81,6 +81,11 @@ ￥{{ scope.row.cash }} + + + - + + + + - + 付款 - --> + + + + + + + + +
+ 取 消 + 确 定 +
+ + + \ No newline at end of file diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue new file mode 100644 index 0000000..af0d27b --- /dev/null +++ b/src/views/invoicing/consumable/specifications.vue @@ -0,0 +1,494 @@ + + + + + + \ No newline at end of file diff --git a/src/views/invoicing/consumable/type.vue b/src/views/invoicing/consumable/type.vue new file mode 100644 index 0000000..5267136 --- /dev/null +++ b/src/views/invoicing/consumable/type.vue @@ -0,0 +1,294 @@ + + + + + + \ No newline at end of file From 14bf3f4ac8881b7b490bf88d005c094d0df99b63 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 26 Jun 2024 09:09:51 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/data_forms.vue | 9 +++++++-- src/views/order_manage/components/orderDetail.vue | 2 +- src/views/order_manage/order_list.vue | 14 ++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/views/home/data_forms.vue b/src/views/home/data_forms.vue index c43bc34..86f3373 100644 --- a/src/views/home/data_forms.vue +++ b/src/views/home/data_forms.vue @@ -63,12 +63,12 @@ @@ -106,6 +106,7 @@ + @@ -161,6 +162,10 @@ export default { filters: { timeFilter(time) { return dayjs(time).format("YYYY-MM-DD HH:mm:ss"); + }, + totalfilter(item,d) { + let num = item + d + return num.toFixed(2) } }, mounted() { diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue index d61a119..117490d 100644 --- a/src/views/order_manage/components/orderDetail.vue +++ b/src/views/order_manage/components/orderDetail.vue @@ -142,7 +142,7 @@ -
退款：￥-{{ item.refundAmount }}
+
退款：￥-{{ item.orderAmount }}
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue index de42361..cd3afe0 100644 --- a/src/views/order_manage/order_list.vue +++ b/src/views/order_manage/order_list.vue @@ -123,10 +123,8 @@ {{ item.productName }} (退 - {{ item.num }})(退 - {{ item.refundNumber }})
{{ item.productSkuName }}
@@ -140,13 +138,13 @@
{{ scope.row.orderType | orderTypeFilter }}
- 退款：-￥{{ scope.row.refundAmount }} + 退款：-￥{{ scope.row.orderAmount }}
-
￥{{ scope.row.orderAmount }}
+
￥{{ scope.row.orderAmount }}
 From ac96e0f3e081bbd1fe56f9c260f054c1287477e9 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 26 Jun 2024 11:11:59 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/api/invoicing.js | 3 ++- src/components/shopList/index.vue | 15 ++++++++++++++- src/views/invoicing/operation_in.vue | 8 +++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index 7029818..363647d 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ ENV = 'development' # 接口地址 # VUE_APP_BASE_API = 'http://192.168.2.17:8000' # VUE_APP_BASE_API = 'http://192.168.2.42:8000' -# VUE_APP_BASE_API = 'http://192.168.2.133:8000' +VUE_APP_BASE_API = 'http://192.168.2.147:8000' # 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 = 'http://192.168.2.96:8000' VUE_APP_WS_API = 'ws://192.168.2.128:8000' diff --git a/src/api/invoicing.js b/src/api/invoicing.js index 58b107b..85d75e4 100644 --- a/src/api/invoicing.js +++ b/src/api/invoicing.js @@ -54,11 +54,12 @@ export function tbProductStockDetailSum(params) { */ export function tbShopPurveyorGet(params) { return request({ - url: `/api/tbShopPurveyor`, + url: `/api/tbProduct/admin`, method: "get", params }); } + // 供应商列表1 export function tbShopPurveyorGets(params) { return request({ diff --git a/src/components/shopList/index.vue b/src/components/shopList/index.vue index 232270e..e24f0ad 100644 --- a/src/components/shopList/index.vue +++ b/src/components/shopList/index.vue @@ -30,6 +30,19 @@ + + + + + + + - + @@ -178,7 +178,7 @@ export default { purveyorId: [ { required: true, - message: ' ', + message: '请选择供应商', trigger: 'change' } ], @@ -202,6 +202,7 @@ export default { this.tbShopPurveyorGet() }, methods: { + // 提交 submitHandle() { this.$refs.queryForm.validate(async valid => { @@ -209,6 +210,7 @@ export default { try { this.queryFormLoading = true this.queryForm.list = this.tableData.list + console.log(this.queryForm,'调试costPrice') await tbProductStockOperateOutAndOn(this.queryForm) this.queryFormLoading = false this.showResult = true From 0d42d145af8fee994f2023316c602fa56a9caaf0 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 26 Jun 2024 13:57:10 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.production | 4 ++-- src/api/invoicing.js | 3 +-- src/api/shop.js | 2 +- src/views/invoicing/operation_in.vue | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index 363647d..ad2c296 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 接口地址 # VUE_APP_BASE_API = 'http://192.168.2.17:8000' # VUE_APP_BASE_API = 'http://192.168.2.42:8000' -VUE_APP_BASE_API = 'http://192.168.2.147:8000' -# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' +# VUE_APP_BASE_API = 'http://192.168.2.133:8000' +VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' # VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' # VUE_APP_BASE_API = 'http://192.168.2.96:8000' VUE_APP_WS_API = 'ws://192.168.2.128:8000' diff --git a/.env.production b/.env.production index ffc2fc2..3b02e74 100644 --- a/.env.production +++ b/.env.production @@ -2,8 +2,8 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' -# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' +# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' +VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' # VUE_APP_BASE_API = 'http://192.168.2.98:8000' # 如果接口是 http 形式， wss 需要改为 ws VUE_APP_WS_API = 'wss://123.56.110.252 diff --git a/src/api/invoicing.js b/src/api/invoicing.js index 85d75e4..58b107b 100644 --- a/src/api/invoicing.js +++ b/src/api/invoicing.js @@ -54,12 +54,11 @@ export function tbProductStockDetailSum(params) { */ export function tbShopPurveyorGet(params) { return request({ - url: `/api/tbProduct/admin`, + url: `/api/tbShopPurveyor`, method: "get", params }); } - // 供应商列表1 export function tbShopPurveyorGets(params) { return request({ diff --git a/src/api/shop.js b/src/api/shop.js index 5891ae2..a5e27ff 100644 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -6,7 +6,7 @@ import request from "@/utils/request"; */ export function tbProduct(params) { return request({ - url: "/api/tbProduct", + url: "/api/tbProduct/list", method: "get", params }); diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue index 206a408..2663d9d 100644 --- a/src/views/invoicing/operation_in.vue +++ b/src/views/invoicing/operation_in.vue @@ -89,7 +89,7 @@ From 98c9b20e37ae29700cae5ff61e438a675e9e3d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Wed, 26 Jun 2024 14:34:11 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/consumable/information.vue | 8 ++++---- src/views/invoicing/consumable/specifications.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue index ebf7cff..43332f1 100644 --- a/src/views/invoicing/consumable/information.vue +++ b/src/views/invoicing/consumable/information.vue @@ -361,11 +361,11 @@ export default { }, // 重置查询 resetHandletype() { - this.query.conTypeCode = '' - this.query.conTypeName = '' - this.query.status = '' + this.querytypedialogshowquery.conTypeName = '' + this.querytypedialogshowquery.conTypeCode = '' + this.querytypedialogshowquery.status = '' this.tableData.page = 0 - this.getTableData() + this.getTableDatatype() }, // 选择的类型 tableDatatypetable(item) { diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue index af0d27b..4f0d552 100644 --- a/src/views/invoicing/consumable/specifications.vue +++ b/src/views/invoicing/consumable/specifications.vue @@ -313,10 +313,10 @@ export default { this.getTableDatasku() }, resetHandleinformation() { - this.resetHandleinformation.conTypeId = '' - this.resetHandleinformation.conTypeName = '' - this.resetHandleinformation.conCode = '' - this.resetHandleinformation.conName = '' + this.queryinformation.conTypeId = '' + this.queryinformation.conTypeName = '' + this.queryinformation.conCode = '' + this.queryinformation.conName = '' this.tableDatainformation.page = 0 this.getTableDatainformation() }, From f9ae277ca8959e71a1a5cdb9dceb28cd9c3484df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Wed, 26 Jun 2024 15:57:18 +0800 Subject: [PATCH 11/14] add --- src/views/invoicing/consumable/information.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/invoicing/consumable/information.vue b/src/views/invoicing/consumable/information.vue index 43332f1..f614437 100644 --- a/src/views/invoicing/consumable/information.vue +++ b/src/views/invoicing/consumable/information.vue @@ -68,7 +68,7 @@ @@ -202,6 +202,13 @@ export default { this.tbShopPurveyorGet() }, methods: { + modifyPrice() { + let zong = 0 + this.tableData.list.forEach(ele => { + zong += ele.costPrice * ele.number + }) + this.queryForm.totalAmount = zong + }, // 提交 submitHandle() { this.$refs.queryForm.validate(async valid => { From 55e696a6a2e99f964df8380a2baa69d9a9638e2a Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 26 Jun 2024 16:48:52 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/supplier_manage/purchase_detail.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/invoicing/supplier_manage/purchase_detail.vue b/src/views/invoicing/supplier_manage/purchase_detail.vue index 139b7fa..c8f8543 100644 --- a/src/views/invoicing/supplier_manage/purchase_detail.vue +++ b/src/views/invoicing/supplier_manage/purchase_detail.vue @@ -90,7 +90,7 @@ {{ scope.row.type == 'purveyor' ? '进货单' : '退货单' }} - + @@ -104,8 +104,7 @@ From 3d4434dbbe01116bf10cd6457175ce824971f3c8 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Thu, 27 Jun 2024 09:36:42 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/invoicing/goods_stoks.vue | 42 +++++++++++-------------- src/views/invoicing/supplier_manage.vue | 1 + 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/views/invoicing/goods_stoks.vue b/src/views/invoicing/goods_stoks.vue index 157a4a6..008cd69 100644 --- a/src/views/invoicing/goods_stoks.vue +++ b/src/views/invoicing/goods_stoks.vue @@ -25,17 +25,23 @@
+ + + -