Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
9be9ca7d
Commit
9be9ca7d
authored
Oct 27, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into test
parents
a55c0f08
25d74114
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
7 deletions
+11
-7
menu.ts
src/locales/zh-CN/menu.ts
+5
-0
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+0
-1
index.tsx
...saction/supplierEvaluation/unevaluated/evaluate/index.tsx
+5
-5
index.ts
...n/supplierEvaluation/unevaluated/evaluate/schema/index.ts
+1
-1
No files found.
src/locales/zh-CN/menu.ts
View file @
9be9ca7d
...
...
@@ -2,6 +2,10 @@
* @Author: LeeJiancong
* @Date: 2020-07-13 14:08:50
<<<<<<< HEAD
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-21 14:13:00
=======
<<<<<<< HEAD
* @LastEditors: Please set LastEditors
<<<<<<< HEAD
<<<<<<< HEAD
...
...
@@ -20,6 +24,7 @@
=======
* @LastEditTime: 2020-10-26 11:36:19
>>>>>>> 38b99535... 结算能力对接应付账款,应收账款
>>>>>>> d77ca7466dfa18de6954ff08d0d11d97fea61cec
*/
export
default
{
...
...
src/pages/lxMall/commodityDetail/index.tsx
View file @
9be9ca7d
...
...
@@ -21,7 +21,6 @@ import jinhuodanIcon from '@/assets/imgs/jinhuodan.png'
import
styles
from
'./index.less'
import
{
GlobalConfig
}
from
'@/global/config'
import
{
isEmpty
}
from
'lodash'
import
{
LAYOUT_TYPE
,
COMMODITY_TYPE
,
OrderModalType
}
from
'@/constants'
const
Logistics_Type
=
{
...
...
src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx
View file @
9be9ca7d
...
...
@@ -83,9 +83,9 @@ const EvaluateOrder: React.FC = () => {
}
=
item
;
return
{
memberId
:
orderInfo
.
createMember
Id
,
roleId
:
orderInfo
.
create
RoleId
,
memberName
:
orderInfo
.
createMember
Name
||
''
,
memberId
:
orderInfo
.
supplyMembers
Id
,
roleId
:
orderInfo
.
supplyMembers
RoleId
,
memberName
:
orderInfo
.
supplyMembers
Name
||
''
,
star
,
comment
,
product
:
JSON
.
stringify
(
good
),
...
...
@@ -101,7 +101,7 @@ const EvaluateOrder: React.FC = () => {
};
});
PublicApi
.
postMemberComment
Supply
OrderTradeSubmit
({
PublicApi
.
postMemberComment
Consumer
OrderTradeSubmit
({
commentSubmitDetailList
:
payload
,
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -173,7 +173,7 @@ const EvaluateOrder: React.FC = () => {
padding
:
'0 32px'
,
}
}
>
<
Descriptions
.
Item
label=
"
采购会员"
>
{
orderInfo
?.
createMember
Name
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"
供应会员"
>
{
orderInfo
?.
supplyMembers
Name
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"下单时间"
span=
{
2
}
>
{
orderInfo
?.
createTime
}
</
Descriptions
.
Item
>
</
Descriptions
>
</
PageHeader
>
...
...
src/pages/transaction/supplierEvaluation/unevaluated/evaluate/schema/index.ts
View file @
9be9ca7d
...
...
@@ -72,7 +72,7 @@ export const evaluateSchema: ISchema = {
action
:
'/api/file/file/upload/prefix'
,
data
:
{
fileType
:
UPLOAD_TYPE
,
prefix
:
'/
suppli
erEvaluation/'
,
prefix
:
'/
purchas
erEvaluation/'
,
},
beforeUpload
:
'{{beforeUpload}}'
,
accept
:
'.png, .jpg, .jpeg'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment