From 5973a3c1eea409a4210e3b9d3c9c6f6314b3f83c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 20 Jun 2022 11:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20=20?=
 =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=B7(=E5=A4=A7=E9=93=81CTC)=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/dialog/modifyTripNumber.vue         | 97 +++++++++++++------
 1 file changed, 66 insertions(+), 31 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
index 1e306ad9d..dd92fc91d 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
@@ -4,7 +4,7 @@
     class="chengdou-03__systerm train-set-plan"
     :title="title"
     :visible.sync="show"
-    width="460px"
+    width="560px"
     :before-close="doClose"
     :z-index="2000"
     :modal="false"
@@ -15,7 +15,7 @@
       <div class="modifyTripNumberT">
         <div style="display:inline-block;margin-right:10px">请选择车站</div>
         <el-select
-          v-model="model.stationCode"
+          v-model="stationCode"
           placeholder=""
           size="mini"
           style="width:100px"
@@ -34,47 +34,71 @@
           <div class="modifyTripNumberTip">原列车信息</div>
           <div class="modifyTripNumberS">
             <div class="modifyTripNumberName">到达车次：</div>
-            <el-input v-model="oldArriveTripNumber" type="text" class="" size="mini" style="width: 95px;" disabled />
+            <el-input v-model="oldArriveTripNumber" type="text" class="" size="mini" style="width: 140px;" disabled />
           </div>
           <div class="modifyTripNumberE">
             <div class="modifyTripNumberName">出发车次：</div>
-            <el-input v-model="oldDepartTripNumber" type="text" class="" size="mini" style="width: 95px;" disabled />
+            <el-input v-model="oldDepartTripNumber" type="text" class="" size="mini" style="width: 140px;" disabled />
           </div>
         </div>
         <div class="modifyTripNumberBR">
           <div class="modifyTripNumberTip">新列车信息</div>
-          <div class="modifyTripNumberS">
-            <div class="modifyTripNumberName">到达车次：</div>
+          <div>
+            <el-form ref="form" :model="model" label-width="85px" :rules="rules">
+              <el-form-item label="到达车次：" prop="arriveTripNumber">
+                <el-input v-model="model.arriveTripNumber" style="width:140px" />
+              </el-form-item>
+              <el-form-item label="出发车次：" prop="departTripNumber">
+                <el-input v-model="model.departTripNumber" style="width:140px" />
+              </el-form-item>
+            </el-form>
+          <!-- <div class="modifyTripNumberName">到达车次：</div>
             <el-input v-model="model.arriveTripNumber" type="text" class="" size="mini" style="width: 95px;" />
           </div>
           <div class="modifyTripNumberE">
             <div class="modifyTripNumberName">出发车次：</div>
             <el-input v-model="model.departTripNumber" type="text" class="" size="mini" style="width: 95px;" />
+          </div> -->
           </div>
         </div>
+        <el-checkbox-group v-model="trainTypeList" style="text-align:center;margin-top:10px">
+          <el-checkbox label="保留车" name="type" />
+          <el-checkbox label="终到车" name="type" />
+        </el-checkbox-group>
       </div>
-      <el-checkbox-group v-model="trainTypeList" style="text-align:center;margin-top:10px">
-        <el-checkbox label="保留车" name="type" />
-        <el-checkbox label="终到车" name="type" />
-      </el-checkbox-group>
-    </div>
-    <el-row justify="center" style="margin-top:10px">
-      <el-col :span="7" :offset="5">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="7" :offset="2">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
+      <el-row justify="center" style="margin-top:10px">
+        <el-col :span="7" :offset="5">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+        </el-col>
+        <el-col :span="7" :offset="2">
+          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+        </el-col>
+      </el-row>
+    </div></el-dialog>
 </template>
 <script>
-import { mapGetters } from 'vuex';
+// import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
     name: 'ModifyTripNumber',
     data() {
+        var validateTripNumber = (rule, value, callback) => {
+            if (value) {
+                const judge = /^[a-zA-Z0-9]*[\d]$/.test(value);
+                if (judge) {
+                    if (value.toString().length > 6 || value.toString().length < 2) {
+                        callback('车次长度2-6位');
+                    } else {
+                        callback();
+                    }
+                } else {
+                    callback('字母+数字,最后一位数字');
+                }
+            } else {
+                callback('请输入车次');
+            }
+        };
         return {
             dialogShow: false,
             loading: false,
@@ -82,11 +106,20 @@ export default {
             oldDepartTripNumber:'',
             trainTypeList:[],
             stationList:[],
+            stationCode:'', // 车站编码
+            runPlanCode:'', // 运行编码
             model:{
-                stationCode:'', // 车站编码
-                runPlanCode:'', // 运行编码
                 arriveTripNumber:'', // 到达车次
                 departTripNumber:'' // 发车车次
+            },
+            rules: {
+                arriveTripNumber:[
+                    { required: true, validator: validateTripNumber, trigger: 'blur' }
+                    // message: '请输入到达车次'
+                ],
+                departTripNumber:[
+                    { required: true, validator: validateTripNumber, trigger: 'blur' }
+                ]
             }
         };
     },
@@ -109,8 +142,8 @@ export default {
     },
     methods: {
         doShow(row) {
-            this.model.stationCode = row.stationCode;
-            this.model.runPlanCode = row.code;
+            this.stationCode = row.stationCode;
+            this.runPlanCode = row.code;
             this.oldArriveTripNumber = (row.arriveRunPlan && row.arriveRunPlan.tripNumber) || '';
             this.oldDepartTripNumber = (row.departRunPlan && row.departRunPlan.tripNumber) || '';
             this.dialogShow = true;
@@ -122,8 +155,6 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.model = {
-                stationCode:'', // 车站编码
-                runPlanCode:'', // 运行编码
                 arriveTripNumber:'', // 到达车次
                 departTripNumber:'' // 发车车次
             };
@@ -131,7 +162,8 @@ export default {
         },
         commit() {
             this.loading = true;
-            commitOperate(menuOperate.CTC.modifyTripNumber, this.model, 2).then(({valid})=>{
+            const params = Object.assign({stationCode:this.stationCode, runPlanCode:this.runPlanCode}, this.model);
+            commitOperate(menuOperate.CTC.modifyTripNumber, params, 2).then(({valid})=>{
                 this.loading = false;
                 this.$emit('clearRpRow');
                 if (valid) {
@@ -176,9 +208,9 @@ export default {
     background: #ece9d8;
     padding: 0px 5px;
 }
-.modifyTripNumberS{}
-.modifyTripNumberName{display: inline-block;}
-.modifyTripNumberE{margin-top:10px;}
+.modifyTripNumberS{margin-bottom:20px;height: 24px;font-size:0;}
+.modifyTripNumberName{display: inline-block;width:85px;text-align: right;font-size: 15px;}
+.modifyTripNumberE{margin-bottom: 20px;height: 24px;font-size:0;}
 </style>
 <style lang="scss">
 .chengdou-03__systerm .el-dialog .modifyTripNumber .el-checkbox-group .el-checkbox .el-checkbox__label{font-size: 15px !important;line-height: 16px;}
@@ -186,4 +218,7 @@ export default {
 .stationSelect{
   z-index:2014 !important;
 }
+.modifyTripNumberBR .el-form-item .el-form-item__label{font-size:15px;padding-right:0px;line-height:24px;vertical-align:top;}
+.modifyTripNumberBR .el-form-item{margin-bottom:20px;}
+.modifyTripNumberBR .el-form-item .el-form-item__content{line-height:24px;vertical-align: top;height:24px;}
 </style>