521 应急管理系统内所有搜索框都应该有重置按钮

509 办公电话是手机号码吗注意所有电话输入框 507 搜索框没有重置按钮 504 专家组成员新增按钮位置调整 500 删除成功没有提示 494 删除成功没有提示 491 应急管理所有的菜单列表有排序吗应该加排序根据创建时间或者修改时间或者其他逻辑
2024-08-23 15:15:34 +08:00 · 2024-08-23 15:15:34 +08:00 · 1937116ab2
parent ff38de8d48
commit 1937116ab2
8 changed files with 60 additions and 25 deletions
--- 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 @@
              <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
            </el-form-item>
          </el-col>
-          <el-col :span="12">
+          <el-col v-if="false" :span="12">
            <el-form-item label="机构密级" prop="SECURITY_LEVEL">
              <el-input v-model="form.SECURITY_LEVEL" placeholder="请输入机构密级..." />
            </el-form-item>
--- 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 @@
        <table class="table-ui">
          <tr>
            <td class="tbg">医疗机构名称</td>
-            <td>{{ form.INSTITUTION_NAME }}</td>
+            <td style="width: 30%">{{ form.INSTITUTION_NAME }}</td>
            <td class="tbg">地址</td>
            <td>{{ form.ADDRESS }}</td>
          </tr>
          <tr>
            <td class="tbg">医疗机构类型</td>
-            <td>{{ form.INSTITUTION_TYPE }}</td>
+            <td>{{ form.INSTITUTION_TYPE_NAME }}</td>
            <td class="tbg">医疗单位等级</td>
            <td>{{ form.INSTITUTION_LEVEL }}</td>
          </tr>
          <tr>
            <td class="tbg">邮编</td>
-            <td>{{ form.POSTAL_CODE }}</td>
-            <td class="tbg">机构密级</td>
-            <td>{{ form.INSTITUTION_SECURITY_LEVEL }}</td>
+            <td colspan="3">{{ form.POSTAL_CODE }}</td>
          </tr>
          <tr>
            <td class="tbg">值班电话</td>
@ -32,7 +30,7 @@
          </tr>
          <tr>
            <td class="tbg">所属区域</td>
-            <td colspan="3">{{ form.ADMINISTRATIVE_REGION }}</td>
+            <td colspan="3">{{ form.ADMINISTRATIVE_REGION_NAME }}</td>
          </tr>
          <tr>
            <td class="tbg">经度</td>
@ -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,
          // 纬度
--- 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 @@
              <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
            </el-form-item>
          </el-col>
-          <el-col :span="12">
+          <el-col v-if="false" :span="12">
            <el-form-item label="机构密级" prop="INSTITUTION_SECURITY_LEVEL">
-              <!--              <el-input v-model="form.INSTITUTION_SECURITY_LEVEL" placeholder="请输入机构密级..." />-->
              <Treeselect
                :options="yjinstitutionsettingData"
                :normalizer="normalizer"
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
@ -65,7 +65,7 @@
              <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
            </el-form-item>
          </el-col>
-          <el-col :span="12">
+          <el-col v-if="false" :span="12">
            <el-form-item label="机构密级" prop="SECURITY_LEVEL">
              <el-input v-model="form.SECURITY_LEVEL" placeholder="请输入机构密级..." />
            </el-form-item>
--- 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 @@
            <td class="tbg">专家名称</td>
            <td>{{ form.EXPERT_NAME }}</td>
            <td class="tbg">性别</td>
-            <td>{{ form.GENDER }}</td>
+            <td>{{ form.GENDER === '0'?'男':'女' }}</td>
          </tr>

          <tr>
--- 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
        })
--- 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(
--- 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 => {