diff --git a/src/assets/api.js b/src/assets/api.js index fd00796c..fa93bfa5 100644 --- a/src/assets/api.js +++ b/src/assets/api.js @@ -882,6 +882,10 @@ export const keyCancel= (data) => { } //标记使用 export const keyBatchUsage= (data) => { + return req('put', baseurl + "/key/batch_usage",data) +} +//标记使用 +export const keyUsage= (data) => { return req('put', baseurl + "/key/usage",data) } //获取日志 diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js index f7da30db..46029c8d 100644 --- a/src/pages/plan/key/detail/list.js +++ b/src/pages/plan/key/detail/list.js @@ -8,7 +8,7 @@ import Ipt from "../../../../components/input/main" import Grid from "../../../../components/gird/main.js" import TabPage from "../../../../components/tabPage/main.js" import Filterbar from "../../../../components/filterbar/main.js" -import {getKeyLog,planIsSend,keyCancel,keyBatchUsage,keyBatchCancel,getPlanList,handelResponse,startOrStopPlan,getAllEnum,resKeyEmail,planSend,planResend,planReceive,getReseller,getkeyDetailList} from "../../../../assets/api.js" +import {getKeyLog,planIsSend,keyCancel,keyUsage,keyBatchUsage,keyBatchCancel,getPlanList,handelResponse,startOrStopPlan,getAllEnum,resKeyEmail,planSend,planResend,planReceive,getReseller,getkeyDetailList} from "../../../../assets/api.js" import _ from "lodash"; import menu from "../../../../assets/enum.js" @@ -24,8 +24,7 @@ export default class acclist extends React.Component{ dataCount:0, page:1, limit:10, - // tabList:[{title:"全部",index:0},{title:"待使用",index:1},{title:"已使用",index:2},{title:"已完结",index:3},{title:"已作废",index:4}], - tabList:[{title:"key码列表",index:0}], + tabList:[{title:"全部",index:0},{title:"待使用",index:1},{title:"已使用",index:2},{title:"已完结",index:3},{title:"已作废",index:4}], distdata:[{title:'士大夫大师傅'}], filterList:[{id:0,label:"状态", prop:"status", menuList:[{id:999,name:"全部"},{id:0,name:"创建中"},{id:2,name:"审核中"},{id:3,name:"待生效"},{id:4,name:"进行中"},{id:5,name:"暂停中"},{id:6,name:"已完结"}]}, ], @@ -115,6 +114,7 @@ export default class acclist extends React.Component{ //清空 clearFn(){ this.refs.plan_list.allChecked(false) + this.setState({'selectiondata':[]}) } //选中表格的选框 selection(selection){ @@ -152,7 +152,7 @@ export default class acclist extends React.Component{ usage_total+=Number(item.usage_total); silent_total+=Number(item.silent_total); }); - this.setState({grantTotal,usageTotal,invalidTotal,outdateTotal}); + this.setState({grantTotal,usageTotal,invalidTotal,outdateTotal,surplusTotal}); } // 监听组件内部状态的变化: @@ -198,11 +198,13 @@ export default class acclist extends React.Component{ let status = e > 0 ? e : null if(!status) { - this.setState({status:e}) + this.setState({status:e}) } this.setState({search:""}) + this.setState({page:1}) + this.setState({limit:10}) let params={ page:1, limit:10, @@ -220,7 +222,7 @@ export default class acclist extends React.Component{ - keyBatchUsage(formdata).then((res)=>{ + keyUsage(formdata).then((res)=>{ handelResponse(res,(req,msg)=>{ let data = { page:1,