朱兆平 / vue_cli · 提交

转到一个项目

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

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 3 个修改的文件 包含 26 行增加 和 26 行删除
... ... @@ -46,7 +46,7 @@
</el-table-column>
</el-table>
<!--编辑界面-->
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="coneeVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="coneeVisible" :close-on-click-modal="false" width="80%" text-align="center" tyle="margin-top: -20px">
<el-form :model="coneeForm" :rules="coneeRules" ref="coneeForm" label-width="145px" style="margin-top: -10px">
<el-row>
<el-col :span="4" style="display: none">
... ... @@ -63,7 +63,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conAddress">
<el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
<template slot="prepend" >地址</template>
... ... @@ -79,7 +79,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conFax">
<el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
<template slot="prepend" >传真</template>
... ... @@ -96,7 +96,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conCity">
<el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
<template slot="prepend" >城市</template>
... ... @@ -112,7 +112,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conName">
<el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" >
<template slot="prepend" >中文名称</template>
... ... @@ -121,14 +121,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conAeo">
<el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px">
<template slot="prepend" >AEO编码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="enterprise">
<el-input v-model="coneeForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
<template slot="prepend" >企业编码</template>
... ...
... ... @@ -45,7 +45,7 @@
</el-table-column>
</el-table>
<!--编辑界面-->
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="conerVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="conerVisible" :close-on-click-modal="false" width="80%" text-align="center" tyle="margin-top: -20px">
<el-form :model="conerForm" :rules="conerRules" ref="conerForm" label-width="145px" style="margin-top: -10px">
<el-row>
<el-col :span="4" style="display: none">
... ... @@ -62,7 +62,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conAddress">
<el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
<template slot="prepend" >地址</template>
... ... @@ -78,7 +78,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conFax">
<el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
<template slot="prepend" >传真</template>
... ... @@ -95,7 +95,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conCity">
<el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
<template slot="prepend" >城市</template>
... ... @@ -111,7 +111,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="conName">
<el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" >
<template slot="prepend" >中文名称</template>
... ... @@ -120,14 +120,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conAeo">
<el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px">
<template slot="prepend" >AEO编码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :offset="1" :span="8">
<el-form-item label="" prop="enterprise">
<el-input v-model="conerForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
<template slot="prepend" >企业编码</template>
... ...
... ... @@ -197,12 +197,12 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 30%">
<el-form-item>
<el-input v-model="form.agt.agt_name" auto-complete="off" placeholder="代理人名称" size="mini"></el-input>
<el-input disabled v-model="form.agt.agt_name" auto-complete="off" placeholder="代理人名称" size="mini"></el-input>
</el-form-item>
</el-col>
<el-col style="width: 30%;margin-left: 30px">
<el-form-item>
<el-input v-model="form.agt.agt_ADR" auto-complete="off" placeholder="代理人地址" size="mini"></el-input>
<el-input disabled v-model="form.agt.agt_ADR" auto-complete="off" placeholder="代理人地址" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -229,7 +229,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 65%">
<el-form-item>
<el-input v-model="form.agt.agt_IATA_number" auto-complete="off" placeholder="IATA代码" size="mini"></el-input>
<el-input disabled v-model="form.agt.agt_IATA_number" auto-complete="off" placeholder="IATA代码" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -241,7 +241,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 65%">
<el-form-item>
<el-input v-model="form.agt.agt_account_number" auto-complete="off" placeholder="代理人账号" size="mini"></el-input>
<el-input disabled v-model="form.agt.agt_account_number" auto-complete="off" placeholder="代理人账号" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -269,7 +269,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input auto-complete="off" placeholder="出发机场（第一承运人地址）" size="mini"></el-input>
<el-input disabled auto-complete="off" placeholder="出发机场（第一承运人地址）" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -371,7 +371,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input auto-complete="off" placeholder="到达站" size="mini"></el-input>
<el-input disabled auto-complete="off" placeholder="到达站" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -383,7 +383,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input auto-complete="off" placeholder="承运人" size="mini"></el-input>
<el-input disabled auto-complete="off" placeholder="承运人" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -395,7 +395,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input auto-complete="off" placeholder="到达站" size="mini"></el-input>
<el-input disabled auto-complete="off" placeholder="到达站" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -407,7 +407,7 @@
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input auto-complete="off" placeholder="承运人" size="mini"></el-input>
<el-input disabled auto-complete="off" placeholder="承运人" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -603,7 +603,7 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.rtd.rtd_commodity_NUM" auto-complete="off" placeholder="商品代号" size="mini"></el-input>
<el-input disabled v-model="form.rtd.rtd_commodity_NUM" auto-complete="off" placeholder="商品代号" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -682,7 +682,7 @@ Handling Information
</el-row>
<el-row style="padding-top: 20px">
<el-col :span="7" style="border-right: 1px solid #a5a5a5">
<el-input :disabled="form.cvd.cvd_charge_prepaid=='CC'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="毛重" size="mini"></el-input>
<el-input :disabled="form.cvd.cvd_charge_prepaid=='CC'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="货重金额" size="mini"></el-input>
</el-col>
<el-col :span="10" style="border-right: 1px solid #a5a5a5;text-align: center">
<span style="font-size: 12px">
... ... @@ -690,7 +690,7 @@ Handling Information
</span>
</el-col>
<el-col :span="7">
<el-input :disabled="form.cvd.cvd_charge_prepaid=='PP'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="毛重" size="mini"></el-input>
<el-input :disabled="form.cvd.cvd_charge_prepaid=='PP'" v-model="form.ppd.ppd_weight_amount" auto-complete="off" placeholder="货重金额" size="mini"></el-input>
</el-col>
</el-row>
</el-col>
... ...