server_commit

pom.xml

@@ -377,13 +377,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>ooxml-schemas</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xmlbeans</artifactId>
-                    <groupId>org.apache.xmlbeans</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nutz</groupId>
@@ -429,6 +423,18 @@
         <!--            <version>4.3.21.RELEASE</version>-->
         <!--        </dependency>-->
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>fr.opensagres.xdocreport</groupId>
+            <artifactId>fr.opensagres.poi.xwpf.converter.xhtml</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

src/main/java/io/v/nutz/base/utils/MsgApi.java

@@ -70,7 +70,7 @@ public class MsgApi {
      * @param receivers  接收人工号/手机号
      */
     public void sendMsg(String msgContent, List<String> receivers) {
-        /*Assert.notBlank(msgContent);
+        Assert.notBlank(msgContent);
         Assert.notEmpty(receivers);
 
         List<Map<String, String>> tousers = receivers.stream().map(v -> Map.of("touser", v)).collect(Collectors.toList());
@@ -101,7 +101,7 @@ public class MsgApi {
         } else {
             log.error("短信发送失败,发送内容" + Json.toJson(bodyMap));
             throw new RuntimeException("短信发送失败");
-        }*/
+        }
     }
 
     /**

src/main/java/io/v/nutz/lxy/controller/LxyFghShController.java

@@ -156,6 +156,7 @@ public class LxyFghShController {
         nutMap.put("idcard", lxyBm.getIdcard());
         nutMap.put("zyhj", lxyBm.getZyhj());
         nutMap.put("bz", lxyBm.getBz());
+        nutMap.put("scdd", lxyBm.getScdd());
         return nutMap;
     }
 

src/main/java/io/v/nutz/lxy/controller/LxyGhbmController.java

@@ -190,6 +190,7 @@ public class LxyGhbmController {
                 	bm.files,
                 	bm.zyhj,
                 	bm.bz,
+                	bm.scdd,
                 	bm.mobile,
                 	bm.idcard,
                 	bm.unitid,
@@ -249,6 +250,9 @@ public class LxyGhbmController {
                             lxy_grxx.setUserid(bm.getUserid());
                             lxy_grxx.setHdid(bm.getHdid());
                             lxy_grxx.setGhid(bm.getGhid());
+                            lxy_grxx.setZyhj(bm.getZyhj());
+                            lxy_grxx.setBz(bm.getBz());
+                            lxy_grxx.setScdd(bm.getScdd());
                             grxxList.add(lxy_grxx);
                         });
                     }
@@ -280,6 +284,7 @@ public class LxyGhbmController {
                 	bm.bmzt,
                 	bm.zyhj,
                 	bm.bz,
+                	bm.scdd,
                 	bm.ghid
                 FROM
                 	lxy_bm bm

src/main/java/io/v/nutz/lxy/controller/LxyHdTjController.java

@@ -76,16 +76,19 @@ public class LxyHdTjController {
     @RequiresPermissions("zgfw.lxy.hdtj")
     public Object pageData(@Param(value = "hdid", required = false) String hdid,
                            @Param(value = "ghid", required = false) String ghid,
+                           @Param(value = "scdd", required = false) String scdd,
+                           @Param(value = "bmzt", required = false) Integer bmzt,
                            @Param(value = "searchKey", required = false) String searchKey,
                            @Param("pageNumber") int pageNumber, @Param("pageSize") int pageSize) {
         Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
                 	gr.*,
+                	bm.bmzt,
                 	u.unionname,
                 	u.unioncode,
                 	u.unitname unitname,
-                	u.unitcode
+                	u.unitcodev
                 FROM
                 	`lxy_grxx` gr
                 	LEFT JOIN lxy_bm bm ON bm.userid = gr.userid
@@ -96,9 +99,10 @@ public class LxyHdTjController {
                 "LEFT JOIN lxy_bm bm ON bm.userid = gr.userid  \n" +
                 "LEFT JOIN `user` u ON u.id=bm.userid $condition");*/
 
-        cnd.and("bm.bmzt","=",5);
+        cnd.and("bm.bmzt","in","3,4,5");
-//        cnd.and(new Static("bm.bmzt = 5"));
+        cnd.andEX("bm.bmzt","=",bmzt);
         cnd.and("gr.hdid", "=", hdid);
+        cnd.andEX("gr.scdd", "=", scdd);
 
         if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
             cnd.and("gr.ghid","=", Vi.getUnionId());
@@ -109,7 +113,8 @@ public class LxyHdTjController {
             cnd.where().andLike("u.loginname", searchKey).orLike("u.username", searchKey);
         }
         cnd.groupBy("bm.userid");
-        cnd.asc("u.unioncode");
+        cnd.asc("bm.bmzt").asc("u.unioncode");
+
         sql.setCondition(cnd);
         return lxyGrxxService.listPage(pageNumber, pageSize, sql);
     }
@@ -126,6 +131,7 @@ public class LxyHdTjController {
     @RequiresPermissions("zgfw.lxy.hdtj")
     public void doExport(@Param(value = "hdid", required = false) String hdid,
                          @Param(value = "hdname", required = false) String hdname,
+                         @Param(value = "bmzt", required = false) Integer bmzt,
                          @Param(value = "ghid", required = false) String ghid, HttpServletResponse response) throws IOException {
         Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
@@ -134,7 +140,9 @@ public class LxyHdTjController {
                 	bm.unionname,
                 	bm.unitname,
                 	bm.zyhj,
-                	bm.bz
+                	bm.bz,
+                	bm.scdd,
+                	bm.bmzt
                 FROM
                 	`lxy_grxx` gr
                 	LEFT JOIN lxy_bm bm ON bm.userid = gr.userid
@@ -142,7 +150,8 @@ public class LxyHdTjController {
                 $condition
                 """);
 
-        cnd.and(new Static("bm.bmzt = 5"));
+        cnd.and("bm.bmzt","in","3,4,5");
+        cnd.andEX("bm.bmzt","=",bmzt);
         cnd.and("gr.hdid", "=", hdid);
 
         if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
@@ -157,6 +166,13 @@ public class LxyHdTjController {
         int i = 1;
         for (Record r : list) {
             r.set("index", i);
+            if (r.getInt("bmzt")==3){
+                r.set("bmzt", "待校工会审核");
+            }else if (r.getInt("bmzt")==4){
+                r.set("bmzt", "校工会审核不通过");
+            }else if (r.getInt("bmzt")==5){
+                r.set("bmzt", "报名成功");
+            }
             List<NutMap> chry = Json.fromJsonAsList(NutMap.class, r.getString("chry"));
             for (NutMap map : chry) {
                 r.set("rych", (r.getString("rych") == null ? "" : r.getString("rych")) + " " + map.getString("shry"));
@@ -173,8 +189,10 @@ public class LxyHdTjController {
         entities.add(new ExcelExportEntity("身份证号", "idcard", 20));
         entities.add(new ExcelExportEntity("工会", "unionname", 20));
         entities.add(new ExcelExportEntity("单位", "unitname", 20));
+        entities.add(new ExcelExportEntity("上车地点", "scdd", 20));
         entities.add(new ExcelExportEntity("获奖名称", "zyhj", 20));
         entities.add(new ExcelExportEntity("备注", "bz", 20));
+        entities.add(new ExcelExportEntity("报名状态", "bmzt", 20));
 
         ViTool.excelResponse(response, "疗休养人员名单汇总表.xlsx");
         ExportParams exportParams = new ExportParams();

src/main/java/io/v/nutz/lxy/controller/LxyXghshController.java

@@ -171,6 +171,7 @@ public class LxyXghshController {
                 	bm.bmzt,
                 	bm.zyhj,
                 	bm.bz,
+                	bm.scdd,
                 	bm.ghid
                 FROM
                 	lxy_bm bm

src/main/java/io/v/nutz/lxy/model/Lxy_bm.java

@@ -96,6 +96,11 @@ public class Lxy_bm {
     @ColDefine(type = ColType.VARCHAR, width = 1000)
     private String bz;
 
+    @Column
+    @Comment("上车地点")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String scdd;
+
     @Column
     @Comment("附件")
     @ColDefine(type = ColType.MYSQL_JSON)

src/main/java/io/v/nutz/lxy/model/Lxy_grxx.java

@@ -2,6 +2,7 @@ package io.v.nutz.lxy.model;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.wizzer.framework.base.model.BaseModel;
+import lombok.Data;
 import org.nutz.dao.entity.annotation.*;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @DateTime: 2020/8/27 9:06
  * @Description: 疗休养个人信息
  */
+@Data
 @Table("lxy_grxx")
 public class Lxy_grxx extends BaseModel {
 
@@ -96,125 +98,22 @@ public class Lxy_grxx extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String idcard;
 
+    @Column
+    @Comment("主要获奖")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String zyhj;
+
+    @Column
+    @Comment("备注")
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    private String bz;
+
+    @Column
+    @Comment("上车地点")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String scdd;
+
     private List files;
 
-    public String getId() {
-        return id;
-    }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getHdid() {
-        return hdid;
-    }
-
-    public void setHdid(String hdid) {
-        this.hdid = hdid;
-    }
-
-    public String getGhid() {
-        return ghid;
-    }
-
-    public void setGhid(String ghid) {
-        this.ghid = ghid;
-    }
-
-    public String getUserid() {
-        return userid;
-    }
-
-    public void setUserid(String userid) {
-        this.userid = userid;
-    }
-
-    public String getLoginname() {
-        return loginname;
-    }
-
-    public void setLoginname(String loginname) {
-        this.loginname = loginname;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getZw() {
-        return zw;
-    }
-
-    public void setZw(String zw) {
-        this.zw = zw;
-    }
-
-    public String getRsbz() {
-        return rsbz;
-    }
-
-    public void setRsbz(String rsbz) {
-        this.rsbz = rsbz;
-    }
-
-    public List getChry() {
-        return chry;
-    }
-
-    public void setChry(List chry) {
-        this.chry = chry;
-    }
-
-    public String getMz() {
-        return mz;
-    }
-
-    public void setMz(String mz) {
-        this.mz = mz;
-    }
-
-    public String getIdcard() {
-        return idcard;
-    }
-
-    public void setIdcard(String idcard) {
-        this.idcard = idcard;
-    }
-
-    public List getFiles() {
-        return files;
-    }
-
-    public void setFiles(List files) {
-        this.files = files;
-    }
 }

src/main/java/io/v/nutz/web/commons/controller/FileServerController.java

@@ -9,6 +9,7 @@ import com.artofsolving.jodconverter.openoffice.connection.OpenOfficeConnection;
 import com.artofsolving.jodconverter.openoffice.connection.SocketOpenOfficeConnection;
 import com.artofsolving.jodconverter.openoffice.converter.OpenOfficeDocumentConverter;
 import com.artofsolving.jodconverter.openoffice.converter.StreamOpenOfficeDocumentConverter;
+import io.v.nutz.base.utils.WordUtil;
 import io.v.nutz.sys.models.Sys_file;
 import io.v.nutz.sys.models.Sys_log;
 import io.v.nutz.sys.models.Sys_user;
@@ -29,10 +30,7 @@ import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.json.Json;
 import org.nutz.lang.Lang;
 import org.nutz.lang.random.R;
-import org.nutz.mvc.annotation.AdaptBy;
+import org.nutz.mvc.annotation.*;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-import org.nutz.mvc.annotation.POST;
 import org.nutz.mvc.upload.TempFile;
 import org.nutz.mvc.upload.UploadAdaptor;
 import org.springframework.util.FileCopyUtils;
@@ -320,8 +318,8 @@ public class FileServerController {
         String generatedFilePath = fileID + "." + fileSuffixName;
 
         boolean uploadRes;
-
+        uploadRes = ftpService.upload("/", generatedFilePath, file.getInputStream());
-        if (IMGTYPES.contains(fileSuffixName.toUpperCase())) {
+       /* if (IMGTYPES.contains(fileSuffixName.toUpperCase())) {
             BufferedImage bufferedImage = ImageIO.read(file.getFile());
             int size = calculateSize(bufferedImage.getWidth(), bufferedImage.getHeight());
 
@@ -335,7 +333,7 @@ public class FileServerController {
             uploadRes = ftpService.upload("/", generatedFilePath, is);
         } else {
             uploadRes = ftpService.upload("/", generatedFilePath, file.getInputStream());
-        }
+        }*/
 
         if (uploadRes) {
             //上传成功记录到文件表
@@ -394,4 +392,22 @@ public class FileServerController {
     }
 
 
+    @At
+    @POST
+    @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
+    @RequiresAuthentication
+    @Ok("json")
+    public Object word2Html(@Param("file") TempFile tempFile) {
+        try {
+            String submittedFileName = tempFile.getSubmittedFileName().toLowerCase();
+            if (!submittedFileName.endsWith("doc") && !submittedFileName.endsWith("docx")) {
+                return Result.error("请上传doc或docx的文件");
+            }
+            String html = WordUtil.checkConvert2Html(tempFile.getFile());
+            return Result.success().addData(html);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Result.error();
+        }
+    }
 }

src/main/java/io/v/nutz/web/controllers/platform/sys/SysUserController.java

@@ -81,18 +81,18 @@ public class SysUserController {
                     return Result.error("用户名已存在!");
                 }
             }
-            if (Strings.isNotBlank(user.getMobile())) {
+//            if (Strings.isNotBlank(user.getMobile())) {
-                int num = sysUserService.count(Cnd.where("mobile", "=", Strings.trim(user.getMobile())));
+//                int num = sysUserService.count(Cnd.where("mobile", "=", Strings.trim(user.getMobile())));
-                if (num > 0) {
+//                if (num > 0) {
-                    return Result.error("手机号已存在!");
+//                    return Result.error("手机号已存在!");
-                }
+//                }
-            }
+//            }
-            if (Strings.isNotBlank(user.getEmail())) {
+//            if (Strings.isNotBlank(user.getEmail())) {
-                int num = sysUserService.count(Cnd.where("email", "=", Strings.trim(user.getEmail())));
+//                int num = sysUserService.count(Cnd.where("email", "=", Strings.trim(user.getEmail())));
-                if (num > 0) {
+//                if (num > 0) {
-                    return Result.error("邮箱已存在!");
+//                    return Result.error("邮箱已存在!");
-                }
+//                }
-            }
+//            }
             String salt = R.UU32();
             user.setId(R.UU32());
             user.setSalt(salt);

src/main/resources/static/components/activityBx/ActivityBxInfo.vue

@@ -35,6 +35,10 @@
               </el-table-column>
             </el-table>
           </el-descriptions-item>
+          <el-descriptions-item label="成果" :span="2">
+            <file-upload :files="viewData.resultsFiles"
+                         :view="true"></file-upload>
+          </el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
       <!--      <el-tab-pane label="附件" name="100">

src/main/resources/static/components/plugins/textEditor.vue

@@ -28,7 +28,7 @@ class AlertMenu extends BtnMenu {
 
   clickHandler() {
     const _this = this
-    const inputFileElement = document.querySelector('#' + this.editor.textElemId).parentElement.parentElement.nextElementSibling
+    const inputFileElement = document.querySelector('#'+this.editor.textElemId).parentElement.parentElement.nextElementSibling
     inputFileElement.click()
     inputFileElement.addEventListener('change', function () {
       const file = this.files[0];
@@ -160,8 +160,9 @@ module.exports = {
         // if (_this.isEmptyEditor()) {
         //   content = ''
         // }
-        _this.$emit('input', content)
+        const newContent = content.replaceAll('<img', '<image');
-        _this.$emit('catchData', content, text)
+        _this.$emit('input', newContent)
+        _this.$emit('catchData', newContent, text)
       }
 
       //配置图片上传
@@ -172,7 +173,7 @@ module.exports = {
         Promise.all(_this.uploadFiles(resultFiles)).then(res => {
           res.forEach(v => {
             if (v.code === 0) {
-              insertImgFn(CREATE_PREVIEW_URL(v.data.filepath))
+              insertImgFn(APP_DOMAIN + CREATE_PREVIEW_URL(v.data.filepath))
             } else {
               ELEMENT.message.warning('图片上传失败')
             }

src/main/resources/views/layouts/platform.html

@@ -65,6 +65,8 @@
     <script src="${base!}/assets/platform/plugins/echarts/westeros.js"></script><!--主题-->
     <script src="${base!}/assets/platform/plugins/echarts/walden.js"></script><!--主题-->
     <script src="${base!}/assets/platform/plugins/echarts/macarons.js"></script><!--主题-->
+    <script src="${base!}/assets/platform/plugins/echarts/echarts.js"></script>
+    <script src="${base!}/assets/platform/plugins/echarts/langZH.js"></script>
 <!--    <script src="https://cdn.staticfile.org/echarts/5.2.2/echarts.js"></script>-->
 <!--    <script src="https://cdn.staticfile.org/echarts/5.2.2/i18n/langZH.js"></script>-->
 

src/main/resources/views/mobile/platform.html

@@ -9,10 +9,11 @@
     />
     <van-number-keyboard safe-area-inset-bottom/>
     <title></title>
-    <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/index.min.css"/>
+<!--    <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/index.min.css"/>-->
 
     <link rel="stylesheet" href="${base!}/assets/mobile/css/theme.css">
     <link rel="stylesheet" href="${base!}/assets/mobile/css/main.css">
+    <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css">
 
     <script>
         window._AMapSecurityConfig = {
@@ -21,7 +22,8 @@
     </script>
 
     <script src="${base!}/assets/platform/plugins/vue/vue.min.js"></script>
-    <script src="${base!}/assets/platform/plugins/vant/vant.min.js"></script>
+    <script src="${base!}/assets/platform/plugins/vant/vant.js"></script>
+<!--    <script src="${base!}/assets/platform/plugins/vant/vant.min.js"></script>-->
     <script src="${base!}/assets/platform/plugins/vue-loader/httpVueLoader.js"></script>
     <script src="${base!}/assets/mobile/js/basic.js?v=0.0.1"></script>
 

src/main/resources/views/platform/zgfw/lxy/HdGhbm.html

@@ -245,9 +245,9 @@ layout("/layouts/platform.html"){
 
                 <el-table :data="hasApplyUserTableData" border height="480" size="mini">
                     <el-table-column align="center" header-align="center" label="序号"
-                                     type="index"
+                                     type="index" fixed
                                      width="70"></el-table-column>
-                    <el-table-column align="center" header-align="center" label="姓名"
+                    <el-table-column align="center" header-align="center" label="姓名" fixed
                                      prop="username" width="100"></el-table-column>
                     <el-table-column align="center" header-align="center" label="工号"
                                      prop="loginname" width="120"></el-table-column>
@@ -276,7 +276,19 @@ layout("/layouts/platform.html"){
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" header-align="center" label="获奖名称">
+                    <el-table-column align="center" header-align="center" label="上车地点" width="200">
+                        <template scope="{row}">
+                            <div>
+                                <el-select v-model="row.scdd" placeholder="请选择上车地点" :disabled="row.bmzt&&row.bmzt!=4">
+                                    <el-option label="西康路校区" value="西康路校区"></el-option>
+                                    <el-option label="江宁校区" value="江宁校区"></el-option>
+                                    <el-option label="常州新校区（金坛）" value="常州新校区（金坛）"></el-option>
+                                    <el-option label="常州老校区" value="常州老校区"></el-option>
+                                </el-select>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" header-align="center" label="获奖名称" width="250">
                         <template scope="{row}">
                             <div class="tableInput">
                                 <el-input :disabled="row.bmzt&&row.bmzt!=4" :rows="2"
@@ -286,7 +298,7 @@ layout("/layouts/platform.html"){
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" header-align="center" label="备注">
+                    <el-table-column align="center" header-align="center" label="备注" width="250">
                         <template scope="{row}">
                             <div class="tableInput">
                                 <el-input :disabled="row.bmzt&&row.bmzt!=4" :rows="2"
@@ -715,10 +727,10 @@ display: -webkit-box;
                 }
                 if (flag) {
                     for (let i = 0; i < array.length; i++) {
-                        if (array[i].files === undefined) {
+                        // if (array[i].files === undefined) {
-                            this.$message.warning("请选择上传材料!")
+                        //     this.$message.warning("请选择上传材料!")
-                            return
+                        //     return
-                        }
+                        // }
                         if (!array[i].idcard) {
                             this.$message.warning("请填写身份证号!")
                             return
@@ -727,6 +739,10 @@ display: -webkit-box;
                             this.$message.warning("请填写手机号!")
                             return
                         }
+                        if (!array[i].scdd) {
+                            this.$message.warning("请选择上车地点!")
+                            return
+                        }
                     }
                     const confirm = await this.$confirm('是否提交，提交后表示分工会审核通过！', '提示', {
                         confirmButtonText: '确定',

src/main/resources/views/platform/zgfw/lxy/HdTj.html

@@ -58,15 +58,30 @@ layout("/layouts/platform.html"){
             <div class="btn-group tool-button mt5">
                 <el-input placeholder="请输入工号或姓名" v-model="pageForm.searchKey"></el-input>
             </div>
+            <div class="btn-group tool-button mt5">
+                <el-select v-model="pageForm.scdd" placeholder="请选择上车地点" clearable>
+                    <el-option label="西康路校区" value="西康路校区"></el-option>
+                    <el-option label="江宁校区" value="江宁校区"></el-option>
+                    <el-option label="常州新校区（金坛）" value="常州新校区（金坛）"></el-option>
+                    <el-option label="常州老校区" value="常州老校区"></el-option>
+                </el-select>
+            </div>
+            <div class="btn-group tool-button mt5">
+                <el-select v-model="pageForm.bmzt" placeholder="请选择审核状态" clearable>
+                    <el-option label="待校工会审核" :value="3"></el-option>
+                    <el-option label="校工会审核不通过" :value="4"></el-option>
+                    <el-option label="报名成功" value="5"></el-option>
+                </el-select>
+            </div>
 
             <div class="btn-group tool-button mt5">
                 <el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
             </div>
 
             <div class="pull-right offscreen-right mt5">
-                <el-button :disabled="!pageForm.hdid" @click="$refs.customMessage.open()"
+<!--                <el-button :disabled="!pageForm.hdid" @click="$refs.customMessage.open()"-->
-                           type="primary">一键发送
+<!--                           type="primary">一键发送-->
-                </el-button>
+<!--                </el-button>-->
                 <el-button @click="doExport" icon="el-icon-download" type="primary">导 出</el-button>
             </div>
         </el-card>
@@ -94,7 +109,23 @@ layout("/layouts/platform.html"){
                                  prop="unionname" show-overflow-tooltip sortable></el-table-column>
                 <el-table-column align="center" header-align="center" label="单位"
                                  prop="unitname" show-overflow-tooltip sortable></el-table-column>
-
+                <el-table-column align="center" header-align="center" label="上车地点"
+                                 prop="scdd" show-overflow-tooltip sortable></el-table-column>
+                <el-table-column align="center" header-align="center"
+                                 label="审核状态" width="100">
+                    <template scope="{row}">
+                        <span class="text-primary" v-if="row.bmzt==1">待分工会审核</span>
+                        <span class="text-danger"
+                              v-else-if="row.bmzt==2">分工会审核不通过</span>
+                        <span class="text-primary"
+                              v-else-if="row.bmzt==3">待校工会审核</span>
+                        <span class="text-danger"
+                              v-else-if="row.bmzt==4">校工会审核不通过</span>
+                        <span class="text-success"
+                              v-else-if="row.bmzt==5">报名成功</span>
+                        <span class="text-muted" v-else>预选</span>
+                    </template>
+                </el-table-column>
 
                 <el-table-column align="center" fixed="right" header-align="center" label="操作"
                                  width="180px">
@@ -242,6 +273,7 @@ display: -webkit-box;
                     hdid: "",
                     year: "",
                     ghid: "",
+                    bmzt: "",
                     searchKey: "",
                     pageNumber: 1,
                     pageSize: 10,
@@ -305,7 +337,10 @@ display: -webkit-box;
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(async () => {
-                    window.location.href = '/platform/zgfw/lxy/hdtj/doExport?hdid=' + this.pageForm.hdid + '&ghid=' + this.pageForm.ghid + '&hdname=' + obj.name
+                    window.location.href = '/platform/zgfw/lxy/hdtj/doExport?hdid=' + this.pageForm.hdid
+                        + '&ghid=' + this.pageForm.ghid
+                        + '&bmzt=' + this.pageForm.bmzt
+                        + '&hdname=' + obj.name
                 })
             },
 

src/main/resources/views/platform/zgfw/lxy/HdXghsh.html

@@ -170,7 +170,9 @@ layout("/layouts/platform.html"){
                 <el-table-column align="center" header-align="center" label="手机号码"
                                  prop="mobile"></el-table-column>
                 <el-table-column align="center" header-align="center" label="身份证号"
-                                 prop="idcard"></el-table-column>
+                                 prop="idcard" width="200"></el-table-column>
+                <el-table-column align="center" header-align="center" label="上车地点"
+                                 prop="scdd"></el-table-column>
                 <el-table-column align="center" header-align="center" label="获奖名称"
                                  prop="zyhj"
                                  show-overflow-tooltip></el-table-column>
@@ -279,6 +281,11 @@ layout("/layouts/platform.html"){
                         {{ viewData.idcard }}
                     </el-form-item>
                 </el-col>
+                <el-col :span="24">
+                    <el-form-item label="上车地点：">
+                        {{ viewData.scdd }}
+                    </el-form-item>
+                </el-col>
                 <el-col :span="24">
                     <el-form-item label="获奖名称：">
                         {{ viewData.zyhj }}

src/main/resources/views/platform/zgfw/lxy/dialogView.html

@@ -59,9 +59,9 @@
             <el-tab-pane label="名额分配信息" name="2">
                 <!--#include("/platform/zgfw/lxy/dialogViewFp.html"){}#-->
             </el-tab-pane>
-            <el-tab-pane label="报名人员信息" name="3">
+<!--            <el-tab-pane label="报名人员信息" name="3">-->
-                <!--#include("/platform/zgfw/lxy/dialogViewBm.html"){}#-->
+<!--                &lt;!&ndash;#include("/platform/zgfw/lxy/dialogViewBm.html"){}#&ndash;&gt;-->
-            </el-tab-pane>
+<!--            </el-tab-pane>-->
         </el-tabs>
 
         <span slot="footer" class="dialog-footer">