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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-03-19 15:24:30 +08:00
parent 2b0a2a9926
commit 0766026f2c
10 changed files with 385 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/base/sms/impl/SmsWhcpServiceImpl.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class SmsWhcpServiceImpl implements SmsService {
json.put("password", SecureUtil.md5(SecureUtil.md5("Whszyxy123") + tKey)); json.put("password", SecureUtil.md5(SecureUtil.md5("Whszyxy123") + tKey));
json.put("tKey", tKey + ""); json.put("tKey", tKey + "");
json.put("mobile", mobile); json.put("mobile", mobile);
json.put("content", "【智慧工会】" + content); json.put("content", "智慧工会：" + content);
log.info("【log】调用短信消息接口，请求参数：{}", Json.toJson(json)); log.info("【log】调用短信消息接口，请求参数：{}", Json.toJson(json));
String result = HttpRequest.post(urls) String result = HttpRequest.post(urls)
src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class SmsMessageSendStrategy implements GlobalMessageSendStrategy {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
return true; return false;
} }
@Override @Override
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java
+2 -1
View File
@@ -78,6 +78,7 @@ public class MemberApplyBranchUnionApprovalController {
info.personType, info.personType,
info.applyDateTime, info.applyDateTime,
info.sign, info.sign,
info.nativePlace,
ins.id AS instanceId, ins.id AS instanceId,
ins.businessNo, ins.businessNo,
ins.state instanceState, ins.state instanceState,
@@ -125,7 +126,7 @@ public class MemberApplyBranchUnionApprovalController {
} else { } else {
cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
} }
cnd.groupBy("t.id"); cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination); return Result.success(pagination);
src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java
+2 -1
View File
@@ -93,6 +93,7 @@ public class MemberApplySchoolUnionApprovalController {
info.origin, info.origin,
info.applyDateTime, info.applyDateTime,
info.sign, info.sign,
info.nativePlace,
ins.id AS instanceId, ins.id AS instanceId,
ins.businessNo, ins.businessNo,
ins.state instanceState, ins.state instanceState,
@@ -138,7 +139,7 @@ public class MemberApplySchoolUnionApprovalController {
} else { } else {
cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
} }
cnd.groupBy("t.id"); cnd.groupBy("info.id");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination); return Result.success(pagination);
src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
+16 -6
View File
@@ -13,7 +13,8 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button> <el-radio-button label="false">未审核</el-radio-button>
</el-radio-group> </el-radio-group>
</table-tool> </table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%"> <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id"
style="width: 100%">
<el-table-column <el-table-column
:index="indexMethod" :index="indexMethod"
align="center" align="center"
@@ -73,6 +74,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature>
</el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button> <el-button @click="$refs.guava.index()" size="small">取消</el-button>
@@ -103,7 +108,8 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true }, { prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true }, { prop: "userState", label: "在职状态", sortable: true },
// { prop: "personType", label: "教职工类别", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "nativePlace", label: "籍贯", sortable: true },
// { prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true },
// { prop: "sign", label: "签字" }, // { prop: "sign", label: "签字" },
@@ -115,12 +121,12 @@ layout("/layouts/platform.html"){
showApprovalForm: false, showApprovalForm: false,
formData: { formData: {
tf_opinion: "" tf_opinion: ""
}, }
} }
}, },
components: { components: {
'info': INFO, "info": INFO,
'common-query': COMMON_QUERY, "common-query": COMMON_QUERY
}, },
methods: { methods: {
openView(row) { openView(row) {
@@ -140,6 +146,8 @@ layout("/layouts/platform.html"){
}) })
}, },
handleTaskAction(val) { handleTaskAction(val) {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", { this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@@ -161,6 +169,8 @@ layout("/layouts/platform.html"){
loading.close() loading.close()
}) })
}) })
}
})
}, },
openRevoke(row) { openRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", { this.$confirm("您确定要撤回吗？", "提示", {
@@ -184,7 +194,7 @@ layout("/layouts/platform.html"){
this.pageForm = { ...this.pageForm, ...pageForm } this.pageForm = { ...this.pageForm, ...pageForm }
} }
this.doSearch() this.doSearch()
}, }
}, },
created() { created() {
this.pageData() this.pageData()
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
+9 -5
View File
@@ -16,22 +16,22 @@ const INFO = {
<el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item> <el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
<el-descriptions-item label="学位">{{ viewData.academicDegree }}</el-descriptions-item> <el-descriptions-item label="学位">{{ viewData.academicDegree }}</el-descriptions-item>
<el-descriptions-item label="党政职务">{{ viewData.position }}</el-descriptions-item> <el-descriptions-item label="籍贯">{{ viewData.nativePlace }}</el-descriptions-item>
<el-descriptions-item label="工作单位">{{ viewData.unitName }}</el-descriptions-item> <el-descriptions-item label="工作单位">{{ viewData.unitName }}</el-descriptions-item>
<el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item> <el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>
<el-descriptions-item label="岗位名称">{{ viewData.jobCategory }}</el-descriptions-item>
<!-- <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>--> <!-- <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>-->
<el-descriptions-item label="身份证号码">{{ viewData.idCard }}</el-descriptions-item> <el-descriptions-item label="身份证号码">{{ viewData.idCard }}</el-descriptions-item>
<el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item> <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
<!-- <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>--> <!-- <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>-->
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item> <!-- <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>--> <!-- <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>-->
<el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item> <!-- <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>-->
<el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item> <el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
<el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item> <el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭住址" :span="3">{{ viewData.homeAddress }}</el-descriptions-item> <el-descriptions-item label="家庭住址" :span="3">{{ viewData.homeAddress }}</el-descriptions-item>
@@ -101,7 +101,11 @@ const INFO = {
</template> </template>
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.tf_opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字信息" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-image :src="task.taskFormData.tf_sign"
class="signature-image"></el-image>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+1 -1
View File
@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
{ prop: "userName", label: "姓名", sortable: true }, { prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true }, { prop: "userState", label: "在职状态", sortable: true },
// { prop: "personType", label: "教职工类别", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "nativePlace", label: "籍贯", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true },
// { prop: "sign", label: "签字" }, // { prop: "sign", label: "签字" },
src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
+18 -8
View File
@@ -14,7 +14,8 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button> <el-radio-button label="false">未审核</el-radio-button>
</el-radio-group> </el-radio-group>
</table-tool> </table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%"> <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id"
style="width: 100%">
<el-table-column <el-table-column
:index="indexMethod" :index="indexMethod"
align="center" align="center"
@@ -91,6 +92,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item prop="tf_sign" label="签字"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature>
</el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button> <el-button @click="$refs.guava.index()" size="small">取消</el-button>
@@ -120,11 +125,12 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true }, { prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", label: "姓名", sortable: true }, { prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true }, { prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true }, { prop: "nativePlace", label: "籍贯", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true },
// { prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true },
{ prop: "sign", label: "签字" }, // { prop: "sign", label: "签字" },
{ prop: "curTaskName", label: "当前节点" }, { prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" } { prop: "instanceState", label: "流程状态" }
], ],
@@ -134,12 +140,12 @@ layout("/layouts/platform.html"){
formData: { formData: {
tf_opinion: "" tf_opinion: ""
}, },
unions: [], unions: []
} }
}, },
components: { components: {
'info': INFO, "info": INFO,
'common-query': COMMON_QUERY, "common-query": COMMON_QUERY
}, },
methods: { methods: {
openView(row) { openView(row) {
@@ -163,6 +169,8 @@ layout("/layouts/platform.html"){
}) })
}, },
handleTaskAction(val) { handleTaskAction(val) {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", { this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@@ -184,6 +192,8 @@ layout("/layouts/platform.html"){
loading.close() loading.close()
}) })
}) })
}
})
}, },
openRevoke(taskId) { openRevoke(taskId) {
this.$confirm("您确定要撤回吗？", "提示", { this.$confirm("您确定要撤回吗？", "提示", {
@@ -212,7 +222,7 @@ layout("/layouts/platform.html"){
assignmentUnionName(val) { assignmentUnionName(val) {
const union = this.unions.find(item => item.id === val) const union = this.unions.find(item => item.id === val)
this.$set(this.formData, "tf_allocation_unionName", union.name) this.$set(this.formData, "tf_allocation_unionName", union.name)
}, }
}, },
created() { created() {
this.pageData() this.pageData()
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+22 -14
View File
@@ -60,9 +60,9 @@ layout("/layouts/platform.html"){
code="USER_ACADEMIC_DEGREE"></dict-select> code="USER_ACADEMIC_DEGREE"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="党政职务"> <el-descriptions-item label="籍贯">
<el-form-item prop="position"> <el-form-item prop="nativePlace">
<el-input v-model="formData.position" placeholder="请输入党政职务" <el-input v-model="formData.nativePlace" placeholder="请输入籍贯"
maxlength="50"></el-input> maxlength="50"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
@@ -90,24 +90,31 @@ layout("/layouts/platform.html"){
</el-descriptions-item>--> </el-descriptions-item>-->
<el-descriptions-item label="在职状态"> <el-descriptions-item label="岗位名称">
<el-form-item prop="jobCategory">
<el-input v-model="formData.jobCategory" placeholder="请输入岗位名称"
maxlength="50"></el-input>
</el-form-item>
</el-descriptions-item>
<!-- <el-descriptions-item label="在职状态">
<el-form-item prop="userState"> <el-form-item prop="userState">
<dict-select v-model="formData.userState" code="USER_STATE" <dict-select v-model="formData.userState" code="USER_STATE"
disabled style="width: 100%"></dict-select> disabled style="width: 100%"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>-->
<!--<el-descriptions-item label="教职工类别"> <!--<el-descriptions-item label="教职工类别">
<el-form-item prop="personType"> <el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE" <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
style="width: 100%"></dict-select> style="width: 100%"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item>--> </el-descriptions-item>-->
<el-descriptions-item label="编制类别"> <!--<el-descriptions-item label="编制类别">
<el-form-item prop="preparedBy"> <el-form-item prop="preparedBy">
<dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE" <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
disabled style="width: 100%"></dict-select> disabled style="width: 100%"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>-->
<el-descriptions-item label="婚姻状况"> <el-descriptions-item label="婚姻状况">
<el-form-item prop="marriage" label="婚姻状况"> <el-form-item prop="marriage" label="婚姻状况">
<dict-select v-model="formData.marriage" code="USER_MARRIAGE" <dict-select v-model="formData.marriage" code="USER_MARRIAGE"
@@ -133,7 +140,6 @@ layout("/layouts/platform.html"){
disabled maxlength="50"></el-input> disabled maxlength="50"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭住址" :span="3"> <el-descriptions-item label="家庭住址" :span="3">
<el-form-item prop="homeAddress" label="家庭住址"> <el-form-item prop="homeAddress" label="家庭住址">
<el-input v-model="formData.homeAddress" placeholder="请输入家庭住址" maxlength="90"></el-input> <el-input v-model="formData.homeAddress" placeholder="请输入家庭住址" maxlength="90"></el-input>
@@ -219,11 +225,11 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">--> <el-descriptions-item label="签字" :span="3">
<!-- <el-form-item prop="sign">--> <el-form-item prop="sign">
<!-- <pc-signature v-model="formData.sign"></pc-signature>--> <pc-signature v-model="formData.sign"></pc-signature>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-descriptions-item>--> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-form> </el-form>
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
@@ -256,7 +262,9 @@ layout("/layouts/platform.html"){
personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }], personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }], specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }], marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
arrivalAtSchoolDate: [{ required: true, message: "必填", trigger: ["change", "blur"] }] arrivalAtSchoolDate: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
nativePlace: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
jobCategory: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
/*email: [ /*email: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html
+5 -5
View File
@@ -89,7 +89,7 @@ layout("/layouts/platform.html"){
.content-left { .content-left {
grid-column: 1 / 4; grid-column: 1 / 4;
display: grid; display: grid;
grid-template-rows: 1fr 1fr; /*grid-template-rows: 1fr 1fr;*/
gap: 20px; gap: 20px;
min-height: 0; min-height: 0;
} }
@@ -332,10 +332,10 @@ layout("/layouts/platform.html"){
<div class="chart-container" id="personTypeMemberChart" v-loading="loading.personTypeMember"></div> <div class="chart-container" id="personTypeMemberChart" v-loading="loading.personTypeMember"></div>
</div>--> </div>-->
<!-- 在职类型图表 --> <!-- 在职类型图表 -->
<div class="card"> <!-- <div class="card">
<div class="card-title">人员类型统计</div> <div class="card-title">人员类型统计</div>
<div class="chart-container" id="userStateMemberChart" v-loading="loading.userStateMember"></div> <div class="chart-container" id="userStateMemberChart" v-loading="loading.userStateMember"></div>
</div> </div>-->
</div> </div>
<!-- 右侧表格区域 --> <!-- 右侧表格区域 -->
@@ -622,8 +622,8 @@ layout("/layouts/platform.html"){
// X轴配置 // X轴配置
xAxis: { xAxis: {
label: { label: {
autoHide: true, autoHide: false,
autoRotate: false, autoRotate: true,
style: { style: {
fill: '#666', fill: '#666',
fontSize: 12 fontSize: 12