2024-6-25 出证下载

.env.development

@@ -6,6 +6,7 @@ ENV = 'development'
 
 # 北京继续教育/开发环境
 VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API2 = 'http://192.168.1.62:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/jianlirenyuan/chengji/index.vue

@@ -67,9 +67,12 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<el-dialog title="证书下载" width="50vw" :visible.sync="zsShow" >
-			 <div style="height: 40vh;">
-				 
+		<el-dialog title="证书下载" width="60vw"  :visible.sync="zsShow" >
+			 <div style="height: 60vh;">
+			 	<iframe :src="iframeUrl" style="width: 100%;height: 100%;"></iframe>
+			 </div>
+			 <div slot="footer" class="dialog-footer">
+			  	<el-button type="danger" @click="xiazai">下 载</el-button> 
 			 </div>
 		</el-dialog>
 		<div class="shijuan">
@@ -85,6 +88,7 @@
 		getKsList,getFinishSjInfo
 	} from "@/api/jianliyuan/index"
 	import finishSj from "../../components/shijuan/finishSj" 
+	import { Base64 } from "js-base64";
 	export default {
 		name: "Chengji",
 		components:{
@@ -103,7 +107,10 @@
 				sjContent:null,
 				sjConfig:null,
 				title:null,
-				zsShow:false
+				zsShow:false,
+				filePath:null,
+				baseUrl:process.env.VUE_APP_BASE_API2,
+				iframeUrl:null
 			}
 		},
 		created() {
@@ -142,7 +149,18 @@
 				this.ksShow = false
 			},
 			zsDownload(row){
+				this.iframeUrl =  `http://192.168.1.56:8201/onlinePreview?url=` +
+					encodeURIComponent(
+						Base64.encode(this.baseUrl+'/profile'+row.pdfpath)
+					) 
+				this.filePath =row.pdfpath
 				this.zsShow = true
+			},
+			//下载
+			xiazai(){
+				this.download('common/download', {
+					fileName:this.filePath,delete:false
+				}, `资格证书.pdf`)
 			}
 		}
 	}

src/views/jianlirenyuan/peixunList/index.vue

@@ -89,10 +89,13 @@
 		<el-dialog title="继续教育学习" :visible.sync="studyShow" fullscreen destroy-on-close :before-close="studyOver">
 			<xuexi :classData="classData"></xuexi>
 		</el-dialog>
-		<el-dialog title="证书下载" width="50vw" :visible.sync="zsShow" >
-			 <div style="height: 40vh;">
-				 
-			 </div>
+		<el-dialog title="证书下载" width="60vw" :visible.sync="zsShow" >
+			<div style="height: 60vh;">
+				<iframe :src="iframeUrl" style="width: 100%;height: 100%;"></iframe>
+			</div>
+			<div slot="footer" class="dialog-footer">
+			 	<el-button type="danger" @click="xiazai">下 载</el-button> 
+			</div>
 		</el-dialog>
 		<div class="shijuan">
 			<el-dialog title="继续教育考试" :visible.sync="ksShow" :show-close="false" fullscreen destroy-on-close >
@@ -111,6 +114,7 @@
 	import xuexi from "../../components/xuexi/index"
 	import zhengjuan from "../../components/shijuan/zhengjuan"
 	import zhuti from "../../components/shijuan/zhuti"
+	import { Base64 } from "js-base64";
 	export default {
 		name: "PeixunList",
 		components:{
@@ -128,7 +132,10 @@
 				sjConfig:null,
 				personId:null,
 				sjTYpe:'zj',
-				zsShow:false
+				zsShow:false,
+				filePath:null,
+				baseUrl:process.env.VUE_APP_BASE_API2,
+				iframeUrl:null
 			}
 		},
 		created() {
@@ -166,7 +173,18 @@
 			},
 			//证书下载
 			zsDownload(row){
+				this.iframeUrl =  `http://192.168.1.56:8201/onlinePreview?url=` +
+					encodeURIComponent(
+						Base64.encode(this.baseUrl+'/profile'+row.pdfpath)
+					) 
+				this.filePath =row.pdfpath
 				this.zsShow = true
+			},
+			//下载
+			xiazai(){
+				this.download('common/download', {
+					fileName:this.filePath,delete:false
+				}, `资格证书.pdf`)
 			}
 			
 		}

src/views/xiehui/zgks/ZigeTraining/index.vue

@@ -2,16 +2,16 @@
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 			label-width="68px">
-			<el-form-item label="计划名称" prop="TrainName">
-				<el-input v-model="queryParams.TrainName" placeholder="请输入计划名称" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
 			<el-form-item label="培训类别" prop="ZcsZhuanYe">
 				<el-select v-model="queryParams.ZcsZhuanYe" placeholder="请选择培训类别" clearable>
 					<el-option v-for="dict in dict.type.jxjy_zhuanye" :key="dict.value" :label="dict.label"
 						:value="dict.value" />
 				</el-select>
 			</el-form-item>
+			<el-form-item label="培训名称" prop="TrainName">
+				<el-input v-model="queryParams.TrainName" placeholder="请输入计划名称" clearable
+					@keyup.enter.native="handleQuery" />
+			</el-form-item> 
 			<el-form-item label="年" prop="QiciYear">
 				<el-input v-model="queryParams.QiciYear" placeholder="请输入年" clearable
 					@keyup.enter.native="handleQuery" />
@@ -19,55 +19,24 @@
 			<el-form-item label="期次" prop="QiCi">
 				<el-input v-model="queryParams.QiCi" placeholder="请输入期次" clearable @keyup.enter.native="handleQuery" />
 			</el-form-item>
-			<el-form-item label="学时" prop="XueShi">
-				<el-input v-model="queryParams.XueShi" placeholder="请输入学时" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="培训开始时间" prop="StartDate">
+			
+			<el-form-item label="开始时间" prop="StartDate">
 				<el-date-picker clearable v-model="queryParams.StartDate" type="date" value-format="yyyy-MM-dd"
 					placeholder="请选择培训开始时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="培训结束时间" prop="EndDate">
+			<el-form-item label="结束时间" prop="EndDate">
 				<el-date-picker clearable v-model="queryParams.EndDate" type="date" value-format="yyyy-MM-dd"
 					placeholder="请选择培训结束时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="报名人数" prop="BmNum">
-				<el-input v-model="queryParams.BmNum" placeholder="请输入报名人数" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="报名最大人数" prop="BmNumMax">
-				<el-input v-model="queryParams.BmNumMax" placeholder="请输入报名最大人数" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="通知审核 0未审核  1审核" prop="ShenHe">
+			
+			<el-form-item label="通知审核" prop="ShenHe">
 				<el-select v-model="queryParams.ShenHe" placeholder="请选择通知审核 0未审核  1审核" clearable>
 					<el-option v-for="dict in dict.type.jxjy_shenhe" :key="dict.value" :label="dict.label"
 						:value="dict.value" />
 				</el-select>
 			</el-form-item>
-			<el-form-item label="添加时间" prop="AddDate">
-				<el-date-picker clearable v-model="queryParams.AddDate" type="date" value-format="yyyy-MM-dd"
-					placeholder="请选择添加时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="每学时多少分钟" prop="Minute">
-				<el-input v-model="queryParams.Minute" placeholder="请输入每学时多少分钟" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="缴费金额" prop="money">
-				<el-input v-model="queryParams.money" placeholder="请输入缴费金额" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="选课名称" prop="className">
-				<el-input v-model="queryParams.className" placeholder="请输入选课名称" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item label="考试名称" prop="ksName">
-				<el-input v-model="queryParams.ksName" placeholder="请输入考试名称" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,34 +65,39 @@
 
 		<el-table v-loading="loading" :data="ZigeTrainingList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="期次" align="center" prop="QiCi" />
+			<el-table-column label="期次" align="center" prop="QiCi">
+				<template slot-scope="scope">
+					{{scope.row.QiciYear+"年 第"+scope.row.QiCi+"期"}}
+				</template>
+			</el-table-column>
 			<el-table-column label="培训类别" align="center" prop="ZcsZhuanYe">
 				<template slot-scope="scope">
 					<dict-tag :options="dict.type.jxjy_zhuanye" :value="scope.row.ZcsZhuanYe" />
 				</template>
 			</el-table-column>
-			<el-table-column label="培训计划名称" align="center" prop="TrainName" />
-			<el-table-column label="培训开始时间" align="center" prop="StartDate" width="180">
+			<el-table-column label="培训计划名称" align="center" prop="TrainName" width="400" />
+			<el-table-column label="培训开始时间" align="center" prop="StartDate" width="100">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.StartDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="培训结束时间" align="center" prop="EndDate" width="180">
+			<el-table-column label="培训结束时间" align="center" prop="EndDate" width="100">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.EndDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="报名截止时间" align="center" prop="BmEndDate" width="180">
+			<el-table-column label="培训地点" align="center" prop="dishi" />
+			
+			<el-table-column label="现报人数" align="center" prop="BmNum" />
+			<el-table-column label="报名上限" align="center" prop="BmNumMax" />
+			<el-table-column label="审核状态" align="center" prop="ShenHe">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.BmEndDate, '{y}-{m}-{d}') }}</span>
+					<dict-tag :options="dict.type.jxjy_shenhe" :value="scope.row.ShenHe" />
 				</template>
 			</el-table-column>
-			<el-table-column label="地点" align="center" prop="dishi" />
-			<el-table-column label="报名人数" align="center" prop="BmNum" />
-			<el-table-column label="报名最大人数" align="center" prop="BmNumMax" />
-			<el-table-column label="通知审核 0未审核  1审核" align="center" prop="ShenHe">
+			<!-- <el-table-column label="报名截止时间" align="center" prop="BmEndDate" width="180">
 				<template slot-scope="scope">
-					<dict-tag :options="dict.type.jxjy_shenhe" :value="scope.row.ShenHe" />
+					<span>{{ parseTime(scope.row.BmEndDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="添加时间" align="center" prop="AddDate" width="180">
@@ -139,7 +113,7 @@
 			<el-table-column label="缴费金额" align="center" prop="Undef3" />
 			<el-table-column label="缴费金额" align="center" prop="money" />
 			<el-table-column label="选课名称" align="center" prop="className" />
-			<el-table-column label="考试名称" align="center" prop="ksName" />
+			<el-table-column label="考试名称" align="center" prop="ksName" /> -->
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -154,86 +128,87 @@
 			@pagination="getList" />
 
 		<!-- 添加或修改资格考试培训计划对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="类别id字典  监理工程师 监理员" prop="ZYIdList">
-					<el-input v-model="form.ZYIdList" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="计划名称" prop="TrainName">
-					<el-input v-model="form.TrainName" placeholder="请输入计划名称" />
-				</el-form-item>
-				<el-form-item label="培训类别" prop="ZcsZhuanYe">
-					<el-select v-model="form.ZcsZhuanYe" placeholder="请选择培训类别">
-						<el-option v-for="dict in dict.type.jxjy_zhuanye" :key="dict.value" :label="dict.label"
-							:value="dict.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="年" prop="QiciYear">
-					<el-input v-model="form.QiciYear" placeholder="请输入年" />
-				</el-form-item>
-				<el-form-item label="期次" prop="QiCi">
-					<el-input v-model="form.QiCi" placeholder="请输入期次" />
-				</el-form-item>
-				<el-form-item label="学时" prop="XueShi">
-					<el-input v-model="form.XueShi" placeholder="请输入学时" />
-				</el-form-item>
-				<el-form-item label="培训开始时间" prop="StartDate">
-					<el-date-picker clearable v-model="form.StartDate" type="date" value-format="yyyy-MM-dd"
-						placeholder="请选择培训开始时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="培训结束时间" prop="EndDate">
-					<el-date-picker clearable v-model="form.EndDate" type="date" value-format="yyyy-MM-dd"
-						placeholder="请选择培训结束时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="地点" prop="dishi">
-					<el-input v-model="form.dishi" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="报名人数" prop="BmNum">
-					<el-input v-model="form.BmNum" placeholder="请输入报名人数" />
-				</el-form-item>
-				<el-form-item label="报名最大人数" prop="BmNumMax">
-					<el-input v-model="form.BmNumMax" placeholder="请输入报名最大人数" />
-				</el-form-item>
-				<el-form-item label="通知审核 0未审核  1审核" prop="ShenHe">
-					<el-select v-model="form.ShenHe" placeholder="请选择通知审核 0未审核  1审核">
-						<el-option v-for="dict in dict.type.jxjy_shenhe" :key="dict.value" :label="dict.label"
-							:value="dict.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="添加时间" prop="AddDate">
-					<el-date-picker clearable v-model="form.AddDate" type="date" value-format="yyyy-MM-dd"
-						placeholder="请选择添加时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="备注" prop="BeiZhu">
-					<el-input v-model="form.BeiZhu" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="通知附件" prop="TongZhi">
-					<el-input v-model="form.TongZhi" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="每学时多少分钟" prop="Minute">
-					<el-input v-model="form.Minute" placeholder="请输入每学时多少分钟" />
-				</el-form-item>
-				<el-form-item label="选课1" prop="Undef1">
-					<el-input v-model="form.Undef1" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="考试名称1" prop="Undef2">
-					<el-input v-model="form.Undef2" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="缴费金额" prop="Undef3">
-					<el-input v-model="form.Undef3" type="textarea" placeholder="请输入内容" />
-				</el-form-item>
-				<el-form-item label="缴费金额" prop="money">
-					<el-input v-model="form.money" placeholder="请输入缴费金额" />
-				</el-form-item>
-				<el-form-item label="选课名称" prop="className">
-					<el-input v-model="form.className" placeholder="请输入选课名称" />
-				</el-form-item>
-				<el-form-item label="考试名称" prop="ksName">
-					<el-input v-model="form.ksName" placeholder="请输入考试名称" />
-				</el-form-item>
+		<el-dialog :title="title" :visible.sync="open" width="60vw" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="培训类别" prop="ZcsZhuanYe">
+							<el-select v-model="form.ZcsZhuanYe" placeholder="请选择培训类别">
+								<el-option v-for="dict in dict.type.jxjy_zhuanye" :key="dict.value" :label="dict.label"
+									:value="dict.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-row>
+							<el-col :span="12">
+								<el-form-item label="期次" prop="QiciYear">
+									<div class="flex-ac">
+										<el-input v-model="form.QiciYear" placeholder="请输入年" />年
+									</div>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="第" prop="QiCi">
+									<div class="flex-ac">
+										<el-input v-model="form.QiCi" placeholder="请输入期次" />期
+									</div>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="培训计划名称" prop="TrainName">
+							<el-input v-model="form.TrainName" placeholder="请输入计划名称" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-row>
+							<el-col :span="2">
+								地点
+							</el-col>
+							<el-col :span="22">
+								<el-form-item label="培训计划名称" prop="TrainName">
+									<el-input v-model="form.TrainName" placeholder="请输入计划名称" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="培训开始时间" prop="StartDate">
+							<el-date-picker clearable v-model="form.StartDate" type="date" value-format="yyyy-MM-dd"
+								placeholder="请选择培训开始时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="培训结束时间" prop="EndDate">
+							<el-date-picker clearable v-model="form.EndDate" type="date" value-format="yyyy-MM-dd"
+								placeholder="请选择培训结束时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="报名截止日期" prop="BmEndDate">
+							<el-date-picker clearable v-model="form.BmEndDate" type="date" value-format="yyyy-MM-dd"
+								placeholder="请选择培训结束时间">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="附件" prop="ShenHe">
+							<FileUpload  v-model="form.ShenHe"></FileUpload>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="是否审核" prop="ShenHe">
+							<el-select v-model="form.ShenHe" placeholder="请选择通知审核 0未审核  1审核">
+								<el-option v-for="dict in dict.type.jxjy_shenhe" :key="dict.value" :label="dict.label"
+									:value="dict.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row> 
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -315,7 +290,48 @@
 				// 表单参数
 				form: {},
 				// 表单校验
-				rules: {}
+				rules: {
+					ZcsZhuanYe:{
+						required: true,
+						message: '请选择培训类别',
+						trigger: ['blur', 'change']
+					},
+					QiciYear:{
+						required: true,
+						message: '请填写年',
+						trigger: ['blur', 'change']
+					},
+					QiCi:{
+						required: true,
+						message: '请填写次',
+						trigger: ['blur', 'change']
+					},
+					TrainName:{
+						required: true,
+						message: '请填写培训计划名称',
+						trigger: ['blur', 'change']
+					},
+					StartDate:{
+						required: true,
+						message: '请选择培训开始日期',
+						trigger: ['blur', 'change']
+					},
+					EndDate:{
+						required: true,
+						message: '请选择培训结束日期',
+						trigger: ['blur', 'change']
+					},
+					BmEndDate:{
+						required: true,
+						message: '请选择报名截止日期',
+						trigger: ['blur', 'change']
+					},
+					ShenHe:{
+						required: true,
+						message: '请选择是否审核',
+						trigger: ['blur', 'change']
+					}
+				}
 			};
 		},
 		created() {