|
@@ -67,6 +67,54 @@
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="开考时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ class="input"
|
|
|
|
+ v-model="startExamDatetimeRange"
|
|
|
|
+ type="datetimerange"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ range-separator="至"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ value-format="yyyy/MM/dd HH:mm:ss"
|
|
|
|
+ :clearable="false"
|
|
|
|
+ size="small"
|
|
|
|
+ @change="changeStartExamDatetimeRange"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="交卷时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ class="input"
|
|
|
|
+ v-model="endExamDatetimeRange"
|
|
|
|
+ type="datetimerange"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ range-separator="至"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ value-format="yyyy/MM/dd HH:mm:ss"
|
|
|
|
+ :clearable="false"
|
|
|
|
+ size="small"
|
|
|
|
+ @change="changeStartExamDatetimeRange"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="审核时间">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ class="input"
|
|
|
|
+ v-model="AuditExamDatetimeRange"
|
|
|
|
+ type="datetimerange"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ range-separator="至"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ value-format="yyyy/MM/dd HH:mm:ss"
|
|
|
|
+ :clearable="false"
|
|
|
|
+ size="small"
|
|
|
|
+ @change="changeAuditExamDatetimeRange"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</commonFormVue>
|
|
</commonFormVue>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
@@ -118,9 +166,9 @@
|
|
type="text"
|
|
type="text"
|
|
>{{ scope.row.examRecordDataId }}</el-button
|
|
>{{ scope.row.examRecordDataId }}</el-button
|
|
>
|
|
>
|
|
- <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
|
|
|
|
- {{ scope.row.examRecordDataId }}
|
|
|
|
- </span>
|
|
|
|
|
|
+ <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">{{
|
|
|
|
+ scope.row.examRecordDataId
|
|
|
|
+ }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
@@ -182,6 +230,18 @@
|
|
prop="examOrder"
|
|
prop="examOrder"
|
|
width="120"
|
|
width="120"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ label="开考时间"
|
|
|
|
+ prop="paperStartTime"
|
|
|
|
+ width="120"
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ label="交卷时间"
|
|
|
|
+ prop="paperSubmitTime"
|
|
|
|
+ width="120"
|
|
|
|
+ ></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
sortable
|
|
sortable
|
|
label="审核说明"
|
|
label="审核说明"
|
|
@@ -200,6 +260,12 @@
|
|
prop="auditUserName"
|
|
prop="auditUserName"
|
|
width="180"
|
|
width="180"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ label="审核时间"
|
|
|
|
+ prop="paperAuditTime"
|
|
|
|
+ width="120"
|
|
|
|
+ ></el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<div class="block pull-right">
|
|
<div class="block pull-right">
|
|
<el-pagination
|
|
<el-pagination
|
|
@@ -251,7 +317,13 @@ export default {
|
|
disciplineType: "",
|
|
disciplineType: "",
|
|
auditUserName: "",
|
|
auditUserName: "",
|
|
status: "",
|
|
status: "",
|
|
- ORG_FIND_ALL: false //查询所有机构
|
|
|
|
|
|
+ ORG_FIND_ALL: false, //查询所有机构
|
|
|
|
+ startTime: null, //开考时间起
|
|
|
|
+ endTime: null, //开考时间止
|
|
|
|
+ submitStartTime: null, //交卷时间起
|
|
|
|
+ submitEndTime: null, //交卷时间止
|
|
|
|
+ auditStartTime: null, //审核时间起
|
|
|
|
+ auditEndTime: null //审核时间止
|
|
},
|
|
},
|
|
|
|
|
|
getExamCondition: {
|
|
getExamCondition: {
|
|
@@ -268,7 +340,10 @@ export default {
|
|
SNAPSHOT_DETAILS: false //详情查看
|
|
SNAPSHOT_DETAILS: false //详情查看
|
|
},
|
|
},
|
|
getPermissionStatus: false, //获取权限状态
|
|
getPermissionStatus: false, //获取权限状态
|
|
- disciplineTypeList: []
|
|
|
|
|
|
+ disciplineTypeList: [],
|
|
|
|
+ startExamDatetimeRange: [],
|
|
|
|
+ endExamDatetimeRange: [],
|
|
|
|
+ auditExamDatetimeRange: []
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -295,8 +370,17 @@ export default {
|
|
disciplineType: "",
|
|
disciplineType: "",
|
|
auditUserName: "",
|
|
auditUserName: "",
|
|
status: "",
|
|
status: "",
|
|
- ORG_FIND_ALL: this.form.ORG_FIND_ALL
|
|
|
|
|
|
+ ORG_FIND_ALL: this.form.ORG_FIND_ALL,
|
|
|
|
+ startTime: null, //开考时间起
|
|
|
|
+ endTime: null, //开考时间止
|
|
|
|
+ submitStartTime: null, //交卷时间起
|
|
|
|
+ submitEndTime: null, //交卷时间止
|
|
|
|
+ auditStartTime: null, //审核时间起
|
|
|
|
+ auditEndTime: null //审核时间止
|
|
};
|
|
};
|
|
|
|
+ this.startExamDatetimeRange = [];
|
|
|
|
+ this.endExamDatetimeRange = [];
|
|
|
|
+ this.auditExamDatetimeRange = [];
|
|
},
|
|
},
|
|
showMoreCondition() {
|
|
showMoreCondition() {
|
|
this.showAllCondition = true;
|
|
this.showAllCondition = true;
|
|
@@ -403,6 +487,33 @@ export default {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ },
|
|
|
|
+ changeStartExamDatetimeRange(e) {
|
|
|
|
+ if (e && e.length > 0) {
|
|
|
|
+ this.form.startTime = e[0];
|
|
|
|
+ this.form.endTime = e[1];
|
|
|
|
+ } else {
|
|
|
|
+ this.form.startTime = "";
|
|
|
|
+ this.form.endTime = "";
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ changeEndExamDatetimeRange(e) {
|
|
|
|
+ if (e && e.length > 0) {
|
|
|
|
+ this.form.submitStartTime = e[0];
|
|
|
|
+ this.form.submitEndTime = e[1];
|
|
|
|
+ } else {
|
|
|
|
+ this.form.submitStartTime = "";
|
|
|
|
+ this.form.submitEndTime = "";
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ changeAuditExamDatetimeRange(e) {
|
|
|
|
+ if (e && e.length > 0) {
|
|
|
|
+ this.form.AuditStartTime = e[0];
|
|
|
|
+ this.form.AuditEndTime = e[1];
|
|
|
|
+ } else {
|
|
|
|
+ this.form.AuditStartTime = "";
|
|
|
|
+ this.form.AuditEndTime = "";
|
|
|
|
+ }
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|