From 3966c1a3779a9fa3818384bef923e986d0025659 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Tue, 5 Nov 2024 10:53:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](hyx=5F20?=
 =?UTF-8?q?24-11-5=5FxgfPerson):=20=20=20=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E4=BA=BA=E5=91=98=E9=87=8D=E6=96=B0=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PersonManager/user/components/list.vue   |  3 +--
 .../train/cardOverdue/components/corpUserList.vue  | 14 ++++++++++----
 src/views/train/synInfo/components/sendUtil.vue    | 10 +++++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

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 @@
           <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 + '&currentPage=' + this.listQuery.page,
+        '/user/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
+          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') {