进路添加是否先锁闭字段

src/components/QueryListPage/DataForm.vue

@@ -236,7 +236,7 @@
         <div :key="item.prop" style="margin-left:150px;margin-bottom:20px">
           <el-button v-if="item.buttontip" size="mini" style="margin-bottom:10px" @click="item.buttonClick">{{ item.buttontip }}
           </el-button>
-          <el-table :data="formModel[item.prop]" border style="width:80%" class="table_item">
+          <el-table :data="formModel[item.prop]" border :style="item.style" class="table_item">
             <el-table-column v-for="data in item.tableList" :key="data.prop" :prop="data.prop" :label="data.label">
               <template slot-scope="scope">
                 <el-form-item v-if="data.isEdit" :prop="item.prop+'.' + scope.$index + '.'+data.prop" :required="false" :rules="data.rules[data.prop]">

src/i18n/langs/en/map.js

@@ -559,5 +559,6 @@ export default {
     createModel: 'Create model:',
     startingPoint: 'Starting point:',
     endingPoint: 'Ending point:',
-    frontSectionMode:'Extend Mode'
+    frontSectionMode:'Extend Mode',
+    lockFirst:'Lock First'
 };

src/i18n/langs/zh/map.js

@@ -553,5 +553,6 @@ export default {
     createModel: '创建方式:',
     startingPoint: '起点:',
     endingPoint: '终点:',
-    frontSectionMode:'延伸方式'
+    frontSectionMode:'延伸方式',
+    lockFirst:'是否先锁闭'
 };

src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue

@@ -22,6 +22,13 @@
             <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 是否先锁闭 -->
+        <el-form-item :label="$t('map.lockFirst') + ':'" prop="lockFirst">
+          <el-radio-group v-model="addModel.lockFirst">
+            <el-radio :label="true">{{ $t('map.are') }}</el-radio>
+            <el-radio :label="false">{{ $t('map.deny') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item :label="$t('map.delayUnlockingTime') + ':'" prop="delayReleaseTime">
           <el-input-number v-model="addModel.delayReleaseTime" :min="0" />
           <span>s</span>
@@ -315,6 +322,7 @@ export default {
                 stationCode: '', // 所属站台
                 arc: false, // 是否自动追踪/联锁自动触发
                 flt: false, // 是否车队/联锁自动进路
+                lockFirst:false, // 是否先锁闭——办理过程直接先锁闭区段
                 delayReleaseTime: '', // 延时解锁时间
                 turnBack: false, // 是否折返进路
                 startSignalCode: '', // 始端信号机

src/views/orderauthor/order/draft.vue

@@ -57,14 +57,10 @@ export default {
             errorIntTip:'数量必须为整数',
             formModel: {
                 organizationId: '',
-                goodsId: '',
-                goodsName: '',
                 orderType: '02',
                 contractNo: '',
                 forever: false,
                 totalPrice: 0,
-                price: 0,
-                amount: 0,
                 monthAmount: 0,
                 bizType: '01',
                 payWays: '01',
@@ -161,6 +157,7 @@ export default {
                         buttontip: this.$t('orderAuthor.selectGoods'),
                         buttonClick: this.buttonClick,
                         type:'table',
+                        style:'width:80%',
                         tableList:[
                             {prop:'goodsName', label:this.$t('orderAuthor.commodityName') },
                             {prop:'goodsAmount', label:this.$t('orderAuthor.goodsAmount'), isEdit:true, min:0,