Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/pay/attendance/index.vue

@@ -66,7 +66,8 @@
             size="mini"
             @click="handleAdd"
             v-hasPermi="['pay:attendance:add']"
-          >新增</el-button>
+          >新增
+          </el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button
@@ -77,7 +78,8 @@
             :disabled="single"
             @click="handleUpdate"
             v-hasPermi="['pay:attendance:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button
@@ -88,18 +90,20 @@
             :disabled="multiple"
             @click="handleDelete"
             v-hasPermi="['pay:attendance:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </el-col>
-        <!--      <el-col :span="1.5">
+        <el-col :span="1.5">
           <el-button
             type="info"
             plain
             icon="el-icon-upload2"
             size="mini"
             @click="handleImport"
-                  v-hasPermi="['secure:attendance:import']"
+            v-hasPermi="['pay:attendance:import']"
-                >导入</el-button>
+          >导入
-              </el-col>-->
+          </el-button>
+        </el-col>
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -108,7 +112,8 @@
             size="mini"
             @click="handleExport"
             v-hasPermi="['pay:attendance:export']"
-          >导出</el-button>
+          >导出
+          </el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
@@ -174,32 +179,26 @@
     </div>
 
     <!-- 添加或修改考勤对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="员工姓名" prop="empName">
-              <el-select v-model="form.empName" filterable clearable placeholder="请选择" @change="changeEmployee">
+              <el-input placeholder="请选择员工姓名" readonly v-model="form.empName" @focus="selectEmployee">
-                <el-option
+                <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
-                  v-for="item in employeeList"
+              </el-input>
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="部门名称" prop="deptId">
+            <el-form-item label="部门名称" prop="deptName">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" @select="changeDept"/>
+              <el-input hidden v-model="form.deptName" placeholder="请输入部门名称" :disabled="true"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="考勤年份月份" prop="kaoqinYearMonth">
-              <el-date-picker
+              <el-date-picker style="width: 100%;"
                 v-model="form.kaoqinYearMonth"
                 type="month"
-                size="mini"
                 placeholder="请输入考勤年份月份"
                 value-format="yyyy-MM">
               </el-date-picker>
@@ -207,7 +206,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="考勤日期" prop="kaoqinDate">
-              <el-date-picker clearable
+              <el-date-picker clearable style="width: 100%;"
                               v-model="form.kaoqinDate"
                               type="date"
                               value-format="yyyy-MM-dd"
@@ -215,29 +214,24 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="showClass==true">
-            <el-form-item label="考勤机" prop="kaoqinjiNum">
-              <el-input hidden v-model="form.kaoqinjiNum" placeholder="请输入考勤机 (0:综合办 1:网机 2：围栏)" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="上午开始时间" prop="amBeginTime">
-              <el-time-picker v-model="form.amBeginTime" value-format="HH:mm" format="HH:mm" placeholder="上午开始时间"></el-time-picker>
+              <el-time-picker v-model="form.amBeginTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午开始时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="上午结束时间" prop="amFnishTime">
-              <el-time-picker v-model="form.amFnishTime" value-format="HH:mm" format="HH:mm" placeholder="上午结束时间"></el-time-picker>
+              <el-time-picker v-model="form.amFnishTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午结束时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="下午开始时间" prop="pmBeginTime">
-              <el-time-picker v-model="form.pmBeginTime" value-format="HH:mm" format="HH:mm" placeholder="下午开始时间"></el-time-picker>
+              <el-time-picker v-model="form.pmBeginTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午开始时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="下午结束时间" prop="pmFnishTime">
-              <el-time-picker v-model="form.pmFnishTime" value-format="HH:mm" format="HH:mm" placeholder="下午结束时间"></el-time-picker>
+              <el-time-picker v-model="form.pmFnishTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午结束时间"></el-time-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -248,6 +242,56 @@
       </div>
     </el-dialog>
 
+    <!-- 选择员工信息 -->
+    <el-dialog title="双击选择员工信息" :visible.sync="emp.open" width="900px" append-to-body top="6vh">
+      <div>
+        <el-form :model="emp.queryParams" :inline="true" label-width="70px">
+          <el-form-item label="员工名称" prop="name" style="margin-bottom: 10px">
+            <el-input
+              v-model="emp.queryParams.name"
+              placeholder="请输入员工名称"
+              clearablesize="small"
+              @keyup.enter.native="empQuery"
+            />
+          </el-form-item>
+          <el-form-item style="margin-bottom: 10px">
+            <el-button type="primary" icon="el-icon-search" size="small" @click="empQuery">搜索</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table border v-loading="emp.loading" :data="emp.list" @row-dblclick="empRowChange">
+          <el-table-column label="员工姓名" align="center" prop="name" :show-overflow-tooltip="true" min-width="120"/>
+          <el-table-column label="所属部门" align="center" prop="deptName" :show-overflow-tooltip="true" min-width="120"/>
+          <el-table-column label="状态" align="center" prop="deleted">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.pay_del_status" :value="scope.row.deleted"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" align="center" prop="sex">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column label="手机号" align="center" prop="phone" min-width="100"/>
+          <el-table-column label="身份证号" align="center" prop="idcard" min-width="100" />
+        </el-table>
+
+        <pagination
+          v-show="emp.total>0"
+          :total="emp.total"
+          :page.sync="emp.queryParams.pageNum"
+          :limit.sync="emp.queryParams.pageSize"
+          @pagination="empQuery"
+        />
+
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="empCancel">取 消</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+
     <!-- 考勤导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false">
       <el-upload
@@ -255,7 +299,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport + '&date=' + upload.date + '&kaoqinType=' + upload.kaoqinType"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport + '&date=' + upload.date + '&kaoqinType=' + upload.kaoqinType+ '&tenantId=' + upload.tenantId"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -306,15 +350,12 @@
 <script>
 import { listAttendance, getAttendance, delAttendance, addAttendance, updateAttendance } from "@/api/pay/attendance";
 import { listEmployeeInfo } from "@/api/pay/employeeInfo";
-import { deptTreeSelect } from "@/api/system/user";
 import { listTenant } from "@/api/pay/tenant";
 import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Attendance",
-  components: { Treeselect },
+  dicts: ['sys_user_sex', 'pay_del_status'],
   data() {
     return {
       // 公司信息
@@ -343,8 +384,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 部门树选项
-      deptOptions: undefined,
       // 员工列表
       employeeList: [],
       // 查询参数
@@ -394,7 +433,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/secure/attendance/importData",
+        url: process.env.VUE_APP_BASE_API + "/pay/attendance/import",
         date: "",
         options: [{
           kaoqinType: '0',
@@ -406,16 +445,35 @@ export default {
           kaoqinType: '2',
           facilities: '围栏'
         }],
-        kaoqinType: ''
+        kaoqinType: '',
+        tenantId: '',
+      },
+      /** 选择员工*/
+      emp: {
+        // 是否显示弹出层
+        open: false,
+        // 列表遮罩层
+        loading: true,
+        // 列表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: undefined
+        },
+        // 表格数据
+        list: [],
+        // 总条数
+        total: 0,
       },
-      showClass: false
     };
   },
   created() {
-
+    if (!this.$store.state.user.tenantId) {
-    this.getList();
+      this.getGsInfoList()
-    this.getNamelist()
+    }else {
-    this.getDeptTree();
+      this.gsInfo.active_id = this.$store.state.user.tenantId
+      this.getList()
+    }
   },
   methods: {
     // 获取左侧公司列表
@@ -425,7 +483,6 @@ export default {
           this.gsInfo.list = response.rows;
           this.gsInfo.active_id = this.gsInfo.list[0].id
           this.getList()
-          this.getDeptTree();
         }else{
           this.$alert(`没有查到相关公司，暂无数据！`, `提示`, {
             type: 'warning'
@@ -437,30 +494,17 @@ export default {
     changCompany(id){
       this.gsInfo.active_id = id
       this.getList()
-      this.getDeptTree();
     },
     /** 查询考勤列表 */
     getList() {
       this.loading = true;
+      this.queryParams.tenantId = this.gsInfo.active_id;
       listAttendance(this.queryParams).then(response => {
         this.attendanceList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    /** 查询员工 */
-    getNamelist() {
-      listEmployeeInfo({ pageNum: 1, pageSize: 10000000,}).then(response => {
-        this.employeeList = response.rows;
-      })
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        // deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -566,18 +610,38 @@ export default {
       }, `attendance_${new Date().getTime()}.xlsx`)
     },
     // 选择员工
-    changeEmployee(val){
+    selectEmployee(){
-      this.form.employeeId = val;
+      this.emp.open = true;
+      this.emp.queryParams.pageNum = 1;
+      this.empQuery();
+    },
+    /** 员工列表查询 */
+    empQuery() {
+      this.emp.loading = true;
+      this.emp.queryParams.tenantId = this.gsInfo.active_id
+      listEmployeeInfo(this.emp.queryParams).then(response => {
+        this.emp.list = response.rows;
+        this.emp.total = response.total;
+        this.emp.loading = false;
+      });
+    },
+    /** 员工选择弹出框关闭*/
+    empCancel() {
+      this.emp.open = false
     },
-    // 选择部门
+    // 客户选择 选中数据
-    changeDept(val){
+    empRowChange(val) {
-      this.form.deptId=val.id
+      this.form.employeeId = val.id;
-      this.form.deptName=val.label
+      this.form.empName = val.name;
+      this.form.deptId = val.deptId;
+      this.form.deptName = val.deptName;
+      this.emp.open = false;
     },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "考勤导入";
       this.upload.open = true;
+      this.upload.tenantId = this.gsInfo.active_id;
     },
     /** 下载模板操作 */
     /* importTemplate() {

ruoyi-ui/src/views/pay/butie/index.vue

@@ -1,37 +1,49 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
-      <el-form-item label="租户id" prop="tenantId">
+    <div class="company" v-if="!$store.state.user.tenantId">
       <el-input
-          v-model="queryParams.tenantId"
+        style="width: 200px"
-          placeholder="请输入租户id"
+        placeholder="公司名称"
-          clearable
+        size="small"
-          @keyup.enter.native="handleQuery"
+        prefix-icon="el-icon-search"
-        />
+        v-model="gsInfo.tenantName"
-      </el-form-item>
+        @keyup.enter.native="getGsInfoList">
-      <el-form-item label="补贴或者扣减项名称" prop="name">
+      </el-input>
+      <div class="cp-content" style="width: 200px">
+        <div :class="gsInfo.active_id===item.id?'cp-item active':'cp-item'" @click="changCompany(item.id)" v-for="item in gsInfo.list">{{ item.name }}</div>
+      </div>
+    </div>
+
+    <div :class="$store.state.user.tenantId?'content-all':'content'">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="名称" prop="name">
           <el-input
             v-model="queryParams.name"
-          placeholder="请输入补贴或者扣减项名称"
+            placeholder="请输入名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item label="固定" prop="fixed">
-        <el-input
+          <el-select v-model="queryParams.fixed" placeholder="请选择固定类型" clearable>
-          v-model="queryParams.fixed"
+            <el-option
-          placeholder="请输入固定"
+              v-for="dict in dict.type.pay_butie_fixed"
-          clearable
+              :key="dict.value"
-          @keyup.enter.native="handleQuery"
+              :label="dict.label"
+              :value="dict.value"
             />
+          </el-select>
         </el-form-item>
-      <el-form-item label="删除标志" prop="deleted">
+        <el-form-item label="扣补类型" prop="type">
-        <el-input
+          <el-select v-model="queryParams.type" placeholder="请选择补贴类型" clearable>
-          v-model="queryParams.deleted"
+            <el-option
-          placeholder="请输入删除标志"
+              v-for="dict in dict.type.pay_butie_type"
-          clearable
+              :key="dict.value"
-          @keyup.enter.native="handleQuery"
+              :label="dict.label"
+              :value="dict.value"
             />
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -72,27 +84,23 @@
             v-hasPermi="['pay:butie:remove']"
           >删除</el-button>
         </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['pay:butie:export']"
-        >导出</el-button>
-      </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table v-loading="loading" :data="butieList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" v-if="true"/>
+        <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="租户id" align="center" prop="tenantId" />
+        <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="补贴或者扣减项名称" align="center" prop="name" />
+        <el-table-column label="固定" align="center" prop="fixed">
-      <el-table-column label="固定" align="center" prop="fixed" />
+          <template slot-scope="scope">
-      <el-table-column label="类型" align="center" prop="type" />
+            <dict-tag :options="dict.type.pay_butie_fixed" :value="scope.row.fixed"/>
-      <el-table-column label="删除标志" align="center" prop="deleted" />
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" align="center" prop="type">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.pay_butie_type" :value="scope.row.type"/>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -122,20 +130,33 @@
         @pagination="getList"
       />
 
+    </div>
+
     <!-- 添加或修改补贴扣减对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="租户id" prop="tenantId">
+        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.tenantId" placeholder="请输入租户id" />
+          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="补贴或者扣减项名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入补贴或者扣减项名称" />
         </el-form-item>
-        <el-form-item label="固定" prop="fixed">
+        <el-form-item label="固定类型" prop="fixed">
-          <el-input v-model="form.fixed" placeholder="请输入固定" />
+          <el-select v-model="form.fixed" placeholder="请选择固定类型" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.pay_butie_fixed"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="删除标志" prop="deleted">
+        <el-form-item label="扣补类型" prop="type">
-          <el-input v-model="form.deleted" placeholder="请输入删除标志" />
+          <el-select v-model="form.type" placeholder="请选择扣补类型" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.pay_butie_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -151,11 +172,19 @@
 
 <script>
 import { listButie, getButie, delButie, addButie, updateButie } from "@/api/pay/butie";
+import { listTenant } from "@/api/pay/tenant";
 
 export default {
   name: "Butie",
+  dicts: ['pay_butie_type', 'pay_butie_fixed'],
   data() {
     return {
+      // 公司信息
+      gsInfo:{
+        tenantName:'',
+        active_id:this.$store.state.user.tenantId,
+        list:[]
+      },
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -190,37 +219,50 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键不能为空", trigger: "blur" }
-        ],
-        tenantId: [
-          { required: true, message: "租户id不能为空", trigger: "blur" }
-        ],
         name: [
-          { required: true, message: "补贴或者扣减项名称不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ],
         fixed: [
           { required: true, message: "固定不能为空", trigger: "blur" }
         ],
         type: [
           { required: true, message: "类型不能为空", trigger: "change" }
-        ],
-        deleted: [
-          { required: true, message: "删除标志不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
         ]
       }
     };
   },
   created() {
+    if (!this.$store.state.user.tenantId) {
+      this.getGsInfoList()
+    }else {
+      this.gsInfo.active_id = this.$store.state.user.tenantId
       this.getList();
+    }
   },
   methods: {
+    // 获取左侧公司列表
+    getGsInfoList(){
+      listTenant({ name: this.gsInfo.tenantName }).then(response => {
+        if(response.rows.length>0){
+          this.gsInfo.list = response.rows;
+          this.gsInfo.active_id = this.gsInfo.list[0].id
+          this.getList()
+        }else{
+          this.$alert(`没有查到相关公司，暂无数据！`, `提示`, {
+            type: 'warning'
+          });
+        }
+      });
+    },
+    // 选择公司
+    changCompany(id){
+      this.gsInfo.active_id = id
+      this.getList()
+    },
     /** 查询补贴扣减列表 */
     getList() {
       this.loading = true;
+      this.queryParams.tenantId = this.gsInfo.active_id;
       listButie(this.queryParams).then(response => {
         this.butieList = response.rows;
         this.total = response.total;
@@ -287,6 +329,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.tenantId = this.gsInfo.active_id;
           this.buttonLoading = true;
           if (this.form.id != null) {
             updateButie(this.form).then(response => {
@@ -323,12 +366,46 @@ export default {
         this.loading = false;
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('pay/butie/export', {
-        ...this.queryParams
-      }, `butie_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
+
+<style scoped lang="scss">
+.app-container {
+  display: flex;
+  .company {
+    border-radius: 5px;
+    width: 230px;
+    height: calc(100vh - 115px);
+    overflow-y: auto;
+    .cp-content {
+      margin-top: 20px;
+      .cp-item {
+        cursor: pointer;
+        padding: 6px 10px 6px 5px;
+        color: #424242;
+        font-size: 14px;
+        &:hover {
+          background: #f6f6f6;
+        }
+      }
+      .active{
+        background: #edf6ff;
+      }
+    }
+  }
+  .content{
+    padding-left: 15px;
+    width: calc(100% - 250px);
+    .el-button--medium {
+      padding: 2px 0px;
+    }
+  }
+  .content-all{
+    width: 100%;
+    .el-button--medium {
+      padding: 2px 0px;
+    }
+  }
+}
+</style>