Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1252,7 +1252,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
-              <el-select v-model='addMsg.DepartureCityId' :disabled="IsUnion===1" filterable
+              <el-select v-model='addMsg.DepartureCityId' :disabled="IsUnion===2" filterable
                 :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsIntermodal=2">
                 <el-option v-for="item in startCityList" :label='item.Name' :value='item.ID' :key='item.ID'>
                 </el-option>
@@ -1270,7 +1270,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
-              <el-select v-model='addMsg.ReturnArriveCityId' :disabled="IsUnion===1" filterable
+              <el-select v-model='addMsg.ReturnArriveCityId' :disabled="IsUnion===2" filterable
                 :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsReturnIntermodal=2">
                 <el-option v-for="item in startCityList" :label='item.Name' :value='item.ID' :key='item.ID'>
                 </el-option>