From d082dc2fbc970cccf3ba1f3daee80a9d3a5ecd30 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 19 Apr 2023 10:41:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E4=BB=A4=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=B0=83=E5=BA=A6=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menus/dialog/cmdManage.vue     | 11 ++++++----
 .../newMap/display/terminals/dispatchCmd.vue  | 22 ++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
index 8b3e1f03a..7828dd94e 100644
--- a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
@@ -38,18 +38,18 @@
                   <span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="发令单位">
+              <el-table-column label="发令单位" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="sender" label="发令人" />
+              <el-table-column prop="sender" label="发令人" show-overflow-tooltip />
               <el-table-column label="签否">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="签收人">
+              <el-table-column label="签收人" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span>
                 </template>
@@ -352,7 +352,10 @@ export default {
         },
         findDisCmdObj(obj, val) {
             return Object.values(obj).find(item => {
-                return item.rcvCompanies[0].id == val;
+                const find = item.rcvCompanies.find(ii => {
+                    return ii.id == val;
+                });
+                return find;
             });
         },
         searchCmd() {
diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue
index 3e8d9ae7e..301fea982 100644
--- a/src/views/newMap/display/terminals/dispatchCmd.vue
+++ b/src/views/newMap/display/terminals/dispatchCmd.vue
@@ -1324,20 +1324,16 @@ export default {
             console.log('tabClick');
         },
         selectionChange(selection) {
+            this.command.rcvCompanies = [];
             selection.forEach(item => {
-                const find = this.command.rcvCompanies.find(every => {
-                    return item.code == every.code;
-                });
-                if (!find) {
-                    const obj = {
-                        name: item.name,
-                        rsCompany: true,
-                        cpType: item.cpType,
-                        code: item.code,
-                        ...item
-                    };
-                    this.command.rcvCompanies.push(obj);
-                }
+                const obj = {
+                    name: item.name,
+                    rsCompany: true,
+                    cpType: item.cpType,
+                    code: item.code,
+                    ...item
+                };
+                this.command.rcvCompanies.push(obj);
             });
         },
         getCompanyIdList(sum) {