Merge remote-tracking branch 'origin/master'

yz_08

2021-02-10 bd0708640f2685414b5548cdf4059f7aaeaf96a6

 src/views/user/Informationinput.vue

@@ -1687,7 +1687,7 @@
      </div>
    </el-dialog>
    <el-dialog title="不良记录" :visible.sync="dialogshowArr[12].show" width="50%">
      <el-form :model="badRecordForm" :rules="rules" label-position="right" label-width="140px">
      <el-form ref="badRecordForm" :model="badRecordForm" :rules="badRecordRules" label-position="right" label-width="140px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
@@ -1741,13 +1741,19 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="putBadRecord()">保 存</el-button>
        <el-button type="primary" @click="putBadRecordContinue()">保存并继续新增</el-button>
        <el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
        <el-button type="primary" @click="putBadRecordContinue('badRecordForm')">保存并继续新增</el-button>
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
    <el-dialog title="备注信息" :visible.sync="dialogshowArr[13].show" width="50%">
      <el-form ref="remarkInfoForm" :model="remarkInfoForm" :rules="rules" label-position="right" label-width="140px">
      <el-form
        ref="remarkInfoForm"
        :model="remarkInfoForm"
        :rules="remarkInfoRules"
        label-position="right"
        label-width="140px"
      >
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
@@ -1796,7 +1802,7 @@
        <el-button @click="dialogIsShow()">取 消</el-button>
      </div>
    </el-dialog>
    <el-dialog title="选择员工" :visible.sync="dialogShowXzyg" width="90%">
    <el-dialog title="选择员工" :visible.sync="dialogShowXzyg">
      <Selectuser @selectedUser="selectedUser" @cancleChooseUser="cancleChooseUser" />
    </el-dialog>
  </div>
@@ -1822,11 +1828,15 @@
      tableDataName: '',
      inputForName: '',
      rules: {
        archivesNumb: [{ required: true, message: '请输入档案号', trigger: 'blur' }],
        archivesNumb: [{ required: true, message: '请输入档案号', trigger: 'blur' }, {
          max: 20,
          message: this.$t('rules.noMoreThan20'),
          trigger: 'blur'
        }],
        empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
          { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }],
          { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
        empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
          { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }],
          { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
        deptName: [
          { required: true, message: '请选择护卫点', trigger: 'input' }
        ],
@@ -1875,11 +1885,28 @@
        companyCompensation: [{ required: true, message: '请输入公司赔偿总费用', trigger: 'blur' }],
        arbitrationDate: [{ required: true, message: '请选择仲裁日期', trigger: 'change' }],
        arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }],
        arbitrationStatus: [{ required: true, message: '请选择结案状态', trigger: 'change' }],
        arbitrationStatus: [{ required: true, message: '请选择结案状态', trigger: 'change' }]
      },
      badRecordRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        badDate: [{ required: true, message: '请选择不良记录日期', trigger: 'change' }],
        badContent: [{ required: true, message: '请输入不良记录描述', trigger: 'blur' }],
        badContent: [{ required: true, message: '请输入不良记录描述', trigger: 'blur' }, {
          max: 512,
          message: '长度不超过512个字符',
          trigger: 'blur'
        }],
        reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }, {
          max: 50,
          message: '长度不超过50个字符',
          trigger: 'blur'
        }],
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      remarkInfoRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        remarkDate: [{ required: true, message: '请选择备注日期', trigger: 'change' }],
        remarkContent: [{ required: true, message: '请输入备注内容', trigger: 'blur' }]
        remarkContent: [{ required: true, message: '请输入备注内容', trigger: 'blur' },
          { max: 512, message: this.$t('rules.noMoreThan512'), trigger: 'blur' }]
      },
      restaurants: [{ value: '北京市', code: '110000' },
        { value: '天津市', code: '120000' },
@@ -4365,42 +4392,50 @@
      this.badRecordForm.version = ''
      this.badRecordForm.remark = ''
    },
    putBadRecord() {
      if (this.isAdd) {
        this.$post('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
          this.buttonLoading = false
          this.$message({
            message: this.$t('tips.createSuccess'),
            type: 'success'
          })
          this.cleanBadRecord()
          this.selectBadRecord()
        })
      } else {
        this.$put('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
          this.$message({
            message: this.$t('tips.updateSuccess'),
            type: 'success'
          })
          this.$emit('success')
          this.cleanBadRecord()
          this.selectBadRecord()
        })
      }
      this.dialogIsShow()
    putBadRecord(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          if (this.isAdd) {
            this.$post('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
              this.buttonLoading = false
              this.$message({
                message: this.$t('tips.createSuccess'),
                type: 'success'
              })
              this.cleanBadRecord()
              this.selectBadRecord()
            })
          } else {
            this.$put('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
              this.$message({
                message: this.$t('tips.updateSuccess'),
                type: 'success'
              })
              this.$emit('success')
              this.cleanBadRecord()
              this.selectBadRecord()
            })
          }
          this.dialogIsShow()
        }
      })
    },
    putBadRecordContinue() {
      if (this.isAdd) {
        this.$post('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
          this.buttonLoading = false
          this.$message({
            message: this.$t('tips.createSuccess'),
            type: 'success'
          })
          this.cleanBadRecord()
          this.selectBadRecord()
        })
      }
    putBadRecordContinue(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          if (this.isAdd) {
            this.$post('hr/empBadRecord', { ...this.badRecordForm }).then(() => {
              this.buttonLoading = false
              this.$message({
                message: this.$t('tips.createSuccess'),
                type: 'success'
              })
              this.cleanBadRecord()
              this.selectBadRecord()
            })
          }
        }
      })
    },
    editBadRecord(row) {
      this.isAdd = false
@@ -4620,7 +4655,7 @@
  }
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.el-container {
  height: 770px;

@@ -4662,20 +4697,21 @@
  margin-top: 20px;
}

</style>
<style lang="scss" scoped>
.el-select {
  width: 100%;
}
.el-autocomplete{

.el-autocomplete {
  width: 100%;
}
.el-header,.el-footer {

.el-header, .el-footer {
  background-color: #e9eef3;
  color: #333;
  text-align: center;
  line-height: 60px;
}

.el-date-editor.el-input,
.el-date-editor.el-input__inner {
  width: 100%;