用户添加工作状态

src/views/base/personInfo-detail.vue

@@ -38,7 +38,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>        
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="单位" prop="companyId">
@@ -47,7 +47,7 @@
                 :options="companyResult"
                 v-model="formModel.companyId"
                 height="200"
-                style="width:330px;"
+                style="width: 330px"
                 size="large"
               ></el-select-tree>
             </el-form-item>
@@ -119,6 +119,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="工作状态" prop="workStatus">
+              <el-select
+                v-model="formModel.workStatus"
+                filterable
+                placeholder="请选择"
+                style="width: 40%"
+              >
+                <el-option
+                  v-for="result in workStatusResult"
+                  :key="result.value"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="开放权限">
@@ -243,24 +262,23 @@ export default {
     "companyPosition5",
   ],
   watch: {
-    "formModel.companyId":function(newVal,oldVal){
-        var self = this;
+    "formModel.companyId": function (newVal, oldVal) {
+      var self = this;
 
-        if(newVal!=null){
-          var formData = new FormData();
-          formData.append("companyId", newVal);
+      if (newVal != null) {
+        var formData = new FormData();
+        formData.append("companyId", newVal);
 
-          //查询单位下角色
-          personRoleInfoApi.listByCompanyId(formData)
-          .then(response=>{
-              var jsonData = response.data;
+        //查询单位下角色
+        personRoleInfoApi.listByCompanyId(formData).then((response) => {
+          var jsonData = response.data;
 
-              if (jsonData.result) {
-                self.personRoleResult = jsonData.data;
-              }
-          })
-        }
-    }
+          if (jsonData.result) {
+            self.personRoleResult = jsonData.data;
+          }
+        });
+      }
+    },
   },
   data() {
     let checkIdCard = (rule, value, callback) => {
@@ -280,7 +298,9 @@ export default {
         companyId: [{ required: true, message: "请选择单位", trigger: "blur" }],
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
-        personRoleId: [{ required: true, message: "请选择身份", trigger: "blur" }]
+        personRoleId: [
+          { required: true, message: "请选择身份", trigger: "blur" },
+        ],
         // idCard: [
         //   { required: false, message: "身份证不能为空", trigger: "blur" },
         //   {
@@ -311,6 +331,7 @@ export default {
         children: "children",
       },
       parkList: [],
+      workStatusResult:[]
     };
   },
   created() {
@@ -321,6 +342,15 @@ export default {
       this.parkList = jsonData.data;
     });
 
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "工作状态",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.workStatusResult = jsonData.data;
+      });
+
     this.loadTree();
   },
   methods: {

src/views/base/personInfo-list.vue

@@ -335,6 +335,14 @@
         width="100"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column label="工作状态" width="120">
+        <template slot-scope="{ row }">
+          <span v-if="row.workStatus == 2">外出</span>
+          <span v-else-if="row.workStatus == 3">出差</span>
+          <span v-else-if="row.workStatus == 4">休假</span>
+          <span v-else>工作</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="deviceName"
         label="绑定设备"