|
|
@@ -114,9 +114,10 @@
|
|
|
<el-form
|
|
|
:model="orgSetting"
|
|
|
:rules="orgSettingRules"
|
|
|
- ref="orgSettingForm"
|
|
|
+ ref="addOrgSettingForm"
|
|
|
label-position="right"
|
|
|
:inline="true"
|
|
|
+ inline-message
|
|
|
>
|
|
|
<el-row>
|
|
|
<el-form-item label="学习中心" prop="orgId" label-width="120px">
|
|
|
@@ -144,10 +145,9 @@
|
|
|
<el-form-item
|
|
|
label="考试时间"
|
|
|
prop="orgSettingDatetimeRange"
|
|
|
- label-width="110px"
|
|
|
+ label-width="120px"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- style="margin-left: 10px"
|
|
|
v-model="orgSettingDatetimeRange"
|
|
|
type="datetimerange"
|
|
|
range-separator="至"
|
|
|
@@ -191,9 +191,10 @@
|
|
|
<el-form
|
|
|
:model="orgSetting"
|
|
|
:rules="orgSettingRules"
|
|
|
- ref="orgSettingForm"
|
|
|
+ ref="updateOrgSettingForm"
|
|
|
label-position="right"
|
|
|
:inline="true"
|
|
|
+ inline-message
|
|
|
>
|
|
|
<el-row>
|
|
|
<el-form-item label="学习中心" prop="orgId" label-width="120px">
|
|
|
@@ -222,10 +223,9 @@
|
|
|
<el-form-item
|
|
|
label="考试时间"
|
|
|
prop="orgSettingDatetimeRange"
|
|
|
- label-width="110px"
|
|
|
+ label-width="120px"
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- style="margin-left: 10px"
|
|
|
v-model="orgSettingDatetimeRange"
|
|
|
type="datetimerange"
|
|
|
range-separator="至"
|
|
|
@@ -272,7 +272,7 @@ let _this = null;
|
|
|
|
|
|
let validateOrgSettingDatetimeRange = (rule, value, callback) => {
|
|
|
let examDatetimeRange = _this.orgSettingDatetimeRange;
|
|
|
- if (!examDatetimeRange) {
|
|
|
+ if (!examDatetimeRange || 0 == examDatetimeRange.length) {
|
|
|
callback(new Error("请输入考试时间"));
|
|
|
_this.activeName = "tab1";
|
|
|
} else {
|
|
|
@@ -313,7 +313,9 @@ export default {
|
|
|
orgList4InsertOrUpdate: [],
|
|
|
loadingOrg4InsertOrUpdate: false,
|
|
|
orgSettingRules: {
|
|
|
- orgId: [{ required: true, trigger: "blur" }],
|
|
|
+ orgId: [
|
|
|
+ { required: true, message: "请选择学习中心", trigger: "blur,change" }
|
|
|
+ ],
|
|
|
orgSettingDatetimeRange: [
|
|
|
{
|
|
|
required: true,
|
|
|
@@ -356,7 +358,7 @@ export default {
|
|
|
updateOrgSetting() {
|
|
|
this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
|
|
|
this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
|
|
|
- this.$refs.orgSettingForm.validate(valid => {
|
|
|
+ this.$refs.updateOrgSettingForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
let url = EXAM_WORK_API + "/exam/examOrgSettings";
|
|
|
this.$http.post(url, this.orgSetting).then(response => {
|
|
|
@@ -376,7 +378,7 @@ export default {
|
|
|
addOrgSetting() {
|
|
|
this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
|
|
|
this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
|
|
|
- this.$refs.orgSettingForm.validate(valid => {
|
|
|
+ this.$refs.addOrgSettingForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
let url = EXAM_WORK_API + "/exam/examOrgSettings";
|
|
|
this.$http.put(url, this.orgSetting).then(response => {
|
|
|
@@ -425,7 +427,9 @@ export default {
|
|
|
this.orgSetting.endTime = row.endTime;
|
|
|
this.orgSetting.properties.CAN_UPLOAD_ATTACHMENT =
|
|
|
row.properties.CAN_UPLOAD_ATTACHMENT;
|
|
|
- this.orgSettingDatetimeRange = [row.beginTime, row.endTime];
|
|
|
+ if (row.beginTime && row.endTime) {
|
|
|
+ this.orgSettingDatetimeRange = [row.beginTime, row.endTime];
|
|
|
+ }
|
|
|
this.updateOrgSettingDialog = true;
|
|
|
},
|
|
|
showAddOrgSetting() {
|
WANG