|
|
@@ -15,9 +15,6 @@
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- .el-button--small, .el-button--small.is-round {
|
|
|
- padding: 9px 9px;
|
|
|
- }
|
|
|
.el-divider--horizontal{
|
|
|
margin: 10px 0 20px;
|
|
|
}
|
|
|
@@ -117,7 +114,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="培训时间">
|
|
|
<el-date-picker clearable
|
|
|
- v-model="form.train_time1"
|
|
|
+ v-model="form.train_time"
|
|
|
type="daterange" value-format="yyyy-MM-dd"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
@@ -138,7 +135,7 @@
|
|
|
<el-tab-pane name="1" label="待付款"></el-tab-pane>
|
|
|
<el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
|
|
|
<!-- <el-tab-pane name="7" label="已培训待考试"></el-tab-pane> -->
|
|
|
- <el-tab-pane name="3" label="考试完成"></el-tab-pane>
|
|
|
+ <el-tab-pane name="4" label="考试完成"></el-tab-pane>
|
|
|
<!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
@@ -146,7 +143,7 @@
|
|
|
<el-button @click="setStatus(1,'审核通过')" size="small" type="success" >审核通过</el-button>
|
|
|
<el-button @click="setStatus(-2,'审核不通过')" size="small" type="info" >审核不通过</el-button>
|
|
|
<el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
|
|
|
- <el-button @click="setStatus(3,'已培训')" size="small" type="warning" >已培训</el-button>
|
|
|
+ <el-button @click="setStatus(3,'已培训')" size="small" type="warning" >已培训,待考试</el-button>
|
|
|
<el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
|
|
|
<el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
|
|
|
<el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
|
|
|
@@ -176,7 +173,7 @@
|
|
|
|
|
|
</div>
|
|
|
<el-table
|
|
|
- class="table" :fit='true'
|
|
|
+ class="table"
|
|
|
:data="list" v-loading="loading"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
border
|
|
|
@@ -194,7 +191,8 @@
|
|
|
<el-button size="mini" v-if='scope.row.order_status==0' type="warning">{{scope.row.order_status_1}}</el-button>
|
|
|
<el-button size="mini" v-if='scope.row.order_status==1' type="danger">{{scope.row.order_status_1}}</el-button>
|
|
|
<el-button size="mini" v-if='scope.row.order_status==2' type="primary">{{scope.row.order_status_1}}</el-button>
|
|
|
- <el-button size="mini" v-if='scope.row.order_status==3' type="success">{{scope.row.order_status_1}}</el-button>
|
|
|
+ <el-button size="mini" v-if='scope.row.order_status==3' type="warning">{{scope.row.order_status_1}}</el-button>
|
|
|
+ <el-button size="mini" v-if='scope.row.order_status==4' type="success">{{scope.row.order_status_1}}</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
|
|
|
@@ -222,18 +220,18 @@
|
|
|
<Page ref="pageButton" :total='total' @pageChange='gopage'/>
|
|
|
|
|
|
<el-dialog
|
|
|
- :title="text"
|
|
|
+ :title="text"
|
|
|
:visible.sync="dialogVisible"
|
|
|
width="30%">
|
|
|
<el-date-picker
|
|
|
- v-model="time1" v-show='date_type == 1'
|
|
|
+ v-model="time" v-if='date_type == 1'
|
|
|
type="daterange" value-format="yyyy-MM-dd"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
<el-date-picker
|
|
|
- v-model="time2" v-show='date_type == 2'
|
|
|
+ v-model="time" v-else
|
|
|
type="date" value-format="yyyy-MM-dd">
|
|
|
</el-date-picker>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -261,26 +259,25 @@ export default {
|
|
|
{name:'状态', value:'order_status_1',checked:true,width:'120px'},
|
|
|
{name:'管理员备注', value:'remark',checked:true,width:'150px'},
|
|
|
{name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
|
|
|
- {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
|
|
|
- {name:'准操项目', value:'subject_item2',checked:true,width:'200px'},
|
|
|
+ {name:'作业类别', value:'subject_item1',checked:true},
|
|
|
+ {name:'准操项目', value:'subject_item2',checked:true},
|
|
|
{name:'培训类型', value:'train_type',checked:true},
|
|
|
- {name:'培训时间', value:'train_time',checked:true,width:'200px'},
|
|
|
+ {name:'培训时间', value:'train_time',checked:true,width:'150px'},
|
|
|
{name:'考试时间', value:'exam_time',checked:true,width:'150px'},
|
|
|
- {name:'支付状态', value:'pay_status_1',checked:true},
|
|
|
+ {name:'支付状态', value:'pay_status_1',checked:false},
|
|
|
{name:'培训费用', value:'price',checked:true},
|
|
|
{name:'报名时间', value:'signup_time',checked:true,width:'150px'},
|
|
|
{name:'公司名称', value:'company',checked:true,width:'200px'},
|
|
|
{name:'更新时间', value:'ctime',checked:false,width:'170px'},
|
|
|
{name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
|
|
|
{name:'领证方式', value:'receive_card',checked:false},
|
|
|
- {name:'实名认证', value:'verify_1',checked:true},
|
|
|
+ {name:'实名认证', value:'verify',checked:true},
|
|
|
{name:'ID', value:'id',checked:false},
|
|
|
],
|
|
|
text:'批量设置培训时间',
|
|
|
date_type:1,
|
|
|
- time1:null,
|
|
|
- time2:'',
|
|
|
- form:{train_type:'新办',subject_item:'',order_status:'',page:1,page_size:20},
|
|
|
+ time:'',
|
|
|
+ form:{train_type:'新办',subject_item:'',order_status:'',page:1},
|
|
|
activeName:"1",
|
|
|
total:1,
|
|
|
list:[],
|
|
|
@@ -294,16 +291,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
|
- gopage(size){
|
|
|
- if(size){
|
|
|
- this.form.page_size=size
|
|
|
- }
|
|
|
+ gopage(){
|
|
|
this.form.page=this.$refs.pageButton.page
|
|
|
this.getData()
|
|
|
},
|
|
|
getData(){
|
|
|
var parm=this.form;
|
|
|
- if(parm.train_time1){parm.train_time=parm.train_time1.join(',')};
|
|
|
this.loading=true;
|
|
|
if(this.order_status != '-3'){parm.order_status=this.order_status}else{parm.order_status=''}
|
|
|
this.$api.getSignList(parm).then(res=>{
|
|
|
@@ -319,15 +312,13 @@ export default {
|
|
|
if(item.order_status == -1)status='待提交资料';
|
|
|
if(item.order_status == 0)status='待审核';
|
|
|
if(item.order_status == 1)status='审核通过待付款';
|
|
|
- if(item.order_status == 2)status='学习中';
|
|
|
- if(item.order_status == 3)status='已完成';
|
|
|
+ if(item.order_status == 2)status='已支付,学习中';
|
|
|
+ if(item.order_status == 3)status='已培训,待考试';
|
|
|
+ if(item.order_status == 4)status='考试完成';
|
|
|
item.order_status_1=status
|
|
|
item.pay_status_1=pay_status
|
|
|
item.verify_1=verify
|
|
|
item.bill_type_1=bill_type
|
|
|
- if(!item.pay_status){
|
|
|
- item.price=''
|
|
|
- }
|
|
|
}
|
|
|
this.list=res.data.data.list
|
|
|
this.total=res.data.data.total
|
|
|
@@ -335,7 +326,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
subChange(data){
|
|
|
- console.log(data)
|
|
|
this.form.subject_item=this.subject_item+'|'+data.join('|');
|
|
|
this.getData();
|
|
|
},
|
|
|
@@ -409,32 +399,26 @@ export default {
|
|
|
if(val.length>0){
|
|
|
this.date_type=type
|
|
|
if(type == 1){
|
|
|
- this.dialogVisible=true;
|
|
|
this.text='批量设置培训时间'
|
|
|
- }else if(type == 2){
|
|
|
- this.dialogVisible=true;
|
|
|
- this.text='批量设置考试时间'
|
|
|
}else{
|
|
|
- this.save()
|
|
|
+ this.text='批量设置考试时间'
|
|
|
}
|
|
|
+ this.dialogVisible=true;
|
|
|
}else{
|
|
|
this.$message.error('请选择数据');
|
|
|
}
|
|
|
},
|
|
|
save(){
|
|
|
var parm={id:this.select_ids}
|
|
|
- console.log(this.time)
|
|
|
if(this.date_type == 1){
|
|
|
- parm.train_time=this.time1.join(',')
|
|
|
- }else if(this.date_type == 2){
|
|
|
- parm.exam_time=this.time2
|
|
|
+ parm.train_time=this.time.join(',')
|
|
|
}else{
|
|
|
- parm.classhour_cert_status=1
|
|
|
+ parm.exam_time=this.time
|
|
|
}
|
|
|
- this.$api.updateSign(parm).then((res)=>{
|
|
|
+ this.$api.updateSign(parm).then((res)=>{
|
|
|
if(res.data.code == 0){
|
|
|
this.$message({
|
|
|
- message: '操作成功',
|
|
|
+ message: '修改成功',
|
|
|
type: 'success'
|
|
|
})
|
|
|
this.dialogVisible=false
|
xiaojincai