朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 33bab60be8104ca98ac719721ad113ac8112d1da 1 个父辈 895e2293

海关货物流转界面优化

内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 57 行删除
... ... @@ -6,12 +6,12 @@
<el-row>
<el-col :span="5">
<el-form-item label="车牌号：">
<el-input v-model="filters.trailerFrameNo" placeholder="" size="small"style="width: 120px"></el-input>
<el-input v-model="filters.trailerFrameNo" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="挂靠名称:">
<el-input v-model="filters.agentname" placeholder="" size="small" style="width: 120px"></el-input>
<el-input v-model="filters.agentname" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
... ... @@ -28,7 +28,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="卡口:" style="margin-left: 10px">
<el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站" size="small" style="width: 150px">
<el-select v-model="filters.aisle" :disabled="disabled" placeholder="先选择目的场站">
<el-option
v-for="item in aisleOptions"
:key="item.channel"
... ... @@ -40,7 +40,7 @@
</el-col>
<el-col :span="2">
<el-form-item>
<el-button type="primary" @click="getList(1)" size="small">查询</el-button>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="getList(1)">查询</el-button>
</el-form-item>
</el-col>
</el-row>
... ... @@ -52,10 +52,11 @@
:data="businesstypeList"
border
v-loading="businesstypeListLoading"
style="width: 100%">
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
<el-table-column fixed prop="date" label="操作">
<template slot-scope="scope">
<el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button>
<el-button @click="selectOne(scope.$index, scope.row)" type="warning" size="small">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效">
... ... @@ -90,10 +91,10 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="245">
<template slot-scope="scope">
<el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
<el-button type="primary" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
<!-- <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>-->
<!-- <el-button type="warning" disabled size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>-->
<el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
<el-button type="danger" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
<el-button type="info" @click="forwarderDelete(scope.$index, scope.row)" size="mini">取消申请</el-button>
</template>
</el-table-column>
... ... @@ -124,7 +125,7 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" @click="getWaybillList()" size="small" style="margin-left: 40px">查询</el-button>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="getWaybillList()">查询</el-button>
<span style="color: red;margin-left: 10px">查询单号前请先选定业务类型</span>
</el-form-item>
</el-col>
... ... @@ -133,7 +134,9 @@
</el-row>
<!-- 列表-->
<el-row>
<el-table :data="awbaList" v-loading="commonLoading" style="width: 100%">
<el-table :data="awbaList" v-loading="commonLoading"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
<el-table-column fixed label="操作">
<template slot-scope="scope">
<el-button @click="addWaybill(scope.$index, scope.row)" type="primary" size="small">添加</el-button>
... ... @@ -171,7 +174,7 @@
</el-table-column>
</el-table>
</el-row>
<el-form ref="editForm" :model="editForm">
<el-form ref="editForm" :model="editForm" label-width="50%" style="margin-top: 20px">
<el-row>
<el-col :span="10">
<el-row>
... ... @@ -180,19 +183,18 @@
type="text"
v-model="editForm.remark3"
maxlength="10"
show-word-limit
size="small" style="width: 180px">
show-word-limit>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车牌号码：" prop="trailerFrameNo">
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="货物类型：" prop="cocode">
<el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="editForm.cocode" placeholder="请选择">
<el-option label="转关货" value="转关货"></el-option>
<el-option label="换单货" value="换单货"></el-option>
<el-option label="普通货" value="普通货"></el-option>
... ... @@ -215,19 +217,19 @@
</el-row>
<el-row>
<el-form-item label="运输公司：">
<el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.agentno" placeholder=""></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="挂靠单位：">
<el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.agentname" placeholder=""></el-input>
</el-form-item>
</el-row>
</el-col>
<el-col :span="7">
<el-col :span="10">
<el-row>
<el-form-item label="业务类型：" prop="businesstype">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择">
<el-option label="进口提货" value="进口提货"></el-option>
<el-option label="出口送货" value="出口送货"></el-option>
<el-option label="分拨业务" value="分拨业务"></el-option>
... ... @@ -238,12 +240,12 @@
</el-row>
<el-row>
<el-form-item label="申请单位：">
<el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.veProperty" disabled></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备案单位：">
<el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.trailerLicenseNo" disabled></el-input>
</el-form-item>
</el-row>
... ... @@ -253,21 +255,20 @@
type="textarea"
:rows="4"
placeholder="请输入主单号，例如17212341234，多个单号以‘，’（英文）分割"
v-model="editForm.masterList"
style="width: 180px">
v-model="editForm.masterList">
</el-input>
</el-form-item>
</el-row>
</el-col>
</el-row>
<el-row style="margin-left: 320px">
<el-button type="primary" @click="editSubmit()" >保存</el-button>
<el-row style="text-align: center;margin-top: 20px">
<el-button type="primary" style="width:150px" size="medium" @click="editSubmit()" >保存</el-button>
</el-row>
</el-form>
</el-dialog>
<!-- 查看表单信息-->
<el-dialog title="查看" :visible.sync="selectOneVisible" width="80%" height="80%" :close-on-click-modal="false">
<el-form ref="editForm" :model="editForm">
<el-dialog title="查看" :visible.sync="selectOneVisible" width="60%" :close-on-click-modal="false">
<el-form ref="editForm" :model="editForm" label-width="50%" style="margin-top: 20px">
<el-row>
<el-col :span="10">
<el-row>
... ... @@ -276,19 +277,18 @@
type="text"
v-model="editForm.remark3"
maxlength="10"
show-word-limit
size="small" style="width: 180px">
show-word-limit>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车牌号码：" prop="trailerFrameNo">
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="货物类型：" prop="cocode">
<el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="editForm.cocode" placeholder="请选择">
<el-option label="转关货" value="转关货"></el-option>
<el-option label="换单货" value="换单货"></el-option>
<el-option label="普通货" value="普通货"></el-option>
... ... @@ -311,19 +311,19 @@
</el-row>
<el-row>
<el-form-item label="运输公司：">
<el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.agentno" placeholder=""></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="挂靠单位：">
<el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.agentname" placeholder=""></el-input>
</el-form-item>
</el-row>
</el-col>
<el-col :span="7">
<el-col :span="10">
<el-row>
<el-form-item label="业务类型：" prop="businesstype">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择">
<el-option label="进口提货" value="进口提货"></el-option>
<el-option label="出口送货" value="出口送货"></el-option>
<el-option label="分拨业务" value="分拨业务"></el-option>
... ... @@ -334,12 +334,12 @@
</el-row>
<el-row>
<el-form-item label="申请单位：">
<el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.veProperty" disabled size="small"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备案单位：">
<el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="editForm.trailerLicenseNo" disabled></el-input>
</el-form-item>
</el-row>
... ... @@ -349,8 +349,7 @@
type="textarea"
:rows="4"
placeholder="请输入主单号，例如17212341234，多个单号以‘，’（英文）分割"
v-model="editForm.masterList"
style="width: 180px">
v-model="editForm.masterList">
</el-input>
</el-form-item>
</el-row>
... ...
... ... @@ -6,12 +6,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="主单号：" prop="waybill">
<el-input v-model="filters.waybill" placeholder="" size="small" style="width: 240px"></el-input>
<el-input v-model="filters.waybill" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" @click="getWaybillList('filters')" size="small" style="margin-left: 40px">查询</el-button>
<el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="getWaybillList('filters')">查询</el-button>
<span style="color: red;margin-left: 10px">查询单号前请先选定业务类型</span>
</el-form-item>
</el-col>
... ... @@ -20,7 +20,9 @@
</el-row>
<!-- 列表-->
<el-row>
<el-table :data="awbaList" v-loading="commonLoading" style="width: 100%">
<el-table :data="awbaList" v-loading="commonLoading"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
<el-table-column fixed label="操作">
<template slot-scope="scope">
<el-button @click="addWaybill(scope.$index, scope.row)" type="primary" size="small">添加</el-button>
... ... @@ -60,7 +62,7 @@
</el-row>
<!-- 申请表单信息-->
<el-row style="padding-bottom: 0px;">
<el-form ref="addForm" :model="addForm" :rules="addFormRules">
<el-form ref="addForm" :model="addForm" :rules="addFormRules" label-width="50%" style="margin-top: 20px">
<el-row>
<el-col :span="10">
<el-row>
... ... @@ -68,19 +70,18 @@
<el-input
type="text"
v-model="addForm.remark3"
show-word-limit
size="small" style="width: 180px">
show-word-limit>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车牌号码：" prop="trailerFrameNo">
<el-input v-model.trim="addForm.trailerFrameNo" placeholder="请输入车牌号" @change="trailerFrameNo(addForm.trailerFrameNo)" size="small" style="width: 180px"></el-input>
<el-input v-model.trim="addForm.trailerFrameNo" placeholder="请输入车牌号" @change="trailerFrameNo(addForm.trailerFrameNo)"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="货物类型：" prop="cocode">
<el-select v-model="addForm.cocode" placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="addForm.cocode" placeholder="请选择">
<el-option label="转关货" value="转关货"></el-option>
<el-option label="换单货" value="换单货"></el-option>
<el-option label="普通货" value="普通货"></el-option>
... ... @@ -104,19 +105,19 @@
</el-row>
<el-row>
<el-form-item label="运输公司：">
<el-input v-model="addForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="addForm.agentno" placeholder=""></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="挂靠单位：">
<el-input v-model="addForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
<el-input v-model="addForm.agentname" placeholder=""></el-input>
</el-form-item>
</el-row>
</el-col>
<el-col :span="7">
<el-col :span="10">
<el-row>
<el-form-item label="业务类型：" prop="businesstype">
<el-select v-model="addForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
<el-select v-model="addForm.businesstype" clearable placeholder="请选择">
<el-option label="进口提货" value="进口提货"></el-option>
<el-option label="出口送货" value="出口送货"></el-option>
<el-option label="分拨业务" value="分拨业务"></el-option>
... ... @@ -127,12 +128,12 @@
</el-row>
<el-row>
<el-form-item label="申请单位：">
<el-input v-model="addForm.veProperty" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="addForm.veProperty" disabled></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备案单位：">
<el-input v-model="addForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
<el-input v-model="addForm.trailerLicenseNo" disabled></el-input>
</el-form-item>
</el-row>
... ... @@ -142,15 +143,14 @@
type="textarea"
:rows="4"
placeholder="请输入主单号，例如172-12341234，多个单号以‘，’（英文）分割"
v-model="addForm.masterList"
style="width: 180px">
v-model="addForm.masterList">
</el-input>
</el-form-item>
</el-row>
</el-col>
</el-row>
<el-row style="margin-left: 320px">
<el-button type="primary" @click="saveSubmit()" :loading="addloading" :disabled="disabledStr">保存</el-button>
<el-row style="text-align: center;margin-top: 20px">
<el-button type="primary" style="width:150px" size="medium" @click="saveSubmit()" :loading="addloading" :disabled="disabledStr">保存</el-button>
<!-- <el-button type="primary" @click="saveSubmit()" :disabledStr="disabledStr" >保存</el-button>-->
</el-row>
... ...