HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4

This commit is contained in:
zhangds 2022-08-15 14:33:12 +08:00
parent a93a67e3be c55dc2affe
commit 56f13879aa
3 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/knockGold/index.less
View File

@ -46,8 +46,8 @@
.flex { .flex {
display: grid; display: grid;
grid-template-columns: repeat(2, 50%); grid-template-columns: repeat(1, 100%);
text-align: left;
} }
} }

12
src/components/knockGold/mobileCmponent.jsx
View File

@ -2,7 +2,7 @@
* @Author: Wind * @Author: Wind
* @Date: 2022-06-06 14:53:58 * @Date: 2022-06-06 14:53:58
* @LastEditors: Wind * @LastEditors: Wind
* @LastEditTime: 2022-08-15 10:23:22 * @LastEditTime: 2022-08-15 14:18:35
* @Description: * @Description:
* @FilePath: \frontend\src\components\knockGold\mobileCmponent.jsx * @FilePath: \frontend\src\components\knockGold\mobileCmponent.jsx
*/ */
@ -17,11 +17,7 @@ export default ({ data }) => {
setNewWeek(sortWeeks(data.ruleWeek)) setNewWeek(sortWeeks(data.ruleWeek))
}, [data.ruleWeek]) }, [data.ruleWeek])
function createElement(type) { function createElement() {
{
/* irregularDate: [[]], //不规则日期
irregularTime: [[]], //不规则时间 */
}
if (data.usable_time === 'week') { if (data.usable_time === 'week') {
return ( return (
<div className='available_time'> <div className='available_time'>
@ -49,12 +45,12 @@ export default ({ data }) => {
<h3>可用时间</h3> <h3>可用时间</h3>
<ul className='timeList flex'> <ul className='timeList flex'>
{data.irregularDate?.map((item) => ( {data.irregularDate?.map((item) => (
<li style={{ textAlign: 'center' }}> <li>
{item.join(' 至 ')} {item.join(' 至 ')}
{data.irregularTime.map((item1) => { {data.irregularTime.map((item1) => {
if (item1[1]) if (item1[1])
return ( return (
<p style={{ textAlign: 'center', marginTop: '5px' }}> <p style={{ marginTop: '5px' }}>
{item1[0]}~{item1[1]} {item1[0]}~{item1[1]}
</p> </p>
) )

27
src/pages/plan/key/list.js
View File

@ -884,7 +884,7 @@ export default class acclist extends React.Component {
/*计划已完结6，未通过2，已作废8 不可复制 /*计划已完结6，未通过2，已作废8 不可复制
key创建中1，未通过2 不可复制 key创建中1，未通过2 不可复制
*/ */
if ([1, 6, 7].includes(rowData.status)) { if ([6, 7].includes(rowData.status)) {
str = ( str = (
<span> <span>
<a className='grid-link disabled'>编辑</a> <a className='grid-link disabled'>编辑</a>
@ -948,8 +948,7 @@ export default class acclist extends React.Component {
}> }>
<DropdownClickTrigger> <DropdownClickTrigger>
<div className='linkmore'> <div className='linkmore'>
{' '} 更多 <Icon type={'down'} />
更多 <Icon type={'down'} />{' '}
</div> </div>
</DropdownClickTrigger> </DropdownClickTrigger>
<DropdownContent> <DropdownContent>
@ -994,7 +993,22 @@ export default class acclist extends React.Component {
</a> </a>
)} )}
<span className='grid-link disabled'>撤销审批</span> <span className='grid-link disabled'>撤销审批</span>
{/* 创建中 置灰更多按钮 */}
{rowData.status === 1 ? (
<Dropdown
position={DropdownPosition.RightTop}
visible={this.state.menuVisible}
onVisibleChange={(v) =>
this.setState({ visible: v })
}>
<DropdownClickTrigger>
<div className='linkmore disabled'>
更多 <Icon type={'down'} />{' '}
</div>
</DropdownClickTrigger>
<DropdownContent></DropdownContent>
</Dropdown>
) : (
<Dropdown <Dropdown
position={DropdownPosition.RightTop} position={DropdownPosition.RightTop}
visible={this.state.menuVisible} visible={this.state.menuVisible}
@ -1003,8 +1017,7 @@ export default class acclist extends React.Component {
}> }>
<DropdownClickTrigger> <DropdownClickTrigger>
<div className='linkmore'> <div className='linkmore'>
{' '} 更多 <Icon type={'down'} />
更多 <Icon type={'down'} />{' '}
</div> </div>
</DropdownClickTrigger> </DropdownClickTrigger>
<DropdownContent> <DropdownContent>
@ -1020,10 +1033,10 @@ export default class acclist extends React.Component {
</Menu> </Menu>
</DropdownContent> </DropdownContent>
</Dropdown> </Dropdown>
)}
</span> </span>
) )
} }
return str return str
} }
}} }}