diff --git a/src/views/PersonManager/user/components/list.vue b/src/views/PersonManager/user/components/list.vue
index 80069c1..422070a 100644
--- a/src/views/PersonManager/user/components/list.vue
+++ b/src/views/PersonManager/user/components/list.vue
@@ -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
diff --git a/src/views/train/cardOverdue/components/corpUserList.vue b/src/views/train/cardOverdue/components/corpUserList.vue
index dcdd522..e5037e3 100644
--- a/src/views/train/cardOverdue/components/corpUserList.vue
+++ b/src/views/train/cardOverdue/components/corpUserList.vue
@@ -73,7 +73,7 @@
查看
- 重新推送
+ 重新推送
@@ -91,6 +91,7 @@
+
@@ -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
},
diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue
index c9a0681..42e8ba9 100644
--- a/src/views/train/synInfo/components/sendUtil.vue
+++ b/src/views/train/synInfo/components/sendUtil.vue
@@ -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') {