diff --git a/public/index.html b/public/index.html
index 3ff5007..a678c03 100644
--- a/public/index.html
+++ b/public/index.html
@@ -35,23 +35,23 @@
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<% } %>
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<% } %>
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
<% } %>
diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 6619d71..bb22490 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -339,16 +339,8 @@ export default {
idCard: '',
username: '',
mobile: '',
- outCode: '',
- outStreet: '',
- returnState: '',
- startTime: '',
- endTime: '',
- isInoculate: '',
- age: '',
- company: ''
+ isInoculate: ''
},
- ageArr: [],
companyArr: [],
publicPath: process.env.BASE_URL,
pickerBeginDateBefore: {
@@ -367,13 +359,7 @@ export default {
}
}
},
- ids: [],
options: [],
- outStreetArr: [],
- returnStateArr: [
- { dictValue: 1, dictName: '在本地' },
- { dictValue: 2, dictName: '在外地' }
- ],
inoculateStateArr: [
{ dictValue: '0', dictName: '未接种' },
{ dictValue: '10', dictName: '接种中' },
@@ -382,17 +368,6 @@ export default {
{ dictValue: '1', dictName: '第一针' },
{ dictValue: '2', dictName: '第二针' }
],
- ageStateArr: [
- { dictValue: '0', dictName: '0-18岁' },
- { dictValue: '1', dictName: '19-19岁' },
- { dictValue: '2', dictName: '20-29岁' },
- { dictValue: '3', dictName: '30-39岁' },
- { dictValue: '4', dictName: '40-49岁' },
- { dictValue: '5', dictName: '50-59岁' },
- { dictValue: '6', dictName: '60-69岁' },
- { dictValue: '7', dictName: '70-79岁' },
- { dictValue: '8', dictName: '80岁以上' }
- ],
companyStateArr: [],
exportTemplate: false,
uploeadLoeading: false,
@@ -411,22 +386,8 @@ export default {
AddOrUpdate,
InfoDetail
},
- watch: {
- ids: function (val) {
- if (val.length === 0) {
- this.dataForm.outCode = ''
- } else {
- this.dataForm.outCode = this.ids[val.length - 1]
- }
- }
- },
methods: {
beforeGetDataListSearch () {
- if (this.ageArr.length > 0) {
- this.dataForm.age = this.ageArr.toString()
- } else {
- this.dataForm.age = ''
- }
if (this.companyArr.length > 0) {
this.dataForm.company = this.companyArr.toString()
} else {
@@ -442,12 +403,6 @@ export default {
this.$refs.infoDetail.init()
})
},
- // 获取乡镇下拉信息(传参：4代表查“街道”)
- getDailyTypeArrInfo () {
- this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
- this.outStreetArr = res
- }).catch(() => { })
- },
getcompantyOptions () {
this.$http
.get(`/sys/vaccinecompany/getCompantyList`)
@@ -486,14 +441,6 @@ export default {
}
}).catch(() => { })
},
- // 乡镇取值变化事件
- selectModel (event) {
- this.outStreetArr.find((item) => {
- if (item.dictValue === event) {
- this.dataForm.outStreet = item.dictValue
- }
- })
- },
getOptions () {
this.$http
.get(`/sys/select/getSysArea`)
@@ -565,15 +512,6 @@ export default {
}
})
},
- returnStateFormat (row, column) {
- if (row.returnState === 1 || row.returnState === '1') {
- return '在本地'
- } else if (row.returnState === 2 || row.returnState === '2') {
- return '在外地'
- } else {
- return ''
- }
- },
showRegistFormat (row, column) {
if (row.isInoculate === 0) {
return '否'
@@ -581,18 +519,6 @@ export default {
return '是'
}
},
- returnriskGradeFormat (row, column) {
- // 1:低风险，2：中风险，3：高风险
- if (row.riskGrade === 1 || row.riskGrade === '1') {
- return '低风险'
- } else if (row.returnState === 2 || row.returnState === '2') {
- return '中风险'
- } else if (row.returnState === 3 || row.returnState === '3') {
- return '高风险'
- } else {
- return ''
- }
- },
// 打开导出弹框
exports () {
this.dialogVisibleExcel = true
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index c71c168..bdafb95 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -103,6 +103,25 @@
{{ $t('user.status1') }}
+
+
+ 停用
+ 本人验证
+ 领导验证
+
+
+
+
+
{{ $t('cancel') }}
@@ -136,8 +155,11 @@ export default {
mobile: '',
roleIdList: [],
status: 1,
+ verifyFlag: '0',
+ verifyMobile: '',
userTagKey: ''
},
+ verifyMobileList: [],
userTagDictList: []
}
},
@@ -272,12 +294,36 @@ export default {
this.dataForm.deptName = data.name
this.deptListVisible = false
},
+ handleSelect (item) {
+ console.log(item)
+ },
+ verifyFlagChange (e) {
+ if (e === '2') {
+ this.$http.get(`/sys/user/getLeaderPhone/${this.dataForm.deptId}`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.verifyMobileList = res.data
+ }).catch(() => { })
+ } else {
+ this.verifyMobileList = []
+ this.dataForm.verifyMobile = this.dataForm.mobile
+ }
+ },
+ querySearch (queryString, cb) {
+ let results = this.verifyMobileList
+ // 调用 callback 返回建议列表的数据
+ cb(results)
+ },
// 表单提交
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
+ if (this.dataForm.verifyFlag === '0') {
+ this.dataForm.verifyMobile = ''
+ }
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
...this.dataForm,
roleIdList: [
diff --git a/src/views/modules/vim/vaccinationrole-add-or-update.vue b/src/views/modules/vim/vaccinationrole-add-or-update.vue
index 88081c5..2771de2 100644
--- a/src/views/modules/vim/vaccinationrole-add-or-update.vue
+++ b/src/views/modules/vim/vaccinationrole-add-or-update.vue
@@ -4,13 +4,13 @@
-
+
-
+
-
+
diff --git a/src/views/modules/vim/vaccinationrole.vue b/src/views/modules/vim/vaccinationrole.vue
index 3acc3b2..44ed196 100644
--- a/src/views/modules/vim/vaccinationrole.vue
+++ b/src/views/modules/vim/vaccinationrole.vue
@@ -20,6 +20,9 @@
+
+
+
diff --git a/src/views/modules/vim/vaccinationuserrole-add-or-update.vue b/src/views/modules/vim/vaccinationuserrole-add-or-update.vue
index fb9b79d..cb333a6 100644
--- a/src/views/modules/vim/vaccinationuserrole-add-or-update.vue
+++ b/src/views/modules/vim/vaccinationuserrole-add-or-update.vue
@@ -71,7 +71,7 @@ export default {
},
getUserOptions () {
this.$http
- .get(`/sys/user/userList`)
+ .get(`/sys/user/vaccination/userList`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)