diff --git a/src/App.css b/src/App.css index cfa2dd36..f91c621f 100644 --- a/src/App.css +++ b/src/App.css @@ -190,4 +190,7 @@ resize: none; background-color: rgba(0,0,0,0.5); z-index: 6; +} +.zent-image-upload-list{ + width: 500px !important; } \ No newline at end of file diff --git a/src/assets/api.js b/src/assets/api.js index 8c55e30f..e8838d4c 100644 --- a/src/assets/api.js +++ b/src/assets/api.js @@ -903,6 +903,12 @@ export const planCancel= (id) => { return req('put',baseurl + "/plan/cancel/"+id) } +//key审批 +export const keyApproval =(plan_id,key_id) => { + return req('post',baseurl + "/plan/"+plan_id+"/keys/"+key_id+"/approval") +} + + diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js index 3d7ac72d..cab0f836 100644 --- a/src/pages/exchangecode/add/add.js +++ b/src/pages/exchangecode/add/add.js @@ -6,8 +6,7 @@ import Ipt from "../../../components/input/main" import Form from "../../../components/form/main" import FormItem from "../../../components/form-item/main" import Grid from "../../../components/gird/main.js" -import {addPlanStep,handelResponse,getPlanList,addKeysBatchInfo,getKeyBatchDetail,putKeyBatchDetail,uploadImg,postKeyEmail,getReseller,getAccessVerification - } from "../../../assets/api.js" +import {addPlanStep,handelResponse,getPlanList,addKeysBatchInfo,getKeyBatchDetail,putKeyBatchDetail,uploadImg,postKeyEmail,getReseller,getAccessVerification,keyApproval} from "../../../assets/api.js" import Productform from "../product/add" import Bus from "../../../assets/eventBus.js" import _ from "lodash"; @@ -547,10 +546,18 @@ export default class acclist extends React.Component{ addKeysBatchInfo(id,data).then((res)=>{ handelResponse(res,(req,msg)=>{ - Notify.success("成功发起审批"); - setTimeout(()=>{ - this.props.history.push('/home/key-list/'); - },2000) + // Notify.success("成功发起审批"); + // setTimeout(()=>{ + // this.props.history.push('/home/key-list/'); + // },2000) + + keyApproval(id,req.id).then((res)=>{ + handelResponse(res,(req,msg)=>{ + + },(err)=>{ + Notify.error(err); + }) + }) },(err)=>{ Notify.error(err); diff --git a/src/pages/plan/add/step3.js b/src/pages/plan/add/step3.js index 710881c9..1d68d761 100644 --- a/src/pages/plan/add/step3.js +++ b/src/pages/plan/add/step3.js @@ -30,7 +30,6 @@ export default class acclist extends React.Component{ } componentDidMount(e){ - this.getThemeData(); } @@ -39,13 +38,12 @@ export default class acclist extends React.Component{ let params = {} if(sessionStorage.getItem("white") == 1) { - params.page = 1 + params.page = 1 } else { - params.page = 3 + params.page = 3 } - getThemeChoice(params).then((res)=>{ handelResponse(res,(req,msg)=>{