jinhui.wang

表格状态修正

...@@ -79,7 +79,7 @@ let ductLabels = { ...@@ -79,7 +79,7 @@ let ductLabels = {
79 "4_1": "处理失败(数据异常)", 79 "4_1": "处理失败(数据异常)",
80 "4_2": "处理失败(数据异常)", 80 "4_2": "处理失败(数据异常)",
81 "4_3": "处理失败(其他系统异常)", 81 "4_3": "处理失败(其他系统异常)",
82 - "5": "处理失败(系统异常)", 82 + // "5": "处理失败(系统异常)",
83 "9": "处理中", 83 "9": "处理中",
84 }, 84 },
85 "weatherGenerateWater": { 85 "weatherGenerateWater": {
......
...@@ -984,7 +984,7 @@ let tableHeaders = { ...@@ -984,7 +984,7 @@ let tableHeaders = {
984 columnName: "flightFltNo", 984 columnName: "flightFltNo",
985 columnWidth: "130", 985 columnWidth: "130",
986 status: 1, 986 status: 1,
987 - slot: true 987 + ext1: 'slot',
988 }, 988 },
989 { 989 {
990 columnChineseName: "当前配载航班日期", 990 columnChineseName: "当前配载航班日期",
...@@ -1187,7 +1187,7 @@ let tableHeaders = { ...@@ -1187,7 +1187,7 @@ let tableHeaders = {
1187 columnChineseName: " ", 1187 columnChineseName: " ",
1188 columnName: "serviceCodeMapperList", 1188 columnName: "serviceCodeMapperList",
1189 columnWidth: "", 1189 columnWidth: "",
1190 - expand: true, 1190 + ext1: 'expand',
1191 status: 1 1191 status: 1
1192 }, 1192 },
1193 { 1193 {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 :show-header="showHeader" :height="height" :highlight-current-row="highlightCurrentRow" :lazy="lazy" 4 :show-header="showHeader" :height="height" :highlight-current-row="highlightCurrentRow" :lazy="lazy"
5 :downShiftKey="shiftKey" :limitStart="limitStart" :row-key="rowKey" :default-expand-all="defaultExpandAll" 5 :downShiftKey="shiftKey" :limitStart="limitStart" :row-key="rowKey" :default-expand-all="defaultExpandAll"
6 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading" @sort-change="sortChange" 6 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading" @sort-change="sortChange"
7 - @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange"> 7 + @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange" @row-click="rowClick">
8 <!-- 多选框 --> 8 <!-- 多选框 -->
9 <el-table-column v-if="selection" type="selection" width="50" :align="tableAlign" :fixed="selectFixed" 9 <el-table-column v-if="selection" type="selection" width="50" :align="tableAlign" :fixed="selectFixed"
10 :header-align="headerAlign"> 10 :header-align="headerAlign">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 </template> 29 </template>
30 </el-table-column> 30 </el-table-column>
31 <!-- 隐藏行 --> 31 <!-- 隐藏行 -->
32 - <el-table-column v-else-if="tableColumnHidden(item.ext1) == 'expand'" :prop="item.columnName" 32 + <el-table-column v-else-if="tableColumnHidden(item.ext1, 'expand')" type="expand" :prop="item.columnName"
33 :label="item.columnChineseName" :index="item.index" :width="item.columnWidth" 33 :label="item.columnChineseName" :index="item.index" :width="item.columnWidth"
34 :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false" 34 :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false"
35 :column-key="index.toString()" :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign" 35 :column-key="index.toString()" :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign"
...@@ -343,6 +343,10 @@ export default { ...@@ -343,6 +343,10 @@ export default {
343 SelectChange(selection) { 343 SelectChange(selection) {
344 this.$emit("SelectChange", selection); 344 this.$emit("SelectChange", selection);
345 }, 345 },
346 + //行被点击
347 + rowClick(val) {
348 + this.$emit('rowClick', val)
349 + },
346 //表格选择清空 350 //表格选择清空
347 clearTable() { 351 clearTable() {
348 this.selectTable = []; 352 this.selectTable = [];
...@@ -389,6 +393,11 @@ export default { ...@@ -389,6 +393,11 @@ export default {
389 return cellValue ? cellValue.split(" ")[0] : '' 393 return cellValue ? cellValue.split(" ")[0] : ''
390 } 394 }
391 } 395 }
396 + if (this.ductName === 'cargoLog') {
397 + if (column.property == 'flightDate' || column.property == 'accsFlightDate') {
398 + return cellValue ? cellValue.split(" ")[0] : ''
399 + }
400 + }
392 return cellValue; 401 return cellValue;
393 }, 402 },
394 //列显示状态 403 //列显示状态
......