|
@@ -1,11 +1,11 @@
|
|
|
<template>
|
|
|
- <el-dialog
|
|
|
- :close-on-click-modal="false"
|
|
|
- :close-on-press-escape="false"
|
|
|
- :title="title"
|
|
|
+ <el-dialog
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :close-on-press-escape="false"
|
|
|
+ :title="title"
|
|
|
:append-to-body="true"
|
|
|
- :visible.sync="isVisible"
|
|
|
- :width="width"
|
|
|
+ :visible.sync="isVisible"
|
|
|
+ :width="width"
|
|
|
top="50px"
|
|
|
>
|
|
|
<el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
|
|
@@ -14,33 +14,26 @@
|
|
|
<el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.FREQUENCY" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- :label='$t("calssSchedule.form.timeLength")+":"'
|
|
|
+ <el-form-item
|
|
|
+ :label='$t("calssSchedule.form.beginTime")+":"'
|
|
|
prop="startTime"
|
|
|
- :rules='[
|
|
|
- { required: tenant.name.key == "04" ? false : true, message: this.$t("rules.require"), trigger: "change" }
|
|
|
- ]'
|
|
|
>
|
|
|
- <el-col :span="18">
|
|
|
- <el-time-picker v-model="tenant.startTime" :disabled='tenant.name.key == "04" ? true : false' value-format="HH:mm:ss" :placeholder='$t("calssSchedule.tips.startTime")' style="width: 48%;"></el-time-picker>
|
|
|
- <span>~</span>
|
|
|
- <el-time-picker v-model="tenant.endTime" :disabled='tenant.name.key == "04" ? true : false' value-format="HH:mm:ss" :placeholder='$t("calssSchedule.tips.endTime")' style="width: 48%;"></el-time-picker>
|
|
|
+ <el-col :span="16">
|
|
|
+ <el-time-picker v-model="tenant.startTime" :disabled='tenant.name.key == "04" ? true : false' format="HH:mm" value-format="HH:mm" :placeholder='$t("calssSchedule.tips.startTime")' style="width: 40%;"></el-time-picker>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <span style="margin-left: 20px;">
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ :label='$t("calssSchedule.form.endTime")+":"'
|
|
|
+ prop="endTime"
|
|
|
+ >
|
|
|
+ <el-col :span="16">
|
|
|
+ <el-time-picker v-model="tenant.endTime" :disabled='tenant.name.key == "04" ? true : false' format="HH:mm" value-format="HH:mm" :placeholder='$t("calssSchedule.tips.endTime")' style="width: 40%;"></el-time-picker>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <span style="margin-left: -220px;">
|
|
|
<el-checkbox v-model="tenant.accossDay" :disabled='tenant.name.key == "04" ? true : false'>{{$t("calssSchedule.tips.accossDay")}}</el-checkbox>
|
|
|
</span>
|
|
|
- <!--<template>
|
|
|
- <el-checkbox-group v-for="item in updateCheckbox" v-model="tenant.model2">
|
|
|
- <el-checkbox :key="item.id" :label="item.name">{{item.name}}</el-checkbox>
|
|
|
- </el-checkbox-group>
|
|
|
- </template>-->
|
|
|
- <!--<template style="margin-left: 20px;">
|
|
|
- <el-checkbox-group :disabled='tenant.name.key == "04" ? true : false'>
|
|
|
- <el-checkbox v-model="tenant.accossDay" :label="1">{{$t("calssSchedule.tips.accossDay")}}</el-checkbox>
|
|
|
- </el-checkbox-group>
|
|
|
- </template>-->
|
|
|
- </el-col>
|
|
|
+ </el-col>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label='$t("calssSchedule.form.sumTime")+":"' prop="hours">
|
|
|
<span>{{sumTime}}</span>
|
|
@@ -50,7 +43,7 @@
|
|
|
<el-color-picker v-model="tenant.color" size="small"></el-color-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item :label='$t("calssSchedule.table.calsses.remark")+":"' prop="remark">
|
|
|
- <el-input v-model="tenant.remark" type="textarea" :rows="3" style="width: 100%;"/>
|
|
|
+ <el-input v-model="tenant.remark" type="textarea" :rows="3" style="width: 100%;" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -60,7 +53,7 @@
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
<script>
|
|
|
-
|
|
|
+
|
|
|
// 【班次管理】-API
|
|
|
import classesMgrApi from "@/api/classScheduleMgr/classesMgr"
|
|
|
|
|
@@ -95,6 +88,37 @@ export default {
|
|
|
],
|
|
|
color: [
|
|
|
{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
|
|
|
+ ],
|
|
|
+ startTime: [
|
|
|
+ { required: true, validator: (rule, value, callback) => {
|
|
|
+ if(this.tenant.name.key != '04'){
|
|
|
+ console.log("value=" + value)
|
|
|
+ if (value === null) {
|
|
|
+ callback(new Error("请选择班表开始时间"))
|
|
|
+ } else {
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }, trigger: ['blur','change'] }
|
|
|
+ ],
|
|
|
+ endTime: [
|
|
|
+ { required: true, validator: (rule, value, callback) => {
|
|
|
+ console.log("value=" + value)
|
|
|
+ if(this.tenant.name.key != '04'){
|
|
|
+ if (value === null) {
|
|
|
+ callback(new Error("请选择班表结束时间"))
|
|
|
+ } else {
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }, trigger: ['blur','change'] }
|
|
|
+ ],
|
|
|
+ remark: [
|
|
|
+ {max: 200,message: "备注长度不能超过200"}
|
|
|
]
|
|
|
}
|
|
|
}
|
|
@@ -110,6 +134,16 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
sumTime(){
|
|
|
+ if(this.tenant.name.key != "04"){
|
|
|
+ if(this.tenant.startTime === null){
|
|
|
+ this.tenant.hours = 0
|
|
|
+ return 0
|
|
|
+ }
|
|
|
+ if(this.tenant.endTime === null){
|
|
|
+ this.tenant.hours = 0
|
|
|
+ return 0
|
|
|
+ }
|
|
|
+ }
|
|
|
// 一天的时间,换成毫秒数
|
|
|
let minite = 60*60*24*1000
|
|
|
let startTime = 0
|
|
@@ -141,10 +175,18 @@ export default {
|
|
|
// 【班次名称】值变化-事件
|
|
|
changeName(val){
|
|
|
// 如果是修改,【时间段】不让输入
|
|
|
+ this.$refs.form.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ return true
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ })
|
|
|
if(val == "04"){
|
|
|
this.tenant.accossDay = false
|
|
|
this.tenant.startTime = null
|
|
|
this.tenant.endTime = null
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
initTenant () {
|
|
@@ -152,8 +194,8 @@ export default {
|
|
|
name: {
|
|
|
key: ''
|
|
|
},
|
|
|
- startTime: 0,
|
|
|
- endTime: 0
|
|
|
+ startTime: null,
|
|
|
+ endTime: null
|
|
|
}
|
|
|
},
|
|
|
initWidth () {
|