Showing
2 changed files
with
19 additions
and
8 deletions
| ... | @@ -26,8 +26,6 @@ | ... | @@ -26,8 +26,6 @@ |
| 26 | dataKey="logisticsNo" | 26 | dataKey="logisticsNo" |
| 27 | @formChange="formChange" | 27 | @formChange="formChange" |
| 28 | /> | 28 | /> |
| 29 | - | ||
| 30 | - | ||
| 31 | </Formitem> | 29 | </Formitem> |
| 32 | </el-col> | 30 | </el-col> |
| 33 | <!-- 提运单号 --> | 31 | <!-- 提运单号 --> |
| ... | @@ -60,7 +58,11 @@ | ... | @@ -60,7 +58,11 @@ |
| 60 | placeholder="" | 58 | placeholder="" |
| 61 | > | 59 | > |
| 62 | <el-option | 60 | <el-option |
| 63 | - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')" | 61 | + v-for="( |
| 62 | + item, index | ||
| 63 | + ) in $store.getters.dict.RECEIPT_STATUS.filter( | ||
| 64 | + (fItem) => fItem.itemChineseName !== '已提交' | ||
| 65 | + )" | ||
| 64 | :key="index" | 66 | :key="index" |
| 65 | :label="item.itemChineseName" | 67 | :label="item.itemChineseName" |
| 66 | :value="item.itemValue" | 68 | :value="item.itemValue" |
| ... | @@ -138,7 +140,7 @@ | ... | @@ -138,7 +140,7 @@ |
| 138 | :selectFixed="false" | 140 | :selectFixed="false" |
| 139 | :rowSelectDataType="false" | 141 | :rowSelectDataType="false" |
| 140 | > | 142 | > |
| 141 | - <template v-slot:returnStatus="scope"> | 143 | + <template v-slot:returnStatus="scope"> |
| 142 | <TablePopover | 144 | <TablePopover |
| 143 | ref="returnStatusPopover" | 145 | ref="returnStatusPopover" |
| 144 | dataKey="returnStatus" | 146 | dataKey="returnStatus" |
| ... | @@ -163,7 +165,10 @@ | ... | @@ -163,7 +165,10 @@ |
| 163 | </template> | 165 | </template> |
| 164 | 166 | ||
| 165 | <script> | 167 | <script> |
| 166 | -import { getAllCancellation, getExportCancellationReceiptData } from "@/api/exportRevokeBill-api.js"; | 168 | +import { |
| 169 | + getAllCancellation, | ||
| 170 | + getExportCancellationReceiptData, | ||
| 171 | +} from "@/api/exportRevokeBill-api.js"; | ||
| 167 | 172 | ||
| 168 | export default { | 173 | export default { |
| 169 | name: "ExportRevokeBillQuery", | 174 | name: "ExportRevokeBillQuery", |
| ... | @@ -296,12 +301,18 @@ export default { | ... | @@ -296,12 +301,18 @@ export default { |
| 296 | obj.pageSize = this.page.pageSize; | 301 | obj.pageSize = this.page.pageSize; |
| 297 | obj.createTimeStart = ""; | 302 | obj.createTimeStart = ""; |
| 298 | obj.createTimeEnd = ""; | 303 | obj.createTimeEnd = ""; |
| 304 | + | ||
| 305 | + console.log(obj); | ||
| 306 | + | ||
| 299 | if (obj.createTime.length > 0) { | 307 | if (obj.createTime.length > 0) { |
| 300 | obj.createTimeStart = obj.createTime[0]; | 308 | obj.createTimeStart = obj.createTime[0]; |
| 301 | obj.createTimeEnd = obj.createTime[1]; | 309 | obj.createTimeEnd = obj.createTime[1]; |
| 302 | } | 310 | } |
| 311 | + | ||
| 303 | if (obj.logisticsNo != null && obj.logisticsNo != "") { | 312 | if (obj.logisticsNo != null && obj.logisticsNo != "") { |
| 304 | - obj.logisticsNo = obj.logisticsNo.split("\n"); | 313 | + if (!Array.isArray(obj.logisticsNo)) { |
| 314 | + obj.logisticsNo = obj.logisticsNo.split("\n"); | ||
| 315 | + } | ||
| 305 | } else { | 316 | } else { |
| 306 | obj.logisticsNo = []; | 317 | obj.logisticsNo = []; |
| 307 | } | 318 | } |
| ... | @@ -355,7 +366,7 @@ export default { | ... | @@ -355,7 +366,7 @@ export default { |
| 355 | }) | 366 | }) |
| 356 | .finally(() => { | 367 | .finally(() => { |
| 357 | this.$nextTick(() => { | 368 | this.$nextTick(() => { |
| 358 | - this.$store.dispatch('setLoadingState', false) | 369 | + this.$store.dispatch("setLoadingState", false); |
| 359 | this.$refs.returnStatusPopover.tableLoading = false; | 370 | this.$refs.returnStatusPopover.tableLoading = false; |
| 360 | }); | 371 | }); |
| 361 | }); | 372 | }); | ... | ... |
| ... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
| 4 | title="新增模拟回执管理" | 4 | title="新增模拟回执管理" |
| 5 | :visible.sync="outerVisible" | 5 | :visible.sync="outerVisible" |
| 6 | :show-close="false" | 6 | :show-close="false" |
| 7 | - width="45%" | 7 | + width="960px" |
| 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" | ... | ... |
-
Please register or login to post a comment