fengachen
|
98c63a8665
|
Merge remote-tracking branch 'origin/branch20211008'
# Conflicts:
# src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
|
2021-11-04 18:14:58 +08:00 |
|
fengachen
|
b5186a1e2a
|
合同新增参会人会议费用的显示
|
2021-11-04 18:11:26 +08:00 |
|
zhaoxiao
|
43074faf48
|
[bug] 标协同步的邮寄打印调整
|
2021-11-04 18:06:35 +08:00 |
|
fengachen
|
6ba96e8151
|
项目详情关闭清除之前的信息
|
2021-11-04 17:57:50 +08:00 |
|
zhaoxiao
|
2b70b18fea
|
[bug] 单个开票联系人地址参数
|
2021-11-04 16:39:59 +08:00 |
|
fengachen
|
95cbf3dc89
|
Merge remote-tracking branch 'origin/branch20211008'
|
2021-11-04 12:03:49 +08:00 |
|
fengachen
|
1880bed811
|
字段修改
|
2021-11-04 11:59:56 +08:00 |
|
zhaoxiao
|
21a899dfa4
|
[bug] bug修改;合同打印;角色删除限制
|
2021-11-03 18:11:20 +08:00 |
|
zhaoxiao
|
e68055a0bf
|
[bug] 开票添加邮编参数
|
2021-11-03 17:19:18 +08:00 |
|
fengachen
|
9196989c3b
|
参会未付款的判断
|
2021-11-03 17:17:39 +08:00 |
|
zhaoxiao
|
73f281cbeb
|
[需求变更] 图片预览
|
2021-11-03 14:15:22 +08:00 |
|
fengachen
|
746b62e864
|
合同新增会议参会人的是否需要发票的显示
|
2021-11-03 11:44:39 +08:00 |
|
zhaoxiao
|
cdfa97295f
|
[bug] 打包选择项目列表弹窗调整
|
2021-11-03 11:24:54 +08:00 |
|
fengachen
|
7efa00e685
|
【bug】编辑与详情的控制显示隐藏
|
2021-11-03 11:21:24 +08:00 |
|
fengachen
|
ef7b7f964f
|
【bug】会议来款方式为打包的修改
|
2021-11-03 10:42:55 +08:00 |
|
zhaoxiao
|
ce8128f346
|
[bug] 支出合同合同约定主要时点样式调整
|
2021-11-03 10:00:25 +08:00 |
|
zhaoxiao
|
cecfd565c9
|
Merge branch 'xuqiubangeng1026' of http://10.10.10.43:9090/income_payments/income_payments_client
|
2021-11-03 09:21:36 +08:00 |
|
fengachen
|
9ff75575ab
|
Merge remote-tracking branch 'origin/branch20211008'
|
2021-11-03 09:15:22 +08:00 |
|
fengachen
|
de0b57c6fc
|
【bug】 消息类型
|
2021-11-03 09:14:47 +08:00 |
|
fengachen
|
5706b8c1ca
|
【bug】 审核报名信息按钮的判断修改
|
2021-11-02 17:20:55 +08:00 |
|
zhaoxiao
|
c8fcc028c4
|
[bug] 收入合同合同约定主要时点样式调整
|
2021-11-02 16:39:33 +08:00 |
|
zhaoxiao
|
cfccc1b91d
|
[bug] 收入合同合同约定主要时间点样式调整
|
2021-11-02 16:36:18 +08:00 |
|
zhaoxiao
|
93ad7e49b0
|
[bug] 收入合同关联项目刷新已收金额
|
2021-11-02 16:25:14 +08:00 |
|
fengachen
|
a079a0b333
|
【bug】消息加入内容提示
|
2021-11-02 15:08:32 +08:00 |
|
zhaoxiao
|
51eff1a8cf
|
[bug] 布局修改
|
2021-11-02 14:55:55 +08:00 |
|
fengachen
|
2a66e2adf1
|
【bug】订单后四位输入四位的限制
|
2021-11-02 14:22:52 +08:00 |
|
zhaoxiao
|
3e1182294a
|
[bug] 布局修改
|
2021-11-02 14:09:40 +08:00 |
|
zhaoxiao
|
b4e0580f21
|
[bug] 去掉组织机构导入按钮
|
2021-11-02 13:38:36 +08:00 |
|
zhaoxiao
|
dbb9c9c3fd
|
[bug] 票据打印
|
2021-11-02 11:40:28 +08:00 |
|
fengachen
|
4847d49782
|
【需求变更】会议通知必填
|
2021-11-02 10:29:01 +08:00 |
|
zhaoxiao
|
b8d22247b3
|
[需求变更] 企业联系人添加备注备注,只在管理端的项目详情可查看联系人的备注,企业端和小程序不可查看
|
2021-11-02 10:26:18 +08:00 |
|
zhaoxiao
|
971a89da14
|
[bug] 打包--企业id为空问题
|
2021-11-02 10:22:58 +08:00 |
|
fengachen
|
2b95c40325
|
【需求变更】线上缴费修改为现场缴费
|
2021-11-02 10:20:11 +08:00 |
|
fengachen
|
99272e0fbe
|
【需求变更】会议列表创建时间宽度优化
|
2021-11-02 10:05:06 +08:00 |
|
zhaoxiao
|
a658617954
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-11-02 08:59:52 +08:00 |
|
fengachen
|
12728eceee
|
【bug】报名截止时间的修改为时分
|
2021-11-01 14:49:10 +08:00 |
|
fengachen
|
e0e324299e
|
Merge branch 'branch20211008'
|
2021-11-01 14:47:32 +08:00 |
|
fengachen
|
968a7a2e21
|
去除debugger
|
2021-11-01 14:44:35 +08:00 |
|
fengachen
|
ef2019c4b8
|
【bug】文件上传组件修改 不可上传文件提示语
|
2021-11-01 10:39:51 +08:00 |
|
fengachen
|
87d6b85091
|
【bug】国际研讨会邀请码不出现的问题
|
2021-11-01 10:12:25 +08:00 |
|
fengachen
|
7fe05b972d
|
Merge remote-tracking branch 'origin/xuqiubangeng1026'
# Conflicts:
# src/views/incomePayments/meetManage/AddOrDetailMeet.vue
|
2021-11-01 09:26:22 +08:00 |
|
fengachen
|
d433966479
|
Merge remote-tracking branch 'origin/branch20211008'
|
2021-11-01 09:12:23 +08:00 |
|
zhaoxiao
|
918c3aa3c4
|
[bug] 收入合同关联普通项目重置负责人出现乱码
|
2021-10-29 15:59:06 +08:00 |
|
fengachen
|
7ce97421c0
|
【bug】国际研讨会合作伙伴的禁用 邮编地址的校验 报名页面参会企业的提示语
|
2021-10-29 15:08:04 +08:00 |
|
zhaoxiao
|
c71207cba4
|
[bug] 票据邮寄打印禁用判断
|
2021-10-29 13:47:01 +08:00 |
|
fengachen
|
a663e78435
|
提交注释
|
2021-10-29 10:33:23 +08:00 |
|
fengachen
|
d3b5949f92
|
Merge remote-tracking branch 'origin/branch20211008'
|
2021-10-29 09:45:50 +08:00 |
|
fengachen
|
828c17142e
|
【bug】更换分标委会议发布的接口
|
2021-10-28 20:27:26 +08:00 |
|
fengachen
|
7175b0945c
|
【bug】41666
|
2021-10-28 20:11:43 +08:00 |
|
fengachen
|
25c7eedd7d
|
【bug】国际研讨会时间组件的禁用
|
2021-10-28 18:01:06 +08:00 |
|