代码调整

src/api/attendance/attendance.js

@@ -51,3 +51,5 @@ export function listAttendanceByParams(query) {
     params: query
   })
 }
+
+

src/api/equipment/button.js

@@ -45,3 +45,12 @@ export function delButton(id) {
     method: 'delete'
   })
 }
+
+// 查询考勤记录列表
+export function buttonOptionList(query) {
+  return request({
+    url: '/equipment/button/getOption',
+    method: 'post',
+    params: query
+  })
+}

src/api/personnelMatters/subsidyInformation.js

@@ -68,18 +68,11 @@ export function validatorAmount (rule, value, callback){
 };
 
 
-export function validatorName (rule, value, callback){
+export function validatorName (query){
-  
+  return request({
-  request({
     url: '/personnelMatters/subsidyInfo/checkName',
     method: 'post',
-    data: {"name":value}
+    data:query
-  }).then(response => {
-   if(response.data){
-      callback(new Error('当前补助已经存在'));
-   }else{
-      callback();
-   }
   });
 };
 

src/views/attendance/attendance/index.vue

@@ -86,7 +86,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:attendance:edit']"
+            v-hasPermi="['attendance:attendance:edit']"
           >修改</el-button>
         </template>
       </el-table-column>
@@ -124,11 +124,18 @@
     <el-dialog :title="title" v-dialog-drag :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="98px">
         <el-form-item label="考勤规则" prop="rules">
-          <el-input v-model="form.rules" placeholder="请输入考勤规则" disabled/>
+          <!-- <el-input v-model="form.rules" placeholder="请输入考勤规则" disabled/> -->
+            <el-select v-model="form.rules" placeholder="请选择考勤规则"  style="width: 260px">
+              <el-option
+                v-for="rule in ruleList"
+                :key="rule.label"
+                :label="rule.label"
+                :value="rule.label"
+              ></el-option>
+            </el-select>
         </el-form-item>
         <el-form-item label="上班时间" prop="workStartTime">
-          <el-date-picker clearable
+          <el-date-picker clearable style="width: 260px"
-                          style="width: 260px"
             v-model="form.workStartTime"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -175,6 +182,7 @@
 
 <script>
 import { listAttendance, getAttendance, updateAttendance,updateBatchAttendance } from "@/api/attendance/attendance";
+import { buttonOptionList } from "@/api/equipment/button";
 import { getToken } from '@/utils/auth'
 import { parseTime } from '../../../utils/ruoyi'
 
@@ -192,6 +200,8 @@ export default {
       token: getToken(),
       // 考勤记录表格数据
       attendanceList: [],
+      //打卡规则列表
+      ruleList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -216,6 +226,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        rules: [
+          { required: true, message: "请选择考勤规则", trigger: "blur" },
+        ],
+        workStartTime:[
+        { required: true, message: "上班开始时间不能为空", trigger: "blur" },
+        ],
+        remarks: [
+          { required: true, message: "备注信息不能为空", trigger: "blur" },
+        ],
       },
       upload: {
         open: false, // 控制弹窗是否显示
@@ -239,8 +258,18 @@ export default {
     var param = this.$route.query
     this.queryParams.staffId = param.staffId;
     this.getList();
+    this.getRuleList();
   },
   methods: {
+
+      /**获取补贴 */
+      getRuleList(){
+        buttonOptionList({rules:"上班"}).then(response => {
+        this.ruleList = response.data;
+      });
+
+    },
+
     parseTime,
       // 提交上传文件
     submitFileForm() {
@@ -289,7 +318,7 @@ export default {
         rules: null,
         workStartTime: null,
         workEndTime: null,
-        remarks: null,
+        remarks: "补卡",
       };
       this.resetForm("form");
     },
@@ -308,6 +337,9 @@ export default {
       this.reset();
       getAttendance(row.id).then(response => {
         this.form = response.data;
+        if(!this.form.remarks){
+          this.form.remarks = "补卡";
+        }
         this.open = true;
         this.title = "修改考勤记录";
       });

src/views/attendance/statistical/index.vue

@@ -130,6 +130,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-hasPermi="['attendance:statistical:edit']"
           >修改</el-button>
         </template>
       </el-table-column>

src/views/personnelMatters/specialOverTime/index.vue

@@ -53,7 +53,7 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['product:staff:remove']"
+                v-hasPermi="['personnelMatters:specialOverTime:remove']"
               >删除</el-button>
             </template>
           </el-table-column>

src/views/personnelMatters/subsidyInformation/index.vue

@@ -100,7 +100,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "补助名称不能为空", trigger: "blur" },
-          { validator: validatorName, message: '当前补助已存在', trigger: 'blur' }
+          { validator: this.checkValidatorName, message: '当前补助已存在', trigger: 'blur' }
         ],
         value: [
           { required: true, message: "补助金额不能为空", trigger: "blur" },
@@ -113,6 +113,16 @@ export default {
     this.getList();
   },
   methods: {
+    checkValidatorName(rule, value, callback){
+      validatorName({"name":value, "id": this.form.id}).then(response => {
+          if(response.data){
+              callback(new Error('当前补助已经存在'));
+          }else{
+              callback();
+          }
+        });
+    },
+
     /** 查询补助管理列表 */
     getList() {
       this.loading = true;

src/views/system/staff/index.vue

@@ -81,10 +81,10 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-circle-close"
           size="mini"
           @click="handleClearAll"
-          v-hasPermi="['system:staff:exportDetail']"
+          v-hasPermi="['system:staff:cleanSubsidy']"
         >清除补助</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -95,7 +95,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:staff:export']"
-        >导出</el-button>
+        >导出信息</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -115,7 +115,7 @@
           size="mini"
           @click="handleImport"
           v-hasPermi="['system:staff:import']"
-        >导入员工信息</el-button>
+        >导入信息</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -149,6 +149,7 @@
       </el-table-column>
 
       <el-table-column label="部门" align="center" fixed="left"  width="90"  prop="deptName" />
+      <el-table-column label="员工编码" align="center"  width="90"  prop="code" />
       <!-- <el-table-column label="编号" align="center" prop="code" /> -->
       <el-table-column label="身份证号" align="center" prop="idCard" width="180"/>
       <el-table-column label="性别" align="center" prop="sex">
@@ -189,16 +190,6 @@
           <dict-tag :options="dict.type.sys_worker_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="转正日期" align="center" prop="regularDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.regularDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="全额工资日期" align="center" prop="wagesRatioDate" width="108">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.wagesRatioDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column> -->
       <el-table-column label="离职日期" align="center" prop="quitDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.quitDate, '{y}-{m}-{d}') }}</span>
@@ -518,7 +509,7 @@
         <el-row>
           <el-col :span="12">
           <el-form-item label="所属公司：" prop="companyName">
-            <el-select v-model="form.companyName" placeholder="请选择学历">
+            <el-select v-model="form.companyName" placeholder="请选择公司">
               <el-option
                 v-for="dict in dict.type.sys_company"
                 :key="dict.value"
@@ -1010,7 +1001,7 @@ export default {
           { required: true, message: "入职日期不能为空", trigger: "blur" },
         ],
         idCard: [
-          { required: true, message: "银行卡号不能为空", trigger: "blur" },
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
         ],
         isOvertimePay: [
           { required: true, message: "是否有加班费不能为空", trigger: "blur" },