1
This commit is contained in:
-1
@@ -79,7 +79,6 @@ public class GrassrootsCongressMaterialMineController {
|
||||
grassroots_congress_materials_info info
|
||||
LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
|
||||
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
|
||||
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
|
||||
$condition
|
||||
""");
|
||||
Cnd cnd = Cnd.NEW();
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ public class GrassrootsCongressMeetingMineController {
|
||||
grassroots_congress_meeting_info info
|
||||
LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
|
||||
LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
|
||||
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
|
||||
-- 任务参与人表一条任务会有多条参与人记录，这里不需要联查，否则同一业务会被展开成多行
|
||||
$condition
|
||||
""");
|
||||
Cnd cnd = Cnd.NEW();
|
||||
|
||||
+11
-1
@@ -14,6 +14,7 @@ import org.nutz.dao.Cnd;
|
||||
import org.nutz.dao.Dao;
|
||||
import org.nutz.dao.Sqls;
|
||||
import org.nutz.dao.sql.Sql;
|
||||
import org.nutz.dao.util.cri.SqlExpressionGroup;
|
||||
import org.nutz.ioc.loader.annotation.Inject;
|
||||
import org.nutz.ioc.loader.annotation.IocBean;
|
||||
import org.nutz.lang.util.NutMap;
|
||||
@@ -102,7 +103,16 @@ public class DifficultHelpBranchUnionLeaderApprovalController {
|
||||
$condition
|
||||
""");
|
||||
Cnd cnd = Cnd.NEW();
|
||||
pageParam.buildSearch(cnd, "info.");
|
||||
// pageParam.buildSearchUnit(cnd, "info.");
|
||||
|
||||
if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) {
|
||||
SqlExpressionGroup seg = new SqlExpressionGroup();
|
||||
seg.orLike("info.userName", pageParam.getSearchKeyword());
|
||||
seg.orLike("info.loginName", pageParam.getSearchKeyword());
|
||||
cnd.and(seg);
|
||||
}
|
||||
cnd.andEX("info.unionId", "=", pageParam.getUnionId());
|
||||
cnd.andEX("info.unitId", "=", pageParam.getUnitId());
|
||||
|
||||
cnd.and("t.taskName", "=", "36ebafda-44c2-4bd3-bd7f-10839a575a0d");
|
||||
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
|
||||
|
||||
+1
@@ -78,6 +78,7 @@ public class DifficultHelpMineController {
|
||||
LEFT(info.applyTime, 10) AS applyTime,
|
||||
info.applyCount,
|
||||
info.mobile,
|
||||
info.money,
|
||||
ins.id AS instanceId,
|
||||
ins.businessNo,
|
||||
ins.state instanceState,
|
||||
|
||||
+1
@@ -95,6 +95,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
|
||||
u.isModelWorker,
|
||||
u.userAttribute,
|
||||
u.aidFundMemberUserType,
|
||||
u.arrivalAtSchooDate,
|
||||
his.id hisId,
|
||||
his.changeTypes,
|
||||
his.changeTime
|
||||
|
||||
@@ -334,7 +334,7 @@ layout("/layouts/platform.html"){
|
||||
officialCapacity: [{required: true, message: '请填写职称', trigger: ['blur', 'change']}],
|
||||
subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}],
|
||||
reason: [{required: true, message: '请填写申请原因', trigger: ['blur', 'change']}],
|
||||
// sign: [{required: true, message: '请签字', trigger: ['blur', 'change']}]
|
||||
sign: [{required: true, message: '请签字', trigger: ['blur', 'change']}]
|
||||
},
|
||||
|
||||
// 替他人申请相关
|
||||
|
||||
+14
-3
@@ -49,7 +49,9 @@ layout("/layouts/platform.html"){
|
||||
</el-radio-group>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
|
||||
@selection-change="handleSelectionChange"
|
||||
ref="table" row-key="id" style="width: 100%">
|
||||
<el-table-column type="selection" width="45"></el-table-column>
|
||||
<el-table-column :index="indexMethod" header-align="center" label="序号"
|
||||
type="index" width="60px"></el-table-column>
|
||||
<el-table-column
|
||||
@@ -137,7 +139,8 @@ layout("/layouts/platform.html"){
|
||||
units: [],
|
||||
|
||||
formData: {},
|
||||
showApprovalForm: false
|
||||
showApprovalForm: false,
|
||||
selectData: []
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -160,13 +163,18 @@ layout("/layouts/platform.html"){
|
||||
this.$message.warning('没有待审核的数据！');
|
||||
return;
|
||||
}
|
||||
const message = '确定要一键审核这 ' + this.tableData.length + ' 条记录吗？';
|
||||
if (this.selectData.length === 0) {
|
||||
this.$message.warning('请勾选待审核数据！');
|
||||
return;
|
||||
}
|
||||
|
||||
const message = '确定要一键审核这 ' + this.selectData.length + ' 条记录吗？';
|
||||
this.$confirm(message, '批量审核确认', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.batchApprove(this.tableData);
|
||||
this.batchApprove(this.selectData);
|
||||
}).catch(() => {
|
||||
|
||||
});
|
||||
@@ -284,6 +292,9 @@ layout("/layouts/platform.html"){
|
||||
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
|
||||
}
|
||||
},
|
||||
handleSelectionChange: function (val) {
|
||||
this.selectData = val
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
this.pageData()
|
||||
|
||||
@@ -100,13 +100,14 @@ layout("/layouts/platform.html"){
|
||||
year: this.$moment().format("YYYY")
|
||||
},
|
||||
tableColumns: [
|
||||
{ prop: "loginName", label: "受助人工号", sortable: true },
|
||||
{ prop: "loginName", label: "受助人工号", sortable: true, width: "125" },
|
||||
{ prop: "userName", label: "姓名", sortable: true },
|
||||
{ prop: "proxyUserName", label: "申请人", sortable: true },
|
||||
{ prop: "unionName", label: "所属工会", sortable: true },
|
||||
{ prop: "unitName", label: "所属单位", sortable: true },
|
||||
{ prop: "mobile", label: "联系方式", sortable: true },
|
||||
{ prop: "subsidyStandards", label: "困难类型", sortable: true },
|
||||
{ prop: "money", label: "实际帮扶金额", sortable: true, width: "135"},
|
||||
{ prop: "applyTime", label: "申请时间", sortable: true },
|
||||
{ prop: "applyCount", label: "申请次数", sortable: true },
|
||||
{ prop: "taskName", label: "当前节点" },
|
||||
|
||||
@@ -570,11 +570,12 @@ layout("/layouts/platform.html"){
|
||||
{ prop: "arrivalAtSchoolDate", label: "来校时间", width: 120, sortable: true, checked: 0 },
|
||||
{ prop: "teachingTime", label: "从教年月", width: 120, sortable: true, checked: 0 },
|
||||
{ prop: "expectedLeaveSchoolDate", label: "预计/最后离校时间", width: 120, sortable: true, checked: 0 },
|
||||
{ prop: "arrivalAtSchooDate", label: "入校时间", width: 120, sortable: true, checked: 0 },
|
||||
],
|
||||
|
||||
changeTypeData: [],
|
||||
|
||||
checkedFields: []
|
||||
checkedFields: [],
|
||||
allowChangeFields: []
|
||||
},
|
||||
components: {
|
||||
"member-info": MEMBER_INFO,
|
||||
@@ -657,6 +658,7 @@ layout("/layouts/platform.html"){
|
||||
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
|
||||
}
|
||||
this.changeTypeData = await this.$businessTool.getEnumOptions("MemberChangeType")
|
||||
this.allowChangeFields = await this.$businessTool.getDictOptions("ALLOW_CHANGE_FIELDS")
|
||||
},
|
||||
async flushUnits() {
|
||||
this.$set(this.pageForm, "unitId", null)
|
||||
@@ -827,7 +829,7 @@ layout("/layouts/platform.html"){
|
||||
this.$message.error(resp.msg)
|
||||
}
|
||||
this.batchEditLoading = false
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
showColumns() {
|
||||
|
||||
Reference in New Issue
Block a user