zhanbo.xu

feat: 修改运抵单申报页面

......@@ -253,3 +253,13 @@ export function checkBillNo(data) {
data: data.declareIds,
});
}
// /declareData/getArrivalIneList
// 运抵单申报列表
export function getArrivalIneList(data) {
return request({
url: "/bus-customer/declareData/getArrivalIneList",
method: "post",
data: data,
});
}
......
......@@ -8,6 +8,7 @@
size="small"
>
<el-row class="row-border">
<!-- 提运单号、监管场经营人代码、监管场所经营人名称、创建时间、回执状态 -->
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
......@@ -22,25 +23,29 @@
></el-input>
</Formitem>
</el-col>
<!-- 物流运单编号 -->
<!-- 监管场所经营人代码 -->
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
@formChange="formChange"
/>
<Formitem label="监管场所经营人代码" prop="operatorCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--operatorCode"
resize="none"
v-model="sreachFormData.operatorCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 订单编号 -->
<!-- 监管场所经营人名称 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<Formitem label="监管场所经营人名称" prop="operatorName">
<el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
id="inputInner--operatorName"
resize="none"
v-model="sreachFormData.orderNo"
v-model="sreachFormData.operatorName"
clearable
placeholder=""
></el-input>
......@@ -145,6 +150,11 @@
@tableSelectAll="tableSelectAll"
:selected="selected"
>
<template v-slot:billNo="scope">
<el-button type="text" @click.stop="linkChange(scope)">
{{ scope.row.billNo }}
</el-button>
</template>
<template v-slot:listReceiptStatus="scope">
<TablePopover
ref="listReceiptStatusPopover"
......@@ -198,7 +208,7 @@
<script>
import {
searchDeclareData,
getArrivalIneList,
getListReceipt,
arrivalInReceipt,
} from "@/api/declareData-api.js";
......@@ -217,8 +227,8 @@ export default {
selected: [],
sreachFormData: {
billNo: "",
logisticsNo: "",
orderNo: "",
operatorCode: "",
operatorName: "",
receiptStatus: null,
receiptType: null,
createTime: [],
......@@ -235,25 +245,26 @@ export default {
value: "billNo",
width: "",
align: "left",
slot: true,
},
{
name: "物流运单编号",
value: "logisticsWaybillNumber",
width: "",
align: "left",
},
{
name: "订单编号",
value: "orderno",
name: "监管场所经营人代码",
value: "operatorCode",
width: "",
align: "left",
},
{
name: "电商企业名称",
value: "ecomEntName",
name: "监管场所经营人名称",
value: "operatorName",
width: "",
align: "left",
},
// {
// name: "电商企业名称",
// value: "ecomEntName",
// width: "",
// align: "left",
// },
{
name: "创建时间",
value: "createTime",
......@@ -320,15 +331,22 @@ export default {
window.removeEventListener("resize", this.calculateTableHeight);
},
methods: {
// 运单号跳转
linkChange(record) {
const { billNo } = record.row;
console.log(record);
this.$router.push({
path: "/reportingData",
query: { billNo, search: true },
});
},
tableSelect(val) {
this.selected = val.selection;
},
tableSelectAll(val) {
this.selected = val;
},
formChange(val) {
this.sreachFormData = val;
},
dateChange(val) {
if (val == "" || val == null) {
this.$nextTick(() => {
......@@ -410,8 +428,8 @@ export default {
//重置数据
this.sreachFormData = {
billNo: "",
logisticsNo: "",
orderNo: "",
operatorCode: "",
operatorName: "",
receiptStatus: null,
receiptType: null,
createTime: [],
......@@ -433,8 +451,8 @@ export default {
obj.startCreateTime = obj.createTime[0];
obj.endCreateTime = obj.createTime[1];
}
searchDeclareData({
isOnlySearchArrivalIn: true,
getArrivalIneList({
// isOnlySearchArrivalIn: true,
...obj,
})
.then((res) => {
......
......@@ -675,8 +675,17 @@ export default {
};
},
created() {
this.search(0);
this.calculateTableHeight();
try {
if (this.$route.query.billNo && this.$route.query.search == "true") {
this.sreachFormData.billNo = this.$route.query.billNo;
}
} catch (error) {
console.log(error);
} finally {
this.search(0);
}
},
mounted() {
window.addEventListener("resize", this.calculateTableHeight);
......