员工管理 所属部门查询条件修改

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

@@ -18,13 +18,9 @@
     <div :class="$store.state.user.tenantId?'content-all':'content'">
 
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-        <el-form-item label="所属部门" prop="deptName">
+        <el-form-item label="所属部门" prop="deptId">
-          <el-input
+          <treeselect v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
-            v-model="queryParams.deptName"
+                      placeholder="请选择所属部门" style="width: 220px"/>
-            placeholder="请输入员工所属部门"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="员工姓名" prop="name">
           <el-input
@@ -142,9 +138,11 @@
         <el-table-column label="身份证号" align="center" prop="idcard" min-width="100" />
         <el-table-column label="银行卡号" align="center" prop="bankCardNumber" min-width="100" />
         <el-table-column label="开户行" align="center" prop="openingBank" min-width="100" />
-        <el-table-column label="基本工资" align="center" prop="basicSalary" />
+        <el-table-column label="基本工资" align="center" prop="basicSalary">
-<!--        <el-table-column label="日薪" align="center" prop="daySalary" />-->
+          <template slot-scope="scope">
-<!--        <el-table-column label="时薪" align="center" prop="hourSalary" />-->
+            <div>{{ Math.round(scope.row.basicSalary * Math.pow(10, 2)) / Math.pow(10, 2) }}</div>
+          </template>
+        </el-table-column>
         <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"/>
@@ -164,27 +162,6 @@
         <el-table-column label="家庭住址" align="center" prop="address" />
         <el-table-column label="紧急联系人" align="center" prop="contact" min-width="100"/>
         <el-table-column label="紧急联系人电话" align="center" prop="contactPhone" min-width="120"/>
-<!--        <el-table-column label="是否质检" align="center" prop="zhijian">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.pay_yes_no" :value="scope.row.zhijian"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="业务员" align="center" prop="yewu">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.pay_yes_no" :value="scope.row.yewu"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="合同补助开始时间" align="center" prop="htstime" min-width="130">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.htstime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="合同补助结束时间" align="center" prop="htetime" min-width="130">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.htetime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>-->
-
         <el-table-column label="备注" align="center" prop="remark" min-width="120"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="100">
           <template slot-scope="scope">