医疗机构名称 |
- {{ form.INSTITUTION_NAME }} |
+ {{ form.INSTITUTION_NAME }} |
地址 |
{{ form.ADDRESS }} |
医疗机构类型 |
- {{ form.INSTITUTION_TYPE }} |
+ {{ form.INSTITUTION_TYPE_NAME }} |
医疗单位等级 |
{{ form.INSTITUTION_LEVEL }} |
邮编 |
- {{ form.POSTAL_CODE }} |
- 机构密级 |
- {{ form.INSTITUTION_SECURITY_LEVEL }} |
+ {{ form.POSTAL_CODE }} |
值班电话 |
@@ -32,7 +30,7 @@
所属区域 |
- {{ form.ADMINISTRATIVE_REGION }} |
+ {{ form.ADMINISTRATIVE_REGION_NAME }} |
经度 |
@@ -210,6 +208,7 @@ export default {
INSTITUTION_NAME: data.INSTITUTION_NAME,
// 医疗机构类型
INSTITUTION_TYPE: data.INSTITUTION_TYPE,
+ INSTITUTION_TYPE_NAME: data.INSTITUTION_TYPE_NAME,
// 医疗单位等级
INSTITUTION_LEVEL: data.INSTITUTION_LEVEL,
// 地址
@@ -224,6 +223,7 @@ export default {
FAX: data.FAX,
// 所属区域
ADMINISTRATIVE_REGION: data.ADMINISTRATIVE_REGION,
+ ADMINISTRATIVE_REGION_NAME: data.ADMINISTRATIVE_REGION_NAME,
// 经度
LONGITUDE: data.LONGITUDE,
// 纬度
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue
index fcf4119..ab6c372 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue
@@ -76,9 +76,8 @@
-
+
-
-
+
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/detail.vue b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/detail.vue
index 1e9109b..d45a536 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/detail.vue
@@ -10,7 +10,7 @@
专家名称 |
{{ form.EXPERT_NAME }} |
性别 |
- {{ form.GENDER }} |
+ {{ form.GENDER === '0'?'男':'女' }} |
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
index 3ae12d8..eba55d8 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
@@ -668,6 +668,7 @@ export default {
this.$refs.multipleTable.clearSelection()
this.getList()
this.$message.success('删除成功')
+ }).catch((e) => {
}).catch((e) => {
this.listISLOADing = false
})
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
index 529d3d2..c156378 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/addPeople.vue
@@ -62,7 +62,7 @@ export default {
YJ_EMERGENCY_TEAM_USER_ID: '',
YJ_EMERGENCY_TEAM_INFO_ID: '',
NAME: '',
- SEX: '0',
+ SEX: '',
AGE: '',
PHONE: '',
TELEPHONE: '',
@@ -71,7 +71,38 @@ export default {
COMPANY_NAME: '',
COMPANY_POSITION: ''
},
- rule: []
+ rule: {
+ NAME: [
+ { required: true, message: '请输入姓名', trigger: 'blur' }
+ ],
+ SEX: [
+ { required: true, message: '请选择性别', trigger: 'blur' }
+ ],
+ AGE: [
+ { required: true, message: '请输入年龄', trigger: 'blur' },
+ { type: 'number', message: '年龄必须为数字' }
+ ],
+ PHONE: [
+ { required: true, message: '请输入手机号', trigger: 'blur' },
+ { min: 11, max: 11, message: '请输入11位手机号', trigger: 'blur' },
+ {
+ pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+ message: '请输入正确的手机号码'
+ }
+ ],
+ TELEPHONE: [
+ { required: true, message: '请输入办公电话', trigger: 'blur' }
+ ],
+ TEAM_POSITION: [
+ { required: true, message: '请输入救援队职位名称', trigger: 'blur' }
+ ],
+ COMPANY_NAME: [
+ { required: true, message: '请输入所在单位名称', trigger: 'blur' }
+ ],
+ COMPANY_POSITION: [
+ { required: true, message: '请输入所在单位岗位名称', trigger: 'blur' }
+ ]
+ }
}
},
methods: {
@@ -86,16 +117,22 @@ export default {
}
},
confirm() {
- requestFN('/major/emergency/saveTeamUser', this.form).then(
- (data) => {
- this.$message.success('保存成功')
- this.visible = false
- this.$emit('flush', 'flush')
- })
- .catch((e) => {
- console.error(e)
- this.$message.error('保存失败')
- })
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ requestFN('/major/emergency/saveTeamUser', this.form).then(
+ (data) => {
+ this.$message.success('保存成功')
+ this.visible = false
+ this.$emit('flush', 'flush')
+ })
+ .catch((e) => {
+ console.error(e)
+ this.$message.error('保存失败')
+ })
+ } else {
+ return false
+ }
+ })
},
getInfo() {
requestFN('/major/emergency/getTeamUser', { ID: this.form.YJ_EMERGENCY_TEAM_USER_ID }).then(
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
index c9f3173..0bd83f9 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
@@ -693,7 +693,6 @@ export default {
this.dialogFormEdit = true
this.dialogType = 'editUser'
this.getDetail(id) // 获取详情并回显
- // this.$refs.upload.clearFiles()
},
getDetail(id) {
const params = {
@@ -754,7 +753,6 @@ export default {
this.form.LONGITUDE = ''
this.form.LATITUDE = ''
this.dialogType = 'saveUser'
- // this.$refs.upload.clearFiles()
},
confirm() {
this.$refs.form.validate(valid => {