src/views/PersonManager/user/components/list.vue

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

src/views/train/cardOverdue/components/corpUserList.vue

@@ -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="sendMessage([row])">重新推送</el-button>
+              <el-button v-if="getCardStatus(row.VALIDITY_PERIOD_END) != 0" type="primary" size="mini" @click="toUserDetail(row)">重新推送</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -91,7 +91,6 @@
 <!--      </el-row>-->
 <!--    </div>-->
     <UserBaseInfoView ref="userbaseinfoview" :base_info_url="baseInfourl"/>
-    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
   </div>
 </template>
 
@@ -101,10 +100,9 @@ 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: {SendUtil, Pagination, SelectTree, UserBaseInfoView },
+  components: { Pagination, SelectTree, UserBaseInfoView },
   directives: { waves },
   data() {
     return {
@@ -222,13 +220,12 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/user/cardOverdueList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/trainusers/cardOverdueList?showCount=' + this.listQuery.limit + '&currentPage=' + 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,
-          SEND_TYPE: 1
+          CARD_STATUS: this.searchForm.CARD_STATUS
         }
       ).then((data) => {
         this.listLoading = false
@@ -238,9 +235,6 @@ export default {
         this.listLoading = false
       })
     },
-    sendMessage(row) {
-      this.$refs.sendUtil.init(row,1)
-    },
     getRowKey(row) {
       return row.USER_ID
     },
@@ -293,7 +287,7 @@ export default {
     },
     // 查看
     toUserDetail(ROW) {
-      this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
+      this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, ROW.CORPINFO_ID)
     },
     userEdit() {
       this.$refs.form.validate(valid => {

src/views/train/synInfo/components/sendUtil.vue

@@ -74,7 +74,6 @@ 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 },
@@ -96,7 +95,6 @@ export default {
       listFlag: false,
       departmentTree: [],
       peopleList: [],
-      sendType:'',
       normalizer(node) {
         return {
           id: node.id,
@@ -134,12 +132,11 @@ export default {
     }
   },
   methods: {
-    init(e,sendType) {
+    init(e) {
       this.visible = true
       this.listFlag = false
       this.getCorpinfo()
       this.heirloom = JSON.stringify(e)
-      this.sendType = sendType
     },
     getCorpinfo() {
       requestFN(
@@ -208,11 +205,6 @@ 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') {