dev01 1 ano atrás
pai
commit
69c0e6a0c5

+ 3 - 1
src/views/record/list/index.vue

@@ -196,6 +196,7 @@ export default {
         staffId: undefined,
         projectYear: undefined,
         crossYear: undefined,
+        deptId: undefined
       },
       // 列信息
       columns: [
@@ -298,7 +299,8 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      // this.$refs.tree.setCurrentKey(null);
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 多选框选中数据

+ 12 - 1
src/views/system/dept/index.vue

@@ -57,7 +57,9 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <!-- <el-table-column prop="deptName" label="公司名称" width="260"></el-table-column> -->
+      <el-table-column prop="maxDuration" align="center" label="最高工时" width="140"></el-table-column>
+      <el-table-column prop="orderNum" align="center" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -148,6 +150,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="最高打卡时长(小时)" prop="email">
+              <el-input v-model="form.maxDuration" type="digit" placeholder="请输入时长" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

+ 3 - 0
src/views/system/user/index.vue

@@ -407,6 +407,9 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
+        jobNumber: [
+          { required: true, message: "工号不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }