zhanbo.xu

feat: 修改运抵单申报页面

...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 {{ scope.row.billNo }} 155 {{ scope.row.billNo }}
156 </el-button> 156 </el-button>
157 </template> 157 </template>
158 - <template v-slot:listReceiptStatus="scope"> 158 + <!-- <template v-slot:listReceiptStatus="scope">
159 <TablePopover 159 <TablePopover
160 ref="listReceiptStatusPopover" 160 ref="listReceiptStatusPopover"
161 dataKey="listReceiptStatus" 161 dataKey="listReceiptStatus"
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
175 {{ scope.row.listReceiptStatus }} 175 {{ scope.row.listReceiptStatus }}
176 </div> 176 </div>
177 </TablePopover> 177 </TablePopover>
178 - </template> 178 + </template> -->
179 <template v-slot:arrivalInReceiptStatus="scope"> 179 <template v-slot:arrivalInReceiptStatus="scope">
180 <TablePopover 180 <TablePopover
181 ref="arrivalInReceiptStatusPopover" 181 ref="arrivalInReceiptStatusPopover"
...@@ -207,11 +207,7 @@ ...@@ -207,11 +207,7 @@
207 </template> 207 </template>
208 208
209 <script> 209 <script>
210 -import { 210 +import { getArrivalIneList, arrivalInReceipt } from "@/api/declareData-api.js";
211 - getArrivalIneList,
212 - getListReceipt,
213 - arrivalInReceipt,
214 -} from "@/api/declareData-api.js";
215 import DialogVue from "./dialog.vue"; 211 import DialogVue from "./dialog.vue";
216 export default { 212 export default {
217 name: "SupervisePlaceManage", 213 name: "SupervisePlaceManage",
...@@ -276,7 +272,7 @@ export default { ...@@ -276,7 +272,7 @@ export default {
276 value: "listReceiptStatus", 272 value: "listReceiptStatus",
277 width: "", 273 width: "",
278 align: "left", 274 align: "left",
279 - slot: true, 275 + // slot: true,
280 }, 276 },
281 { 277 {
282 // release-v1.0.9 278 // release-v1.0.9
...@@ -368,23 +364,24 @@ export default { ...@@ -368,23 +364,24 @@ export default {
368 this.tableMaxheight = window.innerHeight - 300; 364 this.tableMaxheight = window.innerHeight - 300;
369 }, 365 },
370 //查询回执 366 //查询回执
371 - receiptApi(id, type) { 367 + receiptApi(billNo, type) {
372 return new Promise((resolve, reject) => { 368 return new Promise((resolve, reject) => {
373 - let obj = { declareId: id }; 369 + let obj = { billNo };
374 - if (type == "listReceiptStatus") { 370 + // if (type == "listReceiptStatus") {
375 - getListReceipt(obj) 371 + // getListReceipt(obj)
376 - .then((res) => { 372 + // .then((res) => {
377 - if (res.code === "200") { 373 + // if (res.code === "200") {
378 - resolve(res.data); 374 + // resolve(res.data);
379 - } else { 375 + // } else {
380 - reject(); 376 + // reject();
381 - } 377 + // }
382 - }) 378 + // })
383 - .catch((err) => { 379 + // .catch((err) => {
384 - console.log(err); 380 + // console.log(err);
385 - reject(); 381 + // reject();
386 - }); 382 + // });
387 - } else if (type == "arrivalInReceiptStatus") { 383 + // } else
384 + if (type == "arrivalInReceiptStatus") {
388 arrivalInReceipt(obj) 385 arrivalInReceipt(obj)
389 .then((res) => { 386 .then((res) => {
390 if (res.code === "200") { 387 if (res.code === "200") {
...@@ -405,7 +402,7 @@ export default { ...@@ -405,7 +402,7 @@ export default {
405 402
406 console.log(val); 403 console.log(val);
407 404
408 - this.receiptApi(val.data.declareId, val.status) 405 + this.receiptApi(val.data.billNo, val.status)
409 .then((res) => { 406 .then((res) => {
410 val.tableData.forEach((item) => { 407 val.tableData.forEach((item) => {
411 if (item.declareId == val.data.declareId) { 408 if (item.declareId == val.data.declareId) {
......