bug修改

zhouwx

2025-03-05 39f97341210dabcffbd50f1cea5bd697a602bb7b

bug修改

 src/layout/components/Register/index.vue

@@ -8,7 +8,7 @@
      </template>
      <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form" label-position="top">
        <el-row :gutter="30">
          <el-col :span="8">
          <el-col :span="6">
            <el-form-item prop="agency.name" label="机构名称">
              <el-input
                  :disabled="isAbleEdit"
@@ -19,7 +19,7 @@
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
          <el-col :span="6">
            <el-form-item prop="agency.creditCode" label="社会信用代码">
              <el-input
                  :disabled="isAbleEdit"
@@ -30,12 +30,19 @@
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
          <el-col :span="6">
            <el-form-item prop="agency.attribute" label="机构属性">
              <el-radio-group v-model="registerForm.agency.attribute" style="width: 50%" @change="changeAttr()">
                <el-radio :label="0" size="large" border>疆内</el-radio>
                <el-radio :label="1" size="large" border>疆外</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item prop="agency.businessType" label="业务类别">
              <el-checkbox-group v-model="registerForm.agency.businessType">
                <el-checkbox v-for="item in state.businessTypeList" :label="item.value" :key="item.value">{{ item.label }}</el-checkbox>
              </el-checkbox-group>
            </el-form-item>
          </el-col>
        </el-row>
@@ -365,13 +372,24 @@
      regAddress: '',
      business: '',
      reportPath: '',
      certPath: ''
      certPath: '',
      businessType: [],
    },
    username: '',
    phone: '',
    password: '',
    confirmPassword: ''
  }
  },
  businessTypeList: [
    {
      value: 1,
      label: '安全评价'
    },
    {
      value: 2,
      label: '检验检测'
    },
  ]
})
const isSuper = ref(false);

@@ -478,6 +496,7 @@
  "agency.name": [{required: true, trigger: "blur", message: "请输入机构名称"}],
  "agency.creditCode": [{required: true, trigger: "blur", message: "请输入社会信用代码"}],
  "agency.attribute": [{required: true, trigger: "blur", message: "请选择机构属性"}],
  "agency.businessType": [{required: true, trigger: "blur", message: "请选择业务类别"}],
  "agency.area": [{required: true, trigger: "blur", message: "请选择实际经营地址所属区域"}],
  "agency.address": [{required: true, trigger: "blur", message: "请输入实际经营地址"}],
  "agency.legalPerson": [{required: true, trigger: "blur", message: "请输入法定代表人"}],
@@ -550,6 +569,7 @@
        state.registerForm.phone = info.user.phone
        startPhone.value = info.user.phone
        state.registerForm.agency.business = info.business.split(',').map(Number)
        state.registerForm.agency.businessType = info.businessType ? info.businessType.split(',').map(Number) : []
          if(state.registerForm.agency.attribute === 0){
              state.registerForm.agency.area = [info.city,info.district].filter(item => { return item && item.trim() })
          }else {
@@ -713,6 +733,7 @@
        const {confirmPassword,id, ...data} = JSON.parse(JSON.stringify(state.registerForm))
        data.password = Base64.encode(data.password)
        data.agency.business = data.agency.business.join(',')
        data.agency.businessType = data.agency.businessType.join(',')
        const cert = state.certList.map(item => item.response ?item.response.data.path:item.url)
        data.agency.certPath = cert.join(',')
        delete data.agency.area
@@ -748,6 +769,7 @@
          const {confirmPassword, ...data} = JSON.parse(JSON.stringify(state.registerForm))
          data.password = Base64.encode(data.password)
          data.agency.business = data.agency.business.join(',')
          data.agency.businessType = data.agency.businessType.join(',')
        console.log('rea',state.certList)
          const cert = state.certList.map(item => item.response ?item.response.data.path:item.url)
          data.agency.certPath = cert.join(',')

 src/views/safetyReview/institution/components/viewInstitution.vue

@@ -2,7 +2,7 @@
    <el-dialog v-model="dialogVisible" width="75%" top="50vh" align-center @close="closeDialog">
        <el-form ref="registerRef" :model="registerForm" class="register-form" label-position="top">
            <el-row :gutter="30">
                <el-col :span="8">
                <el-col :span="6">
                    <el-form-item prop="agency.name" label="机构名称">
                        <el-input
                            disabled
@@ -13,7 +13,7 @@
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                <el-col :span="6">
                    <el-form-item prop="agency.creditCode" label="社会信用代码">
                        <el-input
                            disabled
@@ -24,7 +24,7 @@
                        </el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="8">
                <el-col :span="6">
                    <el-form-item prop="agency.attribute" label="机构属性">
                        <el-radio-group v-model="registerForm.agency.attribute" style="width: 50%" disabled>
                            <el-radio :label="0" size="large">疆内</el-radio>
@@ -32,6 +32,13 @@
                        </el-radio-group>
                    </el-form-item>
                </el-col>
              <el-col :span="6">
                <el-form-item prop="agency.businessType" label="业务类别">
                  <el-checkbox-group v-model="registerForm.agency.businessType" disabled>
                    <el-checkbox v-for="item in registerForm.businessTypeList" :label="item.value" :key="item.value">{{ item.label }}</el-checkbox>
                  </el-checkbox-group>
                </el-form-item>
              </el-col>
            </el-row>
            <el-row :gutter="30">
                <el-col :span="12">
@@ -284,11 +291,22 @@
        regAddress: '',
        business: '',
        reportPath: '',
        businessType: []
    },
    username: '',
    phone: '',
    password: '',
    confirmPassword: ''
    confirmPassword: '',
    businessTypeList: [
      {
        value: 1,
        label: '安全评价'
      },
      {
        value: 2,
        label: '检验检测'
      },
    ]
});


@@ -356,6 +374,7 @@
            registerForm.value.agency.area = [res.data.province,res.data.city,res.data.district].filter(item => { return item && item.trim() })
        }
        registerForm.value.agency.business = res.data.business.split(",").map(Number)
        registerForm.value.agency.businessType = res.data.businessType ? res.data.businessType.split(',').map(Number): []
        imageUrl.value = import.meta.env.VITE_APP_BASE_API + "/" +  res.data.reportPath
        srcList.value.push(imageUrl.value)


 src/views/safetyReview/userManage/institutionUsers/index.vue

@@ -1,12 +1,22 @@
<template>
    <div class="app-container">
      <div style="margin-top: 15px;margin-bottom: 15px;">
        <el-radio-group v-model="queryParams.attribute" @change="changeBtn">
          <el-radio-button label="">全部</el-radio-button>
          <el-radio-button label="0">疆内</el-radio-button>
          <el-radio-button label="1">疆外</el-radio-button>
        </el-radio-group>
      <div style="display: flex;align-items: center">
        <div style="margin: 15px 20px 15px 0;" >
          <el-radio-group v-model="queryParams.businessType" @change="changeBtn">
            <el-radio-button label="0">全部</el-radio-button>
            <el-radio-button label="1">安全评价</el-radio-button>
            <el-radio-button label="2">检验检测</el-radio-button>
          </el-radio-group>
        </div>
        <div style="margin: 15px  0">
          <el-radio-group v-model="queryParams.attribute" @change="changeBtn">
            <el-radio-button label="">全部</el-radio-button>
            <el-radio-button label="0">疆内</el-radio-button>
            <el-radio-button label="1">疆外</el-radio-button>
          </el-radio-group>
        </div>
      </div>

        <div style="margin-bottom: 10px">
          <el-form :inline="true" style="display: flex;align-items: flex-start;flex-wrap: wrap;" >
            <el-form-item label="机构名称：" >
@@ -52,6 +62,12 @@
          <el-table-column label="信用代码" prop="agency.creditCode" align="center"/>
          <el-table-column label="用户名" prop="username" align="center" />
          <el-table-column label="注册手机号" prop="phone" align="center"/>
          <el-table-column label="业务类别" prop="businessType" align="center">
            <template #default="scope">
              <span>{{scope.row.agency.businessType == 1 ? '安全评价' :scope.row.agency.businessType == 2 ? '检验检测' :scope.row.agency.businessType == '1,2' ? '安全评价，检验检测' : ''}}</span>

            </template>
          </el-table-column>
          <el-table-column label="注册审批" prop="state" align="center">
            <template #default="scope">
              <el-tag :type=" scope.row.state == 0 ? 'info' : scope.row.state == 1 ? '' : scope.row.state == 2 ?'success': scope.row.state == 3 || scope.row.state == 4 ?'danger':''">
@@ -130,7 +146,8 @@
        pageSize: 10,
        agencyName: '',
        state: null,
      attribute: "",
        attribute: "",
        businessType: 0
    },
    total: 0,
    dataList: [],
@@ -279,6 +296,7 @@
    agencyName: '',
    state: null,
    attribute: "",
    businessType: 0
  }
  getList();
}