Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-23 94304b8061ceb025860d379c592255093e7db349

Merge remote-tracking branch 'origin/master'

 src/views/dashboard/HtUser.vue

@@ -109,9 +109,11 @@
    }
  },
  mounted() {
    this.getDicts('CONTRACTSTATUS').then(response => {
      this.contractStatusOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('CONTRACTSTATUS').then(response => {
        this.contractStatusOptions = response.data
      })
    }, 1000)
  },
  methods: {
    contractStatusFormat(row, column) {

 src/views/dashboard/ctUser.vue

@@ -129,21 +129,23 @@
    }
  },
  mounted() {
    this.getDicts('EDUCATION').then(response => {
      this.educationOptions = response.data
    })
    this.getDicts('NATIVEPLACE').then(response => {
      this.nativePlaceOptions = response.data
    })
    this.getDicts('sex').then(response => {
      this.sexOptions = response.data
    })
    this.getDicts('empType').then(response => {
      this.empTypeOptions = response.data
    })
    this.getDicts('NATION').then(response => {
      this.nationOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('EDUCATION').then(response => {
        this.educationOptions = response.data
      })
      this.getDicts('NATIVEPLACE').then(response => {
        this.nativePlaceOptions = response.data
      })
      this.getDicts('sex').then(response => {
        this.sexOptions = response.data
      })
      this.getDicts('empType').then(response => {
        this.empTypeOptions = response.data
      })
      this.getDicts('NATION').then(response => {
        this.nationOptions = response.data
      })
    }, 1000)
  },
  methods: {
    educationFormat(row, column) {

 src/views/dashboard/gsUser.vue

@@ -119,12 +119,14 @@
    }
  },
  mounted() {
    this.getDicts('hospitalizatioFlag').then(response => {
      this.hospitalizatioFlagOptions = response.data
    })
    this.getDicts('settleStatus').then(response => {
      this.settleStatusOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('hospitalizatioFlag').then(response => {
        this.hospitalizatioFlagOptions = response.data
      })
      this.getDicts('settleStatus').then(response => {
        this.settleStatusOptions = response.data
      })
    }, 1000)
  },
  methods: {
    hospitalizatioFlagFormat(row, column) {

 src/views/dashboard/lzUser.vue

@@ -112,12 +112,14 @@
    }
  },
  mounted() {
    this.getDicts('ZCTYPE').then(response => {
      this.arbitrationTypeOptions = response.data
    })
    this.getDicts('archivesStatus').then(response => {
      this.archivesStatusOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('ZCTYPE').then(response => {
        this.arbitrationTypeOptions = response.data
      })
      this.getDicts('archivesStatus').then(response => {
        this.archivesStatusOptions = response.data
      })
    }, 1000)
  },
  methods: {
    arbitrationTypeFormat(row, column) {

 src/views/dashboard/qjUser.vue

@@ -111,9 +111,11 @@
    }
  },
  mounted() {
    this.getDicts('LEAVETYPE').then(response => {
      this.leaveTypeOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('LEAVETYPE').then(response => {
        this.leaveTypeOptions = response.data
      })
    }, 1000)
  },
  methods: {
    leaveTypeFormat(row, column) {

 src/views/dashboard/sbUser.vue

@@ -112,15 +112,17 @@
    }
  },
  mounted() {
    this.getDicts('insuranceGaers').then(response => {
      this.insuranceGaersOptions = response.data
    })
    this.getDicts('applayStatus').then(response => {
      this.applayStatusOptions = response.data
    })
    this.getDicts('reportStatus').then(response => {
      this.reportStatusOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('insuranceGaers').then(response => {
        this.insuranceGaersOptions = response.data
      })
      this.getDicts('applayStatus').then(response => {
        this.applayStatusOptions = response.data
      })
      this.getDicts('reportStatus').then(response => {
        this.reportStatusOptions = response.data
      })
    }, 1000)
  },
  methods: {
    insuranceGaersFormat(row, column) {

 src/views/dashboard/tgUser.vue

@@ -110,9 +110,11 @@
    }
  },
  mounted() {
    this.getDicts('changeType').then(response => {
      this.changeTypeOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('changeType').then(response => {
        this.changeTypeOptions = response.data
      })
    }, 1000)
  },
  methods: {
    changeTypeFormat(row, column) {

 src/views/dashboard/tjUser.vue

@@ -113,12 +113,14 @@
    }
  },
  mounted() {
    this.getDicts('PHYSICALEXAMTYPE').then(response => {
      this.physicalExamTypeOptions = response.data
    })
    this.getDicts('ECG').then(response => {
      this.ecgOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('PHYSICALEXAMTYPE').then(response => {
        this.physicalExamTypeOptions = response.data
      })
      this.getDicts('ECG').then(response => {
        this.ecgOptions = response.data
      })
    }, 1000)
  },
  methods: {
    typeFormat(row, column) {

 src/views/dashboard/ygUser.vue

@@ -126,21 +126,23 @@
    }
  },
  mounted() {
    this.getDicts('EDUCATION').then(response => {
      this.educationOptions = response.data
    })
    this.getDicts('NATIVEPLACE').then(response => {
      this.nativePlaceOptions = response.data
    })
    this.getDicts('sex').then(response => {
      this.sexOptions = response.data
    })
    this.getDicts('empType').then(response => {
      this.empTypeOptions = response.data
    })
    this.getDicts('NATION').then(response => {
      this.nationOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('EDUCATION').then(response => {
        this.educationOptions = response.data
      })
      this.getDicts('NATIVEPLACE').then(response => {
        this.nativePlaceOptions = response.data
      })
      this.getDicts('sex').then(response => {
        this.sexOptions = response.data
      })
      this.getDicts('empType').then(response => {
        this.empTypeOptions = response.data
      })
      this.getDicts('NATION').then(response => {
        this.nationOptions = response.data
      })
    }, 1000)
  },
  methods: {
    educationFormat(row, column) {

 src/views/dashboard/ywUser.vue

@@ -119,12 +119,14 @@
    }
  },
  mounted() {
    this.getDicts('hospitalizatioFlag').then(response => {
      this.hospitalizatioFlagOptions = response.data
    })
    this.getDicts('settleStatus').then(response => {
      this.settleStatusOptions = response.data
    })
    setTimeout(() => {
      this.getDicts('hospitalizatioFlag').then(response => {
        this.hospitalizatioFlagOptions = response.data
      })
      this.getDicts('settleStatus').then(response => {
        this.settleStatusOptions = response.data
      })
    }, 1000)
  },
  methods: {
    hospitalizatioFlagFormat(row, column) {

 src/views/user/inemployees.vue

@@ -1580,18 +1580,27 @@
      this.empBaseInfoForm.deptName = row.deptName
      this.empBaseInfoForm.empNumb = row.empNumb
      this.empBaseInfoForm.empName = row.empName
      this.empBaseInfoForm.sex = row.sex
      this.empBaseInfoForm.JobId = row.JobId
      this.empBaseInfoForm.jobName = row.jobName
      this.empBaseInfoForm.empType = row.empType
      this.empBaseInfoForm.certificateType = row.certificateType
      this.empBaseInfoForm.certificateNumb = row.certificateNumb
      this.empBaseInfoForm.nation = row.nation
      this.empBaseInfoForm.certificateValidity = row.certificateValidity
      this.empBaseInfoForm.marriage = row.marriage
      this.empBaseInfoForm.age = row.age
      this.empBaseInfoForm.certificateNumb = row.certificateNumb
      if (!row.birthdate) {
        var userinfo = toCardGetUserInfo(this.empBaseInfoForm.certificateNumb)
        if (userinfo !== null) {
          this.empBaseInfoForm.age = userinfo.age
          this.empBaseInfoForm.birthdate = userinfo.birth
          this.empBaseInfoForm.sex = userinfo.sex
        }
      } else {
        this.empBaseInfoForm.age = row.age
        this.empBaseInfoForm.birthdate = row.birthdate
        this.empBaseInfoForm.sex = row.sex
      }
      this.empBaseInfoForm.stature = row.stature
      this.empBaseInfoForm.birthdate = row.birthdate
      this.empBaseInfoForm.politics = row.politics
      this.empBaseInfoForm.entryDate = row.entryDate
      this.empBaseInfoForm.education = row.education