From 42668b60868ab36cbf367ce1d53df225ce0ae79d Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 13 Feb 2020 14:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=20=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningbo_01/menus/dialog/trainAddPlan.vue   | 60 +++++++++++++++----
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue
index b956ae1e6..18d085d53 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue
@@ -13,14 +13,30 @@
     <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
       <div style="width: 96%;">
         <el-form-item label="车 组 号:" label-width="95px" prop="trainCode">
-          <el-input v-model="addModel.trainCode" />
+          <!-- <el-input v-model="addModel.trainCode" /> -->
+          <el-select v-model="addModel.trainCode" filterable>
+                <el-option
+                    v-for="train in trainList"
+                    :key="train.groupNumber"
+                    :label="train.groupNumber"
+                    :value="train.code"
+                />
+            </el-select>
+        </el-form-item>
+        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
+          <!-- <el-input v-model="addModel.tripNumber" /> -->
+          <el-select v-model="addModel.tripNumber" @change="tripNumberChange">
+                <el-option
+                    v-for="tripNum in tripNumberList"
+                    :key="tripNum"
+                    :label="tripNum"
+                    :value="tripNum"
+                />
+            </el-select>
         </el-form-item>
         <el-form-item label="服 务 号:" label-width="95px" prop="serverNumber">
           <el-input v-model="addModel.serverNumber" />
         </el-form-item>
-        <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
-          <el-input v-model="addModel.tripNumber" />
-        </el-form-item>
       </div>
     </el-form>
     <el-row justify="center" class="button-group">
@@ -37,6 +53,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 
@@ -49,21 +66,22 @@ export default {
         return {
             trainNoList: [],
             selected: null,
+            tripNumberList:  [],
             addModel: {
                 trainCode: '', // 车组号
-                serverNumber: '', // 服务号
+                serviceNumber: '', // 服务号
                 tripNumber: '' // 车次号
             },
 
             rules: {
                 trainCode: [
-                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                    { required: true, message: '请输入车组号', trigger: 'change' }
                 ],
-                serverNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'change' }
+                serviceNumber: [
+                    { required: true, message: '请输入服务号', trigger: 'blur' }
                 ],
                 tripNumber: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                    { required: true, message: '请输入车次号', trigger: 'change' }
                 ]
             },
             dialogShow: false,
@@ -72,7 +90,9 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'stationStandList'
+            'trainList',
+            'stationStandList',
+            'trainWindowSectionCode'
         ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -93,12 +113,30 @@ export default {
         });
     },
     methods: {
+        tripNumberChange(tripNumber) {
+            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
+                this.serviceNumber = resp.data;
+            });
+        },
         doShow(operate, selected) {
             this.selected = selected;
             // 如果不是断点激活，则需要对初始值进行初始化
             // if (!this.dialogShow) {
 
             // }
+            this.addModel = {
+                trainCode:'',
+                tripNumber:'',
+                serviceNumber:''
+            };
+            getTripNumberList(this.$route.query.group).then(resp => {
+                this.tripNumberList = [];
+                resp.data.forEach(item => {
+                    if (!this.tripNumberList.includes(item)) {
+                        this.tripNumberList.push(item);
+                    }
+                });
+            });
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
@@ -109,7 +147,7 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
+            // this.mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {