Showing
4 changed files
with
61 additions
and
11 deletions
| ... | @@ -303,8 +303,8 @@ export default { | ... | @@ -303,8 +303,8 @@ export default { |
| 303 | }, | 303 | }, |
| 304 | pageSizes: { | 304 | pageSizes: { |
| 305 | type: Array, | 305 | type: Array, |
| 306 | - default(){ | 306 | + default() { |
| 307 | - return [10, 20, 30, 40, 50, 100] | 307 | + return [10, 20, 30, 40, 50, 100]; |
| 308 | }, | 308 | }, |
| 309 | }, | 309 | }, |
| 310 | expandRowKeys: { | 310 | expandRowKeys: { |
| ... | @@ -439,7 +439,7 @@ export default { | ... | @@ -439,7 +439,7 @@ export default { |
| 439 | this.$nextTick(() => { | 439 | this.$nextTick(() => { |
| 440 | if (table) { | 440 | if (table) { |
| 441 | table.style.maxHeight = this.maxHeight; | 441 | table.style.maxHeight = this.maxHeight; |
| 442 | - tableBody.clientHeight >= parseInt(this.maxHeight) | 442 | + tableBody.clientHeight >= parseInt(this.maxHeight) |
| 443 | ? (table.style.height = this.maxHeight - 40 + "px") | 443 | ? (table.style.height = this.maxHeight - 40 + "px") |
| 444 | : (table.style.height = tableBody.clientHeight + "px"); | 444 | : (table.style.height = tableBody.clientHeight + "px"); |
| 445 | this.$refs.tables.doLayout(); | 445 | this.$refs.tables.doLayout(); | ... | ... |
| ... | @@ -130,6 +130,22 @@ | ... | @@ -130,6 +130,22 @@ |
| 130 | :selectFixed="false" | 130 | :selectFixed="false" |
| 131 | :rowSelectDataType="false" | 131 | :rowSelectDataType="false" |
| 132 | > | 132 | > |
| 133 | + <template v-slot:interfaceName="scope"> | ||
| 134 | + <el-popover trigger="hover" placement="top"> | ||
| 135 | + <div class="name-wrapper-content">{{ scope.row.interfaceName }}</div> | ||
| 136 | + <span slot="reference" class="name-wrapper"> | ||
| 137 | + {{ scope.row.interfaceName }} | ||
| 138 | + </span> | ||
| 139 | + </el-popover> | ||
| 140 | + </template> | ||
| 141 | + <template v-slot:requestParams="scope"> | ||
| 142 | + <el-popover trigger="hover" placement="top"> | ||
| 143 | + <div class="name-wrapper-content">{{ scope.row.requestParams }}</div> | ||
| 144 | + <span slot="reference" class="name-wrapper"> | ||
| 145 | + {{ scope.row.requestParams }} | ||
| 146 | + </span> | ||
| 147 | + </el-popover> | ||
| 148 | + </template> | ||
| 133 | </Table> | 149 | </Table> |
| 134 | </div> | 150 | </div> |
| 135 | </template> | 151 | </template> |
| ... | @@ -170,6 +186,8 @@ export default { | ... | @@ -170,6 +186,8 @@ export default { |
| 170 | value: "interfaceName", | 186 | value: "interfaceName", |
| 171 | width: "", | 187 | width: "", |
| 172 | align: "left", | 188 | align: "left", |
| 189 | + slot: true, | ||
| 190 | + showOverflowTooltip: false, | ||
| 173 | }, | 191 | }, |
| 174 | { | 192 | { |
| 175 | name: "IP地址", | 193 | name: "IP地址", |
| ... | @@ -182,6 +200,8 @@ export default { | ... | @@ -182,6 +200,8 @@ export default { |
| 182 | value: "requestParams", | 200 | value: "requestParams", |
| 183 | width: "", | 201 | width: "", |
| 184 | align: "left", | 202 | align: "left", |
| 203 | + slot: true, | ||
| 204 | + showOverflowTooltip: false, | ||
| 185 | }, | 205 | }, |
| 186 | { | 206 | { |
| 187 | name: "状态", | 207 | name: "状态", |
| ... | @@ -337,4 +357,14 @@ export default { | ... | @@ -337,4 +357,14 @@ export default { |
| 337 | transform: translate(0, -50%); | 357 | transform: translate(0, -50%); |
| 338 | z-index: 10; | 358 | z-index: 10; |
| 339 | } | 359 | } |
| 360 | +.name-wrapper { | ||
| 361 | + overflow: hidden; | ||
| 362 | + white-space: nowrap; | ||
| 363 | + text-overflow: ellipsis; | ||
| 364 | + max-width: 200px; | ||
| 365 | + display: inline-block; | ||
| 366 | +} | ||
| 367 | +.name-wrapper-content { | ||
| 368 | + max-width: 400px; | ||
| 369 | +} | ||
| 340 | </style> | 370 | </style> | ... | ... |
| ... | @@ -29,13 +29,13 @@ | ... | @@ -29,13 +29,13 @@ |
| 29 | </Formitem> | 29 | </Formitem> |
| 30 | </el-col> | 30 | </el-col> |
| 31 | <el-col :span="5"> | 31 | <el-col :span="5"> |
| 32 | - <Formitem label="订单编号" prop="orderNo"> | 32 | + <Formitem label="物流运单编号" prop="logisticsNo"> |
| 33 | <el-input | 33 | <el-input |
| 34 | type="text" | 34 | type="text" |
| 35 | class="inputShadow" | 35 | class="inputShadow" |
| 36 | - id="inputInner--orderNo" | 36 | + id="inputInner--logisticsNo" |
| 37 | resize="none" | 37 | resize="none" |
| 38 | - v-model="sreachFormData.orderNo" | 38 | + v-model="sreachFormData.logisticsNo" |
| 39 | clearable | 39 | clearable |
| 40 | placeholder="" | 40 | placeholder="" |
| 41 | ></el-input> | 41 | ></el-input> |
| ... | @@ -115,6 +115,14 @@ | ... | @@ -115,6 +115,14 @@ |
| 115 | :selectFixed="false" | 115 | :selectFixed="false" |
| 116 | :rowSelectDataType="false" | 116 | :rowSelectDataType="false" |
| 117 | > | 117 | > |
| 118 | + <template v-slot:receiptInfo="scope"> | ||
| 119 | + <el-popover trigger="hover" placement="top"> | ||
| 120 | + <div class="name-wrapper-content">{{ scope.row.receiptInfo }}</div> | ||
| 121 | + <span slot="reference" class="name-wrapper"> | ||
| 122 | + {{ scope.row.receiptInfo }} | ||
| 123 | + </span> | ||
| 124 | + </el-popover> | ||
| 125 | + </template> | ||
| 118 | </Table> | 126 | </Table> |
| 119 | <DialogVue | 127 | <DialogVue |
| 120 | :outerVisible="outerVisible" | 128 | :outerVisible="outerVisible" |
| ... | @@ -139,7 +147,7 @@ export default { | ... | @@ -139,7 +147,7 @@ export default { |
| 139 | return { | 147 | return { |
| 140 | sreachFormData: { | 148 | sreachFormData: { |
| 141 | receiptType: "", | 149 | receiptType: "", |
| 142 | - orderNo: "", | 150 | + logisticsNo: "", |
| 143 | receiptStatus: "", | 151 | receiptStatus: "", |
| 144 | }, | 152 | }, |
| 145 | page: { | 153 | page: { |
| ... | @@ -156,8 +164,8 @@ export default { | ... | @@ -156,8 +164,8 @@ export default { |
| 156 | align: "left", | 164 | align: "left", |
| 157 | }, | 165 | }, |
| 158 | { | 166 | { |
| 159 | - name: "订单编号", | 167 | + name: "物流运单编号", |
| 160 | - value: "orderNo", | 168 | + value: "logisticsNo", |
| 161 | width: "", | 169 | width: "", |
| 162 | align: "left", | 170 | align: "left", |
| 163 | }, | 171 | }, |
| ... | @@ -172,6 +180,8 @@ export default { | ... | @@ -172,6 +180,8 @@ export default { |
| 172 | value: "receiptInfo", | 180 | value: "receiptInfo", |
| 173 | width: "", | 181 | width: "", |
| 174 | align: "left", | 182 | align: "left", |
| 183 | + slot: true, | ||
| 184 | + showOverflowTooltip: false, | ||
| 175 | }, | 185 | }, |
| 176 | { | 186 | { |
| 177 | name: "创建时间", | 187 | name: "创建时间", |
| ... | @@ -308,6 +318,16 @@ export default { | ... | @@ -308,6 +318,16 @@ export default { |
| 308 | } | 318 | } |
| 309 | } | 319 | } |
| 310 | } | 320 | } |
| 321 | +.name-wrapper { | ||
| 322 | + overflow: hidden; | ||
| 323 | + white-space: nowrap; | ||
| 324 | + text-overflow: ellipsis; | ||
| 325 | + max-width: 200px; | ||
| 326 | + display: inline-block; | ||
| 327 | +} | ||
| 328 | +.name-wrapper-content { | ||
| 329 | + max-width: 400px; | ||
| 330 | +} | ||
| 311 | 331 | ||
| 312 | .texttareaTip { | 332 | .texttareaTip { |
| 313 | position: absolute; | 333 | position: absolute; | ... | ... |
| ... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
| 4 | title="离境单申报" | 4 | title="离境单申报" |
| 5 | :visible.sync="timeVisible" | 5 | :visible.sync="timeVisible" |
| 6 | :show-close="false" | 6 | :show-close="false" |
| 7 | - width="40%" | 7 | + width="450px" |
| 8 | :close-on-click-modal="false" | 8 | :close-on-click-modal="false" |
| 9 | :destroy-on-close="true" | 9 | :destroy-on-close="true" |
| 10 | v-loading="loadings.dialogLoading" | 10 | v-loading="loadings.dialogLoading" |
| ... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
| 19 | size="small" | 19 | size="small" |
| 20 | > | 20 | > |
| 21 | <el-row :gutter="5"> | 21 | <el-row :gutter="5"> |
| 22 | - <el-col :span="8"> | 22 | + <el-col :span="24"> |
| 23 | <Formitem label="离境时间" prop="leaveTime" type="edit"> | 23 | <Formitem label="离境时间" prop="leaveTime" type="edit"> |
| 24 | <!-- <el-select | 24 | <!-- <el-select |
| 25 | type="text" | 25 | type="text" | ... | ... |
-
Please register or login to post a comment