Procházet zdrojové kódy

工作状态改为必选项。

zhengqiang před 5 roky
rodič
revize
4a5cb8e3ac

+ 2 - 0
src/views/base/personInfo-detail.vue

@@ -123,6 +123,7 @@
           <el-col :span="24">
             <el-form-item label="工作状态" prop="workStatus">
               <el-select
+                clearable
                 v-model="formModel.workStatus"
                 filterable
                 placeholder="请选择"
@@ -301,6 +302,7 @@ export default {
         personRoleId: [
           { required: true, message: "请选择身份", trigger: "blur" },
         ],
+        workStatus: [{required: true, message: "工作状态不能为空", trigger: "blur"}]
         // idCard: [
         //   { required: false, message: "身份证不能为空", trigger: "blur" },
         //   {

+ 3 - 2
src/views/base/personInfo-list.vue

@@ -360,10 +360,11 @@
       ></el-table-column>
       <el-table-column label="工作状态" width="120">
         <template slot-scope="{ row }">
-          <span v-if="row.workStatus == 2">外出</span>
+          <span v-if="row.workStatus == 1">工作</span>
+          <span v-else-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>
+          <span v-else>未设置</span>
         </template>
       </el-table-column>
       <el-table-column