Home Explore Help
Register Sign In
xujunjie
/
GtDigManageWeb
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Renxy 2 years ago
parent
c1774a1393
commit
c422278ee8
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      src/services/boom.js

+ 1 - 1
src/services/boom.js
View File 

@@ -173,7 +173,7 @@ export async function queryClassify(data) {
 
 }
 
 
 export async function queryOSSData() {
 
-  return request(`/api/v1/config/chart-template-img?destDir=public/bom`);
 
+  return request(`/api/v1/config/chart-template-img?destDir=doc/bom`);
 
 }
 
 
 // 提交审批