commit
This commit is contained in:
+20
-9
@@ -86,12 +86,12 @@ layout("/layouts/platform.html"){
|
|||||||
<span v-else>否</span>
|
<span v-else>否</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column label="工代会代表" prop="isGdh">-->
|
<!-- <el-table-column label="工代会代表" prop="isGdh">-->
|
||||||
<!-- <template v-slot="{row}">-->
|
<!-- <template v-slot="{row}">-->
|
||||||
<!-- <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
|
<!-- <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
|
||||||
<!-- <span v-else>否</span>-->
|
<!-- <span v-else>否</span>-->
|
||||||
<!-- </template>-->
|
<!-- </template>-->
|
||||||
<!-- </el-table-column>-->
|
<!-- </el-table-column>-->
|
||||||
<el-table-column label="代表类型" prop="representativeType"></el-table-column>
|
<el-table-column label="代表类型" prop="representativeType"></el-table-column>
|
||||||
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
|
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
|
||||||
<el-table-column prop="instanceState" label="流程状态">
|
<el-table-column prop="instanceState" label="流程状态">
|
||||||
@@ -166,11 +166,22 @@ layout("/layouts/platform.html"){
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
doSearch() {
|
async doSearch() {
|
||||||
this.pageData()
|
await this.pageData()
|
||||||
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
|
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
|
||||||
|
|
||||||
this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId,"JG")
|
await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId, "JG")
|
||||||
|
},
|
||||||
|
async pageData() {
|
||||||
|
try {
|
||||||
|
const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/dwSjAudit/pageData", this.pageForm)
|
||||||
|
if (resp.code === 0) {
|
||||||
|
this.tableData = resp.data.list
|
||||||
|
this.pageForm.totalCount = resp.data.totalCount
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onBatchSubmit() {
|
onBatchSubmit() {
|
||||||
this.$confirm('您确定要上报吗?', '提示', {
|
this.$confirm('您确定要上报吗?', '提示', {
|
||||||
|
|||||||
+29
-31
@@ -254,29 +254,28 @@ layout("/layouts/platform.html"){
|
|||||||
isRead: false,
|
isRead: false,
|
||||||
userId: null,
|
userId: null,
|
||||||
|
|
||||||
// 当前分工会的最大推选人员
|
// 当前分工会的最大推选人员
|
||||||
maxPush: 0,
|
maxPush: 0,
|
||||||
// 剩余正式代表推选名额
|
// 剩余正式代表推选名额
|
||||||
formalPush: 0
|
formalPush: 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
doPushFormal() {
|
doPushFormal() {
|
||||||
if (this.tableData.length >= this.maxPush) {
|
if (this.tableData.length >= this.maxPush) {
|
||||||
this.$message.warning("当前正式代表已超过最大推选人员数,如需调整请在表格数据列中选中【删除】按钮")
|
this.$message.warning("当前正式代表已超过最大推选人员数,如需调整请在表格数据列中选中【删除】按钮")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
|
this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
|
||||||
},
|
},
|
||||||
setMaxCount(data) {
|
setMaxCount(data) {
|
||||||
this.maxPush = data
|
this.maxPush = data
|
||||||
},
|
},
|
||||||
doSearch() {
|
async doSearch() {
|
||||||
this.pageData()
|
await this.pageData()
|
||||||
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
|
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
|
||||||
|
await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
|
||||||
this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
|
|
||||||
},
|
},
|
||||||
onView(row) {
|
onView(row) {
|
||||||
this.$refs.guava.view(() => {
|
this.$refs.guava.view(() => {
|
||||||
@@ -320,21 +319,20 @@ layout("/layouts/platform.html"){
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async pageData() {
|
async pageData() {
|
||||||
try {
|
try {
|
||||||
const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
|
const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
|
||||||
if (resp.code === 0) {
|
if (resp.code === 0) {
|
||||||
this.tableData = resp.data.list
|
this.tableData = resp.data.list
|
||||||
this.pageForm.totalCount = resp.data.totalCount
|
this.pageForm.totalCount = resp.data.totalCount
|
||||||
this.formalPush = this.maxPush - this.tableData.length
|
this.formalPush = this.maxPush - this.tableData.length
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.doSearch()
|
|
||||||
this.listUnion()
|
this.listUnion()
|
||||||
this.listSession()
|
this.listSession()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user