Showing
4 changed files
with
25 additions
and
6 deletions
| 1 | <template> | 1 | <template> |
| 2 | <Table | 2 | <Table |
| 3 | - class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable" | 3 | + class="fedexDetialTable fedexTableBlack bodyTable" |
| 4 | ref="entryTable" | 4 | ref="entryTable" |
| 5 | :data="tableData" | 5 | :data="tableData" |
| 6 | :headerData="headerData" | 6 | :headerData="headerData" | ... | ... |
| ... | @@ -44,7 +44,7 @@ | ... | @@ -44,7 +44,7 @@ |
| 44 | <!-- 物流运单编号 --> | 44 | <!-- 物流运单编号 --> |
| 45 | <el-col :span="5"> | 45 | <el-col :span="5"> |
| 46 | <Formitem label="物流运单编号" prop="logisticsNo"> | 46 | <Formitem label="物流运单编号" prop="logisticsNo"> |
| 47 | - <el-input | 47 | + <!-- <el-input |
| 48 | type="text" | 48 | type="text" |
| 49 | class="inputShadow" | 49 | class="inputShadow" |
| 50 | id="inputInner--logisticsNo" | 50 | id="inputInner--logisticsNo" |
| ... | @@ -52,7 +52,15 @@ | ... | @@ -52,7 +52,15 @@ |
| 52 | v-model="sreachFormData.logisticsNo" | 52 | v-model="sreachFormData.logisticsNo" |
| 53 | clearable | 53 | clearable |
| 54 | placeholder="" | 54 | placeholder="" |
| 55 | - ></el-input> | 55 | + ></el-input> --> |
| 56 | + | ||
| 57 | + <FormTextareaInput | ||
| 58 | + :formData="sreachFormData" | ||
| 59 | + dataKey="logisticsNo" | ||
| 60 | + @formChange="formChange" | ||
| 61 | + /> | ||
| 62 | + | ||
| 63 | + | ||
| 56 | </Formitem> | 64 | </Formitem> |
| 57 | </el-col> | 65 | </el-col> |
| 58 | <!-- 创建时间 --> | 66 | <!-- 创建时间 --> |
| ... | @@ -230,7 +238,7 @@ export default { | ... | @@ -230,7 +238,7 @@ export default { |
| 230 | billNo: "", | 238 | billNo: "", |
| 231 | ebpcode: "", | 239 | ebpcode: "", |
| 232 | invtNo: "", | 240 | invtNo: "", |
| 233 | - logisticsNo: "", | 241 | + logisticsNo: [], |
| 234 | orderNo: "", | 242 | orderNo: "", |
| 235 | returnStatus: "", | 243 | returnStatus: "", |
| 236 | createTime: [], | 244 | createTime: [], |
| ... | @@ -340,7 +348,7 @@ export default { | ... | @@ -340,7 +348,7 @@ export default { |
| 340 | if (val == 0) { | 348 | if (val == 0) { |
| 341 | this.page.pageIndex = 1; | 349 | this.page.pageIndex = 1; |
| 342 | } | 350 | } |
| 343 | - let obj = this.sreachFormData; | 351 | + let obj = {...this.sreachFormData}; |
| 344 | obj.pageIndex = this.page.pageIndex; | 352 | obj.pageIndex = this.page.pageIndex; |
| 345 | obj.pageSize = this.page.pageSize; | 353 | obj.pageSize = this.page.pageSize; |
| 346 | obj.createTimeStart = ""; | 354 | obj.createTimeStart = ""; |
| ... | @@ -349,6 +357,12 @@ export default { | ... | @@ -349,6 +357,12 @@ export default { |
| 349 | obj.createTimeStart = obj.createTime[0]; | 357 | obj.createTimeStart = obj.createTime[0]; |
| 350 | obj.createTimeEnd = obj.createTime[1]; | 358 | obj.createTimeEnd = obj.createTime[1]; |
| 351 | } | 359 | } |
| 360 | + delete obj.createTime | ||
| 361 | + if (obj.logisticsNo != null && obj.logisticsNo != "") { | ||
| 362 | + obj.logisticsNo = obj.logisticsNo.split("\n"); | ||
| 363 | + } else { | ||
| 364 | + obj.logisticsNo = []; | ||
| 365 | + } | ||
| 352 | getAllexportList(obj) | 366 | getAllexportList(obj) |
| 353 | .then((res) => { | 367 | .then((res) => { |
| 354 | if (res.code === "200") { | 368 | if (res.code === "200") { | ... | ... |
| ... | @@ -239,6 +239,7 @@ export default { | ... | @@ -239,6 +239,7 @@ export default { |
| 239 | clearFile() {}, | 239 | clearFile() {}, |
| 240 | close() { | 240 | close() { |
| 241 | this.handleRemove(); | 241 | this.handleRemove(); |
| 242 | + this.errorData = [] | ||
| 242 | this.$emit("close", this.uploadType); | 243 | this.$emit("close", this.uploadType); |
| 243 | }, | 244 | }, |
| 244 | }, | 245 | }, | ... | ... |
| ... | @@ -463,7 +463,7 @@ export default { | ... | @@ -463,7 +463,7 @@ export default { |
| 463 | exportDeclareLoading:false, | 463 | exportDeclareLoading:false, |
| 464 | }, | 464 | }, |
| 465 | textareaVisible: {}, | 465 | textareaVisible: {}, |
| 466 | - tableMaxheight: null, | 466 | + tableMaxheight: 653, |
| 467 | outerVisible: false, | 467 | outerVisible: false, |
| 468 | dropdownName: "一键申报", | 468 | dropdownName: "一键申报", |
| 469 | dropdownCode: "full", | 469 | dropdownCode: "full", |
| ... | @@ -639,6 +639,10 @@ export default { | ... | @@ -639,6 +639,10 @@ export default { |
| 639 | // } | 639 | // } |
| 640 | this.search(1); | 640 | this.search(1); |
| 641 | this.outerVisible = false; | 641 | this.outerVisible = false; |
| 642 | + this.$nextTick(()=>{ | ||
| 643 | + window.location.reload() | ||
| 644 | + }) | ||
| 645 | + | ||
| 642 | }, | 646 | }, |
| 643 | popoverChange(val) { | 647 | popoverChange(val) { |
| 644 | console.log(val); | 648 | console.log(val); | ... | ... |
-
Please register or login to post a comment