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

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source
This commit is contained in:
Paidax
2025-09-11 09:22:54 +08:00
parent af765b180f c913ee1a12
commit 32d5791c0a
56 changed files with 3162 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js
+8 -8
View File
@@ -105,7 +105,7 @@ const apply = {
watch: {
applyTime() {
this.$nextTick(async () => {
await this.queryAllowTime()
await this.queryAllowDay()
})
},
},
@@ -166,7 +166,7 @@ const apply = {
},
async onOpen(row, applyRow = null) {
this.row = row
await this.queryAllowTime()
await this.queryAllowDay()
if(applyRow) {
this.taskId = applyRow.taskId
this.bizId = applyRow.bizId
@@ -231,11 +231,11 @@ const apply = {
}
},
// 查询哪些天是开放的
async queryAllowTime() {
async queryAllowDay() {
const days = Array.from(document.querySelectorAll('.div-Calendar'))
.map(el => el.getAttribute('data-day'))
.sort()
const {data} = await this.$axios.post("/platform/site/apply/queryAllowTime", {
const {data} = await this.$axios.post("/platform/site/apply/queryAllowDay", {
siteId: this.row.id,
startTime: days[0],
endTime: days[days.length - 1],
@@ -254,17 +254,17 @@ const apply = {
},
},
style: /*language=CSS*/ `
.div-Calendar {
::v-deep .div-Calendar {
box-sizing: border-box;
height: 100%;
}
.div-Calendar p {
::v-deep .div-Calendar p {
margin: 0;
}
.el-calendar-day:has(.not-allow-day) {
::v-deep .el-calendar-day:has(.not-allow-day) {
background-color: #F5F5F5;
}
.el-dialog__body {
::v-deep .el-dialog__body {
padding-top: 0;
}
`
src/main/resources/views/platform/zhgh/dayofficework/site/apply/index.html
+1 -13
View File
@@ -3,19 +3,7 @@ layout("/layouts/platform.html"){
#-->
<style>
.div-Calendar {
box-sizing: border-box;
height: 100%;
}
.div-Calendar p {
margin: 0;
}
.el-calendar-day:has(.not-allow-day) {
background-color: #F5F5F5;
}
.el-dialog__body {
padding-top: 0;
}
</style>
<div id="app" v-cloak>
src/main/resources/views/platform/zhgh/dayofficework/site/manage/basicForm.js
+2 -2
View File
@@ -140,7 +140,7 @@ const basicForm = {
style="width: 100%"
placeholder="开始时间"
v-model="row.startTime"
:picker-options="{ start: '00:00',step: '00:30',end: '24:00'}">
:picker-options="{ start: '00:00',step: '00:30',end: '23:59'}">
</el-time-select>
</template>
</el-table-column>
@@ -150,7 +150,7 @@ const basicForm = {
style="width: 100%"
placeholder="结束时间"
v-model="row.endTime"
:picker-options="{start: '00:00',step: '00:30',end: '24:00',minTime: row.start_time }">
:picker-options="{start: '00:00',step: '00:30',end: '23:59',minTime: row.start_time }">
</el-time-select>
</template>
</el-table-column>
src/main/resources/views/platform/zhgh/unionReimburse/apply/index.html → src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+7 -8
View File
@@ -153,9 +153,9 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="活动类型" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_2'">
<el-form-item label="活动类型" prop="activityType">
<el-select v-model="formData.activityType" placeholder="请选择活动类型" style="width: 100%">
<el-option label="分工会活动" value="1"></el-option>
<el-option label="校工会活动" value="2"></el-option>
<el-option label="协会(社团)活动" value="3"></el-option>
<el-option label="分工会活动" value="分工会活动"></el-option>
<el-option label="校工会活动" value="校工会活动"></el-option>
<el-option label="协会(社团)活动" value="协会(社团)活动"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
@@ -216,7 +216,7 @@ layout("/layouts/platform.html"){
<el-form-item prop="files" label="附件">
<file-upload
:value.sync="formData.files"
:upload_number="5"
:upload_number="10"
upload_result_category="array"
complete_result
upload_mode="drag"
@@ -251,7 +251,6 @@ layout("/layouts/platform.html"){
paymentWay: [{required: true, message: '请选择支付方式', trigger: ["change", "blur"]}],
reimburseProject: [{required: true, message: '请选择报销项目', trigger: ["change", "blur"]}],
reimburseFundSource: [{required: true, message: '请选择经费来源', trigger: ["change", "blur"]}],
mobile: [{required: true, message: '请填写联系方式', trigger: ["change", "blur"]}],
bankUserName: [{required: true, message: '请填写户名', trigger: ["change", "blur"]}],
bankCardNumber: [{required: true, message: '请填写银行账号', trigger: ["change", "blur"]}],
bankOfDeposit: [{required: true, message: '请填写开户行', trigger: ["change", "blur"]}],
@@ -349,7 +348,7 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/unionReimburse/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/unionReimburse/mine'
window.location.href = '/platform/unionReimburse/mine/index'
}
})
})
@@ -375,7 +374,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/unionReimburse/mine'
window.location.href = '/platform/unionReimburse/mine/index'
}
})
})
@@ -402,7 +401,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/unionReimburse/mine'
window.location.href = '/platform/unionReimburse/mine/index'
}
})
})
src/main/resources/views/platform/zhgh/unionReimburse/collect/index.html → src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
+2 -1
View File
@@ -126,6 +126,7 @@ layout("/layouts/platform.html"){
},
data() {
return {
pageDataUrl: "/platform/unionReimburse/collect/pageData",
unionOptions: [],
unitOptions: [],
userOptions: [],
@@ -175,7 +176,7 @@ layout("/layouts/platform.html"){
})
},
onExport() {
this.$downLoad(loc() + '/onExport', this.pageForm)
this.$downLoad('/platform/unionReimburse/collect/onExport', this.pageForm)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
src/main/resources/views/platform/zhgh/unionReimburse/info.js → src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js
View File
src/main/resources/views/platform/zhgh/unionReimburse/mine/index.html → src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
+2 -1
View File
@@ -126,6 +126,7 @@ layout("/layouts/platform.html"){
},
data() {
return {
pageDataUrl: "/platform/unionReimburse/mine/pageData",
unionOptions: [],
unitOptions: [],
userOptions: [],
@@ -161,7 +162,7 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/unionReimburse/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
window.location.href = '/platform/unionReimburse/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
src/main/resources/views/platform/zhgh/unionReimburse/review/index.html → src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+1
View File
@@ -150,6 +150,7 @@ layout("/layouts/platform.html"){
},
data() {
return {
pageDataUrl: "/platform/unionReimburse/review/pageData",
pageForm: {
approval: false
},
src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+1 -1
View File
@@ -172,7 +172,7 @@ layout("/layouts/platform.html"){
return age >= 0 ? age : '未出生';
},
openEdit(row) {
window.location.href = '/platform/childManage/write?bizId=' + row.id + '&manage=1'
window.location.href = '/platform/childManage/write/index?bizId=' + row.id + '&manage=1'
},
doDelete(id) {
this.$confirm("您确定要删除吗？", "提示", {
src/main/resources/views/platform/zhgh/staffmanage/childManage/mine/index.html
+1 -1
View File
@@ -119,7 +119,7 @@ layout("/layouts/platform.html"){
return age >= 0 ? age : '未出生';
},
openEdit(row) {
window.location.href = '/platform/childManage/write?bizId=' + row.id
window.location.href = '/platform/childManage/write/index?bizId=' + row.id
},
doDelete(id) {
this.$confirm("您确定要删除吗？", "提示", {
src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
+2 -2
View File
@@ -309,9 +309,9 @@ layout("/layouts/platform.html"){
if (res.code === 0) {
this.$message.success(res.msg)
if (GetQueryString('manage') === '1') {
window.location.href = '/platform/childManage/manage'
window.location.href = '/platform/childManage/manage/index'
}else {
window.location.href = '/platform/childManage/mine'
window.location.href = '/platform/childManage/mine/index'
}
}
})