Browse Source

Merge branch 'master' of http://121.28.134.38:2039/yuhuitao/bjjxjy-ui into dzl

dzl 2 months ago
parent
commit
2d61ba1363

+ 18 - 18
src/views/components/baoming/jlgcs.vue

@@ -234,9 +234,9 @@
               <el-form-item label="开票类型" prop="zigeperson.KplxFlg">
                 <el-radio-group v-model="classForm.zigeperson.KplxFlg"
                   @change="$refs.classForm.clearValidate(['zigeperson.Email', 'qiye.kplx', 'qiye.kpfs', 'qiye.kpdw', 'qiye.nsrsbh', 'qiye.dzfpyx'])">
-                  <!-- <el-radio :label="0">不需要开发票</el-radio> -->
-                  <el-radio :label="1">全电普票</el-radio>
-                  <el-radio :label="2">全电专票</el-radio>
+                  <el-radio :label="0">不开发票</el-radio>
+                  <el-radio :label="1">个人(普票)</el-radio>
+                  <el-radio :label="2">企业(专票)</el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
@@ -502,21 +502,21 @@ export default {
           message: '请输入负责人姓名',
           trigger: ['blur', 'change']
         },
-        'zigeperson.DeptLxrPhone': {
-          required: true,
-          message: '请输入手机号码',
-          trigger: ['blur', 'change']
-        },
-        'zigeperson.DeptZipcode': {
-          required: true,
-          message: '请输入邮政编码',
-          trigger: ['blur', 'change']
-        },
-        'zigeperson.DeptEmail': {
-          required: true,
-          message: '请输入电子邮箱',
-          trigger: ['blur', 'change']
-        },
+        // 'zigeperson.DeptLxrPhone': {
+        //   required: true,
+        //   message: '请输入手机号码',
+        //   trigger: ['blur', 'change']
+        // },
+        // 'zigeperson.DeptZipcode': {
+        //   required: true,
+        //   message: '请输入邮政编码',
+        //   trigger: ['blur', 'change']
+        // },
+        // 'zigeperson.DeptEmail': {
+        //   required: true,
+        //   message: '请输入电子邮箱',
+        //   trigger: ['blur', 'change']
+        // },
         'zigeperson.UserName': {
           required: true,
           message: '请输入姓名',

+ 19 - 19
src/views/components/baoming/jly.vue

@@ -210,9 +210,9 @@
               <el-form-item label="开票类型" prop="zigeperson.KplxFlg">
                 <el-radio-group v-model="classForm.zigeperson.KplxFlg"
                   @change="$refs.classForm.clearValidate(['zigeperson.Email', 'qiye.kplx', 'qiye.kpfs', 'qiye.kpdw', 'qiye.nsrsbh', 'qiye.dzfpyx'])">
-                  <!-- <el-radio :label="0">不需要开发票</el-radio> -->
-                  <el-radio :label="1">全电普票</el-radio>
-                  <el-radio :label="2">全电专票</el-radio>
+                  <el-radio :label="0">不开发票</el-radio>
+                  <el-radio :label="1">个人(普票)</el-radio>
+                  <el-radio :label="2">企业(专票)</el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
@@ -455,21 +455,21 @@ export default {
           message: '请输入负责人姓名',
           trigger: ['blur', 'change']
         },
-        'zigeperson.DeptLxrPhone': {
-          required: true,
-          message: '请输入手机号码',
-          trigger: ['blur', 'change']
-        },
-        'zigeperson.DeptZipcode': {
-          required: true,
-          message: '请输入邮政编码',
-          trigger: ['blur', 'change']
-        },
-        'zigeperson.DeptEmail': {
-          required: true,
-          message: '请输入电子邮箱',
-          trigger: ['blur', 'change']
-        },
+        // 'zigeperson.DeptLxrPhone': {
+        //   required: true,
+        //   message: '请输入手机号码',
+        //   trigger: ['blur', 'change']
+        // },
+        // 'zigeperson.DeptZipcode': {
+        //   required: true,
+        //   message: '请输入邮政编码',
+        //   trigger: ['blur', 'change']
+        // },
+        // 'zigeperson.DeptEmail': {
+        //   required: true,
+        //   message: '请输入电子邮箱',
+        //   trigger: ['blur', 'change']
+        // },
         'zigeperson.UserName': {
           required: true,
           message: '请输入姓名',
@@ -553,7 +553,7 @@ export default {
         },
         yeji: [{
           required: true,
-          message: '请输入监理工程师业绩/简历',
+          message: '请输入监理业绩/简历',
           trigger: ['blur', 'change']
         },
         {

+ 19 - 19
src/views/components/baoming/zj.vue

@@ -259,9 +259,9 @@
                     'qiye.dzfpyx',
                   ])
                   ">
-                  <!-- <el-radio :label="0">不需要开发票</el-radio> -->
-                  <el-radio :label="1">全电普票</el-radio>
-                  <el-radio :label="2">全电专票</el-radio>
+                  <el-radio :label="0">不开发票</el-radio>
+                  <el-radio :label="1">个人(普票)</el-radio>
+                  <el-radio :label="2">企业(专票)</el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
@@ -532,21 +532,21 @@ export default {
           message: "请输入负责人姓名",
           trigger: ["blur", "change"],
         },
-        "zigeperson.DeptLxrPhone": {
-          required: true,
-          message: "请输入手机号码",
-          trigger: ["blur", "change"],
-        },
-        "zigeperson.DeptZipcode": {
-          required: true,
-          message: "请输入邮政编码",
-          trigger: ["blur", "change"],
-        },
-        "zigeperson.DeptEmail": {
-          required: true,
-          message: "请输入电子邮箱",
-          trigger: ["blur", "change"],
-        },
+        // "zigeperson.DeptLxrPhone": {
+        //   required: true,
+        //   message: "请输入手机号码",
+        //   trigger: ["blur", "change"],
+        // },
+        // "zigeperson.DeptZipcode": {
+        //   required: true,
+        //   message: "请输入邮政编码",
+        //   trigger: ["blur", "change"],
+        // },
+        // "zigeperson.DeptEmail": {
+        //   required: true,
+        //   message: "请输入电子邮箱",
+        //   trigger: ["blur", "change"],
+        // },
         "zigeperson.UserName": {
           required: true,
           message: "请输入姓名",
@@ -657,7 +657,7 @@ export default {
         yeji: [
           {
             required: true,
-            message: "请输入监理工程师业绩/简历",
+            message: "请输入监理工程师业绩/简历",
             trigger: ["blur", "change"],
           },
           {

+ 5 - 5
src/views/qiye/zgks/ZigePerson/index.vue

@@ -3,11 +3,11 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="期次" prop="qi">
         <el-cascader v-model="queryParams.qi" placeholder="请选择期次" :props="prop" :options="options" @change="handleChange">
-			<template slot-scope="{ node, data }">
-			    <span v-if="data.children != null">{{ data.year+'年' }}</span>
-			    <span v-else> {{ '第 '+data.year+' 期' }} </span>
-			</template>
-		  </el-cascader>
+          <template slot-scope="{ node, data }">
+            <span v-if="data.children != null">{{ data.year + '年' }}</span>
+            <span v-else> {{ '第 ' + data.year + ' 期' }} </span>
+          </template>
+        </el-cascader>
       </el-form-item>
       <el-form-item label="培训类别" prop="ZYIdList">
         <el-select v-model="queryParams.ZYIdList" placeholder="请选择培训类别" clearable>

+ 70 - 12
src/views/userIndex1.vue

@@ -512,15 +512,11 @@
           overflow-x: hidden;
           padding-top: 0;
         " class="pd-10" v-if="zgksShow">
-        <el-row type="flex" justify="">
-          <el-col :span="8">
-            <img src="../assets/images/jly.jpg" alt="">
-          </el-col>
-          <!-- <el-col :span="8"><img src="./assets/images/jly.png" alt="">
-          </el-col>
-          <el-col :span="8"><img src="./assets/images/jly.png" alt="">
-          </el-col> -->
-        </el-row>
+        <!-- <div style="justify-content: space-between;display: flex">
+          <img @click="InfoType('监理员')" width="60%" src="../assets/images/jly.jpg" alt="">
+          <img @click="InfoType('监理工程师')" style="margin:0 20px" width="60%" src="../assets/images/jl.jpg" alt="">
+          <img @click="InfoType('总监理工程师')" width="60%" src="../assets/images/zjl.jpg" alt="">
+        </div> -->
         <component ref="zgks" :is="zgks" :info="zgksInfo" @submitSuccess="zgksSubmitSuccess"></component>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -528,6 +524,35 @@
         <el-button @click="zgksCancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="showModal" :title="typeInfo + '报名要求'" top="3vh" width="1100px">
+      <div style="padding: 0 20px;">
+        <div style="color: #f35c5c;font-size: 23px;text-align: center;margin-bottom: 10px;font-weight: 700;">
+          {{ typeInfo }}报名条件
+        </div>
+        <div style="font-size: 17px;line-height: 32px;">
+          <div v-if="typeInfo == '监理员'" v-html="formattedRemarkJLYTJ">
+          </div>
+          <div v-if="typeInfo == '监理工程师'" v-html="formattedRemarkJLGCSTJ">
+          </div>
+          <div v-if="typeInfo == '总监理工程师'" v-html="formattedRemarkZJLTJ">
+          </div>
+        </div>
+        <div style="color: #f35c5c;font-size: 23px;text-align: center;margin: 10px 0;font-weight: 700;">
+          {{ typeInfo }}报名要求
+        </div>
+        <div style="font-size: 17px;line-height: 32px;">
+          <div v-if="typeInfo == '监理员'" v-html="formattedRemarkJLYYQ">
+          </div>
+          <div v-if="typeInfo == '监理工程师'" v-html="formattedRemarkJLGCSYQ">
+          </div>
+          <div v-if="typeInfo == '总监理工程师'" v-html="formattedRemarkZJLYQ">
+          </div>
+        </div>
+        <div style="align-items: center;text-align: center;margin: 10px 0;">
+          <el-button @click="baomingYaoQiu">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
     <!-- 添加或修改资格考试报名对话框 -->
     <el-dialog title="报名信息" top="3vh" :visible.sync="open" width="70%" :close-on-click-modal="false" destroy-on-close>
       <div style="
@@ -612,8 +637,30 @@ export default {
     zj,
     jlgcs,
   },
+  dicts: ['jly_baoming', 'jlgcs_baoming', 'zj_baoming'],
+  computed: {
+    formattedRemarkJLYTJ() {
+      return this.dict.type.jly_baoming[0].raw.remark.replace(/\n /g, '<br>');
+    },
+    formattedRemarkJLYYQ() {
+      return this.dict.type.jly_baoming[1].raw.remark.replace(/\n /g, '<br>');
+    },
+    formattedRemarkJLGCSTJ() {
+      return this.dict.type.jlgcs_baoming[0].raw.remark.replace(/\n /g, '<br>');
+    },
+    formattedRemarkJLGCSYQ() {
+      return this.dict.type.jlgcs_baoming[1].raw.remark.replace(/\n /g, '<br>');
+    },
+    formattedRemarkZJLTJ() {
+      return this.dict.type.zj_baoming[0].raw.remark.replace(/\n /g, '<br>');
+    },
+    formattedRemarkZJLYQ() {
+      return this.dict.type.zj_baoming[1].raw.remark.replace(/\n /g, '<br>');
+    },
+  },
   data() {
     return {
+      showModal: false,
       // 遮罩层
       loading: true,
       tableData: [],
@@ -717,7 +764,8 @@ export default {
       zgksShow: false,
       zgks: null,
       zgksInfo: null,
-      open: false
+      open: false,
+      typeInfo: null,
     };
   },
   watch: {
@@ -733,6 +781,14 @@ export default {
     this.getJxjyList();
   },
   methods: {
+    baomingYaoQiu() {
+      this.showModal = false
+      this.zgksShow = true
+    },
+    InfoType(type) {
+      this.typeInfo = type
+      this.showModal = true
+    },
     viewFile(url) {
       window.open(process.env.VUE_APP_BASE_API + url, '_blank'); // '_blank' 确保在新标签页中打开
     },
@@ -830,9 +886,11 @@ export default {
           row.ZcsZhuanYe = "总监理工程师";
         }
         this.titleInfo = row.ZcsZhuanYe
-
         this.zgksInfo = row;
-        this.zgksShow = true;
+        // this.zgksShow = true;
+        this.showModal = true
+        this.typeInfo = row.ZcsZhuanYe
+
       }
     },
     //H5报名

+ 36 - 36
src/views/xiehui/zgks/ZigePerson/index.vue

@@ -1,31 +1,31 @@
 <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="期次" prop="qi">
-			<el-cascader v-model="queryParams.qi" placeholder="请选择期次" :props="prop" :options="options" @change="handleChange">
-					<template slot-scope="{ node, data }">
-					    <span v-if="data.children != null">{{ data.year+'年' }}</span>
-					    <span v-else> {{ '第 '+data.year+' 期' }} </span>
-					</template>
-				</el-cascader>
-		</el-form-item>
-		<el-form-item label="执业单位" prop="DeptName">
-		  <el-input v-model="queryParams.DeptName" placeholder="请输入执业单位" clearable @keyup.enter.native="handleQuery" />
-		</el-form-item>
+      <el-form-item label="期次" prop="qi">
+        <el-cascader v-model="queryParams.qi" placeholder="请选择期次" :props="prop" :options="options" @change="handleChange">
+          <template slot-scope="{ node, data }">
+            <span v-if="data.children != null">{{ data.year + '年' }}</span>
+            <span v-else> {{ '第 ' + data.year + ' 期' }} </span>
+          </template>
+        </el-cascader>
+      </el-form-item>
+      <el-form-item label="执业单位" prop="DeptName">
+        <el-input v-model="queryParams.DeptName" placeholder="请输入执业单位" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="姓名" prop="UserName">
         <el-input v-model="queryParams.UserName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="身份证" prop="UserCord">
-        <el-input v-model="queryParams.UserCord" placeholder="请输入身份证" clearable @keyup.enter.native="handleQuery" />
+      <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="City" v-hasRole="['xiehui']">
         <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" />
         </el-select>
       </el-form-item>
-     
+
       <el-form-item label="培训类别" prop="ZYIdList">
         <el-select v-model="queryParams.ZYIdList" placeholder="请选择培训类别" clearable>
           <el-option v-for="dict in dict.type.jxjy_zhuanye" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -105,7 +105,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改资格考试报名对话框 -->
-    <el-dialog title="报名信息" top="3vh" :visible.sync="open" width="75%" :close-on-click-modal="false">
+    <el-dialog title="报名信息" top="3vh" :visible.sync="open" width="1250px" :close-on-click-modal="false">
       <div style="
           height: 74vh;
           overflow-y: auto;
@@ -177,7 +177,7 @@ export default {
         ZYIdList: null,
         orderByColumn: "adddate",
         isAsc: "desc",
-		qi:null
+        qi: null
       },
       // 表单参数
       form: {},
@@ -186,28 +186,28 @@ export default {
       zgks: null,
       zgksInfo: null,
       xiugaiType: false,
-	  options:[],
-	  prop:{
-	  	label:"year",
-	  	value:"year"
-	  }
+      options: [],
+      prop: {
+        label: "year",
+        value: "year"
+      }
     };
   },
   created() {
-	  this.qiciSearch()
+    this.qiciSearch()
     this.getList();
   },
   methods: {
-	  qiciSearch(){
-	  	searchZgksQici().then(res=>{
-	  		this.options = res.data
-	  	})
-	  },
-	  //选择期次
-	  handleChange(e){ 
-	  	this.queryParams.QiciYear = e[0]
-	  	this.queryParams.QiCi = e[1]
-	  },
+    qiciSearch() {
+      searchZgksQici().then(res => {
+        this.options = res.data
+      })
+    },
+    //选择期次
+    handleChange(e) {
+      this.queryParams.QiciYear = e[0]
+      this.queryParams.QiCi = e[1]
+    },
     /** 查询资格考试报名列表 */
     getList() {
       this.loading = true;
@@ -308,8 +308,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-		this.queryParams.QiciYear = null
-		this.queryParams.QiCi = null
+      this.queryParams.QiciYear = null
+      this.queryParams.QiCi = null
       this.resetForm("queryForm");
       this.handleQuery();
     },