From 4f2ce48bb7ff48c5332d7d330f541ed6239b9053 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 21 Dec 2023 16:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/train/flow/components/list.vue      |  6 +-
 src/views/train/synInfo/components/list.vue   | 27 ++-----
 .../train/synInfo/components/sendUtil.vue     | 79 +++++++------------
 3 files changed, 38 insertions(+), 74 deletions(-)

diff --git a/src/views/train/flow/components/list.vue b/src/views/train/flow/components/list.vue
index 4efc06b..f6de9bf 100644
--- a/src/views/train/flow/components/list.vue
+++ b/src/views/train/flow/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
@@ -34,7 +34,7 @@
       border
       fit
       highlight-current-row>
-      <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
+      <el-table-column v-if="false" :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
@@ -51,7 +51,7 @@
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
+        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
diff --git a/src/views/train/synInfo/components/list.vue b/src/views/train/synInfo/components/list.vue
index f351f8e..01a8f19 100644
--- a/src/views/train/synInfo/components/list.vue
+++ b/src/views/train/synInfo/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
@@ -34,7 +34,7 @@
       border
       fit
       highlight-current-row>
-      <el-table-column v-if="false" :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
+      <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
@@ -50,7 +50,7 @@
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
@@ -164,29 +164,14 @@ export default {
     },
     handleAdd() {
       const _selectData = this.$refs.multipleTable.selection
-      if (_selectData == null || _selectData.length == 0) {
+      if (_selectData == null || _selectData.length === 0) {
         this.$message({
-          message: '未勾选培训人员...',
+          message: '未勾选人员...',
           type: 'error'
         })
         return false
       }
-
-      var users = []
-      _selectData.map(item => {
-        if (item.STATUS === 0) {
-          users.push(item.USER_ID)
-        }
-      })
-
-      if (users == null || users.length == 0) {
-        this.$message({
-          message: '勾选人员暂无法提交申请...',
-          type: 'error'
-        })
-        return false
-      }
-      this.$refs.apply.init(users)
+      this.$refs.sendUtil.init(_selectData)
     },
     hasButton() {
       var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'
diff --git a/src/views/train/synInfo/components/sendUtil.vue b/src/views/train/synInfo/components/sendUtil.vue
index 3b46ac8..de8d4c5 100644
--- a/src/views/train/synInfo/components/sendUtil.vue
+++ b/src/views/train/synInfo/components/sendUtil.vue
@@ -1,18 +1,21 @@
 <template>
   <div>
-    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
-      <el-form>
+    <el-dialog
+      :visible.sync="visible"
+      :append-to-body="appendToBody"
+      :before-close="beforeClose"
+      title="推送"
+      width="500px"
+      destroy-on-close>
+      <el-form label-position="right" label-width="100px">
         <el-form-item prop="TERRITORIALITY" label="集团单位 ">
-          <Treeselect
-            :options="jituanDanweiTreeData"
-            :normalizer="normalizer"
-            v-model="corp_id"
-            placeholder="请选择集团单位 "
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            style="width: 100%;"
-            @select="getInfo($event)"
-          />
+          <el-select v-model="corp_id" placeholder="请选择集团单位 " style="width: 90%" @change="getInfo">
+            <el-option
+              v-for="item in jituanDanweiTreeData"
+              :key="item.CORPINFO_ID"
+              :label="item.CORP_NAME"
+              :value="JSON.stringify(item)"/>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -42,21 +45,16 @@ export default {
       jituanDanwei: '',
       loading: false,
       jituanDanweiTreeData: [],
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
       corp_id: null,
       corp_name: '',
-      heirloom: {}
+      heirloom: {},
+      listFlag: false
     }
   },
   methods: {
     init(e) {
       this.visible = true
+      this.listFlag = false
       this.getCorpinfo()
       this.heirloom = JSON.stringify(e)
     },
@@ -69,50 +67,31 @@ export default {
         }
       ).then((data) => {
         this.corpinfo = data.pd
-        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
-        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
-        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
-        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
-
-        if (data.pd.CORP_TYPE == 'jtdw002') {
-          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw003') {
-          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw004') {
-          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw005') {
-          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
-        }
         this.getTreeData()
       })
     },
     getTreeData() {
-      if (this.jituanDanwei) {
-        requestFN(
-          '/companyApi/department/listTree',
-          { CORPINFO_ID: this.jituanDanwei }
-        ).then((data) => {
-          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
-        }).catch((e) => {
-        })
-      }
+      requestFN(
+        '/department/getPreventCrop',
+      ).then((data) => {
+        this.jituanDanweiTreeData = data.data
+      }).catch((e) => {
+      })
     },
     getInfo(e) {
-      console.log(e)
-      this.corp_name = e.name
+      const info = JSON.parse(e)
+      this.corp_name = info.CORP_NAME
     },
     beforeClose() {
       this.corp_id = null
     },
-    sendMessage(row) {
+    sendMessage() {
+      const corp_id = JSON.parse(this.corp_id).CORPINFO_ID
       requestFN(
         '/trainingbatch/sendMessage',
         {
           list: this.heirloom,
-          corp_id: this.corp_id,
+          corp_id: corp_id,
           corp_name: this.corp_name,
           tm: new Date().getTime()
         }