Commit Graph

72 Commits

Author SHA1 Message Date
39b6283793 Merge pull request 'zyj' (#7) from zyj into master
Reviewed-on: #7
2024-06-07 07:18:04 +00:00
c5658fb2c7 Merge branch 'master' into zyj 2024-06-07 15:16:24 +08:00
e6fbd6de48 在星链oms添加功能
1.充值功能-对应运营管理系统中企业充值预处理功能
3.查询油价功能-对应运营管理系统中油价管理功能
4.公司管理-客户管理 开户维护银行信息功能
2024-06-07 11:40:19 +08:00
xiaozhiyong
c872e87349 更新 2024-05-29 14:12:56 +08:00
17416b9008 Merge pull request 'zyj' (#6) from zyj into master
Reviewed-on: #6
2024-03-21 06:26:46 +00:00
f43be96193 Merge branch 'master' into zyj 2024-03-21 14:23:49 +08:00
8b12986800 调价任务-新增-添加策略组计算 2024-03-21 14:23:26 +08:00
668ecb976f Merge branch 'master' into zyj
# Conflicts:
#	utils/request.js
2024-03-19 14:32:27 +08:00
xiaozhiyong
66d928e7d2 更新 2024-03-19 08:43:31 +08:00
xiaozhiyong
d6ba26cf31 更新 2024-03-18 08:40:51 +08:00
f41a30578a 更新 2024-03-15 09:25:02 +08:00
xiaozhiyong
895d23dd5c 更新 2024-03-15 08:51:39 +08:00
xiaozhiyong
eb174869a4 更新 2024-02-28 15:45:30 +08:00
xiaozhiyong
1410072142 更新 2024-02-21 10:44:24 +08:00
xiaozhiyong
b1726eba38 更新 2024-01-10 17:05:40 +08:00
xiaozhiyong
def9eac156 Merge remote-tracking branch 'origin/master' into xiaozy_special 2024-01-09 09:50:40 +08:00
xiaozhiyong
51494be14f 更新 2024-01-09 09:50:32 +08:00
9d829b3887 样式优化 2023-12-13 19:55:59 +08:00
c5ede2ad4c Merge pull request '1、oms调拨时显示可调拨金额及哪些账户可进行调拨' (#5) from zyj into master
Reviewed-on: #5
2023-12-13 07:51:59 +00:00
7c2554cde1 1、oms调拨时显示可调拨金额及哪些账户可进行调拨
2、oms可进行返利充值。
3、oms油站账户可查看近3日平均销量
2023-12-12 16:54:00 +08:00
f481362ca0 Merge pull request 'xiaozy_special' (#4) from xiaozy_special into master
Reviewed-on: #4
2023-12-11 03:33:59 +00:00
xiaozhiyong
aabf040620 更新 2023-11-17 10:28:58 +08:00
xiaozhiyong
2fb5ef3efd 更新 2023-11-15 14:05:49 +08:00
xiaozhiyong
c2412056fd 更新 2023-11-14 14:57:49 +08:00
xiaozhiyong
8c006d4f8b 更新 2023-11-07 16:17:06 +08:00
xiaozhiyong
d4d20013f0 更新 2023-11-07 16:14:20 +08:00
cb566136ed Merge pull request 'zyj' (#3) from zyj into master
Reviewed-on: #3
2023-10-18 09:48:53 +00:00
f9716af72d 金额 2023-10-18 13:54:57 +08:00
872c6f71d6 Merge branch 'master' into zyj
# Conflicts:
#	api/sy.js
#	salesRanking/page/enterpriseDetails/enterpriseDetails.vue
2023-10-18 13:37:27 +08:00
bf2ac62a0e 分油记录 2023-10-18 13:29:04 +08:00
xiaozhiyong
a09c18f0b5 Merge branch 'xiaozy_当月动销' 2023-10-12 11:05:28 +08:00
xiaozhiyong
20899d6055 Merge branch 'master' of http://121.196.213.68:3000/caoliancun/wx_oms 2023-10-12 11:05:23 +08:00
xiaozhiyong
98c722a0f1 更新 2023-10-12 11:05:09 +08:00
xiaozhiyong
90bf153623 更新 2023-10-11 14:21:17 +08:00
xiaozhiyong
9bc6a6c855 Merge remote-tracking branch 'origin/master' into xiaozy_当月动销 2023-10-11 08:53:15 +08:00
2024e05db3 Merge pull request '首页图标' (#2) from zyj into master
Reviewed-on: #2
2023-09-26 08:58:09 +00:00
1c47c1cd47 首页图标 2023-09-26 16:38:39 +08:00
xiaozhiyong
c0cd0262f0 更新 2023-09-21 14:59:45 +08:00
xiaozhiyong
5ec7e9d36e 更新 2023-09-20 17:02:19 +08:00
xiaozhiyong
054f945b8a 更新 2023-07-20 17:03:43 +08:00
xiaozhiyong
3a618dcb68 更新 2023-07-17 16:24:56 +08:00
xiaozhiyong
096853f7d0 更新 2023-06-01 20:01:02 +08:00
xiaozhiyong
4a6d49610d 更新 2023-05-30 14:08:01 +08:00
xiaozhiyong
6b0e5e7399 更新 2023-05-30 10:07:12 +08:00
xiaozhiyong
81556f26a0 更新 2023-05-24 16:03:42 +08:00
xiaozhiyong
95d59596af 更新 2023-05-24 16:03:35 +08:00
xiaozhiyong
35befe4dde 更新 2023-05-24 11:35:28 +08:00
xiaozhiyong
9a4d3de6ed 更新 2023-05-24 10:37:17 +08:00
xiaozhiyong
de9a33d79c 更新 2023-05-11 08:48:02 +08:00
xiaozhiyong
4c55408455 更新 2023-05-10 17:42:53 +08:00