From bd5c9f59529b0b2c71fbf2f00da089e8bc00e66b Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 15 Aug 2022 10:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=90=E8=BF=BD=E5=8A=A0ke?= =?UTF-8?q?y=E6=89=B9=E6=AC=A1=E3=80=91=E6=8F=90=E4=BA=A4=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=EF=BC=8C=E5=90=8E=E7=AB=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E8=BF=98=E6=9C=89=E8=BF=9B=E8=A1=8C=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8D=95=E2=80=9D=EF=BC=8C=E5=88=9B=E5=BB=BA?= =?UTF-8?q?/=E7=BC=96=E8=BE=91=E6=88=90=E5=8A=9F=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E5=AE=A1=E6=89=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangecode/add/add.js | 22 +++---- src/pages/login/loginform.js | 2 - src/pages/plan/key/edit.js | 100 +++++++----------------------- 3 files changed, 33 insertions(+), 91 deletions(-) diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js index de304d33..ed906a86 100644 --- a/src/pages/exchangecode/add/add.js +++ b/src/pages/exchangecode/add/add.js @@ -749,21 +749,21 @@ export default class acclist extends React.Component { handelResponse( res, (req, msg) => { - keyApproval(id, req.key_batch_id, data).then((res) => { - handelResponse( - res, - (req, msg) => { - Notify.success('成功发起审批') + // keyApproval(id, req.key_batch_id, data).then((res) => { + // handelResponse( + // res, + // (req, msg) => { + Notify.success(res.message) setTimeout(() => { // this.props.history.push('/home/key-list/') window.history.back() }, 2000) - }, - (err) => { - Notify.error(err) - } - ) - }) + // }, + // (err) => { + // Notify.error(err) + // } + // ) + // }) }, (err) => { Notify.error(err) diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js index ec62d710..853f2600 100644 --- a/src/pages/login/loginform.js +++ b/src/pages/login/loginform.js @@ -100,9 +100,7 @@ const getAccountList = () => { setTimeout(() => { props.history.replace("/home/plan-list"); }, 1000); - console.log(104,market); } else { - console.log(104,market); try { menuList.forEach((item) => { diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js index 80147e61..0d98ce4d 100644 --- a/src/pages/plan/key/edit.js +++ b/src/pages/plan/key/edit.js @@ -700,7 +700,6 @@ export default class acclist extends React.Component { //除了创建中 编辑key if (this.state.isEdit) { - debugger this.setState({ audit_visible: false }) let approval_id = sessionStorage.getItem('approval_id') if (approval_id > 0) { @@ -806,20 +805,20 @@ export default class acclist extends React.Component { handelResponse( res, (req, msg) => { - keyApproval(this.state.plan_id, id, data).then((res) => { - handelResponse( - res, - (req, msg) => { - Notify.success('成功发起审批') + // keyApproval(this.state.plan_id, id, data).then((res) => { + // handelResponse( + // res, + // (req, msg) => { + Notify.success(res.message) setTimeout(() => { this.props.history.push('/home/key-list/') }, 2000) - }, - (err) => { - Notify.error(err) - } - ) - }) + // }, + // (err) => { + // Notify.error(err) + // } + // ) + // }) }, (err) => { Notify.error(err) @@ -827,30 +826,6 @@ export default class acclist extends React.Component { ) }) } - - // putKeyBatchDetail(id,data).then((res)=>{ - // handelResponse(res,(req,msg)=>{ - // Notify.success("成功发起审批"); - // setTimeout(()=>{ - // window.history.back() - // },1000); - // },(err)=>{ - // Notify.error(err) - // }) - // }) - - // keyApproval(this.state.plan_id,id,data).then((res)=>{ - // handelResponse(res,(req,msg)=>{ - - // Notify.success("成功发起审批"); - // setTimeout(()=>{ - // this.props.history.push('/home/key-list/'); - // },2000) - - // },(err)=>{ - // Notify.error(err); - // }) - // }) } } else { //创建中 编辑key @@ -890,20 +865,20 @@ export default class acclist extends React.Component { handelResponse( res, (req, msg) => { - keyApproval(this.state.plan_id, id, data).then((res) => { - handelResponse( - res, - (req, msg) => { - Notify.success('成功发起审批') + // keyApproval(this.state.plan_id, id, data).then((res) => { + // handelResponse( + // res, + // (req, msg) => { + Notify.success(res.message) setTimeout(() => { this.props.history.push('/home/key-list/') }, 2000) - }, - (err) => { - Notify.error(err) - } - ) - }) + // }, + // (err) => { + // Notify.error(err) + // } + // ) + // }) }, (err) => { Notify.error(err) @@ -934,37 +909,6 @@ export default class acclist extends React.Component { }) } } - - // if(this.refs.form1.validator()) - // { - // let data = {}; - // data.batch_name = this.state.model.batch_name; - // data.style = this.state.model.style; - // data.quantity = this.state.model.quantity; - // data.bind_object = this.state.checkedList; - // data.allow_repetition = this.state.model.allow_repetition; - // data.allow_loss = this.state.model.allow_loss; - // data.merge_stock = this.state.model.merge_stock; - // data.code_batch = this.refs.bindObj.getSelectData(); - // if(data.code_batch.length == 0) - // { - // Notify.error("请绑定对象") - // return - // } - - // let id = sessionStorage.getItem("key_plan_id") - // addKeysBatchInfo(id,data).then((res)=>{ - // handelResponse(res,(req,msg)=>{ - // Notify.success("成功发起审批"); - // setTimeout(()=>{ - // window.history.back() - // },1000); - // },(err)=>{ - // }) - // }) - - // } - //} } onBindNum(e, row) {