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
152cdc0f
Commit
152cdc0f
authored
Jun 22, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev-srm
parents
39989d1b
989144d3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
27 deletions
+47
-27
reset.less
src/global/styles/reset.less
+6
-0
productDescFormDefault.tsx
...odity/products/addProductsItem/productDescFormDefault.tsx
+4
-0
directChannel.tsx
src/pages/commodity/products/directChannel.tsx
+1
-1
onlineBid.ts
src/pages/transaction/purchaseAbility/schema/onlineBid.ts
+20
-15
purchaseBid.ts
src/pages/transaction/purchaseAbility/schema/purchaseBid.ts
+15
-10
index.tsx
src/pages/transaction/purchaseOrder/readyFileOrder/index.tsx
+1
-1
No files found.
src/global/styles/reset.less
View file @
152cdc0f
...
...
@@ -268,6 +268,12 @@
background-color: #F7F8FA;
}
}
.ant-input-affix-wrapper{
padding: 0;
.ant-input-suffix{
margin-right: 11px;
}
}
}
}
// 处理因为antd版本不同导致anchor的背景色不同
...
...
src/pages/commodity/products/addProductsItem/productDescFormDefault.tsx
View file @
152cdc0f
...
...
@@ -9,12 +9,14 @@ import ImgCrop from 'antd-img-crop';
import
{
inject
,
observer
}
from
'mobx-react'
import
{
store
}
from
'@/store'
import
{
getAuth
}
from
'@/utils/auth'
const
ProductDescFormDefualt
:
React
.
FC
<
{}
>
=
(
props
)
=>
{
const
[
fileImageList
,
setFileImageList
]
=
useState
<
any
>
([])
const
[
videoList
,
setVideoList
]
=
useState
<
any
>
([])
const
flagRef
=
useRef
<
boolean
>
(
false
)
const
[
isLoading
,
setIsLoading
]
=
useState
<
boolean
>
(
false
)
// 上传的加载状态
const
{
userId
,
memberId
,
token
}
=
getAuth
()
||
{}
const
{
ProductStore
}
=
store
const
{
productInfoByEdit
,
setProductDescription
,
selectCategoryId
}
=
ProductStore
...
...
@@ -56,6 +58,7 @@ const ProductDescFormDefualt: React.FC<{}> = (props) => {
name
:
'file'
,
action
:
'/api/file/file/upload'
,
showUploadList
:
false
,
headers
:
{
token
},
data
:
{
fileType
:
UPLOAD_TYPE
},
beforeUpload
(
file
)
{
const
isJpgOrPng
=
file
.
type
===
'image/jpeg'
||
file
.
type
===
'image/jpg'
||
file
.
type
===
'image/png'
||
file
.
type
===
'image/gif'
;
...
...
@@ -91,6 +94,7 @@ const ProductDescFormDefualt: React.FC<{}> = (props) => {
name
:
'file'
,
action
:
'/api/file/file/upload'
,
showUploadList
:
false
,
headers
:
{
token
},
data
:
{
fileType
:
UPLOAD_TYPE
},
beforeUpload
(
file
)
{
const
isVideo
=
file
.
type
===
'video/mp4'
;
...
...
src/pages/commodity/products/directChannel.tsx
View file @
152cdc0f
...
...
@@ -303,7 +303,7 @@ const DirectChannel: React.FC<{}> = () => {
PublicApi
.
getTemplateWebMemberChannelWebFindCurrMemberChannel
().
then
(
res
=>
{
if
(
res
.
data
.
id
){
setCheckedValues
(
values
)
setShopId
(
res
.
data
.
id
)
setShopId
(
res
?.
data
?
.
id
)
}
else
{
message
.
error
(
'您还没有开通店铺,无法上下架商品!'
)
}
...
...
src/pages/transaction/purchaseAbility/schema/onlineBid.ts
View file @
152cdc0f
...
...
@@ -12,12 +12,10 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
biddingNo
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
placeholder
:
'竞价单号'
,
align
:
'flex-left'
,
allowClear
:
true
}
}
}
...
...
@@ -49,12 +47,14 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
memberName
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'采购会员'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -62,6 +62,7 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'报名开始时间'
,
allowClear
:
true
}
},
externalState
:
{
...
...
@@ -70,7 +71,8 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
placeholder
:
'外部状态'
,
style
:
{
width
:
160
}
},
allowClear
:
true
},
enum
:
[]
},
...
...
@@ -80,7 +82,8 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
placeholder
:
'内部状态'
,
style
:
{
width
:
160
}
},
allowClear
:
true
},
enum
:
[]
},
...
...
@@ -114,12 +117,10 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
biddingNo
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
align
:
'flex-left'
,
placeholder
:
'竞价单号'
placeholder
:
'竞价单号'
,
allowClear
:
true
}
}
}
...
...
@@ -150,13 +151,15 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
details
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
memberName
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'采购会员'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -164,6 +167,7 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'报名开始时间'
,
allowClear
:
true
}
},
}
...
...
@@ -196,12 +200,10 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
biddingNo
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
align
:
'flex-left'
,
placeholder
:
'竞价单号'
placeholder
:
'竞价单号'
,
allowClear
:
true
}
}
}
...
...
@@ -232,13 +234,15 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
details
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
memberName
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'采购会员'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -246,6 +250,7 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'竞价开始时间'
,
allowClear
:
true
}
},
}
...
...
src/pages/transaction/purchaseAbility/schema/purchaseBid.ts
View file @
152cdc0f
...
...
@@ -12,12 +12,10 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
biddingNo
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
placeholder
:
'竞价单号'
,
align
:
'flex-left'
,
allowClear
:
true
}
}
}
...
...
@@ -49,6 +47,7 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -56,6 +55,7 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'单据时间(全部)'
,
allowClear
:
true
}
},
externalState
:
{
...
...
@@ -64,7 +64,8 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
placeholder
:
'外部状态'
,
style
:
{
width
:
160
}
},
allowClear
:
true
},
enum
:
[]
},
...
...
@@ -74,7 +75,8 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
placeholder
:
'内部状态'
,
style
:
{
width
:
160
}
},
allowClear
:
true
},
enum
:
[]
},
...
...
@@ -119,7 +121,8 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
},
"x-component-props"
:
{
placeholder
:
'竞价单号'
placeholder
:
'竞价单号'
,
allowClear
:
true
}
}
}
...
...
@@ -149,7 +152,8 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
details
:
{
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -157,6 +161,7 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'单据时间(全部)'
,
allowClear
:
true
}
},
}
...
...
@@ -186,12 +191,10 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
biddingNo
:
{
type
:
'string'
,
"x-component"
:
"Search"
,
"x-mega-props"
:
{
},
"x-component-props"
:
{
placeholder
:
'竞价单号'
,
align
:
'flex-left'
,
allowClear
:
true
}
}
}
...
...
@@ -223,6 +226,7 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
type
:
'string'
,
"x-component-props"
:
{
placeholder
:
'竞价单摘要'
,
allowClear
:
true
}
},
"[startTime,endTime]"
:
{
...
...
@@ -230,6 +234,7 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
"x-component"
:
"dateSelect"
,
"x-component-props"
:
{
placeholder
:
'单据时间(全部)'
,
allowClear
:
true
}
},
}
...
...
src/pages/transaction/purchaseOrder/readyFileOrder/index.tsx
View file @
152cdc0f
...
...
@@ -84,7 +84,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
}
}
formilyChilds=
{
{
children
:
<
Space
>
<
Button
onClick=
{
handleSubmitBatch
}
loading=
{
loading
}
>
批量
提交审核
</
Button
>
<
Button
onClick=
{
handleSubmitBatch
}
loading=
{
loading
}
>
批量
归档
</
Button
>
</
Space
>,
layouts
:
{
span
:
8
...
...
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