Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx
This commit is contained in:
commit
d87b77664f
|
@ -66,7 +66,7 @@
|
|||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">问卷预览</a-button>
|
||||
<a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷详情</a-button>
|
||||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷预览</a-button>
|
||||
<a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷结果</a-button>
|
||||
<a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷结果</a-button>
|
||||
</a-col>
|
||||
<!-- <a-col :span="24" style="text-align:center;margin-top:20px;">-->
|
||||
<!-- <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">答卷</a-button>-->
|
||||
|
|
|
@ -97,7 +97,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
|
|||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record) {
|
||||
if(record.totalScore>0){
|
||||
if(record.commitTime != null && record.commitTime != ''){
|
||||
return [
|
||||
{
|
||||
label: '答卷结果',
|
||||
|
@ -107,7 +107,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
|
|||
}else{
|
||||
return [];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function init(record,flag){
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<div class="jeecg-basic-table-form-container">
|
||||
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||
<a-row :gutter="24">
|
||||
|
@ -27,7 +27,7 @@
|
|||
<!--引用表格-->
|
||||
<BasicTable @register="registerTable" >
|
||||
<!--操作栏-->
|
||||
<template #action="{ record }" v-if="isFinished=='1'">
|
||||
<template #action="{ record }">
|
||||
<TableAction :actions="getTableAction(record)"/>
|
||||
</template>
|
||||
</BasicTable>
|
||||
|
@ -89,15 +89,22 @@ import {ref, reactive, defineExpose, unref} from 'vue';
|
|||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record) {
|
||||
return [
|
||||
{
|
||||
label: '答卷结果',
|
||||
onClick: handlePeizhiDjjg.bind(null, record),
|
||||
}
|
||||
]
|
||||
console.log(record);
|
||||
if(record.commitTime != null && record.commitTime != ''){
|
||||
return [
|
||||
{
|
||||
label: '答卷结果',
|
||||
onClick: handlePeizhiDjjg.bind(null, record),
|
||||
}
|
||||
]
|
||||
}else{
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function init(record,flag){
|
||||
console.log(record);
|
||||
console.log(flag);
|
||||
queryParam.value.id = record.id;
|
||||
queryParam.value.rwbh = record.rwbh;
|
||||
queryParam.value.isFinished = flag;
|
||||
|
|
|
@ -22,8 +22,10 @@
|
|||
function edit(record,flag) {
|
||||
if(flag == '1'){
|
||||
title.value = '已完成答卷学生列表';
|
||||
}else{
|
||||
title.value = '已完成答卷学生列表';
|
||||
}else if(flag == '0'){
|
||||
title.value = '未完成答卷学生列表';
|
||||
}else if(flag == ''){
|
||||
title.value = '全部答卷学生列表';
|
||||
}
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
|
|
Loading…
Reference in New Issue