班次管理考勤时间修改

src/views/base/meetingInfo-detail.vue

@@ -132,23 +132,24 @@ export default {
     };
 
     return {
-      data: generateData(),
-      formModel: {},
-      ruleValidate: {
-        name: [{ required: true, message: "会议地点名称不能为空", trigger: "blur" }],
-      },
-      showDialog: true,
-      loading: false,
-      submitting: false,
+        data: generateData(),
+        value:[],
+        formModel: {},
+        ruleValidate: {
+            name: [{ required: true, message: "会议地点名称不能为空", trigger: "blur" }],
+        },
+        showDialog: true,
+        loading: false,
+        submitting: false,
+        filterMethod(query, item) {
+            return item.pinyin.indexOf(query) > -1;
+        },
     };
   },
   methods: {
     closeDialog() {
       this.$emit("close", false);
     },
-    filterMethod(query, item) {
-        return item.pinyin.indexOf(query) > -1;
-    },
     handleSubmit() {
       var self = this;
 

src/views/base/workShiftInfo-detail.vue

@@ -15,18 +15,18 @@
     style="text-align:left;"
     @close="closeDialog"
     :close-on-click-modal="false"
-    width="700px"
+    width="800px"
   >
     <div class="user-panel" v-loading="loading">
-      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'" :inline="true">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'150px'" :inline="true">
         <el-form-item label="班次编号" prop="number" >
-            <el-input v-model="formModel.number" placeholder="请输入班次编号" style="width:510px"></el-input>
+            <el-input v-model="formModel.number" placeholder="请输入班次编号" style="width:560px"></el-input>
         </el-form-item>
         <el-form-item label="班次名称" prop="name" >
-            <el-input v-model="formModel.name" placeholder="请输入班次名称" style="width:510px"></el-input>
+            <el-input v-model="formModel.name" placeholder="请输入班次名称" style="width:560px"></el-input>
         </el-form-item>
         <el-form-item label="对应天数" prop="days">
-            <el-input v-model="formModel.days" placeholder="请输入对应天数" style="width:510px" type="number">
+            <el-input v-model="formModel.days" placeholder="请输入对应天数" style="width:560px" type="number">
                 <template slot="append">天</template>
             </el-input>
         </el-form-item>
@@ -34,12 +34,59 @@
             <el-time-picker
               v-model="formModel.workTime"
               style="width:200px"
-              placeholder="任意时间点"
+              placeholder="上班时间"
               format='HH:mm'
               value-format="HH:mm">
             </el-time-picker>
         </el-form-item>
-        <el-form-item label="上班考勤时段" prop="workTimeRange" >
+        <el-form-item label="下班时间" prop="closingTime">
+            <el-time-picker
+              v-model="formModel.closingTime"
+              style="width:200px"
+              placeholder="下班时间"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="上班考勤开始时间" prop="workStartTime" >
+            <el-time-picker
+              v-model="formModel.workStartTime"
+              style="width:200px"
+              placeholder="上班考勤开始时间"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="上班考勤结束时间" prop="workEndTime" >
+            <el-time-picker
+              v-model="formModel.workEndTime"
+              style="width:200px"
+              placeholder="上班考勤结束时间"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="下班考勤开始时间" prop="closingStartTime" >
+            <el-time-picker
+              v-model="formModel.closingStartTime"
+              style="width:200px"
+              placeholder="下班考勤开始时间"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+        <el-form-item label="下班考勤结束时间" prop="closingEndTime" >
+            <el-time-picker
+              v-model="formModel.closingEndTime"
+              style="width:200px"
+              placeholder="下班考勤结束时间"
+              format='HH:mm'
+              value-format="HH:mm">
+            </el-time-picker>
+        </el-form-item>
+
+
+        <!-- <el-form-item label="上班考勤时段" prop="workTimeRange" >
           <el-time-picker
               is-range
               v-model="formModel.workTimeRange"
@@ -52,15 +99,6 @@
               style="width:200px">
           </el-time-picker>
         </el-form-item>
-        <el-form-item label="下班时间" prop="closingTime">
-            <el-time-picker
-              v-model="formModel.closingTime"
-              style="width:200px"
-              placeholder="任意时间点"
-              format='HH:mm'
-              value-format="HH:mm">
-            </el-time-picker>
-        </el-form-item>
         <el-form-item label="下班考勤时段" prop="closingTimeRange" >
             <el-time-picker
             is-range
@@ -73,14 +111,14 @@
             value-format="HH:mm"
             style="width:200px">
           </el-time-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="关联部门" prop="companyId">
             <el-select-tree
             :props="props"
             :options="companyResult"
             v-model="formModel.companyId"
             height="200"
-            style="width:510px"
+            style="width:560px"
             ></el-select-tree>
         </el-form-item>
         <el-form-item label="已关联部门" prop="companyList">