Kaynağa Gözat

人员缺陷

luowei 1 yıl önce
ebeveyn
işleme
8c8d6870be
2 değiştirilmiş dosya ile 15 ekleme ve 65 silme
  1. 11 20
      src/views/system/user/extend.vue
  2. 4 45
      src/views/system/user/index.vue

+ 11 - 20
src/views/system/user/extend.vue

@@ -34,7 +34,7 @@
                     v-for="dict in dict.type.sys_yes_no"
                     :key="`${dict.value}`"
                     :label="dict.value"
-
+                  
                   >{{ dict.label }}</el-radio
                   >
                 </el-radio-group>
@@ -168,14 +168,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
-              <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
-                            prop="professionalQualifications">
-                <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
-                          placeholder="请输入初级以上证书名称">
-                </el-input>
-              </el-form-item>
-            </el-col> -->
+ 
 
             <el-col :xs="24" :sm="12" :md="8" :lg="8">
               <el-form-item label="金融安全防范工程专家" prop="financialExperts" label-width="240">
@@ -246,7 +239,7 @@ export default {
         deptId: null,
         duties: null,
         workType: null,
-        isFullTime: "1",
+        isFullTime:"Y",
         highestEducation: null,
         educationType: null,
         certificateWork: "1",
@@ -259,31 +252,29 @@ export default {
         responsibilitiesLeaderDuties: null,
         qualificationCertificateUrl: null,
         userId: null,
+        financialExperts:null,
       },
       rules: {
-        financialExperts:[
-          { required: true, message: '请选择金融安全防范工程专家级别', trigger: 'blur'}
-        ],
         idCard:[
           { required: true, message: '请输入身份证号码', trigger: 'change'}
         ],
         deptId: [
-          { required: true, message: '请选择所属部门', trigger: 'blur' },
+          { required: true, message: '请选择所属部门', trigger: 'change' },
         ],
         duties: [
-          { required: true, message: '请选择职务', trigger: 'blur' },
+          { required: true, message: '请选择职务', trigger: 'change' },
         ],
         workType: [
-          { required: true, message: '请选择用工形式', trigger: 'blur' },
+          { required: true, message: '请选择用工形式', trigger: 'change' },
         ],
         isFullTime: [
           { required: true, message: '请选择是否专职', trigger: 'blur' },
         ],
         highestEducation: [
-          { required: true, message: '请选择最高学历', trigger: 'blur' },
+          { required: true, message: '请选择最高学历', trigger: 'change' },
         ],
         educationType: [
-          { required: true, message: '请选择学历取得形式', trigger: 'blur' },
+          { required: true, message: '请选择学历取得形式', trigger: 'change' },
         ],
         certificateWork: [
           { required: true, message: '请选择是否持证上岗', trigger: 'blur' },
@@ -312,8 +303,8 @@ export default {
         certificateFailReason: [
           { required: true, message: '请输入持证上岗未通过原因', trigger: 'change' }
         ],
-        date2: [
-          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        financialExperts: [
+          { required: true, message: '请选择金融安全防范工程专家级别', trigger: 'change' }
         ],
         type: [
           { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }

+ 4 - 45
src/views/system/user/index.vue

@@ -75,7 +75,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="安保部门从业人员" prop="isLock">
+              <el-form-item label="安保部门从业人员" prop="onlyManager">
                 <el-switch
                   v-model="queryParams.onlyManager"
                   active-text=""
@@ -83,22 +83,6 @@
                 >
                 </el-switch>
               </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-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                  range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-              </el-form-item> -->
             </el-form>
             <!--    按纽    -->
             <el-row :gutter="10">
@@ -323,33 +307,6 @@
                   @click="handleResetPwd(scope.row)"
                   v-hasPermi="['system:user:resetPwd']"
                 >重置密码</el-button>
-                <!-- <el-divider direction="vertical"></el-divider> -->
-                <!-- <el-dropdown
-                  size="mini"
-                  @command="(command) => handleCommand(command, scope.row)"
-                  v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                  <el-button size="mini" type="text" icon="el-icon-menu">更多</el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      command="handleResetPwd"
-                      icon="el-icon-key"
-                      v-hasPermi="['system:user:resetPwd']"
-                      >重置密码</el-dropdown-item
-                    >
-                    <el-dropdown-item
-                      command="handleAuthRole"
-                      v-if="false"
-                      icon="el-icon-circle-check"
-                      v-hasPermi="['system:user:edit']"
-                      >分配角色</el-dropdown-item
-                    >
-                    <el-dropdown-item
-                      command="handleDelete"
-                      icon="el-icon-delete"
-                      v-hasPermi="['system:user:remove']"
-                    >删除</el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown> -->
               </template>
             </el-table-column>
           </el-table>
@@ -652,6 +609,8 @@ export default {
         checkSub: true,
         onlyManager: false,
         name: null,
+        roleId:null,
+        isLock:null
       },
       // 列信息
       columns: [
@@ -679,7 +638,7 @@ export default {
           { required: true, message: "用户名称不能为空", trigger: "blur" },
         ],
         roleIds: [
-          { required: true, message: "用户角色不能为空", trigger: "blur" },
+          { required: true, message: "用户角色不能为空", trigger: "change" },
         ],
         password: [
           { required: true, message: "密码不能为空", trigger: "blur" },