修改考勤设置

src/views/base/alarmConfig-detail.vue

@@ -15,8 +15,8 @@
     :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
-      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label="发送单位" prop="companyId">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'150px'">
+        <el-form-item label="考勤单位" prop="companyId">
           <el-select v-model="formModel.companyId" filterable placeholder="请选择" style="width:100% ">
             <el-option
               v-for="company in companyResult"
@@ -26,7 +26,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="周" prop="weekdays">
+        <el-form-item label="是否包含下级单位" prop="subordinate">
+          <el-radio v-model="formModel.subordinate" :label="true">是</el-radio>
+          <el-radio v-model="formModel.subordinate" :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="周工作日" prop="weekdays">
           <el-select
             v-model="formModel.weekdays"
             filterable
@@ -43,16 +47,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
-          <!-- <el-time-picker
-            is-range
-            v-model="rangeTime"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            placeholder="选择时间范围"
-            format="HH:mm"
-            value-format="HH:mm"
-          ></el-time-picker>-->
           <el-time-picker
             v-model="formModel.startTime"
             class="date-box"
@@ -63,6 +57,17 @@
                 }"
           ></el-time-picker>
         </el-form-item>
+        <el-form-item label="考勤时间" prop="endTime">
+          <el-time-picker
+            v-model="formModel.attendanceTime"
+            class="date-box"
+            format="HH:mm"
+            value-format="HH:mm"
+            :picker-options="{
+                  selectableRange: `${formModel.attendanceTime ? formModel.attendanceTime+':00' : '00:00:00'}-23:59:00`
+                }"
+          ></el-time-picker>
+        </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
           <el-time-picker
             v-model="formModel.endTime"
@@ -74,6 +79,10 @@
                 }"
           ></el-time-picker>
         </el-form-item>
+        <el-form-item label="考勤类型" prop="subordinate">
+          <el-radio v-model="formModel.classifier" :label="1">上班时间</el-radio>
+          <el-radio v-model="formModel.classifier" :label="2">下班时间</el-radio>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -136,9 +145,9 @@ export default {
           (function() {
             var id = self.formModel.id;
 
-            //周
             var weekdays = self.formModel.weekdays.join(",");
             self.formModel.weekdays = weekdays;
+            self.loading = true;
 
             if (id == null || id.length == 0) {
               return alarmConfigApi.add(self.formModel);
@@ -146,6 +155,8 @@ export default {
               return alarmConfigApi.update(self.formModel);
             }
           })().then(function(response) {
+            self.loading = false;
+            
             var jsonData = response.data;
 
             if (jsonData.result) {

src/views/base/alarmConfig-list.vue

@@ -69,9 +69,21 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="companyName" label="单位" width="220" fixed="left"></el-table-column>
-      <el-table-column prop="weekdays" label="周" show-overflow-tooltip width="150"></el-table-column>
+      <el-table-column prop="subordinate" label="是否包含下级单位" width="150">
+        <template slot-scope="{row}">
+          <span v-html="row.subordinate ? '是': '否'"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="weekdays" label="周工作日" show-overflow-tooltip width="150"></el-table-column>
       <el-table-column prop="startTime" label="开始时间" width="120"></el-table-column>
+      <el-table-column prop="attendanceTime" label="考勤时间" width="120"></el-table-column>
       <el-table-column prop="endTime" label="结束时间" width="120"></el-table-column>
+      <el-table-column prop="classifier" label="考勤分类" width="120">
+        <template slot-scope="{row}">
+          <span v-html="row.classifier==1 ? '上班时间': ''"></span>
+          <span v-html="row.classifier==2 ? '下班时间': ''"></span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="480">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>

src/views/base/personInfo-list.vue

@@ -233,6 +233,7 @@
           ></el-switch>
         </template>
       </el-table-column>
+      <el-table-column prop="openId" label="微信openid" width="180"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right">
         <template slot-scope="{row}">
           <el-row>

src/views/base/warningPusher-detail.vue

@@ -16,7 +16,7 @@
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
         <el-row>
-          <el-col :span="13">
+          <el-col :span="12">
             <el-form-item label="单位" prop="companyId">
               <el-select
                 v-model="formModel.companyId"
@@ -33,16 +33,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="formModel.name" placeholder="请输入姓名"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="13">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="formModel.name" placeholder="请输入姓名" style="width:200px"></el-input>
+          <el-col :span="12">
+            <el-form-item label="openid" prop="name">
+              <el-input v-model="formModel.openId" placeholder="请输入openid"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="11">
+          <el-col :span="12">
             <el-form-item label="手机号" prop="phone">
-              <el-input v-model="formModel.phone" placeholder="请输入手机号" style="width:200px"></el-input>
+              <el-input v-model="formModel.phone" placeholder="请输入手机号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -53,21 +58,20 @@
                 type="textarea"
                 v-model="formModel.remark"
                 :rows="2"
-                style="width:80%;"
                 placeholder="请输入备注"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="13">
+          <el-col :span="12">
             <el-form-item label="预警温度" prop="temperature">
-              <el-input v-model="formModel.temperature" placeholder="请输入预警温度" style="width:200px"></el-input>
+              <el-input v-model="formModel.temperature" placeholder="请输入预警温度"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="11">
+          <el-col :span="12">
             <el-form-item label="报警触发次数" prop="times">
-              <el-input v-model="formModel.times" placeholder="请输入报警触发次数" style="width:200px"></el-input>
+              <el-input v-model="formModel.times" placeholder="请输入报警触发次数"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/layout/index.vue

@@ -176,7 +176,7 @@ export default {
   top:200px;
   right:-12px;
   background-color:#eeeeee;
-  z-index: 10000;
+  z-index: 1000;
   padding-top:30px;
   padding-right:4px;
   color:black;