parent
49861c1923
commit
3966c1a377
|
@ -672,8 +672,7 @@ export default {
|
|||
DEPART_STATE: this.DEPART_STATE,
|
||||
BASIC_STATE: this.BASIC_STATE,
|
||||
CARD_ID: this.ID_CARD,
|
||||
USER_ID: this.USER_ID,
|
||||
ISPUSH: '1'
|
||||
USER_ID: this.USER_ID
|
||||
}
|
||||
).then((data) => {
|
||||
this.listLoading = false
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
<el-table-column label="操作" align="left" width="200">
|
||||
<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="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>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
@ -91,6 +91,7 @@
|
|||
<!-- </el-row>-->
|
||||
<!-- </div>-->
|
||||
<UserBaseInfoView ref="userbaseinfoview" :base_info_url="baseInfourl"/>
|
||||
<send-util ref="sendUtil" append-to-body @refresh="getList"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -100,9 +101,10 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
|
|||
import { requestFN } from '@/utils/request'
|
||||
import waves from '@/directive/waves' // waves directive
|
||||
import UserBaseInfoView from '@/components/UserBaseInfo/UserBaseInfoView'
|
||||
import SendUtil from "../../synInfo/components/sendUtil.vue";
|
||||
|
||||
export default {
|
||||
components: { Pagination, SelectTree, UserBaseInfoView },
|
||||
components: {SendUtil, Pagination, SelectTree, UserBaseInfoView },
|
||||
directives: { waves },
|
||||
data() {
|
||||
return {
|
||||
|
@ -220,12 +222,13 @@ export default {
|
|||
getList() {
|
||||
this.listLoading = true
|
||||
requestFN(
|
||||
'/trainusers/cardOverdueList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
'/user/cardOverdueList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||
{
|
||||
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
|
||||
NAME: this.searchForm.NAME,
|
||||
USERNAME: this.searchForm.USERNAME,
|
||||
CARD_STATUS: this.searchForm.CARD_STATUS
|
||||
CARD_STATUS: this.searchForm.CARD_STATUS,
|
||||
SEND_TYPE: 1
|
||||
}
|
||||
).then((data) => {
|
||||
this.listLoading = false
|
||||
|
@ -235,6 +238,9 @@ export default {
|
|||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
sendMessage(row) {
|
||||
this.$refs.sendUtil.init(row,1)
|
||||
},
|
||||
getRowKey(row) {
|
||||
return row.USER_ID
|
||||
},
|
||||
|
|
|
@ -74,6 +74,7 @@ import Treeselect from '@riophae/vue-treeselect'
|
|||
import { requestFN } from '@/utils/request'
|
||||
import uploadFile from '../../../util/uploadFile/index.vue'
|
||||
import { upload } from '@/utils/upload'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
|
||||
export default {
|
||||
components: { Treeselect, vueQr, uploadFile },
|
||||
|
@ -95,6 +96,7 @@ export default {
|
|||
listFlag: false,
|
||||
departmentTree: [],
|
||||
peopleList: [],
|
||||
sendType:'',
|
||||
normalizer(node) {
|
||||
return {
|
||||
id: node.id,
|
||||
|
@ -132,11 +134,12 @@ export default {
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
init(e) {
|
||||
init(e,sendType) {
|
||||
this.visible = true
|
||||
this.listFlag = false
|
||||
this.getCorpinfo()
|
||||
this.heirloom = JSON.stringify(e)
|
||||
this.sendType = sendType
|
||||
},
|
||||
getCorpinfo() {
|
||||
requestFN(
|
||||
|
@ -205,6 +208,11 @@ export default {
|
|||
formData.append('chenNuoShu', this.form.APPOINT_ANNEX[i].raw)
|
||||
}
|
||||
this.loading = true
|
||||
console.log(this.heirloom)
|
||||
if (this.sendType != null){
|
||||
formData.append('sendType',1)
|
||||
}
|
||||
console.log(formData)
|
||||
upload('/trainingbatch/sendMessage', formData
|
||||
).then((data) => {
|
||||
if (data.code !== '0') {
|
||||
|
|
Loading…
Reference in New Issue