Compare commits

..

2 Commits

Author SHA1 Message Date
huangyuxuan 96c97d9c29 [问题修复](pet):
列表分页失效问题,
  人员详细信息不全
2024-11-06 14:00:21 +08:00
huangyuxuan 3966c1a377 [新增功能](hyx_2024-11-5_xgfPerson):
相关方过期人员重新推送
2024-11-05 10:53:02 +08:00
3 changed files with 22 additions and 9 deletions

View File

@ -672,8 +672,7 @@ export default {
DEPART_STATE: this.DEPART_STATE, DEPART_STATE: this.DEPART_STATE,
BASIC_STATE: this.BASIC_STATE, BASIC_STATE: this.BASIC_STATE,
CARD_ID: this.ID_CARD, CARD_ID: this.ID_CARD,
USER_ID: this.USER_ID, USER_ID: this.USER_ID
ISPUSH: '1'
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -688,7 +687,7 @@ export default {
this.varList[i].BASIC_STATE = 2 this.varList[i].BASIC_STATE = 2
} }
} }
this.total = data.page.totalResult this.total = data.page.total
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })

View File

@ -73,7 +73,7 @@
<el-table-column label="操作" align="left" width="200"> <el-table-column label="操作" align="left" width="200">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button v-if="row.ACCOUNT_TYPE != 0" type="success" icon="el-icon-view" size="mini" @click="toUserDetail(row)"></el-button> <el-button v-if="row.ACCOUNT_TYPE != 0" type="success" icon="el-icon-view" size="mini" @click="toUserDetail(row)"></el-button>
<el-button v-if="getCardStatus(row.VALIDITY_PERIOD_END) != 0" type="primary" size="mini" @click="toUserDetail(row)"></el-button> <el-button v-if="getCardStatus(row.VALIDITY_PERIOD_END) != 0" type="primary" size="mini" @click="sendMessage([row])"></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -91,6 +91,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<!-- </div>--> <!-- </div>-->
<UserBaseInfoView ref="userbaseinfoview" :base_info_url="baseInfourl"/> <UserBaseInfoView ref="userbaseinfoview" :base_info_url="baseInfourl"/>
<send-util ref="sendUtil" append-to-body @refresh="getList"/>
</div> </div>
</template> </template>
@ -100,9 +101,10 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive import waves from '@/directive/waves' // waves directive
import UserBaseInfoView from '@/components/UserBaseInfo/UserBaseInfoView' import UserBaseInfoView from '@/components/UserBaseInfo/UserBaseInfoView'
import SendUtil from "../../synInfo/components/sendUtil.vue";
export default { export default {
components: { Pagination, SelectTree, UserBaseInfoView }, components: {SendUtil, Pagination, SelectTree, UserBaseInfoView },
directives: { waves }, directives: { waves },
data() { data() {
return { return {
@ -220,12 +222,13 @@ export default {
getList() { getList() {
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/trainusers/cardOverdueList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/user/cardOverdueList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ {
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID, CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
NAME: this.searchForm.NAME, NAME: this.searchForm.NAME,
USERNAME: this.searchForm.USERNAME, USERNAME: this.searchForm.USERNAME,
CARD_STATUS: this.searchForm.CARD_STATUS CARD_STATUS: this.searchForm.CARD_STATUS,
SEND_TYPE: 1
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -235,6 +238,9 @@ export default {
this.listLoading = false this.listLoading = false
}) })
}, },
sendMessage(row) {
this.$refs.sendUtil.init(row,1)
},
getRowKey(row) { getRowKey(row) {
return row.USER_ID return row.USER_ID
}, },
@ -287,7 +293,7 @@ export default {
}, },
// //
toUserDetail(ROW) { toUserDetail(ROW) {
this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, ROW.CORPINFO_ID) this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
}, },
userEdit() { userEdit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {

View File

@ -74,6 +74,7 @@ import Treeselect from '@riophae/vue-treeselect'
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import uploadFile from '../../../util/uploadFile/index.vue' import uploadFile from '../../../util/uploadFile/index.vue'
import { upload } from '@/utils/upload' import { upload } from '@/utils/upload'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
components: { Treeselect, vueQr, uploadFile }, components: { Treeselect, vueQr, uploadFile },
@ -95,6 +96,7 @@ export default {
listFlag: false, listFlag: false,
departmentTree: [], departmentTree: [],
peopleList: [], peopleList: [],
sendType:'',
normalizer(node) { normalizer(node) {
return { return {
id: node.id, id: node.id,
@ -132,11 +134,12 @@ export default {
} }
}, },
methods: { methods: {
init(e) { init(e,sendType) {
this.visible = true this.visible = true
this.listFlag = false this.listFlag = false
this.getCorpinfo() this.getCorpinfo()
this.heirloom = JSON.stringify(e) this.heirloom = JSON.stringify(e)
this.sendType = sendType
}, },
getCorpinfo() { getCorpinfo() {
requestFN( requestFN(
@ -205,6 +208,11 @@ export default {
formData.append('chenNuoShu', this.form.APPOINT_ANNEX[i].raw) formData.append('chenNuoShu', this.form.APPOINT_ANNEX[i].raw)
} }
this.loading = true this.loading = true
console.log(this.heirloom)
if (this.sendType != null){
formData.append('sendType',1)
}
console.log(formData)
upload('/trainingbatch/sendMessage', formData upload('/trainingbatch/sendMessage', formData
).then((data) => { ).then((data) => {
if (data.code !== '0') { if (data.code !== '0') {