lex-xin 4 lat temu
rodzic
commit
02adf541bf

Plik diff jest za duży
+ 0 - 0
dist/index.html


Plik diff jest za duży
+ 0 - 0
dist/static/css/chunk-bda29978.eab75167.css


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.d8934208.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-45a3a828.7b485993.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-4e753dae.2b77ba21.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-7492d0e5.efc65d9b.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-84e1c1c6.271101a1.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-946cd932.d15fd6d2.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-bda29978.9489ef36.js


+ 251 - 186
src/views/HumanResources/form.vue

@@ -10,18 +10,21 @@
             <tr class="description-tr">
               <th class="description-label">姓名</th>
               <td class="description-content">
-                <!-- <span :title='form.realName' v-if="detail">{{form.realName}}</span> -->
-                <el-input v-model="form.realName" size="mini" placeholder="请输入姓名"/>
+                <el-form-item prop="realName">
+                  <el-input v-model="form.realName" size="mini" placeholder="请输入姓名"/>
+                </el-form-item>
               </td>
               <th class="description-label">手机号</th>
               <td class="description-content">
-                <!-- <span :title='form.mobileNo' v-if="detail">{{form.mobileNo}}</span> -->
-                <el-input size="mini" v-model="form.mobileNo" placeholder="请输入手机号"/>
+                <el-form-item prop="mobileNo">
+                  <el-input size="mini" v-model="form.mobileNo" placeholder="请输入手机号"/>
+                </el-form-item>
               </td>
               <th class="description-label">微信号</th>
               <td class="description-content">
-                <!-- <span :title='form.wechatNo' v-if="detail">{{form.wechatNo}}</span> -->
-                <el-input size="mini" v-model="form.wechatNo" placeholder="请输入微信号"/>
+                <el-form-item prop="wechatNo">
+                  <el-input size="mini" v-model="form.wechatNo" placeholder="请输入微信号"/>
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr" v-for="(item, index) in educations" :key="index">
@@ -31,76 +34,84 @@
                   <i v-else @click="removeEducation(index)" class="el-icon-remove-outline"/>
                 </span>学历</th>
               <td class="description-content">
-                <!-- <span :title='form.realName' v-if="detail">{{form.realName}}</span> -->
-                <el-input v-model="educations[index].level" size="mini" placeholder="请输入学历"/>
+                <el-form-item prop="level">
+                  <el-input v-model="educations[index].level" size="mini" placeholder="请输入学历"/>
+                </el-form-item>
               </td>
               <th class="description-label">学校</th>
               <td class="description-content">
-                <!-- <span :title='form.mobileNo' v-if="detail">{{form.mobileNo}}</span> -->
-                <el-input size="mini" v-model="educations[index].school" placeholder="请输入学校"/>
+                <el-form-item prop="school">
+                  <el-input size="mini" v-model="educations[index].school" placeholder="请输入学校"/>
+                </el-form-item>
               </td>
               <th class="description-label">毕业时间</th>
               <td class="description-content">
-                <!-- <span :title='form.wechatNo' v-if="detail">{{form.wechatNo}}</span> -->
-                <el-date-picker
-                  type="month"
-                  placeholder="请选择毕业时间"
-                  size="mini"
-                  v-model="educations[index].year"
-                />
+                <el-form-item prop="year">
+                  <el-date-picker
+                    type="month"
+                    placeholder="请选择毕业时间"
+                    size="mini"
+                    v-model="educations[index].year"
+                  />
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">所在城市</th>
               <td class="description-content">
-                <!-- <span :title='form.liveCity' v-if="detail">{{form.liveCity}}</span> -->
-                <el-input size="mini" v-model.trim="form.liveCity" placeholder="请输入所在城市"/>
+                <el-form-item prop="liveCity">
+                  <el-input size="mini" v-model.trim="form.liveCity" placeholder="请输入所在城市"/>
+                </el-form-item>
               </td>
               <th class="description-label">工作意向</th>
               <td class="description-content">
-                <!-- <span :title='form.intentionCity' v-if="detail">{{form.intentionCity}}</span> -->
-                <el-input size="mini" v-model.trim="form.intentionCity" placeholder="请输入工作意向"/>
+                <el-form-item prop="intentionCity">
+                  <el-input size="mini" v-model.trim="form.intentionCity" placeholder="请输入工作意向"/>
+                </el-form-item>
               </td>
               <th class="description-label">声部</th>
               <td class="description-content">
-                <!-- <span :title='form.subjectId' v-if="detail">{{form.subjectId}}</span> -->
-                <el-select
-                  v-model.trim="form.subjectId"
-                  clearable
-                  filterable
-                  size="mini"
-                  placeholder='请选择声部'
-                >
-                  <el-option-group v-for="group in subjectList"
-                                    :key="group.label"
-                                    :label="group.label">
-                    <el-option v-for="item in group.options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                    </el-option>
-                  </el-option-group>
-                </el-select>
+                <el-form-item prop="subjectId">
+                  <el-select
+                    v-model.trim="form.subjectId"
+                    clearable
+                    filterable
+                    size="mini"
+                    placeholder='请选择声部'
+                  >
+                    <el-option-group v-for="group in subjectList"
+                                      :key="group.label"
+                                      :label="group.label">
+                      <el-option v-for="item in group.options"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                      </el-option>
+                    </el-option-group>
+                  </el-select>
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">是否经过评估</th>
               <td class="description-content">
-                <!-- <span v-if="detail" :title='form.isInterviewed'>{{form.isInterviewed}}</span> -->
-                <el-select size="mini" v-model.trim="form.isInterviewed"
-                            clearable
-                            filterable
-                            placeholder="请选择是否经过评估">
-                  <el-option label="是"
-                              :value="true"></el-option>
-                  <el-option label="否"
-                              :value="false"></el-option>
-                </el-select>
+                <el-form-item prop="isInterviewed">
+                  <el-select size="mini" v-model.trim="form.isInterviewed"
+                              clearable
+                              filterable
+                              placeholder="请选择是否经过评估">
+                    <el-option label="是"
+                                :value="true"></el-option>
+                    <el-option label="否"
+                                :value="false"></el-option>
+                  </el-select>
+                </el-form-item>
               </td>
               <th class="description-label">其他综合情况</th>
               <td class="description-content" colspan="3">
-                <!-- <span :title='form.otherComment' v-if="detail">{{form.otherComment}}</span> -->
-                <el-input size="mini" v-model.trim="form.otherComment" placeholder="请输入其他综合情况"/>
+                <el-form-item prop="otherComment">
+                  <el-input size="mini" v-model.trim="form.otherComment" placeholder="请输入其他综合情况"/>
+                </el-form-item>
               </td>
             </tr>
           </tbody>
@@ -116,18 +127,19 @@
             <tr class="description-tr">
               <th class="description-label">入职日期</th>
               <td class="description-content">
-                <!-- <span :title='form.entryDate' v-if="detail">{{form.entryDate}}</span> -->
-                <el-date-picker
-                  type="date"
-                  placeholder="选择入职日期"
-                  size="mini"
-                  v-model="form.entryDate"
-                />
+                <el-form-item prop="entryDate">
+                  <el-date-picker
+                    type="date"
+                    placeholder="选择入职日期"
+                    size="mini"
+                    v-model="form.entryDate"
+                  />
+                </el-form-item>
               </td>
               <th class="description-label">职位</th>
               <td class="description-content">
-                <!-- <span v-if="detail" :title='form.position'>{{form.position}}</span> -->
-                <el-select v-model.trim="form.position"
+                <el-form-item prop="position">
+                  <el-select v-model.trim="form.position"
                             clearable
                             filterable
                             size="mini"
@@ -139,70 +151,76 @@
                     <el-option label="乐队指导"
                               value="TEACHING"></el-option>
                   </el-select>
+                </el-form-item>
               </td>
               <th class="description-label">分部</th>
               <td class="description-content">
-                <!-- <span v-if="detail" :title='form.organId'>{{form.organId}}</span> -->
-                <el-select v-model.trim="form.organId"
-                    placeholder='请选择分部'
-                    clearable
-                    filterable
-                    size="mini"
-                  >
-                    <el-option v-for='(item,index) in organList'
-                      :key="index"
-                      :value="item.id"
-                      :label="item.name"
+                <el-form-item prop="organId">
+                  <el-select v-model.trim="form.organId"
+                      placeholder='请选择分部'
+                      clearable
+                      filterable
+                      size="mini"
                     >
-                    </el-option>
-                  </el-select>
+                      <el-option v-for='(item,index) in organList'
+                        :key="index"
+                        :value="item.id"
+                        :label="item.name"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">员工类型</th>
               <td class="description-content">
-                <!-- <span v-if="detail" :title='form.jobNature'>{{form.jobNature}}</span> -->
-                <el-select size="mini" v-model.trim="form.jobNature"
-                            clearable
-                            filterable
-                            placeholder="请选择员工类型">
-                  <el-option label="全职"
-                              value="FULL_TIME"></el-option>
-                  <el-option label="兼职"
-                              value="PART_TIME"></el-option>
-                  <el-option label="临时"
-                              value="TEMPORARY"></el-option>
-                </el-select>
+                <el-form-item prop="jobNature">
+                  <el-select size="mini" v-model.trim="form.jobNature"
+                              clearable
+                              filterable
+                              placeholder="请选择员工类型">
+                    <el-option label="全职"
+                                value="FULL_TIME"></el-option>
+                    <el-option label="兼职"
+                                value="PART_TIME"></el-option>
+                    <el-option label="临时"
+                                value="TEMPORARY"></el-option>
+                  </el-select>
+                </el-form-item>
               </td>
               <th class="description-label">员工状态</th>
               <td class="description-content">
-                <!-- <span v-if="detail" :title='form.isProbationPeriod'>{{form.isProbationPeriod}}</span> -->
-                <el-select size="mini" v-model.trim="form.isProbationPeriod"
-                            clearable
-                            filterable
-                            placeholder="请选择员工状态">
-                  <el-option label="正式"
-                              :value="true"></el-option>
-                  <el-option label="试用"
-                              :value="false"></el-option>
-                </el-select>
+                <el-form-item prop="isProbationPeriod">
+                  <el-select size="mini" v-model.trim="form.isProbationPeriod"
+                              clearable
+                              filterable
+                              placeholder="请选择员工状态">
+                    <el-option label="正式"
+                                :value="true"></el-option>
+                    <el-option label="试用"
+                                :value="false"></el-option>
+                  </el-select>
+                </el-form-item>
               </td>
               <th class="description-label">离职日期</th>
               <td class="description-content">
-                <!-- <span :title='form.resignationDate' v-if="detail">{{form.resignationDate}}</span> -->
-                <el-date-picker
-                  type="date"
-                  placeholder="选择离职日期"
-                  size="mini"
-                  v-model="form.resignationDate"
-                />
+                <el-form-item prop="resignationDate">
+                  <el-date-picker
+                    type="date"
+                    placeholder="选择离职日期"
+                    size="mini"
+                    v-model="form.resignationDate"
+                  />
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">证件号码</th>
               <td class="description-content" colspan="5">
-                <!-- <span :title='form.idCard' v-if="detail">{{form.idCard}}</span> -->
-                <el-input size="mini" v-model="form.idCard" placeholder="请输入证件号码"/>
+                <el-form-item prop="idCard">
+                  <el-input size="mini" v-model="form.idCard" placeholder="请输入证件号码"/>
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
@@ -214,45 +232,51 @@
               </td>
               <th class="description-label">性别</th>
               <td class="description-content" colspan="3">
-                <!-- <span v-if="detail" :title='form.gender'>{{form.gender}}</span> -->
-                <el-select size="mini" v-model.trim="form.gender"
-                            clearable
-                            filterable
-                            placeholder="请选择性别">
-                  <el-option label="男"
-                              :value="true"></el-option>
-                  <el-option label="女"
-                              :value="false"></el-option>
-                </el-select>
+                <el-form-item prop="gender">
+                  <el-select size="mini" v-model.trim="form.gender"
+                              clearable
+                              filterable
+                              placeholder="请选择性别">
+                    <el-option label="男"
+                                :value="true"></el-option>
+                    <el-option label="女"
+                                :value="false"></el-option>
+                  </el-select>
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">开户行</th>
               <td class="description-content">
-                <!-- <span :title='form.bankAddress' v-if="detail">{{form.bankAddress}}</span> -->
-                <el-input size="mini" v-model="form.bankAddress" placeholder="请输入开户行"/>
+                <el-form-item prop="bankAddress">
+                  <el-input size="mini" v-model="form.bankAddress" placeholder="请输入开户行"/>
+                </el-form-item>
               </td>
               <th class="description-label">银行卡号</th>
               <td class="description-content" colspan="3">
-                <!-- <span :title='form.bankCardNo' v-if="detail">{{form.bankCardNo}}</span> -->
-                <el-input size="mini" v-model="form.bankCardNo" placeholder="请输入银行卡号"/>
+                <el-form-item prop="bankCardNo">
+                  <el-input size="mini" v-model="form.bankCardNo" placeholder="请输入银行卡号"/>
+                </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
               <th class="description-label">紧急联系人姓名</th>
               <td class="description-content">
-                <!-- <span :title='form.emergencyContactName' v-if="detail">{{form.emergencyContactName}}</span> -->
-                <el-input size="mini" v-model.trim="form.emergencyContactName" placeholder="请输入紧急联系人姓名"/>
+                <el-form-item prop="emergencyContactName">
+                  <el-input size="mini" v-model.trim="form.emergencyContactName" placeholder="请输入紧急联系人姓名"/>
+                </el-form-item>
               </td>
               <th class="description-label">紧急联系人关系</th>
               <td class="description-content">
-                <!-- <span :title='form.emergencyContactRelation' v-if="detail">{{form.emergencyContactRelation}}</span> -->
-                <el-input size="mini" v-model.trim="form.emergencyContactRelation" placeholder="请输入紧急联系人关系"/>
+                <el-form-item prop="emergencyContactRelation">
+                  <el-input size="mini" v-model.trim="form.emergencyContactRelation" placeholder="请输入紧急联系人关系"/>
+                </el-form-item>
               </td>
               <th class="description-label">紧急联系人电话</th>
               <td class="description-content">
-                <!-- <span :title='form.emergencyContactPhone' v-if="detail">{{form.emergencyContactPhone}}</span> -->
-                <el-input size="mini" v-model.trim="form.emergencyContactPhone" placeholder="请输入紧急联系人电话"/>
+                <el-form-item prop="emergencyContactPhone">
+                  <el-input size="mini" v-model.trim="form.emergencyContactPhone" placeholder="请输入紧急联系人电话"/>
+                </el-form-item>
               </td>
             </tr>
           </tbody>
@@ -285,7 +309,6 @@ export default {
         bankAddress: '',
         bankCardNo: '',
         birthdate: '',
-        createTime: '',
         educationalBackground: '',
         emergencyContactName: '',
         emergencyContactPhone: '',
@@ -305,61 +328,98 @@ export default {
         resignationDate: '',
         subjectId: '',
         wechatNo: '',
+        organId: '',
       },
       rules: {
         age: [
           { required: true, message: '请输入年龄', trigger: 'blur' },
         ],
+        bankAddress: [
+          { required: true, message: '请输入开户行', trigger: 'blur' },
+        ],
+        bankCardNo: [
+          { required: true, message: '请输入卡号', trigger: 'blur' },
+        ],
+        birthdate: [
+          { required: true, message: '请输入生日', trigger: 'blur' },
+        ],
         // bankAddress: [
         //   { required: true, message: '请输入年龄', trigger: 'blur' },
         // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
-        // bankAddress: [
-        //   { required: true, message: '请输入年龄', trigger: 'blur' },
-        // ],
+        emergencyContactName: [
+          { required: true, message: '请输入紧急联系人姓名', trigger: 'blur' },
+        ],
+        emergencyContactPhone: [
+          { required: true, message: '请输入紧急联系人电话', trigger: 'blur' },
+        ],
+        emergencyContactRelation: [
+          { required: true, message: '请输入紧急联系人关系', trigger: 'blur' },
+        ],
+        entryDate: [
+          { required: true, message: '请输入入职日期', trigger: 'blur' },
+        ],
+        gender: [
+          { required: true, message: '请选择性别', trigger: 'blur' },
+        ],
+        idCard: [
+          { required: true, message: '请输入证件号码', trigger: 'blur' },
+        ],
+        intentionCity: [
+          { required: true, message: '请输入工作意向', trigger: 'blur' },
+        ],
+        isInterviewed: [
+          { required: true, message: '请选择是否经过评估', trigger: 'blur' },
+        ],
+        isProbationPeriod: [
+          { required: true, message: '请选择员工状态', trigger: 'blur' },
+        ],
+        jobNature: [
+          { required: true, message: '请选择员工类型', trigger: 'blur' },
+        ],
+        liveCity: [
+          { required: true, message: '请输入所在城市', trigger: 'blur' },
+        ],
+        mobileNo: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+        ],
+        otherComment: [
+          { required: true, message: '请输入其他综合情况', trigger: 'blur' },
+        ],
+        position: [
+          { required: true, message: '请输入职位', trigger: 'blur' },
+        ],
+        realName: [
+          { required: true, message: '请输入姓名', trigger: 'blur' },
+        ],
+        resignationDate: [
+          { required: true, message: '请选择离职日期', trigger: 'blur' },
+        ],
+        subjectId: [
+          { required: true, message: '请选择声部', trigger: 'blur' },
+        ],
+        organId: [
+          { required: true, message: '请选择分部', trigger: 'blur' },
+        ],
+        wechatNo: [
+          { required: true, message: '请输入微信号', trigger: 'blur' },
+        ],
+        level: [
+          { required: true, message: '请输入学历', trigger: 'blur' },
+        ],
+        school: [
+          { required: true, message: '请输入学校', trigger: 'blur' },
+        ],
+        year: [
+          { required: true, message: '请选择毕业时间', trigger: 'blur' },
+        ],
       },
-      educations: []
+      educations: [{level: '', school: '', year: ''}]
     }
   },
   watch: {
     detail() {
      this.updateData()
-    }
+    },
   },
   mounted() {
     this.updateData()
@@ -370,6 +430,9 @@ export default {
         this.form = Object.assign({}, this.detail)
         try {
           this.educations = JSON.parse(this.detail.educationalBackground)
+          if (!this.educations.length) {
+            this.educations = [{level: '', school: '', year: ''}]
+          }
         } catch (error) {}
       } else {
         this.educations = [{level: '', school: '', year: ''}]
@@ -384,27 +447,28 @@ export default {
     },
     onTypeSubmit() {
       this.$refs['ruleForm'].validate(valid => {
-        console.log(valid)
+        if (valid) {
+          const { $message } = this
+          this.form.educationalBackground = JSON.stringify(this.educations)
+          if (this.detail) {
+            employeeUpdate(Object.assign({id: this.detail.id}, this.form))
+            .then(res => {
+              if (res.code === 200) {
+                $message.success('修改成功')
+                this.close('ruleForm')
+              }
+            })
+          } else {
+            employeeCreate(this.form)
+            .then(res => {
+              if (res.code === 200) {
+                $message.success('创建成功')
+                this.close('ruleForm')
+              }
+            })
+          }
+        }
       })
-      // const { $message } = this
-      // this.form.educationalBackground = JSON.stringify(this.educations)
-      // if (this.detail) {
-      //   employeeUpdate(Object.assign({id: this.detail.id}, this.form))
-      //   .then(res => {
-      //     if (res.code === 200) {
-      //       $message.success('修改成功')
-      //       this.close('ruleForm')
-      //     }
-      //   })
-      // } else {
-      //   employeeCreate(this.form)
-      //   .then(res => {
-      //     if (res.code === 200) {
-      //       $message.success('创建成功')
-      //       this.close('ruleForm')
-      //     }
-      //   })
-      // }
     }
   }
 }
@@ -477,6 +541,7 @@ export default {
     font-size: 14px;
     line-height: 1.5;
     padding: 12px 16px;
+    padding-bottom: 0;
     color: rgba(0, 0, 0, 0.65);
     display: table-cell;
   }

+ 2 - 4
src/views/HumanResources/index.vue

@@ -5,7 +5,7 @@
       <div class="squrt"></div>人力资源表
     </h2>
     <div class="m-core">
-      <div class="newBand" v-permission="'helpCenterContent/modify'" @click="openTypes('create')">添加</div>
+      <div class="newBand" v-permission="'employeeInfo/insert'" @click="openTypes('create')">添加</div>
       <!-- 搜索标题 -->
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
         <el-form-item>
@@ -145,9 +145,7 @@
           </el-table-column>
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-              <el-button v-permission="'helpCenterContent/modify'" @click="openTypes('update', scope.row)" type="text">修改</el-button>
-              <!-- <el-button @click="onTypeDelOpeation(scope.row)"
-                v-permission="'helpCenterContent/delete'" type="text">删除</el-button> -->
+              <el-button v-permission="'employeeInfo/update'" @click="openTypes('update', scope.row)" type="text">修改</el-button>
             </template>
           </el-table-column>
         </el-table>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików