Merge remote-tracking branch 'origin/master'

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

@@ -704,11 +704,6 @@ export default {
       this.upload.open = true;
       this.upload.tenantId = this.gsInfo.active_id;
     },
-    /** 下载模板操作 */
-    /* importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `attendance_template_${new Date().getTime()}.xlsx`)
-    }, */
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;

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

@@ -282,7 +282,7 @@ export default {
         name: undefined,
         fixed: undefined,
         type: undefined,
-        deleted: undefined,
+        deleted: '0',
         createBy: undefined,
         createTime: undefined,
         updateBy: undefined,

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

@@ -1,145 +1,139 @@
 <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">
-        <el-input
-          v-model="queryParams.tenantId"
-          placeholder="请输入租户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毛料名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入毛料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="specification">
-        <el-input
-          v-model="queryParams.specification"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="尺寸" prop="size">
-        <el-input
-          v-model="queryParams.size"
-          placeholder="请输入尺寸"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <div class="company" v-if="!$store.state.user.tenantId">
-      <el-col :span="1.5">
+      <el-input
-        <el-button
+        style="width: 200px"
-          type="primary"
+        placeholder="公司名称"
-          plain
+        size="small"
-          icon="el-icon-plus"
+        prefix-icon="el-icon-search"
-          size="mini"
+        v-model="gsInfo.tenantName"
-          @click="handleAdd"
+        @keyup.enter.native="getGsInfoList">
-          v-hasPermi="['pay:material:add']"
+      </el-input>
-        >新增</el-button>
+      <div class="cp-content" style="width: 200px">
-      </el-col>
+        <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>
-      <el-col :span="1.5">
+      </div>
-        <el-button
+    </div>
-          type="success"
+
-          plain
+    <div :class="$store.state.user.tenantId?'content-all':'content'">
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pay:material:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pay:material: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:material:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
-      <el-table-column type="selection" width="55" align="center" />
+        <el-form-item label="毛料名称" prop="name">
-      <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>
+          <el-input
-      <el-table-column label="租户id" align="center" prop="tenantId" />
+            v-model="queryParams.name"
-      <el-table-column label="毛料名称" align="center" prop="name" />
+            placeholder="请输入毛料名称"
-      <el-table-column label="材料种类" align="center" prop="materialType" />
+            clearable
-      <el-table-column label="规格" align="center" prop="specification" />
+            @keyup.enter.native="handleQuery"
-      <el-table-column label="尺寸" align="center" prop="size" />
+          />
-      <el-table-column label="单位" align="center" prop="unit" />
+        </el-form-item>
-      <el-table-column label="备注" align="center" prop="remark" />
+        <el-form-item label="材料种类" prop="materialType">
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-input
-        <template slot-scope="scope">
+            v-model="queryParams.materialType"
+            placeholder="请输入材料种类"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
             size="mini"
-            type="text"
+            @click="handleAdd"
+            v-hasPermi="['pay:material:add']"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
             v-hasPermi="['pay:material:edit']"
           >修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
           <el-button
-            size="mini"
+            type="danger"
-            type="text"
+            plain
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
             v-hasPermi="['pay:material:remove']"
           >删除</el-button>
-        </template>
+        </el-col>
-      </el-table-column>
+        <el-col :span="1.5">
-    </el-table>
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['pay:material:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="ID" align="center" prop="id"/>
+        <el-table-column label="毛料名称" align="center" prop="name" />
+        <el-table-column label="材料种类" align="center" prop="materialType" />
+        <el-table-column label="规格" align="center" prop="specification" />
+        <el-table-column label="尺寸" align="center" prop="size" />
+        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['pay:material:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['pay:material:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
 
-    <pagination
+    </div>
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改毛料信息对话框 -->
     <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-input v-model="form.tenantId" placeholder="请输入租户id" />
-        </el-form-item>
         <el-form-item label="毛料名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入毛料名称" />
         </el-form-item>
+        <el-form-item label="材料种类" prop="materialType">
+          <el-input v-model="form.materialType" placeholder="请输入材料种类" />
+        </el-form-item>
         <el-form-item label="规格" prop="specification">
           <el-input v-model="form.specification" placeholder="请输入规格" />
         </el-form-item>
@@ -163,11 +157,18 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/pay/material";
+import { listTenant } from "@/api/pay/tenant";
 
 export default {
   name: "Material",
   data() {
     return {
+      // 公司信息
+      gsInfo:{
+        tenantName:'',
+        active_id:this.$store.state.user.tenantId,
+        list:[]
+      },
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -203,40 +204,47 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键ID不能为空", trigger: "blur" }
-        ],
-        tenantId: [
-          { required: true, message: "租户id不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "毛料名称不能为空", trigger: "blur" }
         ],
         materialType: [
           { required: true, message: "材料种类不能为空", trigger: "change" }
-        ],
-        specification: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
-        ],
-        size: [
-          { required: true, message: "尺寸不能为空", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "单位不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
         ]
       }
     };
   },
   created() {
-    this.getList();
+    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;
       listMaterial(this.queryParams).then(response => {
         this.materialList = response.rows;
         this.total = response.total;
@@ -305,6 +313,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.tenantId = this.gsInfo.active_id;
           if (this.form.id != null) {
             updateMaterial(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -349,3 +358,43 @@ export default {
   }
 };
 </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>

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

@@ -1,252 +1,240 @@
 <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">
-        <el-input
-          v-model="queryParams.tenantId"
-          placeholder="请输入租户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-input
-          v-model="queryParams.year"
-          placeholder="请输入年份"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="月份" prop="month">
-        <el-input
-          v-model="queryParams.month"
-          placeholder="请输入月份"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工id" prop="employeeId">
-        <el-input
-          v-model="queryParams.employeeId"
-          placeholder="请输入员工id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="员工姓名" prop="empName">
-        <el-input
-          v-model="queryParams.empName"
-          placeholder="请输入员工姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="应出勤天数" prop="requireDays">
-        <el-input
-          v-model="queryParams.requireDays"
-          placeholder="请输入应出勤天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出勤天数" prop="avtiveDays">
-        <el-input
-          v-model="queryParams.avtiveDays"
-          placeholder="请输入出勤天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出勤小时数" prop="attendanceHours">
-        <el-input
-          v-model="queryParams.attendanceHours"
-          placeholder="请输入出勤小时数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="加班小时数" prop="overtimeHours">
-        <el-input
-          v-model="queryParams.overtimeHours"
-          placeholder="请输入加班小时数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="放假天数" prop="holidays">
-        <el-input
-          v-model="queryParams.holidays"
-          placeholder="请输入放假天数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="放假小时数" prop="holidayHours">
-        <el-input
-          v-model="queryParams.holidayHours"
-          placeholder="请输入放假小时数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="leaveDays">
-        <el-input
-          v-model="queryParams.leaveDays"
-          placeholder="请输入"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <div class="company" v-if="!$store.state.user.tenantId">
-      <el-col :span="1.5">
+      <el-input
-        <el-button
+        style="width: 200px"
-          type="primary"
+        placeholder="公司名称"
-          plain
+        size="small"
-          icon="el-icon-plus"
+        prefix-icon="el-icon-search"
-          size="mini"
+        v-model="gsInfo.tenantName"
-          @click="handleAdd"
+        @keyup.enter.native="getGsInfoList">
-          v-hasPermi="['pay:requireAttendanceReport:add']"
+      </el-input>
-        >新增</el-button>
+      <div class="cp-content" style="width: 200px">
-      </el-col>
+        <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>
-      <el-col :span="1.5">
+      </div>
-        <el-button
+    </div>
-          type="success"
+
-          plain
+    <div :class="$store.state.user.tenantId?'content-all':'content'">
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['pay:requireAttendanceReport:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pay:requireAttendanceReport: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:requireAttendanceReport:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="requireAttendanceReportList" @selection-change="handleSelectionChange">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-table-column type="selection" width="55" align="center" />
+        <el-form-item label="年份" prop="year">
-      <el-table-column label="主键" align="center" prop="id" v-if="true"/>
+          <el-date-picker
-      <el-table-column label="租户id" align="center" prop="tenantId" />
+            v-model="queryParams.year"
-      <el-table-column label="年份" align="center" prop="year" />
+            type="year"
-      <el-table-column label="月份" align="center" prop="month" />
+            size="mini"
-      <el-table-column label="员工id" align="center" prop="employeeId" />
+            placeholder="选择年"
-      <el-table-column label="员工姓名" align="center" prop="empName" />
+            value-format="yyyy">
-      <el-table-column label="部门名称" align="center" prop="deptName" />
+          </el-date-picker>
-      <el-table-column label="休息类别" align="center" prop="restType" />
+        </el-form-item>
-      <el-table-column label="应出勤天数" align="center" prop="requireDays" />
+        <el-form-item label="月份" prop="month">
-      <el-table-column label="出勤天数" align="center" prop="avtiveDays" />
+          <el-date-picker
-      <el-table-column label="出勤小时数" align="center" prop="attendanceHours" />
+            v-model="queryParams.month"
-      <el-table-column label="加班小时数" align="center" prop="overtimeHours" />
+            type="month"
-      <el-table-column label="放假天数" align="center" prop="holidays" />
+            size="mini"
-      <el-table-column label="放假小时数" align="center" prop="holidayHours" />
+            placeholder="选择月"
-      <el-table-column label="" align="center" prop="leaveDays" />
+            format="MM"
-      <el-table-column label="备注" align="center" prop="remark" />
+            value-format="MM">
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          </el-date-picker>
-        <template slot-scope="scope">
+        </el-form-item>
+        <el-form-item label="员工姓名" prop="empName">
+          <el-input
+            v-model="queryParams.empName"
+            placeholder="请输入员工姓名"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="部门名称" prop="deptName">
+          <el-input
+            v-model="queryParams.deptName"
+            placeholder="请输入部门名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
             size="mini"
-            type="text"
+            @click="handleAdd"
+            v-hasPermi="['pay:requireAttendanceReport:add']"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
             v-hasPermi="['pay:requireAttendanceReport:edit']"
           >修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
           <el-button
-            size="mini"
+            type="danger"
-            type="text"
+            plain
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
             v-hasPermi="['pay:requireAttendanceReport:remove']"
           >删除</el-button>
-        </template>
+        </el-col>
-      </el-table-column>
+        <el-col :span="1.5">
-    </el-table>
+          <el-button
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImport"
+            v-hasPermi="['pay:requireAttendanceReport:import']"
+          >导入</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:requireAttendanceReport:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <pagination
+      <el-table v-loading="loading" :data="requireAttendanceReportList" @selection-change="handleSelectionChange">
-      v-show="total>0"
+        <el-table-column type="selection" width="55" align="center" />
-      :total="total"
+        <el-table-column label="年份" align="center" prop="year" />
-      :page.sync="queryParams.pageNum"
+        <el-table-column label="月份" align="center" prop="month" />
-      :limit.sync="queryParams.pageSize"
+        <el-table-column label="员工姓名" align="center" prop="empName" />
-      @pagination="getList"
+        <el-table-column label="部门名称" align="center" prop="deptName" />
-    />
+        <el-table-column label="休息类别" align="center" prop="restType" />
+        <el-table-column label="应出勤天数" align="center" prop="requireDays" />
+        <el-table-column label="出勤天数" align="center" prop="avtiveDays" />
+        <el-table-column label="出勤小时数" align="center" prop="attendanceHours" />
+        <el-table-column label="加班小时数" align="center" prop="overtimeHours" />
+        <el-table-column label="放假天数" align="center" prop="holidays" />
+        <el-table-column label="放假小时数" align="center" prop="holidayHours" />
+        <el-table-column label="请假天数" align="center" prop="leaveDays" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['pay:requireAttendanceReport:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['pay:requireAttendanceReport:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+
+    </div>
 
     <!-- 添加或修改应出勤报对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="租户id" prop="tenantId">
+        <el-row>
-          <el-input v-model="form.tenantId" placeholder="请输入租户id" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="年份" prop="year">
-        <el-form-item label="年份" prop="year">
+              <el-date-picker style="width: 100%;"
-          <el-input v-model="form.year" placeholder="请输入年份" />
+                v-model="form.year"
-        </el-form-item>
+                type="year"
-        <el-form-item label="月份" prop="month">
+                placeholder="选择年"
-          <el-input v-model="form.month" placeholder="请输入月份" />
+                value-format="yyyy">
-        </el-form-item>
+              </el-date-picker>
-        <el-form-item label="员工id" prop="employeeId">
+            </el-form-item>
-          <el-input v-model="form.employeeId" placeholder="请输入员工id" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="12">
-        <el-form-item label="员工姓名" prop="empName">
+            <el-form-item label="月份" prop="month">
-          <el-input v-model="form.empName" placeholder="请输入员工姓名" />
+              <el-date-picker style="width: 100%;"
-        </el-form-item>
+                v-model="form.month"
-        <el-form-item label="部门名称" prop="deptName">
+                type="month"
-          <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+                placeholder="选择月"
-        </el-form-item>
+                format="MM"
-        <el-form-item label="应出勤天数" prop="requireDays">
+                value-format="MM">
-          <el-input v-model="form.requireDays" placeholder="请输入应出勤天数" />
+              </el-date-picker>
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="出勤天数" prop="avtiveDays">
+          </el-col>
-          <el-input v-model="form.avtiveDays" placeholder="请输入出勤天数" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="员工姓名" prop="empName">
-        <el-form-item label="出勤小时数" prop="attendanceHours">
+              <el-input placeholder="请选择员工姓名" readonly v-model="form.empName" @focus="selectEmployee">
-          <el-input v-model="form.attendanceHours" placeholder="请输入出勤小时数" />
+                <i slot="suffix" class="el-input__icon el-icon-search" style="color:#0f00d1; font-weight: bolder"></i>
-        </el-form-item>
+              </el-input>
-        <el-form-item label="加班小时数" prop="overtimeHours">
+            </el-form-item>
-          <el-input v-model="form.overtimeHours" placeholder="请输入加班小时数" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="12">
-        <el-form-item label="放假天数" prop="holidays">
+            <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="form.holidays" placeholder="请输入放假天数" />
+              <el-input hidden v-model="form.deptName" placeholder="请输入部门名称" :disabled="true"/>
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="放假小时数" prop="holidayHours">
+          </el-col>
-          <el-input v-model="form.holidayHours" placeholder="请输入放假小时数" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="应出勤天数" prop="requireDays">
-        <el-form-item label="" prop="leaveDays">
+              <el-input v-model="form.requireDays" placeholder="请输入应出勤天数" />
-          <el-input v-model="form.leaveDays" placeholder="请输入" />
+            </el-form-item>
-        </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出勤天数" prop="avtiveDays">
+              <el-input v-model="form.avtiveDays" placeholder="请输入出勤天数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="出勤小时数" prop="attendanceHours">
+              <el-input v-model="form.attendanceHours" placeholder="请输入出勤小时数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="加班小时数" prop="overtimeHours">
+              <el-input v-model="form.overtimeHours" placeholder="请输入加班小时数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="放假天数" prop="holidays">
+              <el-input v-model="form.holidays" placeholder="请输入放假天数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="放假小时数" prop="holidayHours">
+              <el-input v-model="form.holidayHours" placeholder="请输入放假小时数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="请假天数" prop="leaveDays">
+              <el-input v-model="form.leaveDays" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -254,16 +242,123 @@
         <el-button @click="cancel">取 消</el-button>
       </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-column label="休息类型" align="center" prop="restType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.pay_work_rest_type" :value="scope.row.restType"/>
+            </template>
+          </el-table-column>
+        </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
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport + '&date=' + upload.date+ '&tenantId=' + upload.tenantId"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的应出勤数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <div class="el-upload__date">
+            <span>请选择应出勤月份：</span>
+            <el-date-picker
+              v-model="upload.date"
+              type="month"
+              size="mini"
+              placeholder="选择月"
+              value-format="yyyy-MM"
+              style="width:40%;">
+            </el-date-picker>
+          </div>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listRequireAttendanceReport, getRequireAttendanceReport, delRequireAttendanceReport, addRequireAttendanceReport, updateRequireAttendanceReport } from "@/api/pay/requireAttendanceReport";
+import { listEmployeeInfo } from "@/api/pay/employeeInfo";
+import { getToken } from "@/utils/auth";
+import { listTenant } from "@/api/pay/tenant";
 
 export default {
   name: "RequireAttendanceReport",
+  dicts: ['sys_user_sex', 'pay_del_status', 'pay_work_rest_type'],
   data() {
     return {
+      // 公司信息
+      gsInfo:{
+        tenantName:'',
+        active_id:this.$store.state.user.tenantId,
+        list:[]
+      },
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -307,64 +402,93 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键不能为空", trigger: "blur" }
-        ],
-        tenantId: [
-          { required: true, message: "租户id不能为空", trigger: "blur" }
-        ],
         year: [
           { required: true, message: "年份不能为空", trigger: "blur" }
         ],
         month: [
           { required: true, message: "月份不能为空", trigger: "blur" }
         ],
-        employeeId: [
-          { required: true, message: "员工id不能为空", trigger: "blur" }
-        ],
         empName: [
-          { required: true, message: "员工姓名不能为空", trigger: "blur" }
+          { required: true, message: "员工姓名不能为空", trigger: "change" }
         ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          { required: true, message: "部门名称不能为空", trigger: "change" }
-        ],
-        restType: [
-          { required: true, message: "休息类别不能为空", trigger: "change" }
         ],
         requireDays: [
           { required: true, message: "应出勤天数不能为空", trigger: "blur" }
         ],
         avtiveDays: [
           { required: true, message: "出勤天数不能为空", trigger: "blur" }
-        ],
-        attendanceHours: [
-          { required: true, message: "出勤小时数不能为空", trigger: "blur" }
-        ],
-        overtimeHours: [
-          { required: true, message: "加班小时数不能为空", trigger: "blur" }
-        ],
-        holidays: [
-          { required: true, message: "放假天数不能为空", trigger: "blur" }
-        ],
-        holidayHours: [
-          { required: true, message: "放假小时数不能为空", trigger: "blur" }
-        ],
-        leaveDays: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
         ]
-      }
+      },
+      // 应出勤导入参数
+      upload: {
+        // 是否显示弹出层（应出勤导入）
+        open: false,
+        // 弹出层标题（应出勤导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的应出勤数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pay/requireAttendanceReport/import",
+        date: "",
+        tenantId: undefined
+      },
+      /** 选择员工*/
+      emp: {
+        // 是否显示弹出层
+        open: false,
+        // 列表遮罩层
+        loading: true,
+        // 列表查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: undefined
+        },
+        // 表格数据
+        list: [],
+        // 总条数
+        total: 0,
+      },
     };
   },
   created() {
-    this.getList();
+    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;
       listRequireAttendanceReport(this.queryParams).then(response => {
         this.requireAttendanceReportList = response.rows;
         this.total = response.total;
@@ -437,6 +561,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.tenantId = this.gsInfo.active_id;
           if (this.form.id != null) {
             updateRequireAttendanceReport(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -477,7 +602,126 @@ export default {
       this.download('pay/requireAttendanceReport/export', {
         ...this.queryParams
       }, `requireAttendanceReport_${new Date().getTime()}.xlsx`)
+    },
+    // 选择员工
+    selectEmployee(){
+      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
+    },
+    // 客户选择 选中数据
+    empRowChange(val) {
+      this.form.employeeId = val.id;
+      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() {
+      this.download('pay/requireAttendanceReport/import', {
+      }, `attendance_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+      this.$loading().close();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      if (this.isEmpty(this.upload.date)) {
+        this.$alert('请选择应出勤月份', '信息', {
+          confirmButtonText: '确定',
+          customClass:'message_box_alert'
+        }).catch((err) => {
+          console.log(err)
+        })
+      } else {
+        this.$refs.upload.submit();
+      }
+    },
+    //判断字符是否为空的方法
+    isEmpty(obj) {
+      if (typeof obj == "undefined" || obj == null || obj == "" || obj.length ==0) {
+        return true;
+      } else {
+        return false;
+      }
     }
   }
 };
 </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>