From 1937116ab2d8128f49751b7fbc5a4d211fe4b361 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 23 Aug 2024 15:15:34 +0800 Subject: [PATCH] =?UTF-8?q?521=20=E5=BA=94=E6=80=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=86=85=E6=89=80=E6=9C=89=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=20=E9=83=BD=E5=BA=94=E8=AF=A5=E6=9C=89=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=20509=20=E5=8A=9E=E5=85=AC=E7=94=B5?= =?UTF-8?q?=E8=AF=9D=E6=98=AF=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=90=97?= =?UTF-8?q?=20=E6=B3=A8=E6=84=8F=E6=89=80=E6=9C=89=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20507=20=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=20=E6=B2=A1=E6=9C=89=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=20504?= =?UTF-8?q?=20=E4=B8=93=E5=AE=B6=E7=BB=84=E6=88=90=E5=91=98=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= =?UTF-8?q?=20500=20=E5=88=A0=E9=99=A4=E6=88=90=E5=8A=9F=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA=20494=20=E5=88=A0=E9=99=A4=E6=88=90?= =?UTF-8?q?=E5=8A=9F=20=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=20491=20?= =?UTF-8?q?=E5=BA=94=E6=80=A5=E7=AE=A1=E7=90=86=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=20=E5=88=97=E8=A1=A8=E6=9C=89=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=90=97=20=E5=BA=94=E8=AF=A5=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=20=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=96=E8=80=85=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=96=E8=80=85=E5=85=B6=E4=BB=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assurance_management/components/list.vue | 2 +- .../components/detail.vue | 12 ++-- .../components/list.vue | 3 +- .../components/list.vue | 2 +- .../rescue_expert/components/detail.vue | 2 +- .../rescue_expert/components/list.vue | 1 + .../rescue_team/components/addPeople.vue | 61 +++++++++++++++---- .../rescue_team/components/list.vue | 2 - 8 files changed, 60 insertions(+), 25 deletions(-) diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue index d4aa3be..fddc588 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue @@ -70,7 +70,7 @@ - + diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/detail.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/detail.vue index fcab015..0eae32a 100644 --- a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/detail.vue +++ b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/detail.vue @@ -8,21 +8,19 @@ - + - + - - - + @@ -32,7 +30,7 @@ - + @@ -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 @@ - + 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 => {
医疗机构名称{{ 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 }}
值班电话
所属区域{{ form.ADMINISTRATIVE_REGION }}{{ form.ADMINISTRATIVE_REGION_NAME }}
经度专家名称 {{ form.EXPERT_NAME }} 性别{{ form.GENDER }}{{ form.GENDER === '0'?'男':'女' }}