12.20.1

.env.development

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

src/views/qiye/qiyeInfo/index.vue

@@ -1,237 +1,240 @@
 <template>
-	<div class="app-container">
-		<el-form :model="form" ref="form" :rules="rules" label-width="0px">
-			<el-row >
-				<el-col :span="24" class="m-b-20">
-					<el-descriptions class="margin-top" title="基本信息" :column="2" border>
-						<el-descriptions-item label="企业名称">
-							<el-form-item prop="qyname">
-								<el-input v-model="form.qyname" readonly placeholder="请输入企业名称" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="用 户 名">
-							<el-form-item prop="UserName">
-								<el-input v-model="form.username" readonly placeholder="请输入用户名" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="负责人姓名">
-							<el-form-item prop="name">
-								<el-input v-model="form.name" placeholder="请输入负责人姓名" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="手机号码">
-							<el-form-item prop="photo">
-								<el-input v-model="form.photo" placeholder="请输入手机号码" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="电子邮箱">
-							<el-form-item prop="lxryx">
-								<!-- <el-input v-model="form.lxryx" placeholder="请输入电子邮箱" /> -->
-								<el-select v-model="form.lxryx" style="width: 100%;" filterable :allow-create="type2" default-first-option :filter-method="searchEmail2" placeholder="请输入电子发票邮箱">
-								    <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
-								    </el-option>
-								  </el-select>
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="邮政编码">
-							<el-form-item prop="yjCode">
-								<el-input v-model="form.yjCode" placeholder="请输入邮政编码" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="通讯地址">
-							<el-form-item prop="kpzcdz">
-								<el-input v-model="form.kpzcdz" placeholder="请输入通讯地址" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="营业执照">
-							<el-form-item prop="UserName">
-								<ImagePreview :src="form.yyzz" ></ImagePreview>
-							</el-form-item>
-						</el-descriptions-item>
-					</el-descriptions>
-				</el-col>
-				<el-col :span="24" class="m-b-20">
-					<el-descriptions size="small" class="margin-top" title="开票信息" :column="2" border>
-						<!-- <el-descriptions-item label="注" :span="2">
+  <div class="app-container">
+    <el-form :model="form" ref="form" :rules="rules" label-width="0px">
+      <el-row>
+        <el-col :span="24" class="m-b-20">
+          <el-descriptions class="margin-top" title="基本信息" :column="2" border>
+            <el-descriptions-item label="企业名称">
+              <el-form-item prop="qyname">
+                <el-input v-model="form.qyname" readonly placeholder="请输入企业名称" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="用 户 名">
+              <el-form-item prop="UserName">
+                <el-input v-model="form.username" readonly placeholder="请输入用户名" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="负责人姓名">
+              <el-form-item prop="name">
+                <el-input v-model="form.name" placeholder="请输入负责人姓名" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="手机号码">
+              <el-form-item prop="photo">
+                <el-input v-model="form.photo" placeholder="请输入手机号码" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="电子邮箱">
+              <el-form-item prop="lxryx">
+                <!-- <el-input v-model="form.lxryx" placeholder="请输入电子邮箱" /> -->
+                <el-select v-model="form.lxryx" style="width: 100%;" filterable :allow-create="type2" default-first-option
+                  :filter-method="searchEmail2" placeholder="请输入电子发票邮箱">
+                  <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="邮政编码">
+              <el-form-item prop="yjCode">
+                <el-input v-model="form.yjCode" placeholder="请输入邮政编码" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="通讯地址">
+              <el-form-item prop="kpzcdz">
+                <el-input v-model="form.kpzcdz" placeholder="请输入通讯地址" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="营业执照">
+              <el-form-item prop="UserName">
+                <ImagePreview :src="form.yyzz"></ImagePreview>
+              </el-form-item>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="24" class="m-b-20">
+          <el-descriptions size="small" class="margin-top" title="开票信息" :column="2" border>
+            <!-- <el-descriptions-item label="注" :span="2">
 							开票类型选择“增值税普通发票”，可只填写开票单位、纳税人识别号与邮箱，“增值税专用发票”需完整填写下列除邮箱外全部信息
 						</el-descriptions-item> -->
-						<!-- <el-descriptions-item label="开票类型">
+            <!-- <el-descriptions-item label="开票类型">
 							<el-form-item prop="UserName">
 								<el-input v-model="form.UserName" placeholder="请输入企业名称" />
 							</el-form-item>
 						</el-descriptions-item> -->
-						<el-descriptions-item label="电子发票邮箱">
-							<el-form-item prop="dzfpyx">
-								<!-- <el-input v-model="form.dzfpyx" placeholder="请输入电子发票邮箱" /> -->
-								<el-select v-model="form.dzfpyx" style="width: 100%;" filterable :allow-create="type" default-first-option :filter-method="searchEmail" placeholder="请输入电子发票邮箱">
-								    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-								    </el-option>
-								  </el-select>
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="开票单位">
-							<el-form-item prop="qyname">
-								<el-input v-model="form.qyname" readonly placeholder="请输入开票单位" />
-							</el-form-item>
-						</el-descriptions-item>
-						<el-descriptions-item label="纳税人识别号">
-							<el-form-item prop="nsrsbh">
-								<el-input v-model="form.nsrsbh" placeholder="请输入纳税人识别号" />
-							</el-form-item>
-						</el-descriptions-item>
-					</el-descriptions>
-				</el-col>
-				<el-col :span="24">
-					<div class="flex-jc" style="text-align: center;">
-						<el-button type="danger" @click="saveInfo">保 存</el-button>
-					</div>
-				</el-col>
-			</el-row>
-		</el-form>
-	</div>
+            <el-descriptions-item label="电子发票邮箱">
+              <el-form-item prop="dzfpyx">
+                <!-- <el-input v-model="form.dzfpyx" placeholder="请输入电子发票邮箱" /> -->
+                <el-select v-model="form.dzfpyx" style="width: 100%;" filterable :allow-create="type" default-first-option
+                  :filter-method="searchEmail" placeholder="请输入电子发票邮箱">
+                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="开票单位">
+              <el-form-item prop="qyname">
+                <el-input v-model="form.qyname" readonly placeholder="请输入开票单位" />
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="纳税人识别号">
+              <el-form-item prop="nsrsbh">
+                <el-input v-model="form.nsrsbh" placeholder="请输入纳税人识别号" />
+              </el-form-item>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="24">
+          <div class="flex-jc" style="text-align: center;">
+            <el-button type="danger" @click="saveInfo">保 存</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
 </template>
 
 <script>
-	import { saveQyInfo } from "@/api/qiye/qyInfo"
-	export default {
-		name: "QiyeInfo",
-		data() {
-			var validatePass = (rule, value, callback) => {
-				let gz = /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/
-			  if ( !value) {
-			    callback(new Error('请填写邮箱'));
-			  } else if(!gz.test(value)){ 
-			    callback(new Error('请填写正确格式的邮箱'));
-			  }else{
-				  callback();
-			  }
-			};
-			return {
-				form: {},
-				rules:{
-					name:[
-						{ required: true,message: '请填写负责人姓名',trigger: ['blur', 'change'] }
-					],
-					photo:[
-						{ required: true,message: '请填写手机号码',trigger: ['blur', 'change'] }
-					],
-					lxryx:[
-						{validator: validatePass, trigger:['blur', 'change']}
-					],
-					yjCode:[
-						{ required: true,message: '请填写邮政编码',trigger: ['blur', 'change'] }
-					],
-					kpzcdz:[
-						{ required: true,message: '请填写通讯地址',trigger: ['blur', 'change'] }
-					],
-					dzfpyx:[
-						{validator: validatePass, trigger:['blur', 'change']}
-					],
-					nsrsbh:[
-						{ required: true,message: '请填写纳税人识别号',trigger: ['blur', 'change'] }
-					]
-				},
-				options:[],
-				options2:[],
-				type:false,
-				type2:false
-			}
-		},
-		created() {
-			this.form = this.$store.getters.userInfo
-		},
-		methods: {
-			searchEmail(e){ 
-				if(e.includes('@') == false){
-					this.type = false
-					this.options = [
-						{
-							value: e+'@163.com',
-							label: e+'@163.com'
-						},
-						{
-							value: e+'@126.com',
-							label: e+'@126.com'
-						},
-						{
-							value: e+'@yeah.net',
-							label: e+'@yeah.net'
-						},
-						{
-							value: e+'@qq.com',
-							label: e+'@qq.com'
-						},
-						{
-							value: e+'@gmail.com',
-							label: e+'@gmail.com'
-						},
-						{
-							value: e+'@outlook.com',
-							label: e+'@outlook.com'
-						},
-					]
-				}else{
-					this.type = true
-					this.options = []
-				}
-			},
-			searchEmail2(e){ 
-				if(e.includes('@') == false){
-					this.type2 = false
-					this.options2 = [
-						{
-							value: e+'@163.com',
-							label: e+'@163.com'
-						},
-						{
-							value: e+'@126.com',
-							label: e+'@126.com'
-						},
-						{
-							value: e+'@yeah.net',
-							label: e+'@yeah.net'
-						},
-						{
-							value: e+'@qq.com',
-							label: e+'@qq.com'
-						},
-						{
-							value: e+'@gmail.com',
-							label: e+'@gmail.com'
-						},
-						{
-							value: e+'@outlook.com',
-							label: e+'@outlook.com'
-						},
-					]
-				}else{
-					this.type2 = true
-					this.options2 = []
-				}
-			},
-			//保存企业信息
-			saveInfo(){
-				this.$refs.form.validate((valid) => {
-					if (valid) {
-						saveQyInfo(this.form).then(res=>{
-							this.$store.dispatch('GetInfo')
-						})
-					} else {
-					
-					}
-				});
-			}
-		}
-	}
+import { saveQyInfo } from "@/api/qiye/qyInfo"
+export default {
+  name: "QiyeInfo",
+  data() {
+    var validatePass = (rule, value, callback) => {
+      let gz = /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/
+      if (!value) {
+        callback(new Error('请填写邮箱'));
+      } else if (!gz.test(value)) {
+        callback(new Error('请填写正确格式的邮箱'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      form: {},
+      rules: {
+        name: [
+          { required: true, message: '请填写负责人姓名', trigger: ['blur', 'change'] }
+        ],
+        photo: [
+          { required: true, message: '请填写手机号码', trigger: ['blur', 'change'] }
+        ],
+        lxryx: [
+          { validator: validatePass, trigger: ['blur', 'change'] }
+        ],
+        yjCode: [
+          { required: true, message: '请填写邮政编码', trigger: ['blur', 'change'] }
+        ],
+        kpzcdz: [
+          { required: true, message: '请填写通讯地址', trigger: ['blur', 'change'] }
+        ],
+        dzfpyx: [
+          { validator: validatePass, trigger: ['blur', 'change'] }
+        ],
+        nsrsbh: [
+          { required: true, message: '请填写纳税人识别号', trigger: ['blur', 'change'] }
+        ]
+      },
+      options: [],
+      options2: [],
+      type: false,
+      type2: false
+    }
+  },
+  created() {
+    this.form = this.$store.getters.userInfo
+  },
+  methods: {
+    searchEmail(e) {
+      if (e.includes('@') == false) {
+        this.type = false
+        this.options = [
+          {
+            value: e + '@163.com',
+            label: e + '@163.com'
+          },
+          {
+            value: e + '@126.com',
+            label: e + '@126.com'
+          },
+          {
+            value: e + '@yeah.net',
+            label: e + '@yeah.net'
+          },
+          {
+            value: e + '@qq.com',
+            label: e + '@qq.com'
+          },
+          {
+            value: e + '@gmail.com',
+            label: e + '@gmail.com'
+          },
+          {
+            value: e + '@outlook.com',
+            label: e + '@outlook.com'
+          },
+        ]
+      } else {
+        this.type = true
+        this.options = []
+      }
+    },
+    searchEmail2(e) {
+      if (e.includes('@') == false) {
+        this.type2 = false
+        this.options2 = [
+          {
+            value: e + '@163.com',
+            label: e + '@163.com'
+          },
+          {
+            value: e + '@126.com',
+            label: e + '@126.com'
+          },
+          {
+            value: e + '@yeah.net',
+            label: e + '@yeah.net'
+          },
+          {
+            value: e + '@qq.com',
+            label: e + '@qq.com'
+          },
+          {
+            value: e + '@gmail.com',
+            label: e + '@gmail.com'
+          },
+          {
+            value: e + '@outlook.com',
+            label: e + '@outlook.com'
+          },
+        ]
+      } else {
+        this.type2 = true
+        this.options2 = []
+      }
+    },
+    //保存企业信息
+    saveInfo() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          saveQyInfo(this.form).then(res => {
+            this.$store.dispatch('GetInfo')
+          })
+        } else {
+
+        }
+      });
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	::v-deep .el-descriptions-item__label{
-		text-align: center !important;
-		
-	}
-	::v-deep .el-form-item{
-		margin-bottom: 10px !important;
-		margin-top: 10px !important;
-	}
-</style>
+::v-deep .el-descriptions-item__label {
+  text-align: center !important;
+
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 10px !important;
+  margin-top: 10px !important;
+}
+</style>

src/views/qiye/zgks/ZigePerson/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label-width="60px" label="期次" prop="QiciYear">
+      <!-- <el-form-item label-width="60px" label="期次" prop="QiciYear">
         <div style="display: flex">
           <div style="display: flex">
             <el-input v-model="queryParams.QiciYear" placeholder="请输入年" clearable style="width: 140px"
@@ -16,6 +16,16 @@
             </div>
           </el-form-item>
         </div>
+      </el-form-item> -->
+      <el-form-item label="期次（年）" label-width="100px" prop="QiciYear">
+        <el-date-picker format="yyyy" value-format="yyyy" v-model="queryParams.QiciYear" type="year"
+          placeholder="请选择期次（年）" @change="changeYear">
+        </el-date-picker>
+        <span style="display: inline-block; margin: 0 10px 0 15px">-</span>
+      </el-form-item>
+      <el-form-item prop="QiCi">
+        <el-input v-model="queryParams.QiCi" :disabled="queryParams.QiciYear == null" style="width: 150px"
+          placeholder="期次" type="number" min="0"></el-input>
       </el-form-item>
       <el-form-item label="培训类别" prop="ZYIdList">
         <el-select v-model="queryParams.ZYIdList" placeholder="请选择培训类别" clearable>
@@ -48,10 +58,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['zgks:ZigePerson:add']">新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['zgks:ZigePerson:edit']">修改</el-button>
@@ -68,7 +78,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ZigePersonList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="45" align="center" /> -->
+      <el-table-column type="selection" width="45" align="center" />
       <el-table-column label="报名表" width="80" align="center" prop="">
         <template slot-scope="scope">
           <el-button @click="handleDownload(scope.row)" size="mini" type="danger">下载</el-button>
@@ -82,7 +92,7 @@
           {{ getXvhao(scope.$index, queryParams) }}
         </template>
       </el-table-column>
-      <el-table-column label="期次" align="center" prop="ZYIdList">
+      <el-table-column width="130" label="期次" align="center" prop="ZYIdList">
         <template slot-scope="scope">
           <span>{{
             scope.row.QiciYear + "年 第" + scope.row.QiCi + "期"
@@ -104,13 +114,13 @@
       <el-table-column label="性别" width="50" align="center" prop="UserSex" />
       <el-table-column label="身份证" align="center" width="170" prop="UserCord" />
       <el-table-column label="联系电话" align="center" width="110" prop="UserPhone" />
-      <el-table-column label="培训类别" align="center">
+      <el-table-column width="110" label="培训类别" align="center">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.jxjy_zhuanye" :value="scope.row.ZYIdList" />
         </template>
       </el-table-column>
-      <el-table-column label="执业单位" align="center" prop="DeptName" />
-      <el-table-column label="报名时间" align="center" prop="UserPwd">
+      <el-table-column width="250" label="执业单位" align="center" prop="DeptName" />
+      <el-table-column label="报名时间" width="100" align="center" prop="UserPwd">
         <template slot-scope="scope">
           {{ parseTime(scope.row.AddDate, "{y}-{m}-{d}") }}
         </template>
@@ -126,20 +136,33 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="培训点审核状态" align="center" prop="pxshenhe">
+      <el-table-column label="培训点审核状态" width="120" align="center" prop="pxshenhe">
         <template slot-scope="scope">
-          {{
-            scope.row.pxshenhe == 0
-            ? "待审核"
-            : scope.row.pxshenhe == 2
-              ? "不通过" + '(' + scope.row.pxshyj + ')'
-              : scope.row.pxshenhe == 1
-                ? "审核通过"
-                : "材料补正"
-          }}
+          <el-tag type="" v-if="scope.row.pxshenhe == 0">待审核</el-tag>
+          <el-tag type="success" v-if="scope.row.pxshenhe == 1">审核通过</el-tag>
+          <el-popover v-else-if="scope.row.pxshenhe == 2" placement="left" width="200" trigger="hover">
+            <template slot="reference">
+              <el-tag type="danger">不通过(原因)</el-tag>
+            </template>
+            <div v-html="scope.row.pxshyj"></div>
+          </el-popover>
+          <el-tag type="warning" v-if="scope.row.pxshenhe == 3">材料补正</el-tag>
+          <!-- <el-popover placement="left" title="原因：" width="400" trigger="hover">
+            <template slot="reference">
+              {{
+                scope.row.pxshenhe == 0
+                ? "待审核"
+                : scope.row.pxshenhe == 2
+                  ? "不通过"
+                  : scope.row.pxshenhe == 1
+                    ? "审核通过"
+                    : "材料补正"
+              }}</template>
+            <div v-html="scope.row.pxshyj"></div>
+          </el-popover> -->
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" width="170" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-s-check" @click="shenhe(scope.row)"
             v-if="scope.row.grshenhe != 1">审核</el-button>
@@ -469,6 +492,11 @@ export default {
       });
       // });
     },
+    changeYear() {
+      if (this.queryParams.QiciYear == null) {
+        this.queryParams.QiCi = null
+      }
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs.zgks.submit();

src/views/xiehui/jlryglxt/supervisionManage.vue

@@ -481,16 +481,16 @@
       <el-row justify="40" style="margin-left: 20px;">
         <el-col :span="12"> <el-link type="primary" :underline="false"
             style="font-size:14px;margin-top: 10px; vertical-align: baseline;"
-            @click="importTemplate">监理员导入模板</el-link></el-col>
+            @click="importTemplate(1, '监理员导入模板')">监理员导入模板</el-link></el-col>
         <el-col :span="12"> <el-link type="primary" :underline="false"
             style="font-size:14px;margin-top: 10px; vertical-align: baseline;"
-            @click="importTemplate">监理工程师导入模板</el-link></el-col>
+            @click="importTemplate(2, '监理工程师导入模板')">监理工程师导入模板</el-link></el-col>
         <el-col :span="12"> <el-link type="primary" :underline="false"
             style="font-size:14px;margin-top: 10px; vertical-align: baseline;"
-            @click="importTemplate">总监理工程师导入模板</el-link></el-col>
+            @click="importTemplate(3, '总监理工程师导入模板')">总监理工程师导入模板</el-link></el-col>
         <el-col :span="12"><el-link type="primary" :underline="false"
             style="font-size:14px;margin-top: 10px; vertical-align: baseline;"
-            @click="importTemplate">单位变更人员模板</el-link></el-col>
+            @click="importTemplate(4, '单位变更人员导入模板')">单位变更人员模板</el-link></el-col>
       </el-row>
 
 
@@ -504,7 +504,6 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div> -->
           <span>仅允许导入xls、xlsx格式文件。</span>
-
         </div>
 
       </el-upload>
@@ -705,9 +704,9 @@ export default {
   },
   methods: {
     /** 下载模板操作 */
-    importTemplate() {
-      // this.download('system/user/importTemplate', {
-      // }, `user_template_${new Date().getTime()}.xlsx`)
+    importTemplate(v, i) {
+      this.download('/jlry/RenCai/importTemplate/' + v, {
+      }, `${i}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

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

@@ -7,7 +7,17 @@
       <el-form-item label="身份证" prop="UserCord">
         <el-input v-model="queryParams.UserCord" placeholder="请输入身份证" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="期次" prop="QiciYear">
+      <el-form-item label="期次（年）" label-width="100px" prop="QiciYear">
+        <el-date-picker format="yyyy" value-format="yyyy" v-model="queryParams.QiciYear" type="year"
+          placeholder="请选择期次（年）" @change="changeYear">
+        </el-date-picker>
+        <span style="display: inline-block; margin: 0 10px 0 15px">-</span>
+      </el-form-item>
+      <el-form-item prop="QiCi">
+        <el-input v-model="queryParams.QiCi" :disabled="queryParams.QiciYear == null" style="width: 150px"
+          placeholder="期次" type="number" min="0"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="期次" prop="QiciYear">
         <div style="display: flex">
           <div style="display: flex">
             <el-input v-model="queryParams.QiciYear" placeholder="请输入年" clearable style="width: 140px"
@@ -22,7 +32,7 @@
             </div>
           </el-form-item>
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="地点" prop="City">
         <el-select v-model="queryParams.City" placeholder="请选择地点" clearable>
           <el-option v-for="dict in dict.type.zgks_address" :key="dict.label" :label="dict.label" :value="dict.label" />
@@ -61,11 +71,15 @@
           <dict-tag :options="dict.type.zgks_address" :value="scope.row.City" />
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="UserName">
+      <el-table-column width="130" label="姓名" align="center" prop="UserName">
         <template slot-scope="scope">
-          <el-button type="text" @click="handleUpdate(scope.row, false)">{{
-            scope.row.UserName
-          }}</el-button>
+          <el-button type="text" @click="handleUpdate(scope.row, false)">
+            <span style="">
+              {{
+                scope.row.UserName
+              }}
+            </span>
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column label="性别" align="center" prop="UserSex" />
@@ -95,7 +109,7 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleUpdate(scope.row, false)">详细</el-button>
         </template>
@@ -360,6 +374,11 @@ export default {
         });
       });
     },
+    changeYear() {
+      if (this.queryParams.QiciYear == null) {
+        this.queryParams.QiCi = null
+      }
+    },
     //撤回
     chehui(row) {
       this.reset();

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

@@ -9,12 +9,22 @@
       <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-form-item label="期次（年）" label-width="100px" prop="QiciYear">
+        <el-date-picker format="yyyy" value-format="yyyy" v-model="queryParams.QiciYear" type="year"
+          placeholder="请选择期次（年）" @change="changeYear">
+        </el-date-picker>
+        <span style="display: inline-block; margin: 0 10px 0 15px">-</span>
+      </el-form-item>
+      <el-form-item prop="QiCi">
+        <el-input v-model="queryParams.QiCi" :disabled="queryParams.QiciYear == null" style="width: 150px"
+          placeholder="期次" type="number" min="0"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="年" prop="QiciYear">
         <el-input v-model="queryParams.QiciYear" placeholder="请输入年" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="期次" prop="QiCi">
         <el-input v-model="queryParams.QiCi" placeholder="请输入期次" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="开始时间" prop="StartDate">
         <el-date-picker clearable v-model="queryParams.StartDate" type="date" value-format="yyyy-MM-dd"
@@ -752,6 +762,11 @@ export default {
       this.open = true;
       this.title = "添加资格考试培训计划";
     },
+    changeYear() {
+      if (this.queryParams.QiciYear == null) {
+        this.queryParams.QiCi = null
+      }
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

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

@@ -62,7 +62,7 @@
         <el-table-column label="性别" align="center" prop="UserSex" width="55" />
         <el-table-column label="身份证" align="center" prop="UserCord" width="170" />
         <el-table-column label="联系电话" align="center" width="110" prop="UserPhone" />
-        <el-table-column label="培训类别" align="center">
+        <el-table-column label="培训类别" width="100" align="center">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.jxjy_zhuanye" :value="scope.row.ZYIdList" />
           </template>
@@ -85,6 +85,18 @@
         </el-table-column>
         <el-table-column width="100" label="培训点审核" align="center" prop="pxshenhe">
           <template slot-scope="scope">
+            <el-tag type="" v-if="scope.row.pxshenhe == 0">待审核</el-tag>
+            <el-tag type="success" v-if="scope.row.pxshenhe == 1">审核通过</el-tag>
+            <el-popover v-else-if="scope.row.pxshenhe == 2" placement="left" width="200" trigger="hover">
+              <template slot="reference">
+                <el-tag type="danger">不通过(原因)</el-tag>
+              </template>
+              <div v-html="scope.row.pxshyj"></div>
+            </el-popover>
+            <el-tag type="warning" v-if="scope.row.pxshenhe == 3">材料补正</el-tag>
+
+          </template>
+          <!-- <template slot-scope="scope">
             {{
               scope.row.pxshenhe == null || scope.row.pxshenhe == 0
               ? ""
@@ -94,16 +106,16 @@
                   ? "审核通过"
                   : "材料补正"
             }}
-          </template>
-        </el-table-column>
-        <el-table-column label="原因" align="center" prop="pxshyj">
+          </template> -->
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <!-- <el-table-column label="原因" align="center" prop="pxshyj">
+        </el-table-column> -->
+        <el-table-column fixed="right" width="120" label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-s-check" v-if="scope.row.grshenhe == null ||
-                    scope.row.grshenhe == 1 ||
-                    scope.row.pxshenhe == 0
-                    " @click="shenhe(scope.row, false)">审核</el-button>
+              scope.row.grshenhe == 1 ||
+              scope.row.pxshenhe == 0
+              " @click="shenhe(scope.row, false)">审核</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" style="color: #f56c6c"
               @click="handleUpdate(scope.row, false)">删除</el-button>
           </template>