From c84501d5bfaaba8de7694f15a80374ba111f3c8a Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 15 Aug 2022 14:09:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?x=E4=BF=AE=E5=A4=8D=20key=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=AD=20=E7=BD=AE=E7=81=B0=E6=9B=B4=E5=A4=9A=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/key/list.js | 73 ++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index 452284e7..af544cb2 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -884,7 +884,7 @@ export default class acclist extends React.Component { /*计划已完结6,未通过2,已作废8 不可复制 key创建中1,未通过2 不可复制 */ - if ([1, 6, 7].includes(rowData.status)) { + if ([6, 7].includes(rowData.status)) { str = ( 编辑 @@ -948,8 +948,7 @@ export default class acclist extends React.Component { }>
- {' '} - 更多 {' '} + 更多
@@ -994,36 +993,50 @@ export default class acclist extends React.Component { )} 撤销审批 - - - this.setState({ visible: v }) - }> - -
- {' '} - 更多 {' '} -
-
- - - this.menuItemClick(key, rowData) - }> - 发送密码及压缩包 - - 日志 - - 作废 - - -
+ {/* 创建中 置灰更多按钮 */} + {rowData.status === 1 ? ( + + this.setState({ visible: v }) + }> + +
+ 更多 {' '} +
+
+ +
+ ) : ( + + this.setState({ visible: v }) + }> + +
+ 更多 +
+
+ + + this.menuItemClick(key, rowData) + }> + 发送密码及压缩包 + + 日志 + + 作废 + + +
+ )}
) } - return str } }} From cf6a4b63505765615eb774d558545222977864ef Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Mon, 15 Aug 2022 14:18:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/knockGold/index.less | 4 ++-- src/components/knockGold/mobileCmponent.jsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less index 4f484d03..72e08747 100644 --- a/src/components/knockGold/index.less +++ b/src/components/knockGold/index.less @@ -46,8 +46,8 @@ .flex { display: grid; - grid-template-columns: repeat(2, 50%); - + grid-template-columns: repeat(1, 100%); + text-align: left; } } diff --git a/src/components/knockGold/mobileCmponent.jsx b/src/components/knockGold/mobileCmponent.jsx index dacd7265..f0695cda 100644 --- a/src/components/knockGold/mobileCmponent.jsx +++ b/src/components/knockGold/mobileCmponent.jsx @@ -2,7 +2,7 @@ * @Author: Wind * @Date: 2022-06-06 14:53:58 * @LastEditors: Wind - * @LastEditTime: 2022-08-15 10:23:22 + * @LastEditTime: 2022-08-15 14:17:03 * @Description: * @FilePath: \frontend\src\components\knockGold\mobileCmponent.jsx */ @@ -49,12 +49,12 @@ export default ({ data }) => {

可用时间