代码更新，文本修正

jinhui.wang
Commit 46e6f642d72538f4716d2ca505ffafd2a959d860 46e6f642 1 parent a16807bf
Showing 3 changed files with 296 additions and 273 deletions
src/assets/styles/FedEx.scss
src/components/Table/index.vue
src/views/basicInformation/queryCargo/index.vue
--- a/src/assets/styles/FedEx.scss
View file @46e6f64
+++ b/src/assets/styles/FedEx.scss
View file @46e6f64
@@ -4,241 +4,264 @@
  */
  /** 基础通用 **/
-.pt5 {
+ .pt5 {
-	padding-top: 5px;
+ 	padding-top: 5px;
-}
+ }
-.pr5 {
+
-	padding-right: 5px;
+ .pr5 {
-}
+ 	padding-right: 5px;
-.pb5 {
+ }
-	padding-bottom: 5px;
+
-}
+ .pb5 {
-.mt5 {
+ 	padding-bottom: 5px;
-	margin-top: 5px;
+ }
-}
+
-.mr5 {
+ .mt5 {
-	margin-right: 5px;
+ 	margin-top: 5px;
-}
+ }
-.mb5 {
+
-	margin-bottom: 5px;
+ .mr5 {
-}
+ 	margin-right: 5px;
-.mb8 {
+ }
-	margin-bottom: 8px;
+
-}
+ .mb5 {
-.ml5 {
+ 	margin-bottom: 5px;
-	margin-left: 5px;
+ }
-}
+
-.mt10 {
+ .mb8 {
-	margin-top: 10px;
+ 	margin-bottom: 8px;
-}
+ }
-.mr10 {
+
-	margin-right: 10px;
+ .ml5 {
-}
+ 	margin-left: 5px;
-.mb10 {
+ }
-	margin-bottom: 10px;
+
-}
+ .mt10 {
-.ml0 {
+ 	margin-top: 10px;
-	margin-left: 10px;
+ }
-}
+
-.mt20 {
+ .mr10 {
-	margin-top: 20px;
+ 	margin-right: 10px;
-}
+ }
-.mr20 {
+
-	margin-right: 20px;
+ .mb10 {
-}
+ 	margin-bottom: 10px;
-.mb20 {
+ }
-	margin-bottom: 20px;
+
-}
+ .ml0 {
-.m20 {
+ 	margin-left: 10px;
-	margin-left: 20px;
+ }
-}
+
-
+ .mt20 {
-.el-dialog:not(.is-fullscreen){
+ 	margin-top: 20px;
-	margin-top: 6vh !important;
+ }
-}
+
-
+ .mr20 {
-.el-table {
+ 	margin-right: 20px;
-	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
+ }
-		th {
+
-			word-break: break-word;
+ .mb20 {
-			background-color: #f8f8f9;
+ 	margin-bottom: 20px;
-			color: #515a6e;
+ }
-			height: 40px;
+
-			font-size: 13px;
+ .m20 {
-		}
+ 	margin-left: 20px;
-	}
+ }
-	.el-table__body-wrapper {
+
-		.el-button [class*="el-icon-"] + span {
+ .el-dialog:not(.is-fullscreen) {
-			margin-left: 1px;
+ 	margin-top: 6vh !important;
-		}
+ }
-	}
+
-}
+ .el-table {
-
+
-/** 表单布局 **/
+ 	.el-table__header-wrapper,
-.form-header {
+ 	.el-table__fixed-header-wrapper {
-    font-size:15px;
+ 		th {
-	color:#6379bb;
+ 			word-break: break-word;
-	border-bottom:1px solid #ddd;
+ 			background-color: #f8f8f9;
-	margin:8px 10px 25px 10px;
+ 			color: #515a6e;
-	padding-top:15px;
+ 			height: 40px;
-	padding-bottom:5px;
+ 			font-size: 13px;
-	.formItem {
+ 		}
-		width: 100%;
+ 	}
-		// max-width: 310px;
+
-	}
+ 	.el-table__body-wrapper {
-}
+ 		.el-button [class*="el-icon-"]+span {
-
+ 			margin-left: 1px;
-/** 表格布局 **/
+ 		}
-.pagination-container {
+ 	}
-	position: relative;
+ }
-	height: 25px;
+
-	margin-bottom: 10px;
+ /** 表单布局 **/
-	margin-top: 15px;
+ .form-header {
-	padding: 10px 20px !important;
+ 	font-size: 15px;
-}
+ 	color: #6379bb;
-
+ 	border-bottom: 1px solid #ddd;
-/* tree border */
+ 	margin: 8px 10px 25px 10px;
-.tree-border {
+ 	padding-top: 15px;
-    margin-top: 5px;
+ 	padding-bottom: 5px;
-    border: 1px solid #e5e6e7;
+
-    background: #FFFFFF none;
+ 	.formItem {
-    border-radius:4px;
+ 		width: 100%;
-}
+ 		// max-width: 310px;
-
+ 	}
-.pagination-container .el-pagination {
+ }
-	right: 0;
+
-	position: absolute;
+ /** 表格布局 **/
-}
+ .pagination-container {
-
+ 	position: relative;
-.el-table .fixed-width .el-button--mini {
+ 	height: 25px;
-	padding-left: 0;
+ 	margin-bottom: 10px;
-	padding-right: 0;
+ 	margin-top: 15px;
-	width: inherit;
+ 	padding: 10px 20px !important;
-}
+ }
-
+
-.el-tree-node__content > .el-checkbox {
+ /* tree border */
-	margin-right: 8px;
+ .tree-border {
-}
+ 	margin-top: 5px;
-
+ 	border: 1px solid #e5e6e7;
-.list-group-striped > .list-group-item {
+ 	background: #FFFFFF none;
-	border-left: 0;
+ 	border-radius: 4px;
-	border-right: 0;
+ }
-	border-radius: 0;
+
-	padding-left: 0;
+ .pagination-container .el-pagination {
-	padding-right: 0;
+ 	right: 0;
-}
+ 	position: absolute;
-
+ }
-.list-group {
+
-	padding-left: 0px;
+ .el-table .fixed-width .el-button--mini {
-	list-style: none;
+ 	padding-left: 0;
-}
+ 	padding-right: 0;
-
+ 	width: inherit;
-.list-group-item {
+ }
-	border-bottom: 1px solid #e7eaec;
+
-	border-top: 1px solid #e7eaec;
+ .el-tree-node__content>.el-checkbox {
-	margin-bottom: -1px;
+ 	margin-right: 8px;
-	padding: 11px 0px;
+ }
-	font-size: 13px;
+
-}
+ .list-group-striped>.list-group-item {
-
+ 	border-left: 0;
-.pull-right {
+ 	border-right: 0;
-	float: right !important;
+ 	border-radius: 0;
-}
+ 	padding-left: 0;
-
+ 	padding-right: 0;
-.el-card__header {
+ }
-	padding: 14px 15px 7px;
+
-	min-height: 40px;
+ .list-group {
-}
+ 	padding-left: 0px;
-
+ 	list-style: none;
-.el-card__body {
+ }
-	padding: 15px 20px 20px 20px;
+
-}
+ .list-group-item {
-
+ 	border-bottom: 1px solid #e7eaec;
-.card-box {
+ 	border-top: 1px solid #e7eaec;
-	padding-right: 15px;
+ 	margin-bottom: -1px;
-	padding-left: 15px;
+ 	padding: 11px 0px;
-	margin-bottom: 10px;
+ 	font-size: 13px;
-}
+ }
-
+
-/* button color */
+ .pull-right {
-.el-button--cyan.is-active,
+ 	float: right !important;
-.el-button--cyan:active {
+ }
-  background: #20B2AA;
+
-  border-color: #20B2AA;
+ .el-card__header {
-  color: #FFFFFF;
+ 	padding: 14px 15px 7px;
-}
+ 	min-height: 40px;
-
+ }
-.el-button--cyan:focus,
+
-.el-button--cyan:hover {
+ .el-card__body {
-  background: #48D1CC;
+ 	padding: 15px 20px 20px 20px;
-  border-color: #48D1CC;
+ }
-  color: #FFFFFF;
+
-}
+ .card-box {
-
+ 	padding-right: 15px;
-.el-button--cyan {
+ 	padding-left: 15px;
-  background-color: #20B2AA;
+ 	margin-bottom: 10px;
-  border-color: #20B2AA;
+ }
-  color: #FFFFFF;
+
-}
+ /* button color */
-
+ .el-button--cyan.is-active,
-/* text color */
+ .el-button--cyan:active {
-.text-navy {
+ 	background: #20B2AA;
-	color: #1ab394;
+ 	border-color: #20B2AA;
-}
+ 	color: #FFFFFF;
-
+ }
-.text-primary {
+
-	color: inherit;
+ .el-button--cyan:focus,
-}
+ .el-button--cyan:hover {
-
+ 	background: #48D1CC;
-.text-success {
+ 	border-color: #48D1CC;
-	color: #1c84c6;
+ 	color: #FFFFFF;
-}
+ }
-
+
-.text-info {
+ .el-button--cyan {
-	color: #23c6c8;
+ 	background-color: #20B2AA;
-}
+ 	border-color: #20B2AA;
-
+ 	color: #FFFFFF;
-.text-warning {
+ }
-	color: #f8ac59;
+
-}
+ /* text color */
-
+ .text-navy {
-.text-danger {
+ 	color: #1ab394;
-	color: #ed5565;
+ }
-}
+
-
+ .text-primary {
-.text-muted {
+ 	color: inherit;
-	color: #888888;
+ }
-}
+
-
+ .text-success {
-/* image */
+ 	color: #1c84c6;
-.img-circle {
+ }
-	border-radius: 50%;
+
-}
+ .text-info {
-
+ 	color: #23c6c8;
-.img-lg {
+ }
-	width: 120px;
+
-	height: 120px;
+ .text-warning {
-}
+ 	color: #f8ac59;
-
+ }
-.avatar-upload-preview {
+
-	position: absolute;
+ .text-danger {
-	top: 50%;
+ 	color: #ed5565;
-	transform: translate(50%, -50%);
+ }
-	width: 200px;
+
-	height: 200px;
+ .text-muted {
-	border-radius: 50%;
+ 	color: #888888;
-	box-shadow: 0 0 4px #ccc;
+ }
-	overflow: hidden;
+
-}
+ /* image */
-
+ .img-circle {
-/* 拖拽列样式 */
+ 	border-radius: 50%;
-.sortable-ghost{
+ }
-	opacity: .8;
+
-	color: #fff!important;
+ .img-lg {
-	background: #42b983!important;
+ 	width: 120px;
-}
+ 	height: 120px;
-
+ }
-.top-right-btn {
+
-	position: relative;
+ .avatar-upload-preview {
-	float: right;
+ 	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
--- a/src/components/Table/index.vue
View file @46e6f64
+++ b/src/components/Table/index.vue
View file @46e6f64
@@ -443,6 +443,9 @@ export default {
       if (column.property == "roleNames") {
         return cellValue.toString();
       }
+      if (column.property == 'flightIdImac') {
+        return cellValue == null ? '未配' : '已配'
+      }
       return cellValue;
     },
   },
--- a/src/views/basicInformation/queryCargo/index.vue
View file @46e6f64
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @46e6f64
@@ -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"
+        <el-table-column v-for="(item, index) in releaseHeader" header-align="center" :align="item.align"
-          :label="item.name" :key="index" :show-overflow-tooltip="true">
+          :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;
     },