修改

src/api/personnel/employee/data.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listHistoryData(query) {
   return request({
-    url: '//personnel/employee/history/page',
+    url: '/personnel/employee/history/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listHistoryData(query) {
 // 查询详细
 export function getHistoryData(dictCode) {
   return request({
-    url: '//personnel/employee/history/get?id=' + dictCode,
+    url: '/personnel/employee/history/get?id=' + dictCode,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getHistoryData(dictCode) {
 // 新增
 export function addHistoryData(data) {
   return request({
-    url: '//personnel/employee/history/create',
+    url: '/personnel/employee/history/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addHistoryData(data) {
 // 修改
 export function updateHistoryData(data) {
   return request({
-    url: '//personnel/employee/history/update',
+    url: '/personnel/employee/history/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateHistoryData(data) {
 // 删除
 export function delHistoryData(dictCode) {
   return request({
-    url: '//personnel/employee/history/delete?id=' + dictCode,
+    url: '/personnel/employee/history/delete?id=' + dictCode,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delHistoryData(dictCode) {
 // 导出
 export function exportHistoryData(query) {
   return request({
-    url: '//personnel/employee/history/delete',
+    url: '/personnel/employee/history/delete',
     method: 'get',
     params: query,
     responseType: 'blob'

src/views/login.vue

@@ -210,7 +210,7 @@ export default {
             removePassword()
             removeRememberMe()
           }
-          // setTenantId(1)
+          setTenantId(1)
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
             this.$router.push({path: "/"}).catch(() => {
             });

src/views/personnel/employee/data.vue

@@ -91,7 +91,8 @@
           <div class="field-name">员工状态</div>
         </div>
         <div class="field-component">
-          <span>{{ form.employeeStatus }}</span>
+          <dict-tag :type="DICT_TYPE.EMPLOYEE_STATUS" :value="form.employeeStatus"/>
+          <!-- <span>{{ form.employeeStatus }}</span> -->
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -115,7 +116,8 @@
           <div class="field-name">性别</div>
         </div>
         <div class="field-component">
-          <span>{{ form.gender }}</span>
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="form.gender"/>
+          <!-- <span>{{ form.gender }}</span> -->
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -259,3 +261,65 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  postId: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>

src/views/personnel/employee/index.vue

@@ -4,9 +4,9 @@
       <el-form-item label="员工名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入员工名称" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <!-- <el-form-item label="员工编号" prop="employeeNumber">
-        <el-input v-model="queryParams.employeeNumber" placeholder="请输入" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
-      </el-form-item> -->
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item label="员工状态" prop="employeeStatus">
         <el-select v-model="queryParams.employeeStatus" placeholder="员工状态" clearable style="width: 240px">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EMPLOYEE_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column label="部门" align="center" prop="deptName" />
       <el-table-column label="职位" align="center" prop="position" />
-      <el-table-column label="员工编号" align="center" prop="employeeNumber" />
+      <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="入职时间" align="center" prop="entryDate" />
       <el-table-column label="员工状态" align="center" prop="employeeStatus">
         <template v-slot="scope">
@@ -84,9 +84,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工职位" prop="position">
-              <el-select v-model="form.position" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
+            <el-form-item label="员工职位" prop="postId">
+              <el-select v-model="form.postId" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -269,7 +269,8 @@
           <div class="field-name">员工状态</div>
         </div>
         <div class="field-component">
-          <span>{{ form.employeeStatus }}</span>
+          <dict-tag :type="DICT_TYPE.EMPLOYEE_STATUS" :value="form.employeeStatus"/>
+          <!-- <span>{{ form.employeeStatus }}</span> -->
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -293,7 +294,8 @@
           <div class="field-name">性别</div>
         </div>
         <div class="field-component">
-          <span>{{ form.gender }}</span>
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="form.gender"/>
+          <!-- <span>{{ form.gender }}</span> -->
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -419,7 +421,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         name: undefined,
-        employeeNumber: undefined,
+        phone: undefined,
         employeeStatus: undefined,
         // createTime: []
       },
@@ -430,9 +432,6 @@ export default {
         name: [
           { required: true, message: "员工姓名不能为空", trigger: "blur" }
         ],
-        id: [
-          { required: true, message: "员工ID不能为空", trigger: "blur" }
-        ],
         employeeStatus: [
           { required: true, message: "员工状态不能为空", trigger: "blur" }
         ],
@@ -501,7 +500,7 @@ export default {
       this.form = {
         name: undefined,
         deptId: undefined,
-        position:undefined,
+        postId:undefined,
         employeeNumber: undefined,
 
         entryDate: undefined,
@@ -628,7 +627,7 @@ export default {
 .fx-field {
   line-height: 20px;
   padding: 7px 12px 12px;
-  position: relative;
+  postId: relative;
 }
 
 .fx-field .field-label {