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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-07-02 20:03:27 +08:00
parent 44680d1abb 75ed9a1b39
commit bc41d3bfd1
17 changed files with 85 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/dayofficework/article/common/info.js
+6
View File
@@ -47,6 +47,12 @@ const info = {
<span v-if="task.extVariable.processAgain===true">需要重新走流程</span>
</el-tag>
<el-tag v-if="task.extVariable.RESULT === 'PASS'" type="success" size="mini">同意</el-tag>
<el-tag v-if="task.extVariable.RESULT === 'BACK_TO_CLUB'" type="danger" size="mini">
退回到协会
</el-tag>
<el-tag v-if="task.extVariable.RESULT === 'BACK_TO_UNION'" type="danger" size="mini">
退回到分工会
</el-tag>
</template>
</div>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/dayofficework/article/examine/index.html
+18 -1
View File
@@ -11,6 +11,21 @@ layout("/layouts/platform.html"){
<search-item label="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
</search-item>
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位：">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="投稿来源：">
<el-select v-model="pageForm.origin" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-option v-for="item in dict.type.ARTICLE_ORIGIN" :key="item.code" :label="item.label" :value="item.code"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
@@ -120,7 +135,7 @@ layout("/layouts/platform.html"){
doApproval(result) {
this.formData.bpmTaskApprovalType = "DYNAMIC"
if (result === 'BACK_TO_START') {
this.$confirm('请确认投稿人重新提交后是否需要分工会主席再次审核？', '提示', {
this.$confirm('请确认投稿人重新提交后是否需要重新走审批流程？', '提示', {
distinguishCancelAndClose: true,
confirmButtonText: '需要',
cancelButtonText: '不需要',
@@ -180,6 +195,8 @@ layout("/layouts/platform.html"){
}
},
created() {
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html
+19 -2
View File
@@ -12,6 +12,21 @@ layout("/layouts/platform.html"){
<search-item label="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
</search-item>
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位：">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="投稿来源：">
<el-select v-model="pageForm.origin" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-option v-for="item in dict.type.ARTICLE_ORIGIN" :key="item.code" :label="item.label" :value="item.code"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
@@ -76,7 +91,7 @@ layout("/layouts/platform.html"){
<el-button type="danger" @click="doApproval('BACK_TO_CLUB')"
v-if="currentRow.origin === 'ARTICLE_ORIGIN_CLUB'">退回到协会
</el-button>
<el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>
<!-- <el-button type="danger" @click="doApproval('REJECT')">拒绝</el-button>-->
<el-button type="primary" @click="doApproval('PASS')">通过</el-button>
</el-row>
</div>
@@ -123,7 +138,7 @@ layout("/layouts/platform.html"){
this.formData.bpmTaskApprovalType = "DYNAMIC"
if (result === 'BACK_TO_START') {
this.$confirm('请确认投稿人重新提交后是否需要分工会主席再次审核？', '提示', {
this.$confirm('请确认投稿人重新提交后是否需要重新走审批流程？', '提示', {
distinguishCancelAndClose: true,
confirmButtonText: '需要',
cancelButtonText: '不需要',
@@ -177,6 +192,8 @@ layout("/layouts/platform.html"){
}
},
created() {
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html
+5 -9
View File
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="投稿来源：">
<el-select v-model="pageForm.mode" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-select v-model="pageForm.origin" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-option v-for="item in dict.type.ARTICLE_ORIGIN" :key="item.code" :label="item.label" :value="item.code"></el-option>
</el-select>
</search-item>
@@ -67,7 +67,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include('../common/info.js'){}#-->
new Vue({
const vue = new Vue({
el: "#app",
store,
mixins: [initTableMixins],
@@ -80,11 +80,7 @@ layout("/layouts/platform.html"){
},
unionOptions: [],
unitOptions: [],
clubOptions: [],
modeOptions: [
{ id: "CLUB", name: "协会投稿" },
{ id: "FGH", name: "分工会投稿" }
]
clubOptions: []
}
},
methods: {
@@ -95,8 +91,8 @@ layout("/layouts/platform.html"){
}
},
created() {
this.$businessTool.listUnit().then((res) => (this.unionOptions = res))
this.$businessTool.listUnion().then((res) => (this.unitOptions = res))
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.$businessTool.listClub().then((res) => (this.clubOptions = res))
this.pageData()
}
src/main/resources/views/platform/zhgh/dayofficework/article/schoolUnionApproval/index.html
+4 -8
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="投稿来源：">
<el-select v-model="pageForm.mode" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-select v-model="pageForm.origin" placeholder="请选择投稿来源" filterable clearable style="width: 100%">
<el-option v-for="item in dict.type.ARTICLE_ORIGIN" :key="item.code" :label="item.label" :value="item.code"></el-option>
</el-select>
</search-item>
@@ -110,11 +110,7 @@ layout("/layouts/platform.html"){
pageForm: {
approval: false
},
showApprovalForm: false,
modeOptions: [
{ id: "CLUB", name: "协会投稿" },
{ id: "FGH", name: "分工会投稿" }
]
showApprovalForm: false
}
},
methods: {
@@ -165,8 +161,8 @@ layout("/layouts/platform.html"){
}
},
created() {
this.$businessTool.listUnit().then((res) => (this.unionOptions = res))
this.$businessTool.listUnion().then((res) => (this.unitOptions = res))
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.pageData()
}
})