commit
This commit is contained in:
@@ -133,7 +133,7 @@ public class SiteUnionProcessController {
|
||||
String dyHomeReserve = "9020230075";
|
||||
// String dyHomeReserve = "2007080352";
|
||||
//校工会审核人(邓研,苏新荣)
|
||||
String schoolReserve = "2007080352,1996070092";
|
||||
String schoolReserve = "1996070092";
|
||||
// String schoolReserve = "2007080352";
|
||||
|
||||
if (isPass){
|
||||
@@ -151,7 +151,7 @@ public class SiteUnionProcessController {
|
||||
// msgApi.sendQiyeMsgTemplate(sendUserLoginName,schoolReserve,"场地预约审核",auditUrl,schoolContent);
|
||||
msgApi.sendMsg(schoolReserve,msgContent);
|
||||
}
|
||||
List<String> list = Lang.list("2007080352", "1996070092");
|
||||
List<String> list = Lang.list("1996070092");
|
||||
list.forEach(item -> {
|
||||
msgApi.sendMsg(item,msgContent);
|
||||
});
|
||||
|
||||
@@ -43,7 +43,7 @@ public enum CondolenceMsgHandler {
|
||||
NutMap nutMap = condolenceService.fetch(sql);
|
||||
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
|
||||
+ nutMap.getString("typeName") + "慰问已经提交,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
|
||||
List<String> schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031");
|
||||
List<String> schoolLoginNames = Lang.list("1996070092", "1987010012");
|
||||
for (String loginname : schoolLoginNames) {
|
||||
msgApi.sendMsg(loginname, msg);
|
||||
}
|
||||
@@ -94,7 +94,7 @@ public enum CondolenceMsgHandler {
|
||||
NutMap nutMap = condolenceService.fetch(sql);
|
||||
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
|
||||
+ nutMap.getString("typeName") + "慰问分工会主席已经审批通过,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
|
||||
List<String> schoolLoginNames = Lang.list("1986110082", "1996070092", "1987070031");
|
||||
List<String> schoolLoginNames = Lang.list("1986110082", "1996070092", "1987010012");
|
||||
for (String loginname : schoolLoginNames) {
|
||||
msgApi.sendMsg(loginname, msg);
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public enum CondolenceToDoHandler {
|
||||
CREATE_SCHOOL_TASK() {
|
||||
@Override
|
||||
public void exec(Condolence condolence, String option) {
|
||||
List<String> schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031");
|
||||
List<String> schoolLoginNames = Lang.list("1996070092", "1987010012");
|
||||
localProcessService.createTask(
|
||||
"condolence@" + condolence.getId(),
|
||||
"vice_chairman_review",
|
||||
|
||||
@@ -102,42 +102,44 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!-- <el-row gutter="60">-->
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee" label="收款人">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="formData.payee"
|
||||
filterable
|
||||
clearable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="请输入姓名或工号查找"
|
||||
:remote-method="userPayee"
|
||||
:loading="userLoading"
|
||||
@change="payeeChange">
|
||||
<el-option
|
||||
v-for="item in userPayees"
|
||||
:key="item.id"
|
||||
:label="item.username+'（'+item.loginname+'）'+'('+item.unitname+')'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee_bank_number" label="收款人银行卡">
|
||||
<el-input placeholder="请填写银行卡号" v-model="formData.payee_bank_number"
|
||||
maxlength="30"
|
||||
type="text"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee_bank_name" label="收款人开户行">
|
||||
<el-input placeholder="请填写开户行" v-model="formData.payee_bank_name" maxlength="30"
|
||||
type="text"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- 结婚、退休离岗慰问无需填写收款信息；不渲染表单项可同时避免触发对应必填校验。 -->
|
||||
<template v-if="showPayeeFields">
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee" label="收款人">
|
||||
<el-select
|
||||
style="width: 100%"
|
||||
v-model="formData.payee"
|
||||
filterable
|
||||
clearable
|
||||
remote
|
||||
reserve-keyword
|
||||
placeholder="请输入姓名或工号查找"
|
||||
:remote-method="userPayee"
|
||||
:loading="userLoading"
|
||||
@change="payeeChange">
|
||||
<el-option
|
||||
v-for="item in userPayees"
|
||||
:key="item.id"
|
||||
:label="item.username+'（'+item.loginname+'）'+'('+item.unitname+')'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee_bank_number" label="收款人银行卡">
|
||||
<el-input placeholder="请填写银行卡号" v-model="formData.payee_bank_number"
|
||||
maxlength="30"
|
||||
type="text"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item prop="payee_bank_name" label="收款人开户行">
|
||||
<el-input placeholder="请填写开户行" v-model="formData.payee_bank_name" maxlength="30"
|
||||
type="text"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</template>
|
||||
|
||||
</el-row>
|
||||
<el-row gutter="60">
|
||||
@@ -444,6 +446,11 @@ layout("/layouts/platform.html"){
|
||||
}*/
|
||||
},
|
||||
computed: {
|
||||
showPayeeFields() {
|
||||
const condolenceType = this.typeOptions.find(item => item.id === this.formData.type)
|
||||
const hiddenTypeNames = ['会员结婚慰问', '会员退休离岗慰问']
|
||||
return !condolenceType || !hiddenTypeNames.includes(condolenceType.name)
|
||||
},
|
||||
goodsAlbumFile() {
|
||||
const goodsAlbum = this.formData.goodsAlbum
|
||||
return goodsAlbum && goodsAlbum.length ? goodsAlbum[0] : null
|
||||
|
||||
Reference in New Issue
Block a user