马宇豪
2024-11-27 2d0b3bbbd171344209a95c0df663be14fcedac96
更新
已修改5个文件
已删除1个文件
102 ■■■■ 文件已修改
.env.development 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safetyReview/expertManage/applyRecords/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safetyReview/expertManage/checkProgress/components/certificatePdf.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safetyReview/expertManage/checkProgress/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/safetyReview/expertManage/fillForm/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -5,8 +5,6 @@
VITE_APP_ENV = 'development'
# 专家管理系统/开发环境
#黄镇
#VITE_APP_BASE_API = 'http://192.168.0.47:8085'
#贺哥
VITE_APP_BASE_API = 'http://192.168.2.11:8585'
src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
@@ -118,6 +118,13 @@
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="最高学历" prop="degree">
                    <el-input v-model="state.form.degree" :readonly="state.disable"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="单位全称" prop="companyName">
                    <el-input v-model="state.form.companyName" :readonly="state.disable"></el-input>
                  </el-form-item>
@@ -169,13 +176,6 @@
                <el-col :span="20">
                  <el-form-item label="毕业学校">
                    <el-input v-model="state.form.graduationSchool" :readonly="state.disable"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="最高学历" prop="degree">
                    <el-input v-model="state.form.degree" :readonly="state.disable"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
src/views/safetyReview/expertManage/applyRecords/index.vue
@@ -6,7 +6,7 @@
              clearable
              v-model="queryParams.domain"
              :options="expertTypes"
              :props="{ expandTrigger: 'hover', value: 'classifyName',label: 'classifyName'}"
              :props="{ expandTrigger: 'hover', value: 'classifyName',label: 'classifyName',emitPath: false}"
              @change="handleChange"></el-cascader>
        </el-form-item>
        <el-form-item label="姓名">
@@ -78,7 +78,7 @@
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-button type="primary" link @click="openDialog('view',scope.row)">查看</el-button>
            <el-button type="primary" link @click="openDialog('edit',scope.row)">编辑</el-button>
            <el-button type="primary" link :disabled="scope.row.state == 2" @click="openDialog('edit',scope.row)">编辑</el-button>
            <el-button type="primary" v-if="scope.row.state !== 2 && scope.row.state !== 4" link @click="openDialog('assess',scope.row)">评定</el-button>
            <el-button type="danger" link @click="handleDelete(scope.row)"
            >删除</el-button>
src/views/safetyReview/expertManage/checkProgress/components/certificatePdf.vue
文件已删除
src/views/safetyReview/expertManage/checkProgress/index.vue
@@ -44,7 +44,6 @@
import { getToken } from "@/utils/auth"
import {getExpertsList, queryApprove} from "@/api/form";
import {listOutDept} from "@/api/system/dept";
import CertificatePdf from './components/certificatePdf'
const { proxy } = getCurrentInstance();
const router = useRouter()
let validatePhone = (rule, value, callback)=>{
@@ -119,11 +118,15 @@
}
const downloadPdf=(info)=>{
  const routePath = '/certPdf';
  const resolvedRoute = router.resolve(routePath);
  const queryString = new URLSearchParams(info).toString();
  const fullPath = `${resolvedRoute.href}?${queryString}`;
  window.open(fullPath, '_blank');
  if(info.state == 2){
    const routePath = '/certPdf';
    const resolvedRoute = router.resolve(routePath);
    const queryString = new URLSearchParams(info).toString();
    const fullPath = `${resolvedRoute.href}?${queryString}`;
    window.open(fullPath, '_blank');
  }else{
    ElMessage.warning('下载聘书需等待评定通过')
  }
}
const resetQuery = ()=>{
src/views/safetyReview/expertManage/fillForm/index.vue
@@ -111,6 +111,13 @@
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="最高学历" prop="degree">
                    <el-input v-model="state.form.degree"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="单位全称" prop="companyName">
                    <el-input v-model="state.form.companyName"></el-input>
                  </el-form-item>
@@ -162,13 +169,6 @@
                <el-col :span="20">
                  <el-form-item label="毕业学校">
                    <el-input v-model="state.form.graduationSchool"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row>
                <el-col :span="20">
                  <el-form-item label="最高学历" prop="degree">
                    <el-input v-model="state.form.degree"></el-input>
                  </el-form-item>
                </el-col>
              </el-row>