Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
xujunjie
/
WorkloadWeb
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Squashed commit of the following:
merge develop_0715
commit 31ac08cd034ac366b735147808abe63f6e223e40
Author: Renxy <18510891294@163.com>
Date: Mon Aug 1 13:20:10 2022 +0800

修改bom

commit a45cbe1fb3fd0adb92b380d62f9601c22a981d89
Author: Renxy <18510891294@163.com>
Date: Mon Aug 1 09:10:44 2022 +0800

Squashed commit of the following:
merge

commit 4391bc9cdd9592ad1958f4c5fc1fc65939b674ac
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 18:34:18 2022 +0800

修改父清单只显示名称

commit d6b8d7a612e8023c7bdb0a78e91de193e92fc1db
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 18:26:22 2022 +0800

Squashed commit of the following:
merge
commit 70cc2fa85255bccb3a39c01a7bc51ff75bfe4e35
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 18:24:20 2022 +0800

修改点击状态不请求问题

commit 88fbd4878fe72fda0ae520cac7fc26740ba08925
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:37:12 2022 +0800

Squashed commit of the following:

commit c6ae9616dd4762e5cef246898a3c9d8aca886a85
Merge: fd83f7f 1c6a121
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:36:27 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit fd83f7f9bf3f8f9336fb3d7a92f8dd72627bd854
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:35:36 2022 +0800

修改上传模板的名称显示/版本树加时间轴

commit 1c6a1218a87bdb5e8837b24ad0ac51ea44cafbeb
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 13:32:41 2022 +0800

修复图表特定情况下渲染出错

commit 39714cfda5107c7a5f3ecc5c45a7b41495aa1c4a
Merge: 5904c28 af73d12
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:19 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 5904c2852ece716be335427761ecf442c281ba8d
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:10 2022 +0800

chart增加loading

commit af73d12783233b1cdfc12696b74f691626db3824
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:38:52 2022 +0800

修改地址

commit c73d7546da57b383f59098436a4582442f053b64
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:35:08 2022 +0800

修改清单列表名称

commit cae1ca9e789fbc0501e510f3fc3818d7248a82e2
Merge: be06c29 6164534
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:34 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit be06c296d6a6e3a9bb5d8d5e82438c2559d8ef35
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:26 2022 +0800

Squashed commit of the following:
merge
commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 61645343cabbedb8e9f8a42c5cb21c7ee20051b7
Merge: 3ca0da6 fd25edb
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:38:04 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 3ca0da61d16cd152c9ccc017e88da966ce8d3f96
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:37:53 2022 +0800

驾驶舱图表修改

commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

# Conflicts:
# src/components/Flow/node/rect/mapServe.tsx

commit c6ae9616dd4762e5cef246898a3c9d8aca886a85
Merge: fd83f7f 1c6a121
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:36:27 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit fd83f7f9bf3f8f9336fb3d7a92f8dd72627bd854
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:35:36 2022 +0800

修改上传模板的名称显示/版本树加时间轴

commit 1c6a1218a87bdb5e8837b24ad0ac51ea44cafbeb
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 13:32:41 2022 +0800

修复图表特定情况下渲染出错

commit 39714cfda5107c7a5f3ecc5c45a7b41495aa1c4a
Merge: 5904c28 af73d12
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:19 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 5904c2852ece716be335427761ecf442c281ba8d
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:10 2022 +0800

chart增加loading

commit af73d12783233b1cdfc12696b74f691626db3824
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:38:52 2022 +0800

修改地址

commit c73d7546da57b383f59098436a4582442f053b64
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:35:08 2022 +0800

修改清单列表名称

commit cae1ca9e789fbc0501e510f3fc3818d7248a82e2
Merge: be06c29 6164534
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:34 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit be06c296d6a6e3a9bb5d8d5e82438c2559d8ef35
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:26 2022 +0800

Squashed commit of the following:
merge
commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 61645343cabbedb8e9f8a42c5cb21c7ee20051b7
Merge: 3ca0da6 fd25edb
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:38:04 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 3ca0da61d16cd152c9ccc017e88da966ce8d3f96
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:37:53 2022 +0800

驾驶舱图表修改

commit 70cc2fa85255bccb3a39c01a7bc51ff75bfe4e35
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 18:24:20 2022 +0800

修改点击状态不请求问题

commit 88fbd4878fe72fda0ae520cac7fc26740ba08925
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:37:12 2022 +0800

Squashed commit of the following:

commit c6ae9616dd4762e5cef246898a3c9d8aca886a85
Merge: fd83f7f 1c6a121
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:36:27 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit fd83f7f9bf3f8f9336fb3d7a92f8dd72627bd854
Author: Renxy <18510891294@163.com>
Date: Fri Jul 29 16:35:36 2022 +0800

修改上传模板的名称显示/版本树加时间轴

commit 1c6a1218a87bdb5e8837b24ad0ac51ea44cafbeb
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 13:32:41 2022 +0800

修复图表特定情况下渲染出错

commit 39714cfda5107c7a5f3ecc5c45a7b41495aa1c4a
Merge: 5904c28 af73d12
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:19 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 5904c2852ece716be335427761ecf442c281ba8d
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 29 10:13:10 2022 +0800

chart增加loading

commit af73d12783233b1cdfc12696b74f691626db3824
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:38:52 2022 +0800

修改地址

commit c73d7546da57b383f59098436a4582442f053b64
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:35:08 2022 +0800

修改清单列表名称

commit cae1ca9e789fbc0501e510f3fc3818d7248a82e2
Merge: be06c29 6164534
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:34 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit be06c296d6a6e3a9bb5d8d5e82438c2559d8ef35
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:24:26 2022 +0800

Squashed commit of the following:
merge
commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 61645343cabbedb8e9f8a42c5cb21c7ee20051b7
Merge: 3ca0da6 fd25edb
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:38:04 2022 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop

commit 3ca0da61d16cd152c9ccc017e88da966ce8d3f96
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 28 16:37:53 2022 +0800

驾驶舱图表修改

commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

Renxy 2 lat temu
rodzic
4391bc9cdd
commit
a043fc5a67
2 zmienionych plików z 4 dodań i 4 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 3 3
      src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
  2. 1 1
      src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

+ 3 - 3
src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
Wyświetl plik 

@@ -128,7 +128,7 @@ function FlowModal(props) {
 
   const handleChangeClick = item => {
 
     let file = isOut ? 'newList' : 'detail';
 
     let type = item.flow_id ? '/queryAuditRecord' : '/queryAuditExcel';
 
-    console.log(`${file}${type}`);
 
+    console.log(`${file}${type}`, item);
 
     dispatch({
 
       type: `${file}${type}`,
 
       payload: {
 
@@ -159,7 +159,7 @@ function FlowModal(props) {
 
         title: '状态',
 
         width: '30%',
 
         render: item => {
 
-          if (item.isParent) return;
 
+          // if (!item.flow_id && item.isParent) return;
 
           let style = { color: getColor(item) };
 
           let txt = '';
 
           switch (item.audit_status) {
 
@@ -191,7 +191,7 @@ function FlowModal(props) {
 
         title: '操作',
 
         width: '20%',
 
         render: item =>
 
-          !item.isParent &&
 
+          (item.flow_id || !item.isParent) &&
 
           item.id != version.id && (
 
             <a
 
               onClick={() => {

+ 1 - 1
src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
Wyświetl plik 

@@ -561,7 +561,7 @@ function Detail(props) {
 
         const nodeId = version.template_node_id;
 
         if (!flowDetail?.nodes || !nodeId) return;
 
         const node = flowDetail.nodes.find(item => item.Id == nodeId);
 
-        if (node.name == 'custom-circle') return;
 
+        if (!node || node.name == 'custom-circle') return;
 
         if (node?.role_list) {
 
           return node.role_list
 
             .split(',')