Commit Graph
478 Commits
Author SHA1 Message Date
zjf 67072d6c6b 修改 2025-03-06 17:46:16 +08:00
zjf 451a1f4cf5 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-06 17:05:48 +08:00
dzc 5151924a27 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	src/views/hard/hard-order/index.vue
2025-03-06 16:45:39 +08:00
dzc 72e075f308 feat:财务增加统计纬度 2025-03-06 16:43:28 +08:00
zjf aceb3c3312 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-06 16:42:34 +08:00
weiwei 978176eea5 货商下拉修改 2025-03-06 16:39:39 +08:00
zjf acfec2862a Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-06 16:24:46 +08:00
weiwei 1c9920c314 修改 2025-03-06 16:23:00 +08:00
zjf 616d8caddb Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	src/views/supermarketerp/components/linkCodeDialog.vue
2025-03-06 15:59:23 +08:00
zjf 6255f84fa0 修改 2025-03-06 15:58:31 +08:00
weiwei 5dce0acf8c 导出excel加上日期 2025-03-06 14:38:52 +08:00
weiwei 8bdf76ae3a 超市调整 2025-03-06 11:11:07 +08:00
weiwei 71e0c15a7c 按钮显示调整 2025-03-05 23:36:58 +08:00
weiwei 9d06971811 修复按钮错误 2025-03-05 22:20:28 +08:00
weiwei 314b380e75 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-05 18:50:56 +08:00
weiwei a6ef0e5b7f 正元同步配置记录增加创建时间查看 2025-03-05 18:50:29 +08:00
weiwei 0b7b27708d 商品管理调整 2025-03-05 18:46:09 +08:00
weiwei b34608b876 商品关联调整 2025-03-05 18:45:28 +08:00
weiwei be7113bc75 商户修改 2025-03-05 18:45:12 +08:00
dzc 3afa5e038f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-05 17:09:24 +08:00
dzc 6773ce379b 11 2025-03-05 17:09:21 +08:00
weiwei d47a4d65c6 成本价不编辑 2025-03-05 16:28:52 +08:00
weiwei a4cbdc75b7 部分调整 2025-03-05 16:28:35 +08:00
weiwei cf57e818e8 轮播图字段默认类型修改 2025-03-05 16:20:22 +08:00
weiwei be64a6c4e1 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-05 16:18:37 +08:00
weiwei a0aeecd584 轮播图字段类型判断 2025-03-05 16:18:11 +08:00
dzc 12ae0b3a97 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 22:44:55 +08:00
dzc 74f7fc610d 111 2025-03-04 22:44:51 +08:00
weiwei 2b9727224d 部分输入框长度调整 2025-03-04 22:39:01 +08:00
weiwei c521ad4feb loading修改 2025-03-04 20:14:27 +08:00
weiwei 4388bcf509 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 19:52:41 +08:00
weiwei e04da7b360 目录结构调整 2025-03-04 19:52:17 +08:00
dzc 7cbdc48ac7 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 19:48:30 +08:00
dzc 3734c4d14c 11 2025-03-04 19:48:21 +08:00
weiwei b78f9d88dc 正元同步配置-错误展示 2025-03-04 17:40:50 +08:00
weiwei 0e7a05adf9 正元同步配置 2025-03-04 17:26:19 +08:00
dzc c2c76ec667 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 17:11:56 +08:00
dzc 93dd7c4f5b 111 2025-03-04 17:11:52 +08:00
weiwei 1c2e964d00 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 17:10:34 +08:00
weiwei b1ca12c9e3 菜单目录调整 2025-03-04 17:10:17 +08:00
weiwei e56450e07b 菜单页面修改 2025-03-04 17:09:26 +08:00
weiwei bd0059b2d6 正元同步配置 2025-03-04 17:07:33 +08:00
dzc 046947eefd Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 16:13:27 +08:00
dzc 91e1d8350b feat:硬件正元接口 2025-03-04 16:13:23 +08:00
weiwei a6dcf72061 正元同步配置 2025-03-04 16:00:38 +08:00
weiwei d10f8a1d16 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-04 15:44:36 +08:00
weiwei 64a6f7871d 正元同步配置 2025-03-04 15:44:25 +08:00
dzc fc0dc53a72 feat:手动同步api 2025-03-04 15:39:04 +08:00
weiwei 23b0342601 正元同步配置 2025-03-04 15:27:03 +08:00
weiwei b94dff9cb0 正元同步配置 2025-03-04 11:20:03 +08:00