c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
zhengziru
2024-07-26 16:53:41 +08:00
parent ddf52e5e86
commit 1f4284acbf
22 changed files with 518 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/web/commons/controller/SignatureController.java
+24 -4
View File
@@ -52,8 +52,27 @@ public class SignatureController {
@At
@Ok("json")
@RequiresAuthentication
public Object doSub(String prefix, String id, String base64) {
redisService.setex(prefix + ":" + id, 60 * 10, base64);
public Object doSub(String prefix, String id, String base64, Boolean is_value_base64) {
if (is_value_base64) {
redisService.setex(prefix + ":" + id, 60 * 10, base64);
} else {
String today = DateUtil.today();
String[] split = today.split("-");
String todayPath = "/signature/" + split[0] + "/" + split[1] + "/" + split[2];
String fileName = R.UU32() + ".png";
String fullPath = todayPath + "/" + fileName;
String replaceData = base64.replaceAll("data:image/png;base64,", "");
try (InputStream is = new ByteArrayInputStream(Base64.decode(replaceData))) {
ftpService.upload(todayPath, fileName, is);
redisService.setex(prefix + ":" + id, 60 * 10, fullPath);
} catch (Exception e) {
return Result.error("签字数据上传失败");
}
}
return Result.success();
}
@@ -94,6 +113,7 @@ public class SignatureController {
try (InputStream is = new ByteArrayInputStream(Base64.decode(replaceData))) {
ftpService.upload(todayPath, fileName, is);
} catch (Exception e) {
e.printStackTrace();
return Result.error("签字数据上传失败");
}
@@ -105,11 +125,11 @@ public class SignatureController {
@Ok("void")
@RequiresAuthentication
public void getSignData(String path, HttpServletResponse response) {
try{
try {
response.setContentType("image/jpg");
response.setHeader("Content-Disposition", "attachment;filename=1.png");
ftpService.download(path, response.getOutputStream());
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+2 -2
View File
@@ -175,7 +175,7 @@ public class ActivityUnionManageController {
});
tissue.getCover();
if (tissue.getIsPushHome()!=0) {
if (tissue.getIsPushHome()!= null && tissue.getIsPushHome()!=0) {
mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
}
@@ -188,7 +188,7 @@ public class ActivityUnionManageController {
@ViReturn
@RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
public Object doEdit(@Param("tissue") ActivityTissue tissue) {
if (tissue.getIsPushHome()!=0) {
if (tissue.getIsPushHome()!= null && tissue.getIsPushHome()!=0) {
mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
} else {
mobileHomeService.delete(tissue.getId());
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java
+7 -7
View File
@@ -108,13 +108,13 @@ public class ActivityReimbursementMineController {
Cnd cnd = Cnd.NEW();
if (!ShiroUtil.hasAnyRoles("sysadmin,wyh02,H10,xghng")) {
SqlExpressionGroup group2 = new SqlExpressionGroup();
if (ShiroUtil.hasAnyRoles("gh01,H04")) {
group2.or("u.unionid", "=", vi.getUnionId());
} else if (ShiroUtil.hasRole("H02")) {
group2.or("scu.clubid", "=", vi.getClubId());
} else {
group2.or("act.user_id", "=", ShiroUtil.getUserId());
}
// if (ShiroUtil.hasAnyRoles("gh01,H04")) {
// group2.or("u.unionid", "=", vi.getUnionId());
// } else if (ShiroUtil.hasRole("H02")) {
// group2.or("scu.clubid", "=", vi.getClubId());
// } else {
// }
group2.or("act.user_id", "=", ShiroUtil.getUserId());
cnd.and(group2);
}
src/main/java/io/v/nutz/zhgh/mobile/common/updateSign.java
+17 -4
View File
@@ -30,10 +30,10 @@ public class updateSign {
@At
public void update(String sign, String user_id) {
if(StrUtil.isBlank(user_id)){
if (StrUtil.isBlank(user_id)) {
user_id = (String) ShiroUtil.getPrincipalProperty("id");
}
if (Strings.isNotBlank(getMySign())) {
if (Strings.isNotBlank(getMySign(null))) {
userSignService.update(Chain.make("data", sign), Cnd.where("user_id", "=", user_id));
} else {
userSignService.insert(new UserSign(user_id, sign));
@@ -41,8 +41,21 @@ public class updateSign {
}
@At
public String getMySign() {
List<UserSign> userSigns = userSignService.query(Cnd.NEW().and("user_id", "=", ShiroUtil.getPrincipalProperty("id")));
public void update(String sign, String user_id, String prefix) {
if (StrUtil.isBlank(user_id)) {
user_id = (String) ShiroUtil.getPrincipalProperty("id");
}
if (Strings.isNotBlank(getMySign(prefix))) {
userSignService.update(Chain.make("data", sign), Cnd.where("user_id", "=", user_id));
} else {
userSignService.insert(new UserSign(user_id, sign, prefix));
}
}
@At
public String getMySign(String prefix) {
List<UserSign> userSigns = userSignService.query(Cnd.NEW().and("user_id", "=", ShiroUtil.getPrincipalProperty("id"))
.andEX("prefix", "=", prefix));
return userSigns.isEmpty() ? null : userSigns.get(0).getData();
}
}
src/main/resources/static/components/difficulty/apply.vue
+217 -181
View File
@@ -1,7 +1,7 @@
<template>
<el-card class="box-card">
<el-card shadow="never">
<div slot="header" class="clearfix">
<span style="color: #409EFF;font-size: 18px">填写申请信息</span>
<h3 style="color: #1867b0">填写申请信息</h3>
</div>
<el-form :model="form" ref="addform" :rules="formRules" label-width="120px">
<el-row gutter="20">
@@ -11,15 +11,16 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="apply_mode" label="申请模式">
<el-radio-group :disabled="form.id" v-model="form.apply_mode" @change="$emit('radio')" style="width: 100%"
>
<el-radio-button label="1" border>本人申请</el-radio-button>
<el-radio-button label="2" border>替他人申请</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item prop="apply_mode" label="申请模式">
<el-radio-group :disabled="form.id" v-model="form.apply_mode" @change="$emit('radio')"
style="width: 100%"
>
<el-radio-button label="1" border>本人申请</el-radio-button>
<el-radio-button label="2" border>替他人申请</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item prop="user_name" label="申请人工号">
<el-input disabled v-model="form.sqrloginname"
@@ -27,91 +28,99 @@
</el-form-item>
</el-col>
</el-row>
<el-row gutter="20">
<el-col :span="8">
<el-form-item prop="bbzrusername" label="受补助人">
<el-select v-if="form.id==null" clearable
v-model="form.bbzrusername" filterable remote
placeholder="输入工号或者姓名查找" :remote-method="querySqr" @change="userChange" style="width: 100%">
<el-option v-for="o in subsidizedList"
:label="o.username+'('+o.loginname+')-'+o.unit_name" :value="o.id"
:key="o.id"></el-option>
</el-select>
<el-input maxlength="100" disabled v-else v-model="form.bbname"
type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="idcard" label="身份证号">
<el-input maxlength="50" placeholder="请输入身份证号" clearable
v-model="form.idcard"
type="text"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item prop="bbzrusername" label="受补助人">
<el-select v-if="form.id==null" clearable
v-model="form.bbzrusername" filterable remote
placeholder="输入工号或者姓名查找" :remote-method="querySqr" @change="userChange"
style="width: 100%">
<el-option v-for="o in subsidizedList"
:label="o.username+'('+o.loginname+')-'+o.unit_name" :value="o.id"
:key="o.id"></el-option>
</el-select>
<el-input maxlength="100" disabled v-else v-model="form.bbname"
type="text"></el-input>
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item prop="idcard" label="身份证号">
<el-input maxlength="50" placeholder="请输入身份证号" clearable
v-model="form.idcard"
type="text"></el-input>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item prop="sex" label="性&emsp;&emsp;别">
<el-select v-model="form.sex" placeholder="请选择性别" clearable
:disabled="form.apply_mode==1" style="width: 100%">
style="width: 100%">
<el-option v-for="item in ['男','女']" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="20">
<!-- <el-col :span="8">
<el-form-item prop="mz" label="民&emsp;&emsp;族">
<el-select v-model="form.mz" placeholder="请选择民族" filterable clearable style="width: 100%">
<el-option
v-for="item in mzOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>-->
<!-- 职称本字段是通过人工选择输入，下面的是直接读取数据库 -->
<!-- <el-form-item prop="zc" label="职&emsp;&emsp;称">
<el-select v-model="form.zc" placeholder="请选择或输入职称" filterable clearable
style="width: 100%">
<el-option
v-for="item in zcOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>-->
<!-- <el-form-item prop="zc" label="职&emsp;&emsp;称">
<el-input placeholder="请填写职称" v-model="form.zc" maxlength="30"
type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="zw" label="职&emsp;&emsp;务">
<el-input maxlength="50" clearable placeholder="请填写职务" v-model="form.zw"
type="text"></el-input>
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item prop="mz" label="民&emsp;&emsp;族">
<el-select v-model="form.mz" placeholder="请选择民族" filterable clearable style="width: 100%">
<el-option
v-for="item in mzOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="zc" label="职&emsp;&emsp;称">
<el-select v-model="form.zc" placeholder="请选择或输入职称" filterable clearable
style="width: 100%">
<el-option
v-for="item in zcOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="zw" label="职&emsp;&emsp;务">
<el-input maxlength="50" clearable placeholder="请填写职务" v-model="form.zw"
<el-form-item prop="unitname" label="所在单位">
<el-input maxlength="50" clearable placeholder="所在单位" v-model="form.unitname"
type="text"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="20">
<el-col :span="8">
<el-form-item prop="brnzsr" label="本人年收入" class="int_input">
<el-form-item prop="brnzsr" label="本人月收入" class="int_input">
<el-input-number clearable style="width: 100%" v-model="form.brnzsr" :min="0"
:max="9999999"
controls-position="right" placeholder="请填写年收入（元）">
controls-position="right" placeholder="请填写本人月收入（元）">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="birthday" label="生&emsp;&emsp;日">
<el-form-item prop="birthday" label="出生年月">
<el-date-picker
clearable
style="width: 100%"
v-model="form.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择生日">
placeholder="选择出生年月">
</el-date-picker>
</el-form-item>
</el-col>
@@ -121,6 +130,12 @@
type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item prop="jtzz" label="家庭地址">
<el-input maxlength="100" clearable placeholder="请填写家庭地址" v-model="form.jtzz"
type="text"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item prop="rsbz" label="人事编制">
<el-select v-model="form.rsbz" placeholder="请选择人事编制" clearable
@@ -134,107 +149,101 @@
</el-select>
</el-form-item>
</el-col>-->
<!-- <el-col :span="12">
<el-form-item prop="sq_ksbz" label="科室班组">
<el-input maxlength="50" clearable placeholder="科室班组" v-model="form.sq_ksbz"
type="text"></el-input>
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item prop="ybzk" label="医保状况">
<el-select v-model="form.ybzk" placeholder="请选择医保状况" clearable style="width: 100%">
<el-option
v-for="item in ybOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>-->
</el-row>
<el-row gutter="20">
<el-col :span="12">
<el-form-item prop="unitname" label="所在单位">
<el-input maxlength="50" clearable placeholder="所在单位" v-model="form.unitname"
type="text"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="sq_ksbz" label="科室班组">
<el-input maxlength="50" clearable placeholder="科室班组" v-model="form.sq_ksbz"
type="text"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- <el-col :span="8">
<el-form-item prop="ybzk" label="医保状况">
<el-select v-model="form.ybzk" placeholder="请选择医保状况" clearable style="width: 100%">
<el-option
v-for="item in ybOptions"
:key="item"
:label="item"
:value="item">
</el-option>
<!-- <el-row gutter="20">
<el-col :span="12">
<el-form-item label="补助类型" prop="sq_bzlx">
<el-select v-model="form.sq_bzlx" @change="$set(form,'sq_knlx','')"
@clear="$set(form,'sq_knlx','')" style="width: 100%">
<el-option v-for="(v,k) in difficulty.subsidy" :label="v" :value="k"
:key="k"></el-option>
</el-select>
</el-form-item>
</el-col>-->
</el-col>
<el-col :span="12">
<el-form-item label="困难类型" prop="sq_knlx">
<el-select v-model="form.sq_knlx" clearable style="width: 100%">
<el-option v-for="(v,k) in difficulty.getHard(form.sq_bzlx)" :key="k" :value="k"
:label="v"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>-->
<!-- <el-row v-if="form.sq_knlx==1">
<el-col :span="12">
<el-form-item label="所在医院" prop="hospital">
<el-input placeholder="请填写所在所在医院" v-model="form.hospital"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="住院时间" prop="hospitalized_time">
<el-date-picker
clearable
style="width: 100%"
v-model="form.hospitalized_time"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择住院时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>-->
<el-row gutter="20">
<el-col :span="12">
<el-form-item label="补助类型" prop="sq_bzlx">
<el-select v-model="form.sq_bzlx" @change="$set(form,'sq_knlx','')"
@clear="$set(form,'sq_knlx','')" style="width: 100%">
<el-option v-for="(v,k) in difficulty.subsidy" :label="v" :value="k"
:key="k"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="困难类型" prop="sq_knlx">
<el-select v-model="form.sq_knlx" clearable style="width: 100%">
<el-option v-for="(v,k) in difficulty.getHard(form.sq_bzlx)" :key="k" :value="k"
:label="v"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row gutter="20">
<el-col :span="12">
<el-form-item prop="yhmc" label="发放补助银行">
<el-input maxlength="100" placeholder="请输入发放补助银行" clearable v-model="form.yhmc"
type="text" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="yhkh" label="银行卡号">
<el-input maxlength="30" placeholder="请输入银行卡号" clearable v-model="form.yhkh"
type="text" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>-->
<el-row v-if="form.sq_knlx==1" gutter="20">
<el-col :span="12">
<el-form-item label="所在医院" prop="hospital">
<el-input placeholder="请填写所在所在医院" v-model="form.hospital"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="住院时间" prop="hospitalized_time">
<el-date-picker
clearable
style="width: 100%"
v-model="form.hospitalized_time"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择住院时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="20">
<el-col :span="12">
<el-form-item prop="yhmc" label="发放补助银行支行名称">
<el-input maxlength="100" placeholder="请输入发放补助银行支行名称" clearable v-model="form.yhmc"
type="text" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="yhkh" label="银行卡号">
<el-input maxlength="30" placeholder="请输入银行卡号" clearable v-model="form.yhkh"
type="text" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item prop="apply_reason" label="申请理由">
<el-input maxlength="500" :autosize="{ minRows: 5, maxRows: 10}" placeholder="请简述申请理由" clearable
<el-form-item prop="apply_reason" label="申请原因">
<el-input maxlength="500" :autosize="{ minRows: 5, maxRows: 10}" placeholder="请简述申请原因"
clearable
v-model="form.apply_reason"
type="textarea"></el-input>
</el-form-item>
<el-form-item prop="zyzkyybz" label="备&emsp;&emsp;注">
<el-input maxlength="500" placeholder="请简述原因" clearable v-model="form.zyzkyybz"
<el-input maxlength="500" placeholder="请简述备注" :autosize="{ minRows: 5, maxRows: 10}"
clearable v-model="form.zyzkyybz"
type="textarea"></el-input>
</el-form-item>
<el-divider content-position="left" class="dia"><span style="color: #3ea1ec;">主要家庭成员</span></el-divider>
<el-form-item label-width="0">
<el-divider content-position="left" class="dia"><span style="color: #3ea1ec;">家庭成员经济收入</span>
</el-divider>
<el-form-item>
<el-button style="float: right;margin-bottom: 10px" icon="el-icon-plus" size="mini"
@click="form.jtcys.push({})">
添加
@@ -246,32 +255,31 @@
style="width: 100%">
<el-table-column prop="xm" label="姓名" align="center" header-align="center">
<template slot-scope="scope">
<el-input placeholder="请输入姓名" maxlength="100" v-model="scope.row.xm" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="gx" label="与本人关系" align="center" header-align="center">
<template slot-scope="scope">
<el-input placeholder="请输入与本人关系" maxlength="30" v-model="scope.row.gx" clearable></el-input>
<el-input placeholder="请输入姓名" maxlength="100" v-model="scope.row.xm"
clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="nl" label="年龄" align="center" header-align="center">
<template slot-scope="scope">
<el-input-number clearable style="width: 100%" v-model="scope.row.nl" :min="0" :max="99"
<el-input-number clearable style="width: 100%" v-model="scope.row.nl" :min="0"
:max="99"
controls-position="right" placeholder="请填写年龄">
</el-input-number>
</template>
</el-table-column>
<el-table-column prop="gzdw" label="工作单位" align="center" header-align="center">
<el-table-column prop="gx" label="与本人关系" align="center" header-align="center">
<template slot-scope="scope">
<el-input placeholder="请输入工作单位" maxlength="100" v-model="scope.row.gzdw"
<el-input placeholder="请输入与本人关系" maxlength="30" v-model="scope.row.gx"
clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="nsr" label="年收入（元）" align="center" header-align="center">
<el-table-column prop="nsr" label="月收入（元）" align="center" header-align="center">
<template slot-scope="scope">
<el-input-number clearable style="width: 100%" v-model="scope.row.nsr" :min="0"
:max="9999999"
controls-position="right" placeholder="请填写年收入">
controls-position="right" placeholder="请填写月收入">
</el-input-number>
</template>
</el-table-column>
@@ -285,20 +293,20 @@
</el-table>
</el-form-item>
<el-divider content-position="left" class="dia"><span style="color: #3ea1ec;">附&emsp;&emsp;件</span></el-divider>
<el-form-item prop="files" label-width="auto">
<el-divider content-position="left" class="dia"><span
style="color: #3ea1ec;">附&emsp;&emsp;件</span></el-divider>
<el-form-item prop="files" label-width="">
<file-upload :files.sync="form.files" card></file-upload>
</el-form-item>
<el-divider content-position="left" class="dia"><span
style="color: #3ea1ec;">签&emsp;&emsp;字</span></el-divider>
<el-form-item prop="sign" label-width="auto">
<el-form-item prop="sign" label-width="">
<sign :qz.sync="form.sqsign"></sign>
</el-form-item>
</el-form>
<slot name="footer"></slot>
</el-card>
</template>
<script>
@@ -314,11 +322,12 @@ module.exports = {
formRules: {
bbzrusername: [{required: true, message: '必填', trigger: ['blur', 'change']}],
apply_reason: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sex: [{required: true, message: '必填', trigger: ['blur', 'change']}],
unitname: [{required: true, message: '必填', trigger: ['blur', 'change']}],
brnzsr: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sq_bzlx: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sq_knlx: [{required: true, message: '必填', trigger: ['blur', 'change']}],
yhmc: [{required: true, message: '必填', trigger: ['blur', 'change']}],
yhkh: [{required: true, message: '必填', trigger: ['blur', 'change']}],
birthday: [{required: true, message: '必填', trigger: ['blur', 'change']}],
lxfs: [{required: true, message: '必填', trigger: ['blur', 'change']}],
jtzz: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
subsidizedList: [],
mzOptions: [
@@ -407,6 +416,36 @@ module.exports = {
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
},
methods: {
async operation(flag) {
let method = this.form.id ? "/doEdit" : "/doAdd"
if (flag) {
const valid = await this.$refs["addform"].validate()
if (!valid) {
return
}
}
const loading = this.$loading({
lock: true,
text: '正在提交...',
spinner: 'el-icon-loading',
background: COVER_LAYER_COLOR
});
const formData = Object.assign({}, this.form);
formData.jtcys = JSON.stringify(formData.jtcys)
formData.files = JSON.stringify(formData.files)
formData.applicantsign = formData.sqsign
formData.flag = flag
const resp = await $.post(loc() + method, formData)
if (resp.code === 0) {
sublime.jumpPagePjax('/platform/fw/difficulty/applylist')
loading.close()
} else {
this.$notify.error({title: '失败', message: resp.msg});
loading.close()
}
},
async getUserData(userId) {
const {data} = await $.get("/platform/fw/condolence/apply/getUserData", {userId})
return data
@@ -419,7 +458,8 @@ module.exports = {
this.$set(this.form, 'zzmm', userData.political)
this.$set(this.form, 'rsbz', userData.personType)
this.$set(this.form, 'mz', userData.nation)
this.$set(this.form, 'zw', userData.zw)
this.$set(this.form, 'zw', userData.position)
this.$set(this.form, 'zc', userData.jobtitle)
this.$set(this.form, 'birthday', userData.birthday)
this.$set(this.form, 'lxfs', userData.mobile)
this.$set(this.form, 'unitname', userData.name)
@@ -428,11 +468,7 @@ module.exports = {
$.post(base + '/platform/fw/difficulty/apply/querySqr', {key: key}).then(res => {
this.subsidizedList = res.data;
});
},
},
async created() {
}
}
}
</script>
src/main/resources/static/components/difficulty/info.vue
+100 -183
View File
@@ -14,66 +14,33 @@
{{ viewData.sqrloginname }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="user_name" label="补助人身份证号码">
{{ viewData.idcard }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="user_name" label="受补助人">
{{ viewData.bbname }}
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item prop="user_name" label="受补助人">
{{ viewData.bbname }}
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item prop="sex" label="性&emsp;&emsp;别">
{{ viewData.sex }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在单位">
{{ viewData.unitname }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="user_age" label="本人月收入">
{{ viewData.brnzsr }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="user_age" label="出生日期">
{{ viewData.birthday }}
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="民&emsp;&emsp;族">
{{ viewData.mz }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="职&emsp;&emsp;称">
{{ viewData.zc }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="职&emsp;&emsp;务">
{{ viewData.zw }}
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item label="政治面貌">
{{ viewData.zzmm }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人事编制">
{{ viewData.rsbz }}
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item label="参加工作时间">
{{ viewData.cjgzsj }}
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item label="医保情况">
{{ viewData.ybzk }}
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="所在单位">
{{ viewData.bbunit }}
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="在职状态">
{{ viewData.on_job ? '在职' : '退休' }}
@@ -84,91 +51,25 @@
{{ viewData.lxfs }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="补助类型">
{{ this.subsidy[viewData.sq_bzlx] }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="困难类型">
{{ this.sq_knlx[viewData.sq_knlx] }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="科室班组">
{{ viewData.sq_ksbz }}
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="主要致困原因">
{{ viewData.zyzkyy }}
</el-form-item>
</el-col>-->
<!-- <el-col :span="8">
<el-form-item label="本人年收入">
{{ viewData.brnzsr > 0 ? viewData.brnzsr : 0 }}元
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="家庭年收入">
{{ viewData.jtnzsr > 0 ? viewData.jtnzsr : 0 }}元
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="家庭人数">
{{ viewData.jtrs > 0 ? viewData.jtrs : 0 }}人
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现住房类型">
{{ viewData.xzflx }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
{{ viewData.jzmj > 0 ? viewData.jzmj : 0 }}平方
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="婚姻状况">
{{ viewData.hyzt }}
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="发放补助银行">
{{ viewData.yhmc }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发放补助银行卡号">
{{ viewData.yhkh }}
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="级别">
{{ viewData.jb }}
</el-form-item>
</el-col>-->
<el-col :span="8">
<el-form-item label="所在医院">
{{ viewData.hospital }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="住院时间">
{{ viewData.hospitalized_time }}
<el-col :span="12">
<el-form-item label="家庭地址">
{{ viewData.jtzz }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="申请理由">
{{ viewData.apply_reason }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
{{ viewData.zyzkyybz }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="user_name" label="附&emsp;&emsp;件">
<file-upload v-if="viewData.files&&viewData.files.length"
@@ -178,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="签&emsp;&emsp;字：">
<el-form-item label="签&emsp;&emsp;字">
<el-image v-if="viewData.sqsign"
style="width: 300px; height: 100px"
:src="viewData.sqsign"
@@ -189,51 +90,26 @@
</el-row>
</el-form>
</el-tab-pane>
<el-tab-pane label="主要家庭成员" name="4">
<el-tab-pane label="家庭成员经济收入" name="2">
<el-table
:data="viewData.jtcys"
border
size="mini"
style="width: 100%">
<el-table-column prop="xm" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="nl" label="年龄" align="center" header-align="center">
</el-table-column>
<el-table-column prop="gx" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="nsr" label="月收入（元）" align="center" header-align="center">
</el-table-column>
<el-table :data="viewData.jtcys" border size="mini" style="width: 100%">
<el-table-column sortable type="index" width="100" label="序号"
align="center" header-align="center">
</el-table-column>
<el-table-column prop="xm" label="姓名" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" v-model="row.xm"
type="text"></el-input>
</template>
</el-table-column>
<el-table-column prop="gx" label="与本人关系" placeholder="暂无" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" placeholder="暂无" v-model="row.gx"
type="text"></el-input>
</template>
</el-table-column>
<el-table-column prop="nl" label="年龄" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" placeholder="暂无" v-model="row.nl"
type="text"></el-input>
</template>
</el-table-column>
<el-table-column prop="gzdw" label="工作单位" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" placeholder="暂无" v-model="row.gzdw"
type="text"></el-input>
</template>
</el-table-column>
<el-table-column prop="nsr" label="年收入（元）" placeholder="暂无" align="center"
header-align="center">
<template slot-scope="{row}">
<el-input maxlength="50" placeholder="暂无" v-model="row.nsr"
type="text"></el-input>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="基层工会主席审核信息" name="5" v-if="hasPane(5)&&viewData.upa">
<el-tab-pane label="分工会审核信息" name="5" v-if="viewData.upa">
<el-form label-width="130px" style="padding: 20px 0">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header">
@@ -247,12 +123,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="审核时间：">
{{ moment(viewData.upa.auditTime).format("YYYY-MM-DD") }}
{{ viewData.upa.auditTime }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="审核意见：">
<div class="textarea-div">{{ viewData.upa.auditOpinion ? viewData.upa.auditOpinion : '暂无' }}</div>
<div class="textarea-div">
{{ viewData.upa.auditOpinion ? viewData.upa.auditOpinion : '暂无' }}
</div>
</el-form-item>
<el-form-item label="签&emsp;&emsp;字：">
<el-image v-if="viewData.upa.auditSign"
@@ -263,37 +141,76 @@
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="校工会主席审核信息" name="9" v-if="hasPane(9)&&viewData.sua">
<el-tab-pane label="校工会初审信息" name="9" v-if="viewData.tda">
<el-form label-width="130px" style="padding: 20px 0">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header">
</el-form-item>
<el-row gutter="20">
<el-col :span="8">
<el-col :span="12">
<el-form-item label="审核人员：">
{{ viewData.sua.username }}
{{ viewData.tda.username }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="审核时间：">
{{ moment(viewData.sua.auditTime).format("YYYY-MM-DD") }}
{{ viewData.tda.auditTime }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="补助金额">
{{ viewData.xghbzje }}
<el-col :span="12">
<el-form-item label="初审金额：">
{{ viewData.xghbzje }}（元）
</el-form-item>
</el-col>
</el-row>
<el-form-item label="审核意见：">
<div class="textarea-div">{{ viewData.sua.auditOpinion ? viewData.sua.auditOpinion : '暂无' }}</div>
<div class="textarea-div">
{{ viewData.tda.auditOpinion ? viewData.tda.auditOpinion : '暂无' }}
</div>
</el-form-item>
<el-form-item label="签&emsp;&emsp;字：">
<el-image v-if="viewData.sua.auditSign"
<el-image v-if="viewData.tda.auditSign"
style="width: 300px; height: 100px"
:src="viewData.sua.auditSign"
:src="viewData.tda.auditSign"
fit="contain"></el-image>
<span v-else>暂无</span>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="校工会主席审核信息" name="10" v-if="viewData.sma">
<el-form label-width="130px" style="padding: 20px 0">
<el-form-item label="审核信息&emsp;" label-width="135px" class="view-header">
</el-form-item>
<el-row gutter="20">
<el-col :span="12">
<el-form-item label="审核人员：">
{{ viewData.sma.username }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="审核时间：">
{{ viewData.sma.auditTime }}
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="补助金额：">
{{ viewData.xghbzje }}
</el-form-item>
</el-col>-->
</el-row>
<el-form-item label="审核意见：">
<div class="textarea-div">
{{ viewData.sma.auditOpinion ? viewData.sma.auditOpinion : '暂无' }}
</div>
</el-form-item>
<el-form-item label="签&emsp;&emsp;字：">
<el-image v-if="viewData.sma.auditSign"
style="width: 300px; height: 100px"
:src="viewData.sma.auditSign"
fit="contain"></el-image>
<span v-else>暂无</span>
</el-form-item>
@@ -362,9 +279,9 @@ module.exports = {
if (data) {
this.viewData.files = []
this.difficulty = this.handle ? "999" : "1"
console.log(data)
this.viewData = data
if (this.viewData.files.length > 0) {
console.log(data)
if (this.viewData.files && this.viewData.files.length > 0) {
this.viewData.files = JSON.parse(data.files)
}
@@ -375,7 +292,7 @@ module.exports = {
type: 'error'
});
}
},
}
}
}
</script>
src/main/resources/static/components/evaluate/evaluateInfo.vue
+1 -1
View File
@@ -110,7 +110,7 @@ pre {
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="院级工会审核信息" name="3" v-if="hasPane(3)&&viewData.unionAuditId">
<el-tab-pane label="分工会审核信息" name="3" v-if="hasPane(3)&&viewData.unionAuditId">
<vi-title title="审核信息"></vi-title>
<el-descriptions :column="2" border class="table_fixed">
src/main/resources/static/components/honor/honorInfo.vue
+1 -1
View File
@@ -150,7 +150,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="院级工会审核信息" name="3" v-if="hasPane(3)&&viewData.unionAuditId">
<el-tab-pane label="分工会审核信息" name="3" v-if="hasPane(3)&&viewData.unionAuditId">
<el-form label-suffix="：" label-position="left" style="margin: 50px">
<el-row gutter="20">
<el-col :span="24">
src/main/resources/static/components/member/MemberInfo.vue
+1 -1
View File
@@ -140,7 +140,7 @@
</el-form-item>
<el-form-item prop="political" label="政治面貌">
<dict-select v-model="formData.political" style="width: 100%" placeholder="请选择政治面貌"
code="JobTitle"></dict-select>
code="political"></dict-select>
<!-- <el-input maxlength="100" placeholder="政治面貌"
v-model="formData.political"></el-input>-->
</el-form-item>
src/main/resources/static/components/mobile/difficulty/info.vue
+1 -1
View File
@@ -47,7 +47,7 @@
<template v-if="viewData.upa">
<div class="van-cell-group__title">
<div class="van-sidebar-item van-sidebar-item--select">
院级工会审核信息
分工会审核信息
</div>
</div>
<van-cell-group class="mt10">
src/main/resources/static/components/mobile/mobile/club/mobileClubUserApplyInfo.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<!-- <template v-if="viewData.upa">
<div class="van-cell-group__title">
<div class="van-sidebar-item van-sidebar-item&#45;&#45;select">
院级工会审核信息
分工会审核信息
</div>
</div>
<van-cell-group class="mt10">
src/main/resources/static/components/mobile/mobile/difficulty/info.vue
+1 -1
View File
@@ -47,7 +47,7 @@
<template v-if="viewData.upa">
<div class="van-cell-group__title">
<div class="van-sidebar-item van-sidebar-item--select">
院级工会审核信息
分工会审核信息
</div>
</div>
<van-cell-group class="mt10">
src/main/resources/static/components/mobile/mobile/member/MobileMemberInfo.vue
+1 -1
View File
@@ -104,7 +104,7 @@
<template v-if="unionAudit!=null">
<div class="van-cell-group__title mt20">
<div class="van-sidebar-item van-sidebar-item--select">
院级工会审核信息
分工会审核信息
</div>
</div>
<van-cell-group>
src/main/resources/static/components/sign/mobileSign.vue
+51 -19
View File
@@ -1,6 +1,6 @@
<template>
<div>
<van-image :src="'/signature/getSignData?path='+value" v-if="!signDrawingBoardShow"
<div style="width: 100%">
<van-image :src="imageUrl" v-if="!signDrawingBoardShow"
style="width: 100%;height: 150px;border: 1px dashed"></van-image>
<div style="text-align: right">
<van-button plain type="danger" hairline size="small" @click="openSignDrawingBoard">
@@ -26,12 +26,31 @@ module.exports = {
},
value: {
type: String
}
},
is_value_base64: {
type: Boolean,
default: true
},
prefix: {
type: String,
default: ''
},
},
data() {
return {
signDrawingBoardShow: false,
signData: null
signData: null,
imageUrl: "",
}
},
watch: {
value:{
handler:function (val){
if(val){
this.getImageUrl(val)
}
},
immediate:true
}
},
methods: {
@@ -64,16 +83,31 @@ module.exports = {
},
async uploadSignData() {
const {data, code, msg} = await $.post('/signature/uploadSignData', {data: this.signData})
if (code === 0) {
console.log(data)
this.$emit('input', data)
if (this.is_value_base64) {
this.$emit('input', this.signData)
this.$emit("update:my_sign", this.signData)
this.getImageUrl(this.signData)
} else {
this.$modal.msgError(msg)
const {data, code, msg} = await $.post('/signature/uploadSignData', {data: this.signData})
if (code === 0) {
console.log(data)
this.getImageUrl(data)
this.$emit('input', data)
this.$emit("update:my_sign", data)
} else {
this.$modal.msgError(msg)
}
}
},
getImageUrl(value) {
if (this.is_value_base64) {
this.imageUrl = value
} else {
this.imageUrl = '/signature/getSignData?path=' + value
}
},
checkNull() {
return $('#canvas').jSignature('getData', 'native').length === 0
},
@@ -81,17 +115,15 @@ module.exports = {
this.$emit("update:my_sign", $('#canvas').jSignature('getData'))
},
async updateSign() {
const data = await $.post("/mobile/common/signing/update", {sign: $('#canvas').jSignature('getData')})
const data = await $.post("/mobile/common/signing/update", {
sign: $('#canvas').jSignature('getData'),
prefix: this.prefix
})
},
async getMySign() {
const data = await $.get("/mobile/common/signing/getMySign")
const data = await $.get("/mobile/common/signing/getMySign", {prefix: this.prefix})
if (data) {
console.log(this.my_sign)
$('#canvas').jSignature("importData", data)
this.$nextTick(() => {
})
this.getImageUrl(data)
}
}
},
src/main/resources/static/components/sign/sign.vue
+66 -13
View File
@@ -10,12 +10,13 @@
</el-collapse-transition>
<el-image fit="contain" v-show="!showQrCode" v-loading="loading"
style="height: 100px;width: 100%" :src="qz">
style="height: 100px;width: 100%" :src="imageUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
<el-link type="danger" style="font-size: 12px;margin-top: 20px" @click="refresh();clear()" icon="el-icon-edit"
<el-link type="danger" style="font-size: 12px;margin-top: 20px" @click="refresh();clear()"
icon="el-icon-edit"
v-show="!showQrCode">重签
</el-link>
</div>
@@ -42,6 +43,14 @@ module.exports = {
qz: {
type: String,
default: ''
},
value: {
type: String,
default: ''
},
is_value_base64: {
type: Boolean,
default: true
}
},
model: {
@@ -53,26 +62,37 @@ module.exports = {
showQrCode: false,
loading: true,
postAddress: '',
imageUrl: '',
}
},
methods: {
refresh() {
this.qz = ''
},
getImageUrl(value) {
if (this.is_value_base64) {
this.imageUrl = value
} else {
this.imageUrl = '/signature/getSignData?path=' + value
}
},
startRequest() {
this.qz = ''
this.imageUrl = ''
clearInterval(signatureInterval)
const ts = new Date().getTime()
this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts
const ts = new Date().getTime() + (Math.floor(Math.random() * (1000 - 1 + 1)) + 1).toString()
console.log(ts)
this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64
// this.postAddress = 'http://zhgh.jiangnan.edu.cn/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64
this.showQrCode = true
console.log(this.postAddress)
window.signatureInterval = setInterval(() => {
$.get(base + "/signature/getBase64?prefix=" + this.prefix + "&id=" + ts).then(res => {
$.get("/signature/getBase64?prefix=" + this.prefix + "&id=" + ts).then(res => {
if (res != null) {
this.$emit("change", res)
this.$emit("update:qz", res)
this.getImageUrl(res)
this.qz = res
this.loading = false
this.save()
@@ -81,23 +101,57 @@ module.exports = {
})
}, 1000 * 3)
},
save() {
localStorage.setItem("signature", this.qz)
async save() {
if (this.is_value_base64) {
localStorage.setItem("signature", this.qz)
} else {
return localStorage.setItem("signatureWelfare", this.qz)
}
},
clear() {
localStorage.removeItem("signature")
if (this.is_value_base64) {
localStorage.removeItem("signature")
} else {
localStorage.removeItem("signatureWelfare")
}
},
getSignature() {
return localStorage.getItem("signature")
if (this.is_value_base64) {
return localStorage.getItem("signature")
} else {
return localStorage.getItem("signatureWelfare")
}
},
async getMySign() {
setTimeout(() => {
if (this.qz) {
this.getImageUrl(this.qz)
} else {
$.get("/mobile/common/signing/getMySign", {prefix: this.prefix}).then(data => {
if (data) {
this.getImageUrl(data)
this.$emit("change", data)
this.$emit("update:qz", data)
this.qz = data
}
})
}
}, 500)
}
},
created() {
this.getMySign()
},
watch: {
'qz': {
handler(s) {
this.loading = !s
if (!s) {
const qz = this.getSignature()
if (!qz) {
this.$emit("change", '')
this.$emit("update:qz", '')
@@ -107,7 +161,6 @@ module.exports = {
this.$emit("change", qz)
this.$emit("update:qz", qz)
}
} else {
this.qz = s
this.showQrCode = false
@@ -147,4 +200,4 @@ module.exports = {
flex-direction: column;
z-index: 999;
}
</style>
</style>
src/main/resources/static/components/zgfw/knbf/knbf.vue
+1 -1
View File
@@ -51,7 +51,7 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="2" v-if="viewData.sq_sqzt>1">
<el-tab-pane label="分工会审核" name="2" v-if="viewData.sq_sqzt>1">
<el-card>
<el-form label-position="right" label-width="100px">
<el-form-item label="审核人">
src/main/resources/static/components/zgfw/wwj/wwj.vue
+1 -1
View File
@@ -45,7 +45,7 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="院级工会审核" name="2" v-if="viewData.status>1">
<el-tab-pane label="分工会审核" name="2" v-if="viewData.status>1">
<el-card>
<el-form label-position="right" label-width="100px">
<el-form-item label="审核人">
src/main/resources/views/layouts/platform.html
+2 -2
View File
@@ -215,10 +215,10 @@
</el-popover>
</li>
<li style="cursor: pointer" @click="menuPopover=true">
<!--<li style="cursor: pointer" @click="menuPopover=true">
<i class="el-icon-sort"></i>
切换应用
</li>
</li>-->
</ul>
<!-- <el-breadcrumb separator-class="el-icon-arrow-right" style="line-height: 50px">-->
src/main/resources/views/platform/activity/school/ActivityManage.html
+2 -2
View File
@@ -165,9 +165,9 @@ layout("/layouts/platform.html"){
<el-dropdown-item :command="{type:'view',row}">
查看
</el-dropdown-item>
<el-dropdown-item :command="{type:'export',row}" v-if="row.applyType===1">
<!--<el-dropdown-item :command="{type:'export',row}" v-if="row.applyType===1">
导出名单docx
</el-dropdown-item>
</el-dropdown-item>-->
<el-dropdown-item :command="{type:'exportXlsx',row}">
导出名单
</el-dropdown-item>
src/main/resources/views/platform/activity/union/applyActivity.html
+2 -2
View File
@@ -202,7 +202,7 @@
<el-col :lg="12" :xl="12" :xs="12">
<!--<el-col :lg="12" :xl="12" :xs="12">
<el-form-item label="是否推送移动端" prop="isPushHome">
<el-radio-group size="medium" v-model="formData.isPushHome">
<el-radio-button :label="0">不推送</el-radio-button>
@@ -210,7 +210,7 @@
<el-radio-button :label="2">推送大图</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-col>-->
<el-col :lg="12" :xl="12" :xs="12"
src/main/resources/views/platform/common/signature.html
+16 -11
View File
@@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
<!-- 在 head 标签中添加 meta 标签，并设置 viewport-fit=cover 值 -->
<meta name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover"
name="viewport">
<title>签字</title>
<!-- 引入样式文件 -->
<link rel="stylesheet" href="https://cdn.staticfile.org/vant/2.12.5/index.min.css">
<link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/2.2.0/weui.min.css">
<link href="https://cdn.staticfile.org/vant/2.12.5/index.min.css" rel="stylesheet">
<link href="https://res.wx.qq.com/open/libs/weui/2.2.0/weui.min.css" rel="stylesheet">
<!-- 引入 Vue 和 Vant 的 JS 文件 -->
<script src="https://cdn.staticfile.org/vue/2.6.9/vue.min.js"></script>
@@ -24,7 +24,7 @@
}
</style>
<body style="height: 100%;width: 100%">
<div v-clock id="app" style="height: 100%;width: 100%">
<div id="app" style="height: 100%;width: 100%" v-clock>
<van-row style="margin-top: 10vh;text-align: center">
<h3 style="color: #1989fa">提示：请在下方区域签字！</h3>
</van-row>
@@ -33,12 +33,13 @@
</van-row>
<van-row style="margin-top: 20px">
<van-col span="24" style="text-align: center">
<van-row type="flex" justify="space-around">
<van-row justify="space-around" type="flex">
<van-col span="11">
<van-button @click="reset" type="default" size="large">清 空</van-button>
<van-button @click="reset" size="large" type="default">清 空</van-button>
</van-col>
<van-col span="11">
<van-button type="info" @click="doSub" size="large" :disabled="subDis">提 交</van-button>
<van-button :disabled="subDis" @click="doSub" size="large" type="info">提 交
</van-button>
</van-col>
</van-row>
</van-col>
@@ -76,6 +77,7 @@
el: "#app",
data: function () {
return {
is_value_base64: true,
prefix: '',
id: '',
base64: '',
@@ -100,6 +102,7 @@
reset() {
qm.reset()
},
doSub() {
qm.getContentBase64(false, (val) => {
this.base64 = val
@@ -108,7 +111,8 @@
$.post("/signature/doSub", {
prefix: this.prefix,
id: this.id,
base64: this.base64
base64: this.base64,
is_value_base64: this.is_value_base64
}, (data) => {
if (data.code == 0) {
this.$notify({
@@ -148,8 +152,9 @@
}
this.id = getQueryVariable("id")
this.prefix = getQueryVariable("prefix")
this.is_value_base64 = getQueryVariable("is_value_base64")
}
})
</script>
</body>
</html>
</html>
src/main/resources/views/platform/sys/login.html
+3 -3
View File
@@ -173,7 +173,7 @@
${AppName!}系统登录
</h4>
<el-tabs class="login-tabs" v-model="activeName">
<el-tab-pane label="用户名登录" name="1">
<!--<el-tab-pane label="用户名登录" name="1">
<el-form v-if="activeName == '1'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
<el-form-item prop="username">
@@ -222,7 +222,7 @@
</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
</el-tab-pane>-->
<el-tab-pane label="短信快捷登陆" name="2">
<el-form v-if="activeName == '2'" :model="loginForm" :rules="loginRules" auto-complete="on" class="login-form"
ref="loginForm">
@@ -288,7 +288,7 @@
timer: null,
// 是否显示滑块验证
isShowSliderVerify: false,
activeName: '1',
activeName: '2',
loginForm: {
username: '',
password: '',