Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
dba60adf 1 parent 6a2bb229

feat: demo优化

Inline Side-by-side
Showing 6 changed files with 172 additions and 81 deletions
......@@ -151,31 +151,24 @@
:selected="selected"
>
<template v-slot:billNo="scope">
<el-button type="text" @click.stop="linkChange(scope)">
<el-button type="text" @click.stop="linkChange(scope, 0)">
{{ scope.row.billNo }}
</el-button>
</template>
<!-- <template v-slot:listReceiptStatus="scope">
<TablePopover
ref="listReceiptStatusPopover"
dataKey="listReceiptStatus"
idKey="declareId"
:parentDom="$refs.entryTable"
:receiptDataHead="receiptDataHead"
:rowData="scope.row"
:tableData="tableData"
@popoverChange="popoverChange"
@popoverClose="popoverClose"
<template v-slot:listReceiptStatus="scope">
海关审结：
<el-button type="text" @click.stop="linkChange(scope, 1)">
{{ scope.row.uncompletedCount }}
</el-button>
/
<el-button
type="text"
@click.stop="linkChange(scope, 2)"
style="margin-left: 0"
>
<div slot="title">
<span style="font-weight: 700; color: #515a6e">订单编号：</span
>{{ scope.row.orderno }}
</div>
<div slot="buttonLabel">
{{ scope.row.listReceiptStatus }}
</div>
</TablePopover>
</template> -->
{{ scope.row.completedCount }}
</el-button>
</template>
<template v-slot:arrivalInReceiptStatus="scope">
<TablePopover
ref="arrivalInReceiptStatusPopover"
......@@ -268,14 +261,13 @@ export default {
align: "left",
},
{
name: "清单回执",
name: "清单审结进度",
value: "listReceiptStatus",
width: "",
align: "left",
// slot: true,
slot: true,
},
{
// release-v1.0.9
name: "运抵单回执",
value: "arrivalInReceiptStatus",
width: "",
......@@ -328,12 +320,21 @@ export default {
},
methods: {
// 运单号跳转
linkChange(record) {
const { billNo } = record.row;
console.log(record);
linkChange(record, type) {
const { billNo, completedLogisticsNo, uncompletedLogisticsNo } =
record.row;
const query = { billNo, search: true };
if (+type === 1) {
query["logisticsNo"] = uncompletedLogisticsNo;
}
if (+type === 2) {
query["logisticsNo"] = completedLogisticsNo;
}
console.log(query, record);
this.$router.push({
path: "/reportingData",
query: { billNo, search: true },
query: { ...query },
});
},
tableSelect(val) {
......
......@@ -29,7 +29,7 @@
clearable
filterable
placeholder=""
@change="getOrderList"
@change="receiptXml"
>
<el-option
v-for="item in receiptTypeList"
......@@ -42,7 +42,18 @@
</el-col>
<el-col :span="8">
<Formitem label="物流运单编号" prop="logisticsNo" type="edit">
<el-select
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-logisticsNo"
resize="none"
v-model="formData.logisticsNo"
clearable
disabled
placeholder=""
@blur="handleOtherInfo"
></el-input>
<!-- <el-select
type="text"
id="inputInner-edit-logisticsNo"
v-model="formData.logisticsNo"
......@@ -62,7 +73,7 @@
:label="item"
:value="item"
></el-option>
</el-select>
</el-select> -->
</Formitem>
</el-col>
<el-col :span="8">
......@@ -159,7 +170,6 @@
<script>
import {
searchOrderNo,
generateReceiptXml,
addInfo,
getListInfo,
......@@ -293,26 +303,26 @@ export default {
}
});
},
remoteMethod(query) {
console.log(query);
this.getOrderList(query, true);
},
getOrderList(val, flag) {
if (!this.formData.receiptType) {
return;
}
searchOrderNo({
receiptType: this.formData.receiptType,
logisticsNo: flag ? val : "",
}).then((res) => {
if (res.code === "200") {
this.orderNoList = res.data;
} else {
this.alertWarningMsg(res.message);
}
});
this.receiptXml();
},
// remoteMethod(query) {
// console.log(query);
// this.getOrderList(query, true);
// },
// getOrderList(val, flag) {
// if (!this.formData.receiptType) {
// return;
// }
// searchOrderNo({
// receiptType: this.formData.receiptType,
// logisticsNo: flag ? val : "",
// }).then((res) => {
// if (res.code === "200") {
// this.orderNoList = res.data;
// } else {
// this.alertWarningMsg(res.message);
// }
// });
// this.receiptXml();
// },
getOtherInfo(e) {
getListInfo(e).then((res) => {
console.log(res);
......
......@@ -29,7 +29,7 @@
clearable
filterable
placeholder=""
@change="getOrderList"
@change="receiptXml"
>
<el-option
v-for="item in receiptTypeList"
......@@ -42,7 +42,17 @@
</el-col>
<el-col :span="8">
<Formitem label="物流运单编号" prop="logisticsNo" type="edit">
<el-select
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-logisticsNo"
resize="none"
v-model="formData.logisticsNo"
clearable
placeholder=""
@blur="handleOtherInfo"
></el-input>
<!-- <el-select
type="text"
id="inputInner-edit-logisticsNo"
v-model="formData.logisticsNo"
......@@ -61,7 +71,7 @@
:label="item"
:value="item"
></el-option>
</el-select>
</el-select> -->
</Formitem>
</el-col>
<el-col :span="8">
......@@ -158,7 +168,6 @@
<script>
import {
searchOrderNo,
generateReceiptXml,
addInfo,
getListInfo,
......@@ -287,26 +296,26 @@ export default {
}
});
},
remoteMethod(query) {
console.log(query);
this.getOrderList(query, true);
},
getOrderList(val, flag) {
if (!this.formData.receiptType) {
return;
}
searchOrderNo({
receiptType: this.formData.receiptType,
logisticsNo: flag ? val : "",
}).then((res) => {
if (res.code === "200") {
this.orderNoList = res.data;
} else {
this.alertWarningMsg(res.message);
}
});
this.receiptXml();
},
// remoteMethod(query) {
// console.log(query);
// this.getOrderList(query, true);
// },
// getOrderList(val, flag) {
// if (!this.formData.receiptType) {
// return;
// }
// searchOrderNo({
// receiptType: this.formData.receiptType,
// logisticsNo: flag ? val : "",
// }).then((res) => {
// if (res.code === "200") {
// this.orderNoList = res.data;
// } else {
// this.alertWarningMsg(res.message);
// }
// });
// this.receiptXml();
// },
getOtherInfo(e) {
getListInfo(e).then((res) => {
console.log(res);
......@@ -343,6 +352,7 @@ export default {
this.close(true);
} else {
this.alertWarningMsg(res.message);
this.close(false);
}
})
.catch((err) => {
......
......@@ -184,6 +184,12 @@ export default {
showOverflowTooltip: false,
},
{
name: "创建人",
value: "createUserName",
width: "",
align: "left",
},
{
name: "创建时间",
value: "createTime",
width: "",
......
......@@ -91,13 +91,21 @@
<el-row class="backgroundRow">
<!-- 回执状态 -->
<el-col :span="5">
<Formitem label="回执状态" prop="receiptStatus">
<Formitem
label="回执状态"
prop="receiptStatus"
:activeType="activeType"
>
<el-select
type="text"
class="multipleElSelect"
id="inputInner--receiptStatus"
v-model="sreachFormData.receiptStatus"
clearable
placeholder=""
multiple
@visible-change="visibleChange"
@remove-tag="removeTag"
@clear="clear"
>
<el-option
v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
......@@ -493,6 +501,7 @@ export default {
},
data() {
return {
activeType: false,
// 控制日志弹窗的显示和隐藏
allLogDataReceiptStatusPopoverType: false,
// 存储选中的日志数据
......@@ -501,7 +510,7 @@ export default {
billNo: "",
logisticsNo: "",
orderNo: "",
receiptStatus: null,
receiptStatus: [],
receiptType: null,
createTime: [],
},
......@@ -680,6 +689,7 @@ export default {
try {
if (this.$route.query.billNo && this.$route.query.search == "true") {
this.sreachFormData.billNo = this.$route.query.billNo;
this.sreachFormData.logisticsNo = this.$route.query.logisticsNo;
}
} catch (error) {
console.log(error);
......@@ -709,6 +719,36 @@ export default {
});
},
methods: {
visibleChange(type) {
if (type) {
this.activeType = true;
} else {
if (this.sreachFormData.receiptStatus.length > 0) {
this.activeType = true;
} else {
this.activeType = false;
document
.querySelector("#inputInner--receiptStatus")
.classList.remove("inputFocus");
}
}
},
removeTag(val) {
if (this.sreachFormData.receiptStatus.length > 0) {
this.activeType = true;
} else {
this.activeType = false;
document
.querySelector("#inputInner--receiptStatus")
.classList.remove("inputFocus");
}
},
clear() {
this.activeType = false;
document
.querySelector("#inputInner--receiptStatus")
.classList.remove("inputFocus");
},
dialogClose(flag = false) {
this.timeVisible = false;
if (flag) {
......@@ -767,7 +807,7 @@ export default {
billNo: "",
logisticsNo: "",
orderNo: "",
receiptStatus: null,
receiptStatus: [],
receiptType: null,
createTime: [],
};
......
......@@ -15,6 +15,9 @@
<span style="margin-left: 20px">
汇总申报地海关：{{ pageData.portCode }}
</span>
<span style="margin-left: 20px">
商品种类总数量：{{ pageData.skuCount }}
</span>
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......@@ -29,6 +32,11 @@
:totalCount="page.total"
@sizeChange="sizeChange"
@currentChange="currentChange"
:selection="true"
:selectFixed="false"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
:selected="tableSelected"
>
</Table>
<div class="dialogOption entrySave">
......@@ -75,6 +83,7 @@ export default {
submitLoading: false,
},
title: "",
tableSelected: [],
page: {
pageIndex: 1,
pageSize: 20,
......@@ -106,6 +115,12 @@ export default {
align: "left",
},
{
name: "商品种类数量",
value: "skuCount",
width: "",
align: "left",
},
{
name: "清单申报时间",
value: "createTime",
width: "",
......@@ -115,6 +130,12 @@ export default {
};
},
methods: {
tableSelect(val) {
this.tableSelected = val.selection;
},
tableSelectAll(val) {
this.tableSelected = val;
},
fetchPreview() {
preview({
...this.selected,
......@@ -147,7 +168,10 @@ export default {
},
//数据保存
submit() {
declareSummaryApplication(this.selected).then((response) => {
declareSummaryApplication({
...this.selected,
logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
}).then((response) => {
if (response.data) {
this.msgSuccess("汇总申报成功");
this.$router.push("summaryDataSearch");
......