Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
46e6f642 1 parent a16807bf

代码更新，文本修正

Inline Side-by-side
Showing 3 changed files with 296 additions and 273 deletions
......@@ -4,241 +4,264 @@
*/
/** 基础通用 **/
.pt5 {
padding-top: 5px;
}
.pr5 {
padding-right: 5px;
}
.pb5 {
padding-bottom: 5px;
}
.mt5 {
margin-top: 5px;
}
.mr5 {
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.mb8 {
margin-bottom: 8px;
}
.ml5 {
margin-left: 5px;
}
.mt10 {
margin-top: 10px;
}
.mr10 {
margin-right: 10px;
}
.mb10 {
margin-bottom: 10px;
}
.ml0 {
margin-left: 10px;
}
.mt20 {
margin-top: 20px;
}
.mr20 {
margin-right: 20px;
}
.mb20 {
margin-bottom: 20px;
}
.m20 {
margin-left: 20px;
}
.el-dialog:not(.is-fullscreen){
margin-top: 6vh !important;
}
.el-table {
.el-table__header-wrapper, .el-table__fixed-header-wrapper {
th {
word-break: break-word;
background-color: #f8f8f9;
color: #515a6e;
height: 40px;
font-size: 13px;
}
}
.el-table__body-wrapper {
.el-button [class*="el-icon-"] + span {
margin-left: 1px;
}
}
}
/** 表单布局 **/
.form-header {
font-size:15px;
color:#6379bb;
border-bottom:1px solid #ddd;
margin:8px 10px 25px 10px;
padding-top:15px;
padding-bottom:5px;
.formItem {
width: 100%;
// max-width: 310px;
}
}
/** 表格布局 **/
.pagination-container {
position: relative;
height: 25px;
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
}
/* tree border */
.tree-border {
margin-top: 5px;
border: 1px solid #e5e6e7;
background: #FFFFFF none;
border-radius:4px;
}
.pagination-container .el-pagination {
right: 0;
position: absolute;
}
.el-table .fixed-width .el-button--mini {
padding-left: 0;
padding-right: 0;
width: inherit;
}
.el-tree-node__content > .el-checkbox {
margin-right: 8px;
}
.list-group-striped > .list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0;
}
.list-group {
padding-left: 0px;
list-style: none;
}
.list-group-item {
border-bottom: 1px solid #e7eaec;
border-top: 1px solid #e7eaec;
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
}
.pull-right {
float: right !important;
}
.el-card__header {
padding: 14px 15px 7px;
min-height: 40px;
}
.el-card__body {
padding: 15px 20px 20px 20px;
}
.card-box {
padding-right: 15px;
padding-left: 15px;
margin-bottom: 10px;
}
/* button color */
.el-button--cyan.is-active,
.el-button--cyan:active {
background: #20B2AA;
border-color: #20B2AA;
color: #FFFFFF;
}
.el-button--cyan:focus,
.el-button--cyan:hover {
background: #48D1CC;
border-color: #48D1CC;
color: #FFFFFF;
}
.el-button--cyan {
background-color: #20B2AA;
border-color: #20B2AA;
color: #FFFFFF;
}
/* text color */
.text-navy {
color: #1ab394;
}
.text-primary {
color: inherit;
}
.text-success {
color: #1c84c6;
}
.text-info {
color: #23c6c8;
}
.text-warning {
color: #f8ac59;
}
.text-danger {
color: #ed5565;
}
.text-muted {
color: #888888;
}
/* image */
.img-circle {
border-radius: 50%;
}
.img-lg {
width: 120px;
height: 120px;
}
.avatar-upload-preview {
position: absolute;
top: 50%;
transform: translate(50%, -50%);
width: 200px;
height: 200px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
}
/* 拖拽列样式 */
.sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
}
.top-right-btn {
position: relative;
float: right;
}
.pt5 {
padding-top: 5px;
}
.pr5 {
padding-right: 5px;
}
.pb5 {
padding-bottom: 5px;
}
.mt5 {
margin-top: 5px;
}
.mr5 {
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.mb8 {
margin-bottom: 8px;
}
.ml5 {
margin-left: 5px;
}
.mt10 {
margin-top: 10px;
}
.mr10 {
margin-right: 10px;
}
.mb10 {
margin-bottom: 10px;
}
.ml0 {
margin-left: 10px;
}
.mt20 {
margin-top: 20px;
}
.mr20 {
margin-right: 20px;
}
.mb20 {
margin-bottom: 20px;
}
.m20 {
margin-left: 20px;
}
.el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important;
}
.el-table {
.el-table__header-wrapper,
.el-table__fixed-header-wrapper {
th {
word-break: break-word;
background-color: #f8f8f9;
color: #515a6e;
height: 40px;
font-size: 13px;
}
}
.el-table__body-wrapper {
.el-button [class*="el-icon-"]+span {
margin-left: 1px;
}
}
}
/** 表单布局 **/
.form-header {
font-size: 15px;
color: #6379bb;
border-bottom: 1px solid #ddd;
margin: 8px 10px 25px 10px;
padding-top: 15px;
padding-bottom: 5px;
.formItem {
width: 100%;
// max-width: 310px;
}
}
/** 表格布局 **/
.pagination-container {
position: relative;
height: 25px;
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
}
/* tree border */
.tree-border {
margin-top: 5px;
border: 1px solid #e5e6e7;
background: #FFFFFF none;
border-radius: 4px;
}
.pagination-container .el-pagination {
right: 0;
position: absolute;
}
.el-table .fixed-width .el-button--mini {
padding-left: 0;
padding-right: 0;
width: inherit;
}
.el-tree-node__content>.el-checkbox {
margin-right: 8px;
}
.list-group-striped>.list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0;
}
.list-group {
padding-left: 0px;
list-style: none;
}
.list-group-item {
border-bottom: 1px solid #e7eaec;
border-top: 1px solid #e7eaec;
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
}
.pull-right {
float: right !important;
}
.el-card__header {
padding: 14px 15px 7px;
min-height: 40px;
}
.el-card__body {
padding: 15px 20px 20px 20px;
}
.card-box {
padding-right: 15px;
padding-left: 15px;
margin-bottom: 10px;
}
/* button color */
.el-button--cyan.is-active,
.el-button--cyan:active {
background: #20B2AA;
border-color: #20B2AA;
color: #FFFFFF;
}
.el-button--cyan:focus,
.el-button--cyan:hover {
background: #48D1CC;
border-color: #48D1CC;
color: #FFFFFF;
}
.el-button--cyan {
background-color: #20B2AA;
border-color: #20B2AA;
color: #FFFFFF;
}
/* text color */
.text-navy {
color: #1ab394;
}
.text-primary {
color: inherit;
}
.text-success {
color: #1c84c6;
}
.text-info {
color: #23c6c8;
}
.text-warning {
color: #f8ac59;
}
.text-danger {
color: #ed5565;
}
.text-muted {
color: #888888;
}
/* image */
.img-circle {
border-radius: 50%;
}
.img-lg {
width: 120px;
height: 120px;
}
.avatar-upload-preview {
position: absolute;
top: 50%;
transform: translate(50%, -50%);
width: 200px;
height: 200px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
}
/* 拖拽列样式 */
.sortable-ghost {
opacity: .8;
color: #fff !important;
background: #42b983 !important;
}
.top-right-btn {
position: relative;
float: right;
}
.dialogColumn .el-tooltip {
white-space: pre-line !important;
}
\ No newline at end of file
......
......@@ -443,6 +443,9 @@ export default {
if (column.property == "roleNames") {
return cellValue.toString();
}
if (column.property == 'flightIdImac') {
return cellValue == null ? '未配' : '已配'
}
return cellValue;
},
},
......
......@@ -118,6 +118,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配舱状态">
<el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
<el-option label="已配" value="1"> </el-option>
<el-option label="未配" value="0"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
......@@ -156,8 +164,9 @@
<el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column v-for="(item, index) in releaseHeader" header-align="center" align="center" :prop="item.value"
:label="item.name" :key="index" :show-overflow-tooltip="true">
<el-table-column v-for="(item, index) in releaseHeader" header-align="center" :align="item.align"
:prop="item.value" :label="item.name" :key="index" :width="item.width" :show-overflow-tooltip="true"
class-name="dialogColumn">
</el-table-column>
</el-table>
<div slot="footer">
......@@ -184,6 +193,7 @@ export default {
createTimeStart: null,
createTimeEnd: null,
pickUpDate: null,
hasFlight: null,
waybillNo: "",
siteName: "",
fltNo: "",
......@@ -296,6 +306,15 @@ export default {
disabled: true
},
{
name: "配舱状态",
value: "flightIdImac",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
name: "释放状态",
value: "releasing",
width: "100",
......@@ -613,74 +632,46 @@ export default {
], //表头数据
releaseHeader: [
{
type: "",
name: "提示信息",
value: "msg",
width: "",
width: "500",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "释放状态",
value: "releasing",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "ACCSpool",
value: "accsPool",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled: true
}
],
findConditionData: {}, //货物查询条件
......@@ -816,16 +807,19 @@ export default {
} else if (res.code === 201) {
this.selectTable.map(item => {
res.data['success'].map(val => {
val === item.id ? item.msg = item.msg + '操作成功,正在释放中。' : ''
val === item.id ? item.msg = item.msg + '操作成功,正在释放中。\n' : ''
})
res.data['accsPoolFlase'].map(val => {
val === item.id ? item.msg = item.msg + '推送状态/ACCSpool不正确。' : ''
val === item.id ? item.msg = item.msg + 'Manifest状态不能释放。\n' : ''
})
res.data['existReleasing'].map(val => {
val === item.id ? item.msg = item.msg + '已经在释放，请勿重复释放。' : ''
val === item.id ? item.msg = item.msg + '正在释放中，请勿重复释放。\n' : ''
})
res.data['noFlight'].map(val => {
val === item.id ? item.msg = item.msg + '无配载航班。' : ''
val === item.id ? item.msg = item.msg + '已释放仓位。\n' : ''
})
res.data['pushFalse'].map(val => {
val === item.id ? item.msg = item.msg + '该货物不为"不推送"状态，不能释放。\n' : ''
})
})
this.dialogVisible = true
......@@ -884,6 +878,9 @@ export default {
if (this.formData.waybillNo) {
this.formData.waybillNo = this.formData.waybillNo.trim();
}
if (this.formData.hasFlight == "") {
this.formData.hasFlight = null
}
this.formData.limitStart = this.limitStart;
this.formData.limitSize = 100;
},
......