From 5b191b60b76b0dd54a54c9f91ba898915436f0c4 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 8 Jul 2022 11:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E5=BA=A6=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E6=8A=A5=E9=94=99=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=AD?=
 =?UTF-8?q?=E8=BD=AC=E8=AF=86=E5=88=AB=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dispatcherStationManage/cmdManage.vue     |  2 ++
 .../dispatcherStationManage/dispatchCmd.vue   | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/dispatcherStationManage/cmdManage.vue b/src/views/dispatcherStationManage/cmdManage.vue
index 8086ed8d9..f925be9f9 100644
--- a/src/views/dispatcherStationManage/cmdManage.vue
+++ b/src/views/dispatcherStationManage/cmdManage.vue
@@ -192,6 +192,7 @@ export default {
             return 'unsigned-row';
         },
         doShow() {
+            this.currentInfo = {};
             this.searchCmd();
             this.dialogShow = true;
             this.$store.commit('socket/clearDispatchCommandMsg');
@@ -200,6 +201,7 @@ export default {
             this.dialogShow = false;
         },
         handleCurrentChange(obj) {
+            if (!obj) { return; }
             this.currentInfo = obj;
             if (!this.getSignInfo(obj.receiverInfos).receivedTime) {
                 const data = {
diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue
index 5d2c0586a..84c139929 100644
--- a/src/views/dispatcherStationManage/dispatchCmd.vue
+++ b/src/views/dispatcherStationManage/dispatchCmd.vue
@@ -46,7 +46,7 @@
                   <div v-show="active1" class="left-table1">
                     <el-table ref="table1" :data="cacheTableData" border style="width: 100%" height="100" highlight-current-row @current-change="handleCurrentChange($event, 'table1')">
                       <el-table-column prop="number" label="命令号" width="80" />
-                      <el-table-column prop="deviceName" label="识别号" width="80" />
+                      <el-table-column prop="transferNumber" label="识别号" width="80" />
                       <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
                       <el-table-column prop="sendTime" label="接收单位" show-overflow-tooltip width="160">
                         <template slot-scope="scope">
@@ -160,22 +160,25 @@
           <div class="middle">
             <el-tabs v-model="cmdTab" type="border-card">
               <el-tab-pane label="调度命令" name="cmd">
-                <el-form ref="form" :model="command" label-width="80px">
+                <el-form ref="form" :model="command" label-width="85px">
                   <el-form-item label="命令标题">
                     <el-input v-model="command.title" />
                   </el-form-item>
-                  <el-row>
-                    <el-col :span="12">
-                      <el-form-item label="命令号">
-                        <el-input v-model="command.number" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="发令时间">
-                        <el-date-picker v-model="command.sendTime" type="datetime" placeholder="选择日期时间" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
+                  <el-col :span="12">
+                    <el-form-item label="命令号">
+                      <el-input v-model="command.number" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="中转识别号">
+                      <el-input v-model="command.transferNumber" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="发令时间">
+                      <el-date-picker v-model="command.sendTime" type="datetime" placeholder="选择日期时间" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="12">
                     <el-form-item label="发令人">
                       <el-select v-model="command.senderName" disabled placeholder="请选择" style="width: 100%;" @change="senderChange">
@@ -322,6 +325,7 @@ export default {
             command: {
                 title: '',
                 number: '',
+                transferNumber: '',
                 sendTime: '',
                 senderId: '',
                 senderName: '',
@@ -520,6 +524,7 @@ export default {
             this.command = {
                 title: '',
                 number: '',
+                transferNumber: '',
                 sendTime: '',
                 senderId: '',
                 senderName: this.command.senderName,