朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 f35885581c0ab1d9ca873b180fbd04b253e7c7e4 2 个父辈 1b57e2a0 124994eb

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 3 个修改的文件 包含 26 行增加 和 26 行删除
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </el-table-column> 46 </el-table-column>
47 </el-table> 47 </el-table>
48 <!--编辑界面--> 48 <!--编辑界面-->
49 - <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="coneeVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px"> 49 + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="coneeVisible" :close-on-click-modal="false" width="80%" text-align="center" tyle="margin-top: -20px">
50 <el-form :model="coneeForm" :rules="coneeRules" ref="coneeForm" label-width="145px" style="margin-top: -10px"> 50 <el-form :model="coneeForm" :rules="coneeRules" ref="coneeForm" label-width="145px" style="margin-top: -10px">
51 <el-row> 51 <el-row>
52 <el-col :span="4" style="display: none"> 52 <el-col :span="4" style="display: none">
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </el-input> 63 </el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 - <el-col :span="8"> 66 + <el-col :offset="1" :span="8">
67 <el-form-item label="" prop="conAddress"> 67 <el-form-item label="" prop="conAddress">
68 <el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" > 68 <el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
69 <template slot="prepend" >地址</template> 69 <template slot="prepend" >地址</template>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 </el-input> 79 </el-input>
80 </el-form-item> 80 </el-form-item>
81 </el-col> 81 </el-col>
82 - <el-col :span="8"> 82 + <el-col :offset="1" :span="8">
83 <el-form-item label="" prop="conFax"> 83 <el-form-item label="" prop="conFax">
84 <el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" > 84 <el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
85 <template slot="prepend" >传真</template> 85 <template slot="prepend" >传真</template>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </el-input> 96 </el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
99 - <el-col :span="8"> 99 + <el-col :offset="1" :span="8">
100 <el-form-item label="" prop="conCity"> 100 <el-form-item label="" prop="conCity">
101 <el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" > 101 <el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
102 <template slot="prepend" >城市</template> 102 <template slot="prepend" >城市</template>
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 </el-input> 112 </el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 - <el-col :span="8"> 115 + <el-col :offset="1" :span="8">
116 <el-form-item label="" prop="conName"> 116 <el-form-item label="" prop="conName">
117 <el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" > 117 <el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" >
118 <template slot="prepend" >中文名称</template> 118 <template slot="prepend" >中文名称</template>
@@ -121,14 +121,14 @@ @@ -121,14 +121,14 @@
121 </el-col> 121 </el-col>
122 </el-row> 122 </el-row>
123 <el-row> 123 <el-row>
124 - <el-col :span="8"> 124 + <el-col :span="8" style="margin-right: 20px">
125 <el-form-item label="" prop="conAeo"> 125 <el-form-item label="" prop="conAeo">
126 <el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px"> 126 <el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px">
127 <template slot="prepend" >AEO编码</template> 127 <template slot="prepend" >AEO编码</template>
128 </el-input> 128 </el-input>
129 </el-form-item> 129 </el-form-item>
130 </el-col> 130 </el-col>
131 - <el-col :span="8"> 131 + <el-col :offset="1" :span="8">
132 <el-form-item label="" prop="enterprise"> 132 <el-form-item label="" prop="enterprise">
133 <el-input v-model="coneeForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px"> 133 <el-input v-model="coneeForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
134 <template slot="prepend" >企业编码</template> 134 <template slot="prepend" >企业编码</template>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </el-table-column> 45 </el-table-column>
46 </el-table> 46 </el-table>
47 <!--编辑界面--> 47 <!--编辑界面-->
48 - <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="conerVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px"> 48 + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="conerVisible" :close-on-click-modal="false" width="80%" text-align="center" tyle="margin-top: -20px">
49 <el-form :model="conerForm" :rules="conerRules" ref="conerForm" label-width="145px" style="margin-top: -10px"> 49 <el-form :model="conerForm" :rules="conerRules" ref="conerForm" label-width="145px" style="margin-top: -10px">
50 <el-row> 50 <el-row>
51 <el-col :span="4" style="display: none"> 51 <el-col :span="4" style="display: none">
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </el-input> 62 </el-input>
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 - <el-col :span="8"> 65 + <el-col :offset="1" :span="8">
66 <el-form-item label="" prop="conAddress"> 66 <el-form-item label="" prop="conAddress">
67 <el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" > 67 <el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
68 <template slot="prepend" >地址</template> 68 <template slot="prepend" >地址</template>
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 </el-input> 78 </el-input>
79 </el-form-item> 79 </el-form-item>
80 </el-col> 80 </el-col>
81 - <el-col :span="8"> 81 + <el-col :offset="1" :span="8">
82 <el-form-item label="" prop="conFax"> 82 <el-form-item label="" prop="conFax">
83 <el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" > 83 <el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
84 <template slot="prepend" >传真</template> 84 <template slot="prepend" >传真</template>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </el-input> 95 </el-input>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 - <el-col :span="8"> 98 + <el-col :offset="1" :span="8">
99 <el-form-item label="" prop="conCity"> 99 <el-form-item label="" prop="conCity">
100 <el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" > 100 <el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
101 <template slot="prepend" >城市</template> 101 <template slot="prepend" >城市</template>
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
114 - <el-col :span="8"> 114 + <el-col :offset="1" :span="8">
115 <el-form-item label="" prop="conName"> 115 <el-form-item label="" prop="conName">
116 <el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" > 116 <el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" >
117 <template slot="prepend" >中文名称</template> 117 <template slot="prepend" >中文名称</template>
@@ -120,14 +120,14 @@ @@ -120,14 +120,14 @@
120 </el-col> 120 </el-col>
121 </el-row> 121 </el-row>
122 <el-row> 122 <el-row>
123 - <el-col :span="8"> 123 + <el-col :span="8" style="margin-right: 20px">
124 <el-form-item label="" prop="conAeo"> 124 <el-form-item label="" prop="conAeo">
125 <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px"> 125 <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px">
126 <template slot="prepend" >AEO编码</template> 126 <template slot="prepend" >AEO编码</template>
127 </el-input> 127 </el-input>
128 </el-form-item> 128 </el-form-item>
129 </el-col> 129 </el-col>
130 - <el-col :span="8"> 130 + <el-col :offset="1" :span="8">
131 <el-form-item label="" prop="enterprise"> 131 <el-form-item label="" prop="enterprise">
132 <el-input v-model="conerForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px"> 132 <el-input v-model="conerForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
133 <template slot="prepend" >企业编码</template> 133 <template slot="prepend" >企业编码</template>
@@ -197,12 +197,12 @@ @@ -197,12 +197,12 @@
197 <el-row style="margin-bottom: -5px"> 197 <el-row style="margin-bottom: -5px">
198 <el-col style="width: 30%"> 198 <el-col style="width: 30%">
199 <el-form-item> 199 <el-form-item>
200 - <el-input v-model="form.agt.agt_name" auto-complete="off" placeholder="代理人名称" size="mini"></el-input> 200 + <el-input disabled v-model="form.agt.agt_name" auto-complete="off" placeholder="代理人名称" size="mini"></el-input>
201 </el-form-item> 201 </el-form-item>
202 </el-col> 202 </el-col>
203 <el-col style="width: 30%;margin-left: 30px"> 203 <el-col style="width: 30%;margin-left: 30px">
204 <el-form-item> 204 <el-form-item>
205 - <el-input v-model="form.agt.agt_ADR" auto-complete="off" placeholder="代理人地址" size="mini"></el-input> 205 + <el-input disabled v-model="form.agt.agt_ADR" auto-complete="off" placeholder="代理人地址" size="mini"></el-input>
206 </el-form-item> 206 </el-form-item>
207 </el-col> 207 </el-col>
208 </el-row> 208 </el-row>
@@ -229,7 +229,7 @@ @@ -229,7 +229,7 @@
229 <el-row style="margin-bottom: -5px"> 229 <el-row style="margin-bottom: -5px">
230 <el-col style="width: 65%"> 230 <el-col style="width: 65%">
231 <el-form-item> 231 <el-form-item>
232 - <el-input v-model="form.agt.agt_IATA_number" auto-complete="off" placeholder="IATA代码" size="mini"></el-input> 232 + <el-input disabled v-model="form.agt.agt_IATA_number" auto-complete="off" placeholder="IATA代码" size="mini"></el-input>
233 </el-form-item> 233 </el-form-item>
234 </el-col> 234 </el-col>
235 </el-row> 235 </el-row>
@@ -241,7 +241,7 @@ @@ -241,7 +241,7 @@
241 <el-row style="margin-bottom: -5px"> 241 <el-row style="margin-bottom: -5px">
242 <el-col style="width: 65%"> 242 <el-col style="width: 65%">
243 <el-form-item> 243 <el-form-item>
244 - <el-input v-model="form.agt.agt_account_number" auto-complete="off" placeholder="代理人账号" size="mini"></el-input> 244 + <el-input disabled v-model="form.agt.agt_account_number" auto-complete="off" placeholder="代理人账号" size="mini"></el-input>
245 </el-form-item> 245 </el-form-item>
246 </el-col> 246 </el-col>
247 </el-row> 247 </el-row>
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <el-row style="margin-bottom: -5px"> 269 <el-row style="margin-bottom: -5px">
270 <el-col style="width: 95%"> 270 <el-col style="width: 95%">
271 <el-form-item> 271 <el-form-item>
272 - <el-input auto-complete="off" placeholder="出发机场（第一承运人地址）" size="mini"></el-input> 272 + <el-input disabled auto-complete="off" placeholder="出发机场（第一承运人地址）" size="mini"></el-input>
273 </el-form-item> 273 </el-form-item>
274 </el-col> 274 </el-col>
275 </el-row> 275 </el-row>
@@ -371,7 +371,7 @@ @@ -371,7 +371,7 @@
371 <el-row style="margin-bottom: -5px"> 371 <el-row style="margin-bottom: -5px">
372 <el-col style="width: 95%"> 372 <el-col style="width: 95%">
373 <el-form-item> 373 <el-form-item>
374 - <el-input auto-complete="off" placeholder="到达站" size="mini"></el-input> 374 + <el-input disabled auto-complete="off" placeholder="到达站" size="mini"></el-input>
375 </el-form-item> 375 </el-form-item>
376 </el-col> 376 </el-col>
377 </el-row> 377 </el-row>
@@ -383,7 +383,7 @@ @@ -383,7 +383,7 @@
383 <el-row style="margin-bottom: -5px"> 383 <el-row style="margin-bottom: -5px">
384 <el-col style="width: 95%"> 384 <el-col style="width: 95%">
385 <el-form-item> 385 <el-form-item>
386 - <el-input auto-complete="off" placeholder="承运人" size="mini"></el-input> 386 + <el-input disabled auto-complete="off" placeholder="承运人" size="mini"></el-input>
387 </el-form-item> 387 </el-form-item>
388 </el-col> 388 </el-col>
389 </el-row> 389 </el-row>
@@ -395,7 +395,7 @@ @@ -395,7 +395,7 @@
395 <el-row style="margin-bottom: -5px"> 395 <el-row style="margin-bottom: -5px">
396 <el-col style="width: 95%"> 396 <el-col style="width: 95%">
397 <el-form-item> 397 <el-form-item>
398 - <el-input auto-complete="off" placeholder="到达站" size="mini"></el-input> 398 + <el-input disabled auto-complete="off" placeholder="到达站" size="mini"></el-input>
399 </el-form-item> 399 </el-form-item>
400 </el-col> 400 </el-col>
401 </el-row> 401 </el-row>
@@ -407,7 +407,7 @@ @@ -407,7 +407,7 @@
407 <el-row style="margin-bottom: -5px"> 407 <el-row style="margin-bottom: -5px">
408 <el-col style="width: 95%"> 408 <el-col style="width: 95%">
409 <el-form-item> 409 <el-form-item>
410 - <el-input auto-complete="off" placeholder="承运人" size="mini"></el-input> 410 + <el-input disabled auto-complete="off" placeholder="承运人" size="mini"></el-input>
411 </el-form-item> 411 </el-form-item>
412 </el-col> 412 </el-col>
413 </el-row> 413 </el-row>
@@ -603,7 +603,7 @@ Handling Information @@ -603,7 +603,7 @@ Handling Information
603 <el-row style="margin-bottom: -5px"> 603 <el-row style="margin-bottom: -5px">
604 <el-col style="width: 95%"> 604 <el-col style="width: 95%">
605 <el-form-item> 605 <el-form-item>
606 - <el-input v-model="form.rtd.rtd_commodity_NUM" auto-complete="off" placeholder="商品代号" size="mini"></el-input> 606 + <el-input disabled v-model="form.rtd.rtd_commodity_NUM" auto-complete="off" placeholder="商品代号" size="mini"></el-input>
607 </el-form-item> 607 </el-form-item>
608 </el-col> 608 </el-col>
609 </el-row> 609 </el-row>
@@ -682,7 +682,7 @@ Handling Information @@ -682,7 +682,7 @@ Handling Information
682 </el-row> 682 </el-row>
683 <el-row style="padding-top: 20px"> 683 <el-row style="padding-top: 20px">
684 <el-col :span="7" style="border-right: 1px solid #a5a5a5"> 684 <el-col :span="7" style="border-right: 1px solid #a5a5a5">
685 - <el-input :disabled="form.cvd.cvd_charge_prepaid=='CC'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="毛重" size="mini"></el-input> 685 + <el-input :disabled="form.cvd.cvd_charge_prepaid=='CC'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="货重金额" size="mini"></el-input>
686 </el-col> 686 </el-col>
687 <el-col :span="10" style="border-right: 1px solid #a5a5a5;text-align: center"> 687 <el-col :span="10" style="border-right: 1px solid #a5a5a5;text-align: center">
688 <span style="font-size: 12px"> 688 <span style="font-size: 12px">
@@ -690,7 +690,7 @@ Handling Information @@ -690,7 +690,7 @@ Handling Information
690 </span> 690 </span>
691 </el-col> 691 </el-col>
692 <el-col :span="7"> 692 <el-col :span="7">
693 - <el-input :disabled="form.cvd.cvd_charge_prepaid=='PP'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="毛重" size="mini"></el-input> 693 + <el-input :disabled="form.cvd.cvd_charge_prepaid=='PP'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="货重金额" size="mini"></el-input>
694 </el-col> 694 </el-col>
695 </el-row> 695 </el-row>
696 </el-col> 696 </el-col>