fix:后线人员新增增加是否计算机专业

config/dev.env.js

@@ -18,11 +18,11 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
-   BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
+  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
   //BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
   // BASE_URL: '"http:///192.168.0.55:8080/"',//蔡雅茹
-  // CONSOLE_BASE_URL: '"http://localhost:8080/"' //控制台测试服务器
-  // CONSOLE_BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/console-api"' //控制台正式服务器
+  CONSOLE_BASE_URL: '"http://localhost:8080/"' //控制台测试服务器
+  // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
 
 })
 

src/components/UserDetail/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="userdetail">
-    <el-form :inline="true" :model="formData" label-width="110px" size="small" :rules="rules" ref="formData">
-      <div class="info-title" style="padding-top: 0;">人员信息</div>
+    <el-form
+      :inline="true"
+      :model="formData"
+      label-width="110px"
+      size="small"
+      :rules="rules"
+      ref="formData"
+    >
+      <div class="info-title" style="padding-top: 0">人员信息</div>
       <el-row>
         <el-col :span="8">
           <el-form-item label="姓名" prop="name">
@@ -11,9 +18,9 @@
         <el-col :span="8">
           <el-form-item label="身份证号" prop="identity">
             <el-input
-               :disabled="isDisabled"
-               clearable
-               v-model="formData.identity"
+              :disabled="isDisabled"
+              clearable
+              v-model="formData.identity"
               :maxlength="18"
               style="width: 200px"
               @change="identityChange"
@@ -23,20 +30,25 @@
         <el-col :span="8">
           <el-form-item label="性别" prop="sex">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.sex"
               placeholder="请选择"
               popper-class="select-prop"
             >
-              <el-option v-for="val in sexoptions" :key="val.id" :label="val.label" :value="val.value"></el-option>
+              <el-option
+                v-for="val in sexoptions"
+                :key="val.id"
+                :label="val.label"
+                :value="val.value"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="出生日期">
             <el-date-picker
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.birthday"
               type="date"
@@ -50,7 +62,7 @@
         <el-col :span="8">
           <el-form-item label="民族" prop="nations">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.nations"
               placeholder="请选择民族"
@@ -68,7 +80,7 @@
         <el-col :span="8">
           <el-form-item label="户籍" prop="koseki">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.koseki"
             ></el-input>
@@ -77,7 +89,7 @@
         <el-col :span="8">
           <el-form-item label="婚姻状况" prop="maritalStatus">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.maritalStatus"
               placeholder="请选择"
@@ -93,7 +105,7 @@
         <el-col :span="8">
           <el-form-item label="政治面貌" prop="politicsStatus">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.politicsStatus"
               placeholder="请选择"
@@ -108,7 +120,7 @@
         <el-col :span="8">
           <el-form-item label="健康状况" prop="health">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.health"
               placeholder="请选择"
@@ -123,7 +135,7 @@
         <el-col :span="8">
           <el-form-item label="居住地址" prop="address">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.address"
             ></el-input>
@@ -132,7 +144,7 @@
         <el-col :span="8">
           <el-form-item label="邮政编码" prop="postalCode">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.postalCode"
             ></el-input>
@@ -141,7 +153,7 @@
         <el-col :span="8">
           <el-form-item label="血型" prop="bloodType">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.bloodType"
               placeholder="请选择"
@@ -157,7 +169,7 @@
         <el-col :span="8">
           <el-form-item label="学历" prop="education">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.education"
               placeholder="请选择"
@@ -176,7 +188,7 @@
         <el-col :span="8">
           <el-form-item label="毕业院校" prop="school">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.school"
             ></el-input>
@@ -185,7 +197,7 @@
         <el-col :span="8">
           <el-form-item label="毕业时间" prop="graduationTime">
             <el-date-picker
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.graduationTime"
               type="date"
@@ -198,7 +210,7 @@
         <el-col :span="8">
           <el-form-item label="原工作单位" prop="formerEmployer">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.formerEmployer"
             ></el-input>
@@ -210,15 +222,16 @@
               v-model="formData.password"
               :disabled="isDisabled"
               style="width: 200px"
-              type="password" show-password
-              ></el-input>
-              <!-- :class="isShow == true ? 'disc' : 'none'" -->
+              type="password"
+              show-password
+            ></el-input>
+            <!-- :class="isShow == true ? 'disc' : 'none'" -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="紧急联系人姓名" prop="emergencyContactName">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.emergencyContactName"
             ></el-input>
@@ -227,13 +240,29 @@
         <el-col :span="8">
           <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.emergencyContactTel"
             ></el-input>
           </el-form-item>
         </el-col>
-<!-- 
+        <el-col :span="8" v-show="isSpeciality">
+          <el-form-item label="是否计算机专业" prop="isSpeciality">
+            <el-radio v-model="formDataDetail.isSpeciality" :label="1"
+              >是</el-radio
+            >
+            <el-radio v-model="formDataDetail.isSpeciality" :label="0"
+              >否</el-radio
+            >
+            <!-- <el-input
+              :disabled="isDisabled"
+              style="width: 200px"
+              v-model="formDataDetail.isSpeciality"
+            ></el-input> -->
+          </el-form-item>
+        </el-col>
+
+        <!-- 
 
         <el-col :span="8">
           <el-form-item label="邮箱">
@@ -250,7 +279,7 @@
         <el-col :span="8">
           <el-form-item label="工资">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.salary"
             ></el-input>
@@ -259,7 +288,7 @@
         <el-col :span="8">
           <el-form-item label="工资等级">
             <el-input
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.salaryLevel"
             ></el-input>
@@ -269,7 +298,7 @@
         <el-col :span="8">
           <el-form-item label="绩效方案">
             <el-select
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.performance"
               placeholder="请选择"
@@ -352,7 +381,7 @@
         <el-col :span="8">
           <el-form-item label="入司时间" prop="entryTime">
             <el-date-picker
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               style="width: 200px"
               v-model="formDataDetail.entryTime"
               type="date"
@@ -365,7 +394,7 @@
         <el-col :span="8">
           <el-form-item label="离职时间" prop="logoutTime">
             <el-date-picker
-               :disabled="isDisabled"
+              :disabled="isDisabled"
               value-format="yyyy-MM-dd"
               style="width: 200px"
               v-model="formData.logoutTime"
@@ -379,18 +408,18 @@
         <!--  v-show="isDisabled" -->
       </el-row>
       <div class="info-title">其他</div>
-        <el-col :span="24">
-          <el-form-item label="备注">
-            <el-input
-               :disabled="isDisabled"
-               v-model="formData.approvalOpinion"
-               type="textarea"
-               style="width: 800px"
-               :autosize="{ minRows: 4, maxRows: 6 }"
-               placeholder="请输入内容"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注">
+          <el-input
+            :disabled="isDisabled"
+            v-model="formData.approvalOpinion"
+            type="textarea"
+            style="width: 800px"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+      </el-col>
     </el-form>
   </div>
 </template>
@@ -420,11 +449,15 @@ export default {
     },
     showTjr: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isDisabled: {
       type: Boolean,
-      default: false
+      default: false,
+    },
+    isSpeciality: {
+      type: Boolean,
+      default: false,
     },
   },
   mixins: [mixin],
@@ -438,27 +471,25 @@ export default {
           { required: true, message: "请填写身份证号" },
           { validator: validateSfz },
         ],
-        password: [
-          { required: true, message: "请输入密码", trigger: "blur" },
-        ]
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
-    }
+    };
   },
   created() {
     this.$api.user
-    .selectfindByreferrerId({ deptId: this.formData.deptId })
-    .then((res) => {
-      this.recommenderOptions = res.data || [];
-    });
+      .selectfindByreferrerId({ deptId: this.formData.deptId })
+      .then((res) => {
+        this.recommenderOptions = res.data || [];
+      });
     this.getDictItems("user_status");
   },
   methods: {
     submit() {
       this.$refs.formData.validate((valid) => {
-        let valids
-        valids = valid
-        this.$emit('valids', valids)
-      })
+        let valids;
+        valids = valid;
+        this.$emit("valids", valids);
+      });
     },
     isShowFun() {
       this.isShow = !this.isShow;
@@ -475,7 +506,7 @@ export default {
           this[typeName + "options"] = [];
         });
     },
-    
+
     identityChange(iden) {
       if (iden) {
         let sex = null;
@@ -504,28 +535,29 @@ export default {
         ).value;
       }
     },
-  }
+  },
 };
 </script>
 
 <style lang="scss">
 .select-prop {
-  .el-select-dropdown__item.selected,.el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>
 
 <style lang="scss" scoped>
 >>> .el-radio__input.is-checked .el-radio__inner {
-  background-color: #2D4D89 !important;
-  border-color: #2D4D89 !important;
+  background-color: #2d4d89 !important;
+  border-color: #2d4d89 !important;
 }
 >>> .el-radio__input.is-checked + .el-radio__label {
-  color: #2D4D89 !important;
+  color: #2d4d89 !important;
 }
 >>> .radio-four {
   .el-radio {
@@ -536,8 +568,9 @@ export default {
     padding-left: 4px;
   }
 }
->>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-  border-color: #2D4D89;
+>>> .el-input__inner:focus,
+>>> .el-select .el-input.is-focus .el-input__inner {
+  border-color: #2d4d89;
 }
 .info-title {
   color: #262626;

src/views/Login.vue

@@ -287,10 +287,10 @@ export default {
                     res.data,
                     "token"
                   ).toString();
-                  // console.log(token);
+
                   window.location.href =
                     process.env.CONSOLE_BASE_URL +
-                    "/#/form/agreement?token=" +
+                    "/#/agreement/agreement?token=" +
                     token;
                   // alert(res.data);
                 } else {

src/views/PeopleManage/Staff/StaffManage.vue

@@ -154,7 +154,11 @@
       v-dialogDrag
       class="people-style"
     >
-      <el-tabs v-model="activeName" :before-leave="beforeTabLeave" class="tab-style">
+      <el-tabs
+        v-model="activeName"
+        :before-leave="beforeTabLeave"
+        class="tab-style"
+      >
         <el-tab-pane label="基本信息" name="1">
           <el-form
             :model="formData"
@@ -223,22 +227,26 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="工号" prop="id">
-                  <el-input v-model="formData.id" disabled 
-                  style="width: 200px"
+                  <el-input
+                    v-model="formData.id"
+                    disabled
+                    style="width: 200px"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="姓名" prop="name">
-                  <el-input v-model="formData.name"
-                  style="width: 200px"
+                  <el-input
+                    v-model="formData.name"
+                    style="width: 200px"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号" prop="mobile">
-                  <el-input v-model="formData.mobile"
-                  style="width: 200px"
+                  <el-input
+                    v-model="formData.mobile"
+                    style="width: 200px"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -309,23 +317,26 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="领导人工号" prop="leaderName">
-                  <el-input v-model="formData.leaderId" disabled
-                  style="width: 200px"
+                  <el-input
+                    v-model="formData.leaderId"
+                    disabled
+                    style="width: 200px"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="代理人资格证号" prop="agentQualificationCode">
+                <el-form-item
+                  label="代理人资格证号"
+                  prop="agentQualificationCode"
+                >
                   <el-input
                     style="width: 200px"
                     v-model="formDataDetail.agentQualificationCode"
                   ></el-input>
                 </el-form-item>
               </el-col>
-              
-            </el-row>
-            <el-row>
             </el-row>
+            <el-row> </el-row>
           </el-form>
           <div style="text-align: right">
             <el-button size="small" type="primary" @click="nextStep"
@@ -339,6 +350,7 @@
             :formDataDetail="formDataDetail"
             ref="formDataDetails"
             @valids="valids"
+            :isSpeciality="true"
           ></userDetail>
 
           <div style="text-align: right">
@@ -529,7 +541,7 @@ export default {
           label: "性别",
           minWidth: 80,
           sortable: false,
-          isSex: true
+          isSex: true,
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
         {
@@ -566,7 +578,7 @@ export default {
           label: "状态",
           minWidth: 120,
           sortable: false,
-          isStatus: true
+          isStatus: true,
         },
       ],
       dialogTitle: "",
@@ -612,25 +624,29 @@ export default {
   methods: {
     // 离司恢复
     handleRest(data) {
-      this.$confirm('是否恢复', '提示', { 
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$api.user.separationReinstatement(data.row.userId).then((res) => {
-            if (res.code == 200) {
-              this.$message({
-                type: 'success',
-                message: res.msg
-              });
-              this.findPage()
-            }
-          })
-        }).catch(() => {
+      this.$confirm("是否恢复", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.user
+            .separationReinstatement(data.row.userId)
+            .then((res) => {
+              if (res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: res.msg,
+                });
+                this.findPage();
+              }
+            });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消'
-          });          
+            type: "info",
+            message: "已取消",
+          });
         });
     },
     handleSubOut() {
@@ -730,7 +746,7 @@ export default {
     },
     // 查询Start
     queryStaffInfo() {
-      this.isQueryStaff = true
+      this.isQueryStaff = true;
       this.findPage();
     },
     sexFormatter(row) {
@@ -764,25 +780,25 @@ export default {
     // 下一步
     nextStep() {
       // this.$refs.formData.validate((valid) => {
-        // if (valid) {
-          this.activeName = "2";
-          // this.formData.deptIdCom= this.formData.deptId
-          // this.formData.deptId =  this.formData.deptId.at(-1);
-          // if (this.formData.referrerId) {
-          //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
-          // }
-          // this.$api.user.saveOrUpdate(this.formData).then((res) => {
-          //   if (res.code == 200) {
-          //   this.activeName='2'
-          //   this.basicInformation=res.data
-          //   } else {
-          //     this.$message({
-          //       message: `操作失败，请重新添加,(${res.msg})`,
-          //       type: "error",
-          //     });
-          //   }
-          // });
-        // }
+      // if (valid) {
+      this.activeName = "2";
+      // this.formData.deptIdCom= this.formData.deptId
+      // this.formData.deptId =  this.formData.deptId.at(-1);
+      // if (this.formData.referrerId) {
+      //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
+      // }
+      // this.$api.user.saveOrUpdate(this.formData).then((res) => {
+      //   if (res.code == 200) {
+      //   this.activeName='2'
+      //   this.basicInformation=res.data
+      //   } else {
+      //     this.$message({
+      //       message: `操作失败，请重新添加,(${res.msg})`,
+      //       type: "error",
+      //     });
+      //   }
+      // });
+      // }
       // });
     },
     // 右侧列表的方法Start
@@ -793,9 +809,9 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
       if (this.isQueryStaff) {
-        this.pageData.pageNum = 1
+        this.pageData.pageNum = 1;
       }
-      this.isQueryStaff = false
+      this.isQueryStaff = false;
       let dto = {
         deptId: this.deptId,
         mobile: this.pageData.mobile,
@@ -985,14 +1001,14 @@ export default {
       //   status:''
       // }
       this.dialogVisible = false;
-      this.activeName = '1'
+      this.activeName = "1";
     },
     valids(data) {
-      this.detailValid = data
+      this.detailValid = data;
     },
     // 提交
     submitForm() {
-      this.$refs.formDataDetails.submit()
+      this.$refs.formDataDetails.submit();
       setTimeout(() => {
         this.$refs.formData.validate((valid) => {
           if (valid && this.detailValid) {
@@ -1066,7 +1082,7 @@ export default {
               }
             });
           } else {
-            this.$message.error('请填写全部信息')
+            this.$message.error("请填写全部信息");
           }
         });
       }, 200);