From 2d0b3bbbd171344209a95c0df663be14fcedac96 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 27 十一月 2024 13:10:32 +0800
Subject: [PATCH] 更新
---
.env.development | 2 -
/dev/null | 53 --------------------------
src/views/safetyReview/expertManage/fillForm/index.vue | 14 +++---
src/views/safetyReview/expertManage/applyRecords/index.vue | 4 +-
src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue | 14 +++---
src/views/safetyReview/expertManage/checkProgress/index.vue | 15 ++++---
6 files changed, 25 insertions(+), 77 deletions(-)
diff --git a/.env.development b/.env.development
index 1104d7a..03765fa 100644
--- a/.env.development
+++ b/.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'
diff --git a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue b/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
index 59cf27e..6e35719 100644
--- a/src/views/safetyReview/expertManage/applyRecords/components/expertForm.vue
+++ b/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>
diff --git a/src/views/safetyReview/expertManage/applyRecords/index.vue b/src/views/safetyReview/expertManage/applyRecords/index.vue
index c62e07f..cc5552d 100644
--- a/src/views/safetyReview/expertManage/applyRecords/index.vue
+++ b/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>
diff --git a/src/views/safetyReview/expertManage/checkProgress/components/certificatePdf.vue b/src/views/safetyReview/expertManage/checkProgress/components/certificatePdf.vue
deleted file mode 100644
index 4ada139..0000000
--- a/src/views/safetyReview/expertManage/checkProgress/components/certificatePdf.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
- <div class="form-container">
- <div class="certContent">
- <div></div>
- </div>
- </div>
-</template>
-<script setup>
-import {reactive, ref, toRefs, onMounted} from 'vue'
-import {ElMessage, ElMessageBox} from "element-plus"
-import htmlToPdf from '@/utils/htmlToPdf';
-const { proxy } = getCurrentInstance();
-
-const data = reactive({
- info: {}
-})
-
-const {info} = toRefs(data)
-const deptList = ref([]);
-onMounted(()=>{
-
-})
-
-function getPdf(info) {
- console.log(info,'info')
- htmlToPdf();
-}
-
-onMounted(()=>{
-
-})
-
-defineExpose({
- getPdf
-})
-</script>
-
-<style scoped lang="scss">
-.form-container{
- padding: 20px;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-
- .certContent{
- width: 1123px;
- height: 794px;
- background: url("@/assets/images/certBg.jpg") no-repeat;
- background-size: contain;
- }
-}
-</style>
diff --git a/src/views/safetyReview/expertManage/checkProgress/index.vue b/src/views/safetyReview/expertManage/checkProgress/index.vue
index be60b04..fc32392 100644
--- a/src/views/safetyReview/expertManage/checkProgress/index.vue
+++ b/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 = ()=>{
diff --git a/src/views/safetyReview/expertManage/fillForm/index.vue b/src/views/safetyReview/expertManage/fillForm/index.vue
index 996a55d..410ff0f 100644
--- a/src/views/safetyReview/expertManage/fillForm/index.vue
+++ b/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>
--
Gitblit v1.9.2