瀏覽代碼
Squashed commit of the following:
Squashed commit of the following:
merge master
commit 4d71bc504ef2064ba5e07a8d781c7fd1a59a5d0c
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:48:16 2023 +0800
Squashed commit of the following:
merge dev
commit 3e0df3efd9afb3abb24ddf1f1ee4989aca02437e
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:43:25 2023 +0800
Squashed commit of the following:
merge dev
commit 3719c1ec1c0a5c00056806fafb3983a10be370b7
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:37:45 2023 +0800
update
commit d527e2d6b0c15a07514bef21d7cef500ab4d47a2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:31:01 2023 +0800
修改统一用47
commit b2de45bb84195237999765f30fc2e26f00d19288
Author: xjj <645007605@qq.com>
Date: Tue Jul 4 16:03:18 2023 +0800
修复冲突
commit 33bb0bae465e268e53b9c4b8d0cee03944f56433
Merge: 5b69945 e0cb10b
Author: xjj <645007605@qq.com>
Date: Tue Jul 4 15:55:37 2023 +0800
Merge branch 'master' into develop
# Conflicts:
# .umirc.ts
# src/components/UserDropdown/index.tsx
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Flow/OaAuditDetail.js
# src/pages/ManufacturerMng/ManufacturerList.js
# src/pages/Profile/index.js
# src/pages/UserCenter/index.js
# src/services/contract.js
commit 5b69945e06818cec3cdb951f8f7cf0eb73acaf52
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 15:08:30 2023 +0800
删除合同详情页审批逻辑，兼容部门显示数字问题
commit ee7a4ef8571f0316df39d6781dab9469d5bfc7fa
Merge: 7ceb0b6 2a73bec
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Jul 3 18:03:35 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 2a73bec68a329c8d97b13fc6dd2cb23d415ae238
Author: Renxy <18510891294@163.com>
Date: Mon Jul 3 18:03:05 2023 +0800
添加合同审批详情页
commit 7ceb0b61a0dbeb053daa720142926d8502efb7aa
Merge: ebe83ea 933e34f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Jul 3 17:58:54 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 933e34f3aedde1aab00049d7ca8b19c5e37b0b1d
Author: Renxy <18510891294@163.com>
Date: Mon Jul 3 17:14:45 2023 +0800
修改个人中心
commit ebe83ea6f2872791a6bb2c4f9b2c18c40fae10fc
Merge: 458dc59 afeda21
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Jul 3 15:11:38 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 458dc599d2db722143336e34631c72b1c79a6836
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Jul 3 15:10:25 2023 +0800
feat(合同管理): 新增处于[审核拒绝]状态的合同，可编辑后重新提交审核
commit afeda21c60620096d607833f0d620e1bb8e7974f
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 19:25:27 2023 +0800
添加延时
commit 6d773763d5a921fd6edafc931999e10289ef33f4
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 19:21:03 2023 +0800
替换luckysheet包
commit 32d3ff6473ed1b7e28a803c429559a930fb192e6
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 19:04:10 2023 +0800
update
commit c62444594632d2e425d4753bc895ec24847acdf6
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 18:53:05 2023 +0800
修改public
commit 7731aa5756a97488ed826e18a201e05ba12cf8dd
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 18:42:09 2023 +0800
update
commit 498ecdd3d797b8e563344c38feda098bdc64a35d
Merge: 6d8b22f 0ff44ed
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 18:37:20 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 6d8b22f68c3a9e0f530c796786558cfba3385ef1
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 18:37:06 2023 +0800
Squashed commit of the following:
merge psr
commit c11b2ba95b515b822d8cda460dbd6da816e28024
Author: Renxy <18510891294@163.com>
Date: Fri Jun 30 18:33:34 2023 +0800
添加psr比对等功能
commit a2673ca8bffda6f2d7876153931415d66a31b353
Author: Renxy <18510891294@163.com>
Date: Thu Jun 29 18:07:57 2023 +0800
添加返回psr列表
commit 7f3e16222e80b7fb7c924c06a94f902d9275dd2f
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 18:35:35 2023 +0800
修改psr
commit ca5f0e630d52a1c9e1d0f305d46538729607f5ef
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 13:42:23 2023 +0800
添加跳转详情
commit ced329d650dc8ac1dfec450a602947478136108b
Author: hanxin <32479996@qq.com>
Date: Sun Jun 25 14:01:47 2023 +0800
PSR列表首页
commit 848683d4e31671c7285358423c0a58085a613087
Author: hanxin <32479996@qq.com>
Date: Sun Jun 25 14:01:10 2023 +0800
首页加入PSR管理菜单入口
commit 282d1252bd73be8b078725ea5cfde4488d7a0d05
Author: Renxy <18510891294@163.com>
Date: Wed Jun 21 17:20:16 2023 +0800
update
commit 766d88d0f231ea72d9a2aab3481c92cf2189f6cf
Author: Renxy <18510891294@163.com>
Date: Wed Jun 21 16:48:19 2023 +0800
修改psr详情
commit 8dea4bb8ce626a02ecdc9d78f0f3afe88c892f3f
Author: Renxy <18510891294@163.com>
Date: Mon Jun 19 18:10:40 2023 +0800
添加psr列表页
# Conflicts:
# .umirc.ts
commit 0ff44edbd42057d71cf578745ea31496a4891e42
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Jun 29 17:57:22 2023 +0800
fix(我的审批): YSC-750 合同管理Tab标签审批数字显示异常
commit 7e6863a614d3b1b880319628e7323b6474a3351b
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Jun 29 15:35:30 2023 +0800
feat(合同管理): 新建合同时，选择本部时使用deps接口请求到的部门数据。
commit b2768adf9d0399d981f8eb672e5e5e41a9159f95
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Jun 29 11:30:19 2023 +0800
style(合同管理): 隐藏分页大小调整选择
commit 44b21e3f0aa5330353dc3b22f8f13c04197ff521
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 13:58:15 2023 +0800
修改切换公司部门不刷新问题
commit 407ab4b373786de22bed9e9de0689e9c0f6be079
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:40:08 2023 +0800
Squashed commit of the following:
merge master
commit fe87431b47d5bc773e5dd072c09dd34fada9be3d
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:39:26 2023 +0800
Squashed commit of the following:
merge develop
commit 34fdd822ef4f9776b87c10fc3286d4412a7cb712
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:34:46 2023 +0800
添加甲乙丙方模糊搜索
commit 3850b3d2fada80a2d60744995534eb662dba4218
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:23:13 2023 +0800
Squashed commit of the following:
merge master
commit a3976477a18f072d57e21cf47dc2fe89d3bee314
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:20:28 2023 +0800
修改所属部门只展示部门编号问题
commit 71e32953590f134c388d310c348352c2d335a918
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:44:38 2023 +0800
Squashed commit of the following:
merge develop
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:27:54 2023 +0800
修改bug
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit b58454c5c85ebc308152268200aab395ce41727e
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 16:08:27 2023 +0800
html禁止缓存
commit a6215cdbf20b4a3f59f2cca59143d63f87165592
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 15:45:13 2023 +0800
所属部门必填
commit 06f16bcc67c59a68ff219c0089679a134d9774dd
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:19:19 2023 +0800
update
commit e09f09638ef71fa029598dc70fc174dd183455d2
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:15:15 2023 +0800
修改地址
commit d83e65995dbcbd2b07637b80e923cbf039f3a6cc
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:14:59 2023 +0800
修改合同管理相关
commit 979832fd90f68350d21a38ca57b9e40309d9b43e
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 13:42:22 2023 +0800
修改预览问题
commit b806f8fb1ee00a48cfb7aee9b81cea13908f20d9
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 09:49:40 2023 +0800
注释合同新增
commit d4b38eea0e731b9d595977de618b819c60886ffb
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:47:29 2023 +0800
放开新增
commit f73606ab9cac5c3d56ef044c307344e6768b0735
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:45:14 2023 +0800
Squashed commit of the following:
merge develop
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Profile/approve.js
commit 263f5d3dd9e43444b968abcee94900dbfddf080f
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:43:12 2023 +0800
合同管理暂时把新增禁用
commit 6acb354d702e9db1b497a5b3603266ba51c6a434
Author: Renxy <18510891294@163.com>
Date: Thu May 18 15:39:45 2023 +0800
修改合同管理审批
commit 01d445b91ef6ff053f496698a3d335ccf0113258
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:41:02 2023 +0800
修改合同管理
commit d7d6c400b0b759b5c3851909be2ab29dcef8f7ce
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:11:43 2023 +0800
修改bug
commit 5834122418df3409bc07261a52acb4e5ccd5c3d6
Merge: 8e5ab97 deda5dd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:51:19 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
merge
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Flow/AuditModal.js
commit 8e5ab972b355713eeff9919f48b84f4b79811e58
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:46:21 2023 +0800
Squashed commit of the following:
merge
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
commit 76fb9a2eb447d32b5936c4450a80a838c77993f3
Author: hanxin <32479996@qq.com>
Date: Sat May 13 16:31:24 2023 +0800
供应商部分问题修复
commit 8e9b417fa05087dc06dc89e7924b627c0cdf2fca
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri May 12 17:54:04 2023 +0800
审批流管理增加流程类型
commit 2a95fdc8290eab18f048fbf7da279adee59dae18
Author: hanxin <32479996@qq.com>
Date: Thu May 11 17:50:26 2023 +0800
供应商更新个人主体
commit 32d734543b7c53c17b534f63c595defd8cff28f6
Author: Renxy <18510891294@163.com>
Date: Thu May 11 10:28:02 2023 +0800
添加合同管理导出功能
commit 0bf6b36d6a43099dee26d888799921054da82831
Author: Renxy <18510891294@163.com>
Date: Thu May 11 09:14:11 2023 +0800
OA审批表单添加供应商控件
commit 8f7305467d8668994e01d6b0655584f486ab3a90
Author: Renxy <18510891294@163.com>
Date: Wed May 10 10:40:07 2023 +0800
合同相关修改
commit 7267298b722bef27030c00defe87190d17a07126
Author: Renxy <18510891294@163.com>
Date: Tue May 9 16:12:48 2023 +0800
Squashed commit of the following:
merge
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/AuditForm/RelModal.js
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit deda5dd82e4f3f55a71e1404622b2ab5476369ab
Merge: 31e3af6 76fb9a2
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:58:15 2023 +0800
Merge branch 'develop'
commit 31e3af66a1c77a602a625b061fb0d4b355780784
Merge: 8b5574e 8e9b417
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:03:27 2023 +0800
Merge branch 'develop'
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit 8b5574e2a3c116b20cc9f2c9399c1f514c94aacf
Author: xjj <645007605@qq.com>
Date: Sat May 13 15:54:46 2023 +0800
合同管理增加日常项目
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:27:54 2023 +0800
修改bug
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/Profile/approve.js
commit a3976477a18f072d57e21cf47dc2fe89d3bee314
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:20:28 2023 +0800
修改所属部门只展示部门编号问题
commit 71e32953590f134c388d310c348352c2d335a918
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:44:38 2023 +0800
Squashed commit of the following:
merge develop
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:27:54 2023 +0800
修改bug
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit b58454c5c85ebc308152268200aab395ce41727e
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 16:08:27 2023 +0800
html禁止缓存
commit a6215cdbf20b4a3f59f2cca59143d63f87165592
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 15:45:13 2023 +0800
所属部门必填
commit 06f16bcc67c59a68ff219c0089679a134d9774dd
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:19:19 2023 +0800
update
commit e09f09638ef71fa029598dc70fc174dd183455d2
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:15:15 2023 +0800
修改地址
commit d83e65995dbcbd2b07637b80e923cbf039f3a6cc
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:14:59 2023 +0800
修改合同管理相关
commit 979832fd90f68350d21a38ca57b9e40309d9b43e
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 13:42:22 2023 +0800
修改预览问题
commit b806f8fb1ee00a48cfb7aee9b81cea13908f20d9
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 09:49:40 2023 +0800
注释合同新增
commit d4b38eea0e731b9d595977de618b819c60886ffb
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:47:29 2023 +0800
放开新增
commit f73606ab9cac5c3d56ef044c307344e6768b0735
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:45:14 2023 +0800
Squashed commit of the following:
merge develop
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Profile/approve.js
commit 263f5d3dd9e43444b968abcee94900dbfddf080f
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:43:12 2023 +0800
合同管理暂时把新增禁用
commit 6acb354d702e9db1b497a5b3603266ba51c6a434
Author: Renxy <18510891294@163.com>
Date: Thu May 18 15:39:45 2023 +0800
修改合同管理审批
commit 01d445b91ef6ff053f496698a3d335ccf0113258
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:41:02 2023 +0800
修改合同管理
commit d7d6c400b0b759b5c3851909be2ab29dcef8f7ce
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:11:43 2023 +0800
修改bug
commit 5834122418df3409bc07261a52acb4e5ccd5c3d6
Merge: 8e5ab97 deda5dd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:51:19 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
merge
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Flow/AuditModal.js
commit 8e5ab972b355713eeff9919f48b84f4b79811e58
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:46:21 2023 +0800
Squashed commit of the following:
merge
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
commit 76fb9a2eb447d32b5936c4450a80a838c77993f3
Author: hanxin <32479996@qq.com>
Date: Sat May 13 16:31:24 2023 +0800
供应商部分问题修复
commit 8e9b417fa05087dc06dc89e7924b627c0cdf2fca
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri May 12 17:54:04 2023 +0800
审批流管理增加流程类型
commit 2a95fdc8290eab18f048fbf7da279adee59dae18
Author: hanxin <32479996@qq.com>
Date: Thu May 11 17:50:26 2023 +0800
供应商更新个人主体
commit 32d734543b7c53c17b534f63c595defd8cff28f6
Author: Renxy <18510891294@163.com>
Date: Thu May 11 10:28:02 2023 +0800
添加合同管理导出功能
commit 0bf6b36d6a43099dee26d888799921054da82831
Author: Renxy <18510891294@163.com>
Date: Thu May 11 09:14:11 2023 +0800
OA审批表单添加供应商控件
commit 8f7305467d8668994e01d6b0655584f486ab3a90
Author: Renxy <18510891294@163.com>
Date: Wed May 10 10:40:07 2023 +0800
合同相关修改
commit 7267298b722bef27030c00defe87190d17a07126
Author: Renxy <18510891294@163.com>
Date: Tue May 9 16:12:48 2023 +0800
Squashed commit of the following:
merge
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/AuditForm/RelModal.js
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit deda5dd82e4f3f55a71e1404622b2ab5476369ab
Merge: 31e3af6 76fb9a2
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:58:15 2023 +0800
Merge branch 'develop'
commit 31e3af66a1c77a602a625b061fb0d4b355780784
Merge: 8b5574e 8e9b417
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:03:27 2023 +0800
Merge branch 'develop'
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit 8b5574e2a3c116b20cc9f2c9399c1f514c94aacf
Author: xjj <645007605@qq.com>
Date: Sat May 13 15:54:46 2023 +0800
合同管理增加日常项目
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# .umirc.ts
# src/pages/Profile/approve.js
commit 34fdd822ef4f9776b87c10fc3286d4412a7cb712
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:34:46 2023 +0800
添加甲乙丙方模糊搜索
commit 3850b3d2fada80a2d60744995534eb662dba4218
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:23:13 2023 +0800
Squashed commit of the following:
merge master
commit a3976477a18f072d57e21cf47dc2fe89d3bee314
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 11:20:28 2023 +0800
修改所属部门只展示部门编号问题
commit 71e32953590f134c388d310c348352c2d335a918
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:44:38 2023 +0800
Squashed commit of the following:
merge develop
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:27:54 2023 +0800
修改bug
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit b58454c5c85ebc308152268200aab395ce41727e
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 16:08:27 2023 +0800
html禁止缓存
commit a6215cdbf20b4a3f59f2cca59143d63f87165592
Author: xjj <645007605@qq.com>
Date: Sun Jun 25 15:45:13 2023 +0800
所属部门必填
commit 06f16bcc67c59a68ff219c0089679a134d9774dd
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:19:19 2023 +0800
update
commit e09f09638ef71fa029598dc70fc174dd183455d2
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:15:15 2023 +0800
修改地址
commit d83e65995dbcbd2b07637b80e923cbf039f3a6cc
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 15:14:59 2023 +0800
修改合同管理相关
commit 979832fd90f68350d21a38ca57b9e40309d9b43e
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 13:42:22 2023 +0800
修改预览问题
commit b806f8fb1ee00a48cfb7aee9b81cea13908f20d9
Author: Renxy <18510891294@163.com>
Date: Fri Jun 16 09:49:40 2023 +0800
注释合同新增
commit d4b38eea0e731b9d595977de618b819c60886ffb
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:47:29 2023 +0800
放开新增
commit f73606ab9cac5c3d56ef044c307344e6768b0735
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 16:45:14 2023 +0800
Squashed commit of the following:
merge develop
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Profile/approve.js
commit 263f5d3dd9e43444b968abcee94900dbfddf080f
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:43:12 2023 +0800
合同管理暂时把新增禁用
commit 6acb354d702e9db1b497a5b3603266ba51c6a434
Author: Renxy <18510891294@163.com>
Date: Thu May 18 15:39:45 2023 +0800
修改合同管理审批
commit 01d445b91ef6ff053f496698a3d335ccf0113258
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:41:02 2023 +0800
修改合同管理
commit d7d6c400b0b759b5c3851909be2ab29dcef8f7ce
Author: Renxy <18510891294@163.com>
Date: Thu May 18 14:11:43 2023 +0800
修改bug
commit 5834122418df3409bc07261a52acb4e5ccd5c3d6
Merge: 8e5ab97 deda5dd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:51:19 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
merge
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/pages/Flow/AuditModal.js
commit 8e5ab972b355713eeff9919f48b84f4b79811e58
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:46:21 2023 +0800
Squashed commit of the following:
merge
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
commit 76fb9a2eb447d32b5936c4450a80a838c77993f3
Author: hanxin <32479996@qq.com>
Date: Sat May 13 16:31:24 2023 +0800
供应商部分问题修复
commit 8e9b417fa05087dc06dc89e7924b627c0cdf2fca
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri May 12 17:54:04 2023 +0800
审批流管理增加流程类型
commit 2a95fdc8290eab18f048fbf7da279adee59dae18
Author: hanxin <32479996@qq.com>
Date: Thu May 11 17:50:26 2023 +0800
供应商更新个人主体
commit 32d734543b7c53c17b534f63c595defd8cff28f6
Author: Renxy <18510891294@163.com>
Date: Thu May 11 10:28:02 2023 +0800
添加合同管理导出功能
commit 0bf6b36d6a43099dee26d888799921054da82831
Author: Renxy <18510891294@163.com>
Date: Thu May 11 09:14:11 2023 +0800
OA审批表单添加供应商控件
commit 8f7305467d8668994e01d6b0655584f486ab3a90
Author: Renxy <18510891294@163.com>
Date: Wed May 10 10:40:07 2023 +0800
合同相关修改
commit 7267298b722bef27030c00defe87190d17a07126
Author: Renxy <18510891294@163.com>
Date: Tue May 9 16:12:48 2023 +0800
Squashed commit of the following:
merge
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/AuditForm/RelModal.js
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit deda5dd82e4f3f55a71e1404622b2ab5476369ab
Merge: 31e3af6 76fb9a2
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:58:15 2023 +0800
Merge branch 'develop'
commit 31e3af66a1c77a602a625b061fb0d4b355780784
Merge: 8b5574e 8e9b417
Author: xjj <645007605@qq.com>
Date: Sat May 13 16:03:27 2023 +0800
Merge branch 'develop'
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit 8b5574e2a3c116b20cc9f2c9399c1f514c94aacf
Author: xjj <645007605@qq.com>
Date: Sat May 13 15:54:46 2023 +0800
合同管理增加日常项目
commit 02a921115ce0a93687f3ecddb0a3a3e2b28c9c68
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:51:27 2023 +0800
修改bug
commit ac8b018b7df30ec681f1ace5bd5703f8187a6e94
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:39:18 2023 +0800
Squashed commit of the following:
merge
commit 291264751bbbaf745a0214992ce87344b86e4584
Author: Renxy <18510891294@163.com>
Date: Tue May 9 15:14:56 2023 +0800
【oa审批】新需求删除审批流/关联选项需求
commit cc297e585b7d9b4542fcb76a569e493bd5c85f41
Merge: 13a9cc5 6c5ffdf
Author: Renxy <18510891294@163.com>
Date: Mon May 8 14:50:00 2023 +0800
Merge branch 'master' into develop
合并master修改
# Conflicts:
# src/components/DDComponents/ProjectField/index.js
commit 13a9cc5131db4372a8d4ee54ecc6cd73800933f8
Author: Renxy <18510891294@163.com>
Date: Fri May 5 18:01:18 2023 +0800
update上个提交
commit 743b0996ad83d272d6fb4ec66998cf738c1fe955
Author: Renxy <18510891294@163.com>
Date: Fri May 5 17:46:44 2023 +0800
增加表单控件选择项目名称编号，修改表单设计布局
commit 9e6e944a98e453e082b0e8748a66da215dcc728b
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:53:29 2023 +0800
Squashed commit of the following:
merge master
commit 6a70a5215e1dd3469118a16754cd99d30146c79d
Author: Renxy <18510891294@163.com>
Date: Fri May 5 14:50:19 2023 +0800
修改OA审批流连线拉不出来问题
commit 5bae7e29b3032f3983919ba8d17739397ef0182d
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 18:12:57 2023 +0800
修改合同管理
commit 52f7076220dc7a373c84f437c2e637d257f88a99
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 16:22:29 2023 +0800
修改条件节点显示错误
commit c422278ee87d1258b12421e04f43af54825845c9
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 15:45:23 2023 +0800
Squashed commit of the following:
merge develop
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
commit c1774a1393d95827d7dee725c38e9fb1e8c7e914
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 13:21:25 2023 +0800
修改审批时提示请上传合同附件
commit 91b4cba8976d6bb99d8fe75dbef87a87dc030bf3
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 10:02:08 2023 +0800
修改【提交审批】表单必填项没有校验
commit cafe3b425be745c40651ed8062ecff9dee94b5dc
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:42:03 2023 +0800
Squashed commit of the following:
merge develop
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/PageContent/index.js
# src/pages/ContractManager/component/Modal.jsx
commit 3c792d04e1e39a696837d7f45c576536eed23b4a
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:20:58 2023 +0800
Squashed commit of the following:
merge develop
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit a272eb938d32768ae5811037aafb5b0725f8b3b9
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 15:37:00 2023 +0800
文件上传接口调整
commit 7e587bb6ed4131ebca3328e565e357363cbf02a1
Author: Renxy <18510891294@163.com>
Date: Fri Apr 28 09:39:43 2023 +0800
修改选择甲方列表供应商管理不显示
commit eec1629a06bf2b8d227f5ee2ebeb98c2b6557067
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Apr 28 09:29:59 2023 +0800
版权文字修复
commit d60847a5891841879e8f31567ca307f6bf774cc3
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 21:22:05 2023 +0800
Squashed commit of the following:
merge
commit af9764065902735710923239294ae6efd21850af
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:30 2023 +0800
组件修复
commit 0ecc6f6c2a2703738052b9d06ddc250e84f6697a
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 18:52:19 2023 +0800
OA审批撤回
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/components/DDComponents/InnerContactField/index.js
# src/pages/Profile/apply.js
commit 203ab7ee2cc6167e332d6e8b777b7216305c3e1c
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 17:52:55 2023 +0800
Squashed commit of the following:
merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:03 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:47:00 2023 +0800
logo宽度修改
commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 16:44:44 2023 +0800
菜单样式
commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:15:35 2023 +0800
菜单上边距调整
commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:12:33 2023 +0800
头上部边距修改
commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 16:07:41 2023 +0800
首页上边距
commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date: Thu Apr 27 15:58:58 2023 +0800
背景高度修改
commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Thu Apr 27 15:50:17 2023 +0800
菜单样式
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# src/global.less
# src/pages/Home/index.less
commit b323d412f3ee4a7cc47cf0eb4146fdb270a58a8e
Author: Renxy <18510891294@163.com>
Date: Thu Apr 27 09:31:23 2023 +0800
Squashed commit of the following:
mearge
commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:23 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 18:39:16 2023 +0800
修改默认选中提交人
commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 18:36:20 2023 +0800
菜单首页样式调整及头部调整
commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:42 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date: Wed Apr 26 17:35:38 2023 +0800
头部样式调整
commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 17:17:34 2023 +0800
修改提交审批表单报错
commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:41 2023 +0800
Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb
commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date: Wed Apr 26 16:25:34 2023 +0800
需改合同及审批流管理条件节点选择联系人选不了
# Conflicts:
# .umirc.ts
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
commit 1046d899bb974c79baff9e1116f574deaf7e9c40
Author: Renxy <18510891294@163.com>
Date: Mon Jun 26 10:27:54 2023 +0800
修改bug
commit 297c9b753fb568c590b1ef078b80b27121f177af
Author: Renxy <18510891294@163.com>
Date: Thu Jun 15 13:55:39 2023 +0800
修改合同管理点击加号查看子合同导致页码不对
commit 95d8668c565b7ace271a657f56189a44398a738b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 18:01:41 2023 +0800
修改测试cc_list报错问题
commit 0afedb446622c1e1ece45ef7a18ef54ce17a67fb
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:37:34 2023 +0800
修改审批流配置时一个审批节点多选人审批
commit 07d9ec5badf6402f6ec309f3e18e234143af1565
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:28:14 2023 +0800
Squashed commit of the following:
合并Oa审批相关修改
commit 5ebec549350be80379fa3a62b9e84436fddce9f9
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:27:17 2023 +0800
删除log
commit f4dc257905af71235bba619ed4d80820e07efb5b
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 17:24:50 2023 +0800
审批节点支持选择多人依次审批
commit f87dbf6acfc4f5feff9c913272a2d381bdb4f080
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:44:42 2023 +0800
Squashed commit of the following:
合并develop
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit ea7c41df6b110fef53edc8e5cea0001f5cb3be1e
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 11:14:22 2023 +0800
抄送人修改
commit bc3dfed8bc8dfbe4e5b45676fe92b01b6de35b43
Author: Renxy <18510891294@163.com>
Date: Tue Jun 13 13:41:02 2023 +0800
合同管理兼容旧审批流程
commit 70e9acd8616204ad9e0a48ce2bf28723acd2c0f7
Author: Renxy <18510891294@163.com>
Date: Mon Jun 12 11:38:29 2023 +0800
修改合同管理撤回/添加修改密码
commit 14c5daaa89549fa24d0503fec213a6adccb3839c
Author: Renxy <18510891294@163.com>
Date: Tue Jun 6 18:28:10 2023 +0800
修改合同走OA审批流程
commit f7a9b85def9165c9d3c73009b8426e0d12dcb755
Author: Renxy <18510891294@163.com>
Date: Mon Jun 5 17:05:21 2023 +0800
修改供应商管理
commit 384b2efc8b51a13875180a12edecb67ba9a79c29
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 18:00:54 2023 +0800
update
commit 538958cebfb957ab52b95ed4e9e3627ea4e1e6ff
Author: Renxy <18510891294@163.com>
Date: Fri Jun 2 17:59:48 2023 +0800
修改合同预览/修改合同相关
commit e9fe47ccd098e11b5cf026f0b9a8a151a9863850
Merge: a9c0fb8 e14b706
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:59 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit a9c0fb85e00f662fc0371ce18329e9b75f217683
Author: xjj <645007605@qq.com>
Date: Wed May 31 18:26:54 2023 +0800
加签
commit e14b706d41c53066ab6c694d3e1fc86ab1ed4e45
Merge: 1f42e19 e3c5635
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:43 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 1f42e196c5703cc4d4ee9a6ea676c0925547e1e9
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:34 2023 +0800
update
commit 46cb4fe1081fa498603abf808e83adafa1606959
Author: Renxy <18510891294@163.com>
Date: Wed May 31 11:22:01 2023 +0800
合同详情里面添加预览按钮
commit e3c563564c937c19c06bada3620c6eb92c1ef361
Merge: b920297 4eba9cf
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:41 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit b9202974083f2f6c59b0c422ef41f15e9b70ff09
Author: xjj <645007605@qq.com>
Date: Tue May 30 15:08:29 2023 +0800
增加或条件
commit 4eba9cf99126d93ee283dfb69b1ec78a323246df
Merge: 3a93b15 0860bbd
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:47 2023 +0800
Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb into develop
commit 3a93b15457311d57c8a9f22b7403a4a1c52f3827
Author: Renxy <18510891294@163.com>
Date: Thu May 18 13:45:38 2023 +0800
修改合同审核
commit 0860bbd4fd51b4897df483facf318df5638bca9b
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Sat May 13 18:00:45 2023 +0800
审批流类型 合同审批改为合同归档审批
commit 3719c1ec1c0a5c00056806fafb3983a10be370b7
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:37:45 2023 +0800
update
commit d527e2d6b0c15a07514bef21d7cef500ab4d47a2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 4 17:31:01 2023 +0800
修改统一用47
# Conflicts:
# src/pages/ContractManager/component/Modal.jsx
# src/pages/ContractManager/index.jsx
# src/services/contract.js
+ 8
- 13
src/pages/ContractManager/component/Modal.jsx
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||