考勤设置完善。

src/views/base/alarmConfig-detail.vue

@@ -29,7 +29,8 @@
             :props="props"
             :options="companyResult"
             v-model="formModel.companyId"
-            height="200"
+            width="300px"
+            size="mediumn"
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="是否包含下级单位" prop="subordinate">
@@ -66,7 +67,7 @@
                 }"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="考勤时间" prop="endTime">
+        <el-form-item label="考勤时间" prop="attendanceTime">
           <el-time-picker
             v-model="formModel.attendanceTime"
             class="date-box"
@@ -97,6 +98,10 @@
           <el-radio v-model="formModel.needMeasureTemperature" :label="true">是</el-radio>
           <el-radio v-model="formModel.needMeasureTemperature" :label="false">否</el-radio>
         </el-form-item>
+        <el-form-item label="实时统计" prop="realTimeStat">
+          <el-radio v-model="formModel.realTimeStat" :label="true">是</el-radio>
+          <el-radio v-model="formModel.realTimeStat" :label="false">否</el-radio>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -117,7 +122,15 @@ export default {
   data() {
     return {
       ruleValidate: {
-        companyId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        companyId: [{ required: true, message: "不能为空", trigger: "blur" }],
+        weekdays: [{ required: true, message: "不能为空", trigger: "blur" }],
+        startTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        attendanceTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        endTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        classifier: [{ required: true, message: "不能为空", trigger: "blur" }],
+        attendanceType: [{ required: true, message: "不能为空", trigger: "blur" }],
+        needMeasureTemperature: [{ required: true, message: "不能为空", trigger: "blur" }],
+        realTimeStat: [{ required: true, message: "不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -210,23 +223,26 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-            self.loading = true;
-            if (self.formModel.weekdays != null) {
-                var weekdays = self.formModel.weekdays.join(",");
-                self.formModel.weekdays = weekdays;
+            self.submitting = true;
+
+            var requestModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if (requestModel.weekdays != null) {
+              var weekdays = requestModel.weekdays.join(",");
+              requestModel.weekdays = weekdays;
             }
 
-            if (self.formModel.companyId == null) {
-              self.formModel.companyId = "";
+            if (requestModel.companyId == null) {
+              requestModel.companyId = "";
             }
 
             if (id == null || id.length == 0) {
-              return alarmConfigApi.add(self.formModel);
+              return alarmConfigApi.add(requestModel);
             } else {
-              return alarmConfigApi.update(self.formModel);
+              return alarmConfigApi.update(requestModel);
             }
           })().then(function(response) {
-            self.loading = false;
+            self.submitting = false;
 
             var jsonData = response.data;
 

src/views/base/workSchedule-detail.vue

@@ -60,19 +60,23 @@
             value-format="HH:mm"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="上班提前分钟" prop="startAdvanceMinutes">
+        <el-form-item label="上班提前" prop="startAdvanceMinutes">
           <el-input
             v-model="formModel.startAdvanceMinutes"
             placeholder="请输入上班提前分钟"
-            style="width: 300px"
-          ></el-input>
+            style="width: 200px"
+          >
+            <template slot="append">分钟</template>
+          </el-input>
         </el-form-item>
-        <el-form-item label="上班延迟分钟" prop="startDelayMinutes">
+        <el-form-item label="上班延迟" prop="startDelayMinutes">
           <el-input
             v-model="formModel.startDelayMinutes"
             placeholder="请输入上班延迟分钟"
-            style="width: 300px"
-          ></el-input>
+            style="width: 200px"
+          >
+            <template slot="append">分钟</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="下班时间" prop="endTime">
           <el-time-picker
@@ -82,19 +86,23 @@
             value-format="HH:mm"
           ></el-time-picker>
         </el-form-item>
-        <el-form-item label="下班提前分钟" prop="endAdvanceMinutes">
+        <el-form-item label="下班提前" prop="endAdvanceMinutes">
           <el-input
             v-model="formModel.endAdvanceMinutes"
             placeholder="请输入下班提前分钟"
-            style="width: 300px"
-          ></el-input>
+            style="width: 200px"
+          >
+            <template slot="append">分钟</template>
+          </el-input>
         </el-form-item>
-        <el-form-item label="下班延迟分钟" prop="endDelayMinutes">
+        <el-form-item label="下班延迟" prop="endDelayMinutes">
           <el-input
             v-model="formModel.endDelayMinutes"
             placeholder="请输入下班延迟分钟"
-            style="width: 300px"
-          ></el-input>
+            style="width: 200px"
+          >
+            <template slot="append">分钟</template>
+          </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -205,18 +213,23 @@ export default {
         if (valid) {
           (function () {
             var id = self.formModel.id;
+            self.submitting = true;
+
+            var requestModel = JSON.parse(JSON.stringify(self.formModel));
 
-            if (self.formModel.weekdays != null) {
-                var weekdays = self.formModel.weekdays.join(",");
-                self.formModel.weekdays = weekdays;
+            if (requestModel.weekdays != null) {
+                var weekdays = requestModel.weekdays.join(",");
+                requestModel.weekdays = weekdays;
             }
 
             if (id == null || id.length == 0) {
-              return workScheduleApi.add(self.formModel);
+              return workScheduleApi.add(requestModel);
             } else {
-              return workScheduleApi.update(self.formModel);
+              return workScheduleApi.update(requestModel);
             }
           })().then(function (response) {
+            self.submitting = false;
+
             var jsonData = response.data;
 
             if (jsonData.result) {

src/views/base/workSchedule-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">考勤管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/workSchedule">班次考勤设置</a>
@@ -19,7 +19,7 @@
       inline
       class="demo-form-inline"
     >
-    <el-form-item label="公司名称" prop="companyId">
+    <el-form-item label="单位名称" prop="companyId">
         <el-select-tree
           size="mini"
           :props="companyProps"
@@ -80,8 +80,8 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column
         prop="companyName"
-        label="部门名称"
-        width="180"
+        label="单位名称"
+        width="220"
       ></el-table-column>
       <el-table-column
         prop="name"
@@ -96,40 +96,40 @@
       <el-table-column
         prop="startTime"
         label="上班时间"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="startAdvanceMinutes"
         label="上班提前分钟"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="startDelayMinutes"
         label="上班延迟分钟"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="endTime"
         label="下班时间"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="endAdvanceMinutes"
         label="下班提前分钟"
-        width="180"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="endDelayMinutes"
         label="下班延迟分钟"
-        width="180"
+        width="120"
       ></el-table-column>
-      <el-table-column label="操作" width="210" fixed="right">
+      <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button
           >
           <el-button size="mini" type="primary" @click="handleCompany(row)"
-            >部门</el-button
+            >关联部门</el-button
           >
           <el-button size="mini" type="danger" @click="handleDelete(row)"
             >删除</el-button