Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
cc14f848 1 parent 3874af4d

modify

Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
...@@ -33,12 +33,9 @@ ...@@ -33,12 +33,9 @@
33 <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40"> 33 <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
34 </el-input> 34 </el-input>
35 </el-form-item> 35 </el-form-item>
36 -<<<<<<< HEAD
37 <!-- <el-form-item label="是否为ET86航线"> 36 <!-- <el-form-item label="是否为ET86航线">
38 <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox> 37 <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
39 </el-form-item> --> 38 </el-form-item> -->
40 -=======
41 ->>>>>>> fix-issues
42 <el-form-item> 39 <el-form-item>
43 <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div> 40 <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
44 </el-form-item> 41 </el-form-item>
......