Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
f19a0af0 1 parent 9536206e

feat: 开发新增功能

Inline Side-by-side
Showing 11 changed files with 1230 additions and 134 deletions
......@@ -223,3 +223,23 @@ export function bathDeclareDate(data) {
data,
});
}
// GET
// ​/operatorPlace​/getCurrUserOperatorCode
// 获取当前用户监管场所代码
export function getCurrUserOperatorCode() {
return request({
url: "/bus-customer/operatorPlace/getCurrUserOperatorCode",
method: "get",
});
}
export function declareUpload(data) {
return request({
url: "/bus-customer/declareData/" + data.type,
method: "post",
data: {
...data,
},
});
}
......
......@@ -5,7 +5,7 @@ import request from "@/utils/request";
// 新增监管场所
export function addOperatorPlace(data) {
return request({
url: "/bus-customer/operatorPlace​/addOperatorPlace",
url: "/bus-customer/operatorPlace/addOperatorPlace",
method: "post",
data: data,
});
......@@ -16,7 +16,7 @@ export function addOperatorPlace(data) {
// 查询监管场所列表
export function getOperatorPlaceList(data) {
return request({
url: "/bus-customer/operatorPlace​/getOperatorPlaceList",
url: "/bus-customer/operatorPlace/getOperatorPlaceList",
method: "post",
data: data,
});
......@@ -27,7 +27,7 @@ export function getOperatorPlaceList(data) {
// 修改监管场所
export function updateOperatorPlace(data) {
return request({
url: "/bus-customer/operatorPlace​/updateOperatorPlace",
url: "/bus-customer/operatorPlace/updateOperatorPlace",
method: "post",
data: data,
});
......
<template>
<el-dialog
class="entryDialog classCUploadDialog"
title="运抵单申报"
:visible.sync="outerVisible"
:show-close="false"
width="40%"
:close-on-click-modal="false"
:destroy-on-close="true"
v-loading="loadings.dialogLoading"
@close="close"
>
<div class="modelItem">
<el-form
class="fedexFormStyle"
ref="formData"
:model="formData"
label-position="top"
size="small"
>
<el-row :gutter="5">
<el-col :span="8">
<Formitem label="监管场所" prop="operatorCode" type="edit">
<el-select
type="text"
id="inputInner-edit-operatorCode"
v-model="formData.operatorCode"
clearable
filterable
placeholder=""
>
<el-option
v-for="item in operatorCode"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</Formitem>
</el-col>
<el-col :span="8">
<Formitem
label="境内运输工具编码"
prop="domesticTrafNo"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-domesticTrafNo"
resize="none"
v-model="formData.domesticTrafNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
</el-form>
</div>
<div class="dialogOption entrySave">
<el-button
class="entrySaveButton"
:disabled="loadings.submitLoading"
@click="submit"
>确 定</el-button
>
<el-button class="entrySaveButton" @click="close">关 闭</el-button>
</div>
</el-dialog>
</template>
<script>
import {
getCurrUserOperatorCode,
declareUpload,
} from "@/api/declareData-api.js";
export default {
props: {
outerVisible: {
type: Boolean,
default: false,
},
selected: {
type: Array,
default: () => {
return [];
},
},
},
watch: {
outerVisible(val) {
if (val) {
this.loadings.dialogLoading = false;
this.fetchOperatorCode();
}
},
},
data() {
return {
formData: {
operatorCode: "",
domesticTrafNo: "",
},
loadings: {
dialogLoading: false,
submitLoading: false,
},
loadingText: "",
operatorCode: [],
};
},
methods: {
fetchOperatorCode() {
getCurrUserOperatorCode().then((res) => {
if (res.code === "200") {
this.operatorCode = res.data;
}
});
},
//数据保存
submit() {
this.loadings.dialogLoading = true;
let obj = {
...this.formData,
declareIds: this.selected.map((item) => item.declareId),
type: "arrivalIn",
};
this.$refs.formData.validate((valid) => {
if (valid) {
this.addapi(obj);
} else {
this.loadings.dialogLoading = false;
}
});
},
//新增
addapi(val) {
declareUpload(val)
.then((res) => {
if (res.code === "200") {
this.msgSuccess(res.message);
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
}
})
.catch((err) => {
console.log(err);
this.loadings.dialogLoading = false;
});
},
close() {
this.formData = {
operatorCode: "",
domesticTrafNo: "",
};
this.loadings.dialogLoading = false;
this.$emit("close");
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
</style>
<template>
<div class="entrySreach">
<el-form
class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
ref="sreachForm"
:model="sreachFormData"
label-position="top"
size="small"
>
<el-row class="row-border">
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
resize="none"
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 物流运单编号 -->
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
@formChange="formChange"
/>
</Formitem>
</el-col>
<!-- 订单编号 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
resize="none"
v-model="sreachFormData.orderNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 创建时间 -->
<el-col :span="5">
<Formitem label="创建时间" prop="createTime" :activeType="true">
<el-date-picker
class="inputInner--createTime"
id="inputInner-edit-createTime"
v-model="sreachFormData.createTime"
type="daterange"
format="yyyy-MM-dd"
prefix-icon="none"
value-format="yyyy-MM-dd"
range-separator="至"
@change="dateChange"
/>
</Formitem>
</el-col>
<el-col :span="2">
<el-form-item class="textCenter">
<el-button
class="entrySreachButton"
type="text"
icon="el-icon-search"
:loading="loadings.sreachLoading"
@click="search(0)"
></el-button>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item class="textLeft textCenter">
<el-button
type="text"
size="small"
icon="el-icon-refresh"
@click="clear"
>
重置
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row class="backgroundRow">
<!-- 回执状态 -->
<el-col :span="5">
<Formitem label="回执状态" prop="receiptStatus">
<el-select
type="text"
id="inputInner--receiptStatus"
v-model="sreachFormData.receiptStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
</el-row>
</el-form>
<div class="optionButton">
<el-button
size="small"
type="primary"
class="dropdown-style-button"
@click="addDeclare"
>
<svg-icon
class="el-icon-user-solid"
icon-class="fedexDeclareIcon"
></svg-icon>
运抵单申报
</el-button>
</div>
<Table
class="fedexDetialTable fedexSreachTable"
ref="entryTable"
:data="tableData"
:headerData="headerData"
:height="tableMaxheight + 'px'"
:maxHeight="tableMaxheight + 'px'"
:border="true"
:pagination="true"
:order="false"
:loading="loadings.sreachLoading"
:page="page.pageIndex"
:pageSizes="[20, 30, 50, 100]"
:totalCount="page.total"
@sizeChange="sizeChange"
@currentChange="currentChange"
:selection="true"
:selectFixed="false"
:rowSelectDataType="false"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
:selected="selected"
>
<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"
>
<div slot="title">
<span style="font-weight: 700; color: #515a6e">订单编号：</span
>{{ scope.row.orderno }}
</div>
<div slot="buttonLabel">
{{ scope.row.listReceiptStatus }}
</div>
</TablePopover>
</template>
<template v-slot:arrivalInReceiptStatus="scope">
<TablePopover
ref="arrivalInReceiptStatusPopover"
dataKey="arrivalInReceiptStatus"
idKey="declareId"
:parentDom="$refs.entryTable"
:receiptDataHead="receiptDataHead"
:rowData="scope.row"
:tableData="tableData"
@popoverChange="popoverChange"
@popoverClose="popoverClose"
>
<div slot="title">
<span style="font-weight: 700; color: #515a6e">订单编号：</span
>{{ scope.row.orderno }}
</div>
<div slot="buttonLabel">
{{ scope.row.arrivalInReceiptStatus }}
</div>
</TablePopover>
</template>
</Table>
<DialogVue
:outerVisible="outerVisible"
:selected="selected"
@close="dialogClose"
/>
</div>
</template>
<script>
import {
searchDeclareData,
getListReceipt,
arrivalInReceipt,
} from "@/api/declareData-api.js";
import DialogVue from "./dialog.vue";
export default {
name: "SupervisePlaceManage",
components: {
DialogVue,
},
data() {
return {
// 控制日志弹窗的显示和隐藏
allLogDataReceiptStatusPopoverType: false,
// 存储选中的日志数据
selectedLogRow: {},
selected: [],
sreachFormData: {
billNo: "",
logisticsNo: "",
orderNo: "",
receiptStatus: null,
receiptType: null,
createTime: [],
},
page: {
pageIndex: 1,
pageSize: 20,
total: 0,
},
tableData: [],
headerData: [
{
name: "提运单号",
value: "billNo",
width: "",
align: "left",
},
{
name: "物流运单编号",
value: "logisticsWaybillNumber",
width: "",
align: "left",
},
{
name: "订单编号",
value: "orderno",
width: "",
align: "left",
},
{
name: "电商企业名称",
value: "ecomEntName",
width: "",
align: "left",
},
{
name: "创建时间",
value: "createTime",
width: "",
align: "left",
},
{
name: "清单回执",
value: "listReceiptStatus",
width: "",
align: "left",
slot: true,
},
{
// release-v1.0.9
name: "运抵单回执",
value: "arrivalInReceiptStatus",
width: "",
align: "left",
slot: true,
},
],
receiptDataHead: [
{
name: "回执状态",
value: "receiptStatus",
width: "",
align: "left",
},
{
name: "状态时间",
value: "statusTime",
width: "",
align: "left",
},
{
name: "回执描述",
value: "receiptDescription",
width: "",
align: "left",
},
],
loadings: {
sreachLoading: false,
},
tableMaxheight: 500,
outerVisible: false,
};
},
created() {
this.search(0);
this.calculateTableHeight();
},
watch: {
$route(val, oldval) {
this.popoverClose();
},
},
mounted() {
window.addEventListener("resize", this.calculateTableHeight);
},
beforeDestroy() {
window.removeEventListener("resize", this.calculateTableHeight);
},
methods: {
tableSelect(val) {
this.selected = val.selection;
},
tableSelectAll(val) {
this.selected = val;
},
formChange(val) {
this.sreachFormData = val;
},
dateChange(val) {
if (val == "" || val == null) {
this.$nextTick(() => {
this.sreachFormData.createTime = [];
});
}
},
popoverClose(val) {
this.tableData.forEach((item) => {
item.listReceiptStatusPopoverType = false;
item.arrivalInReceiptStatusPopoverType = false;
item.popoverData = [];
});
this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
"auto";
},
calculateTableHeight() {
this.tableMaxheight = window.innerHeight - 300;
},
//查询回执
receiptApi(id, type) {
return new Promise((resolve, reject) => {
let obj = { declareId: id };
if (type == "listReceiptStatus") {
getListReceipt(obj)
.then((res) => {
if (res.code === "200") {
resolve(res.data);
} else {
reject();
}
})
.catch((err) => {
console.log(err);
reject();
});
} else if (type == "arrivalInReceiptStatus") {
arrivalInReceipt(obj)
.then((res) => {
if (res.code === "200") {
resolve(res.data);
} else {
reject();
}
})
.catch((err) => {
console.log(err);
reject();
});
}
});
},
popoverChange(val) {
this.tableData = val.tableData;
console.log(val);
this.receiptApi(val.data.declareId, val.status)
.then((res) => {
val.tableData.forEach((item) => {
if (item.declareId == val.data.declareId) {
item.popoverData = res;
}
});
this.tableData = val.tableData;
})
.finally(() => {
this.$nextTick(() => {
this.$store.dispatch("setLoadingState", false);
this.$refs.listReceiptStatusPopover.tableLoading = false; // 清单回执
this.$refs.arrivalInReceiptStatusPopover.tableLoading = false; //运抵单回执
});
});
},
clear() {
this.$refs.sreachForm.resetFields();
//重置数据
this.sreachFormData = {
billNo: "",
logisticsNo: "",
orderNo: "",
receiptStatus: null,
receiptType: null,
createTime: [],
};
},
//查询
search(val) {
this.loadings.sreachLoading = true;
this.selected = [];
if (val == 0) {
this.page.pageIndex = 1;
}
let obj = this.sreachFormData;
obj.pageIndex = this.page.pageIndex;
obj.pageSize = this.page.pageSize;
obj.startCreateTime = "";
obj.endCreateTime = "";
if (this.sreachFormData.createTime.length > 0) {
obj.startCreateTime = obj.createTime[0];
obj.endCreateTime = obj.createTime[1];
}
searchDeclareData({
isOnlySearchArrivalIn: true,
...obj,
})
.then((res) => {
if (res.code === "200") {
this.tableData = res.data.value;
this.page.total = res.data.totalItems;
this.tableData.forEach((item, idx) => {
item.index = idx;
item.listReceiptStatusPopoverType = false; // 清单回执
item.arrivalInReceiptStatusPopoverType = false; // 运抵单回执
// item.logLoading = false;
item.popoverData = [];
});
this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
} else {
this.alertWarningMsg(res.message);
}
this.loadings.sreachLoading = false;
})
.catch((err) => {
console.log(err);
this.loadings.sreachLoading = false;
});
},
addDeclare() {
if (this.selected.length === 0) {
this.alertWarningMsg("请选择数据！");
return;
}
this.outerVisible = true;
},
dialogClose() {
this.outerVisible = false;
this.search(1);
},
//分页
currentChange(val) {
this.page.pageIndex = val.page;
this.search(1);
},
sizeChange(val) {
this.page.pageSize = val;
this.search(1);
},
input() {
this.$forceUpdate();
},
},
};
</script>
<style scoped lang="scss">
@import "@/assets/styles/variables.scss";
.entrySreach {
height: 100%;
background-color: $menuLightBg;
.entrySreachButton {
display: inline-block;
font-size: 20px;
color: $fedexButton !important;
}
.optionButton {
padding: 10px;
text-align: left;
.el-button.dropdown-style-button {
background-color: #ffffff !important;
border: 2px solid $fedexBottonColor !important; /* 设置边框颜色 */
color: $fedexBottonColor !important;
font-size: 12px !important;
}
.el-button.dropdown-style-button:hover,
.el-button.dropdown-style-button:focus {
color: #ffffff !important;
background-color: $fedexBottonColor !important;
}
.el-button {
color: $fedexButton;
border-color: $fedexButton !important;
svg {
display: inline-block;
margin-right: 5px;
fill: $fedexButton;
}
}
.entrySaveButton:hover,
.entrySaveButton:focus {
color: $menuLightBg !important;
background-color: $fedexButton !important;
}
}
}
.texttareaTip {
position: absolute;
top: 52%;
right: 20px;
transform: translate(0, -50%);
z-index: 10;
}
</style>
......@@ -64,6 +64,107 @@
</Formitem>
</el-col>
</el-row>
<!-- 1.0.9 -->
<!-- 电商平台代码:、电商平台名称:、收发货人代码:、收发货人名称:、生产销售企业代码:、生产销售企业名称: -->
<!-- 证书到期时间: -->
<el-row :gutter="5">
<el-col :span="8">
<Formitem label="电商平台代码" prop="ebpcode" type="edit">
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-ebpcode"
resize="none"
v-model="formData.ebpcode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<Formitem label="电商平台名称" prop="ebpname" type="edit">
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-ebpname"
resize="none"
v-model="formData.ebpname"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<Formitem
label="收发货人代码"
prop="consigneeShipperCode"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-consigneeShipperCode"
resize="none"
v-model="formData.consigneeShipperCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="8">
<Formitem
label="收发货人名称"
prop="consigneeShipperName"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-consigneeShipperName"
resize="none"
v-model="formData.consigneeShipperName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<Formitem
label="生产销售企业代码"
prop="productionSaleEnterpriseCode"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-productionSaleEnterpriseCode"
resize="none"
v-model="formData.productionSaleEnterpriseCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<Formitem
label="生产销售企业名称"
prop="productionSaleEnterpriseName"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-productionSaleEnterpriseName"
resize="none"
v-model="formData.productionSaleEnterpriseName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 订单申报方 -->
<el-col :span="8">
......@@ -77,7 +178,8 @@
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.ORDER_DECLARATION_PARTY"
v-for="(item, index) in $store.getters.dict
.ORDER_DECLARATION_PARTY"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -158,7 +260,11 @@
</el-col>
<!-- </div>-->
<el-col :span="8">
<Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
<Formitem
label="山电DXPID"
prop="qingdaoDanyiUserDxpid"
type="edit"
>
<el-input
type="text"
class="inputShadow"
......@@ -184,7 +290,11 @@
</Formitem>
</el-col>
<el-col :span="8">
<Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit">
<Formitem
label="山电用户密码"
prop="qingdaoUserPassword"
type="edit"
>
<el-input
type="text"
class="inputShadow"
......@@ -196,7 +306,7 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="16" style="padding-right: 5px;">
<el-col :span="16" style="padding-right: 5px">
<div class="uploadItem">
<div class="uploadbox">
<el-button
......@@ -204,7 +314,7 @@
type="text"
v-loading="loadings.qingdaoUploadLoading"
@click="qingdaoUploadFile"
>上传文件
>上传文件
</el-button>
<el-upload
class="upload-demo"
......@@ -218,7 +328,13 @@
>
</el-upload>
</div>
<div class="fileList" v-if="portConfig.TAO.certificateBase64 != '' || portConfig.TAO.certificateName">
<div
class="fileList"
v-if="
portConfig.TAO.certificateBase64 != '' ||
portConfig.TAO.certificateName
"
>
<div class="fileList-item">
<div class="uploadbox-fileName">
<svg-icon
......@@ -236,9 +352,8 @@
:title="$t('entry.upload.delTip')"
@confirm="delQingdaoTypeDFile"
>
<el-button slot="reference" type="text">{{
$t("entry.upload.del")
}}
<el-button slot="reference" type="text"
>{{ $t("entry.upload.del") }}
</el-button>
</el-popconfirm>
</div>
......@@ -258,7 +373,8 @@
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.METHOD_OF_SIGNATURE"
v-for="(item, index) in $store.getters.dict
.METHOD_OF_SIGNATURE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -317,7 +433,11 @@
</section>
<el-row :gutter="5">
<el-col :span="8">
<Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
<Formitem
label="证书序列号"
prop="certificateSerialNumber"
type="edit"
>
<el-input
type="text"
class="inputShadow"
......@@ -330,7 +450,11 @@
</Formitem>
</el-col>
<el-col :span="8">
<Formitem label="证书索引号" prop="certificateIndexNumber" type="edit">
<Formitem
label="证书索引号"
prop="certificateIndexNumber"
type="edit"
>
<el-input
type="text"
class="inputShadow"
......@@ -342,7 +466,34 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="16" style="padding-right: 5px;">
<el-col :span="8">
<Formitem
label="证书到期时间"
prop="certificateExpirationTime"
type="edit"
>
<el-date-picker
id="inputInner-edit-certificateExpirationTime"
v-model="formData.certificateExpirationTime"
type="date"
value-format="yyyy-MM-dd"
clearable
placeholder=""
prefix-icon="none"
>
</el-date-picker>
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner-edit-certificateExpirationTime"
resize="none"
v-model="formData.certificateExpirationTime"
clearable
placeholder=""
></el-input> -->
</Formitem>
</el-col>
<el-col :span="16" style="padding-right: 5px">
<div class="uploadItem">
<div class="uploadbox">
<el-button
......@@ -350,7 +501,7 @@
type="text"
v-loading="loadings.uploadLoading"
@click="uploadFile"
>上传文件
>上传文件
</el-button>
<el-upload
class="upload-demo"
......@@ -365,7 +516,10 @@
</el-upload>
</div>
<!-- 1{{ formData.file }} -->
<div class="fileList" v-if="formData.file != null || formData.certificare">
<div
class="fileList"
v-if="formData.file != null || formData.certificare"
>
<div class="fileList-item">
<div class="uploadbox-fileName">
<svg-icon
......@@ -374,8 +528,16 @@
style="font-size: 18px; color: #de002e"
/>
<Tooltip
:content="formData.file ? formData.file.name : formData.certificare"
:refName="formData.file ? formData.file.name : formData.certificare"
:content="
formData.file
? formData.file.name
: formData.certificare
"
:refName="
formData.file
? formData.file.name
: formData.certificare
"
/>
</div>
<div class="uploadbox-option">
......@@ -383,9 +545,8 @@
:title="$t('entry.upload.delTip')"
@confirm="delTypeDFile"
>
<el-button slot="reference" type="text">{{
$t("entry.upload.del")
}}
<el-button slot="reference" type="text"
>{{ $t("entry.upload.del") }}
</el-button>
</el-popconfirm>
</div>
......@@ -393,7 +554,6 @@
</div>
</div>
</el-col>
</el-row>
</el-form>
</div>
......@@ -402,16 +562,14 @@
class="entrySaveButton"
:disabled="loadings.submitLoading"
@click="submit"
>确 定
</el-button
>
>确 定
</el-button>
<el-button
class="entrySaveButton"
:disabled="loadings.uploadLoading"
@click="close"
>关 闭
</el-button
>
>关 闭
</el-button>
</div>
</el-dialog>
</template>
......@@ -423,7 +581,7 @@ import {
uploadQingdaoCertificate,
updateCustomerData,
delCertificate,
delQingdaoCertificate
delQingdaoCertificate,
} from "@/api/system/customer-ai.js";
export default {
......@@ -444,7 +602,7 @@ export default {
type: Object,
default: null,
},
portCodeList: []
portCodeList: [],
// dict: {
// type: Array,
// default() {
......@@ -457,20 +615,20 @@ export default {
//配置模板
portConfig: {
PEK: {
dxpId: '',
signMethod:"CIPHER_MACHINE"
dxpId: "",
signMethod: "CIPHER_MACHINE",
},
TAO: {
dxpId: '',
userId: '',
key: '',
danyiDxpId: '',
userName: '',
password: '',
certificateName: '',
certificateBase64: '',
methodOfSignature: ''
}
dxpId: "",
userId: "",
key: "",
danyiDxpId: "",
userName: "",
password: "",
certificateName: "",
certificateBase64: "",
methodOfSignature: "",
},
},
choosePortCode: [],
formData: {
......@@ -485,6 +643,13 @@ export default {
certificateSerialNumber: "",
certificateIndexNumber: "",
file: null,
certificateExpirationTime: "", //证书到期时间
ebpcode: "", //电商平台代码
ebpname: "", //电商平台名称
consigneeShipperCode: "", //收发货人代码
consigneeShipperName: "", //收发货人名称
productionSaleEnterpriseCode: "", //生产销售企业代码
productionSaleEnterpriseName: "", //生产销售企业名称
},
rules: {
ecomEntCode: [
......@@ -500,7 +665,6 @@ export default {
trigger: "blur",
message: "电商企业名称不能为空！",
},
],
orderRequester: [
{
......@@ -582,10 +746,10 @@ export default {
}
}
if (this.active?.config != null) {
this.choosePortCode = Object.keys(this.active.config)
Object.keys(this.active.config).forEach(key => {
this.portConfig[key] = this.active.config[key]
})
this.choosePortCode = Object.keys(this.active.config);
Object.keys(this.active.config).forEach((key) => {
this.portConfig[key] = this.active.config[key];
});
}
},
// type(newVal) {
......@@ -664,8 +828,7 @@ export default {
// qingdaoBeforeUpload(val) {
// return true;
// },
fileUpload({file}) {
fileUpload({ file }) {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = (e) => {
......@@ -676,24 +839,21 @@ export default {
};
this.formData.file = obj;
};
},
qingdaoFileUpload({file}) {
qingdaoFileUpload({ file }) {
const reader = new FileReader();
reader.readAsDataURL(file);
console.log(file);
reader.onload = (e) => {
console.log(e);
this.portConfig.TAO.certificateName = file.name
this.portConfig.TAO.certificateBase64 = e.target.result
this.portConfig.TAO.certificateName = file.name;
this.portConfig.TAO.certificateBase64 = e.target.result;
// let obj = {
// file: e.target.result,
// name: file.name,
// };
// this.formData.qingdaoFile = obj;
};
},
// fileChange(val) {
// },
......@@ -724,18 +884,20 @@ export default {
//删除证书
delCertificate() {
if (this.formData.id && this.formData.certificare) {
delCertificate(this.formData.id, this.formData.certificare).then((res) => {
if (res.code == 200) {
this.formData.file = null;
this.formData.certificare = "";
// this.msgSuccess("证书删除成功！");
} else {
delCertificate(this.formData.id, this.formData.certificare)
.then((res) => {
if (res.code == 200) {
this.formData.file = null;
this.formData.certificare = "";
// this.msgSuccess("证书删除成功！");
} else {
this.alertErrorMsg("证书删除失败，请联系管理员！");
}
})
.catch((err) => {
console.log(err);
this.alertErrorMsg("证书删除失败，请联系管理员！");
}
}).catch((err) => {
console.log(err);
this.alertErrorMsg("证书删除失败，请联系管理员！");
})
});
} else {
this.formData.file = null;
this.formData.certificare = "";
......@@ -767,7 +929,7 @@ export default {
//查询用户信息详情
searchUserData(id) {
this.loadings.dialogLoading = true;
getUserDetailData({id: id})
getUserDetailData({ id: id })
.then((res) => {
if (res.code === "200") {
this.formData = res.data;
......@@ -783,7 +945,7 @@ export default {
},
//数据保存
submit() {
this.handlePortConfigJson()
this.handlePortConfigJson();
this.loadings.dialogLoading = true;
let obj = {};
// this.formData.checkboxState = this.checkboxState();
......@@ -800,7 +962,7 @@ export default {
this.$refs.formData.validate((valid) => {
if (valid) {
obj = this.formData;
this.clearData(); //清除值
this.clearData(); //清除值
this.updateapi(obj);
if (this.formData.orderRequester == 1) {
this.delCertificate(); //删除证书
......@@ -812,24 +974,37 @@ export default {
}
},
handlePortConfigJson() {
this.formData.config = {}
this.choosePortCode.forEach(portCode => {
this.formData.config[portCode] = JSON.stringify(this.portConfig[portCode])
})
this.formData.config = {};
this.choosePortCode.forEach((portCode) => {
this.formData.config[portCode] = JSON.stringify(
this.portConfig[portCode]
);
});
},
addApi(val) {
addCustomerData(val)
.then((res) => {
if (res.code === "200") {
if (this.formData.file) {
this.uploadCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.file.file, this.formData.file.name));
this.uploadCertificate(
val.ecomEntCode,
this.base64ConvertFile(
this.formData.file.file,
this.formData.file.name
)
);
}
if (this.formData.qingdaoFile) {
this.uploadQingdaoCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.qingdaoFile.file, this.formData.qingdaoFile.name));
this.uploadQingdaoCertificate(
val.ecomEntCode,
this.base64ConvertFile(
this.formData.qingdaoFile.file,
this.formData.qingdaoFile.name
)
);
}
this.msgSuccess("客户添加成功！");
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
......@@ -841,7 +1016,6 @@ export default {
});
},
uploadCertificate(ecomEntCode, file) {
uploadCertificate(ecomEntCode, file)
.then((uploadRes) => {
if (uploadRes.code === "200") {
......@@ -859,7 +1033,6 @@ export default {
},
uploadQingdaoCertificate(ecomEntCode, file) {
uploadQingdaoCertificate(ecomEntCode, file)
.then((uploadRes) => {
if (uploadRes.code === "200") {
......@@ -883,14 +1056,25 @@ export default {
// this.msgSuccess(res.message);
// this.close();
if (this.formData.file) {
this.uploadCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.file.file, this.formData.file.name));
this.uploadCertificate(
val.ecomEntCode,
this.base64ConvertFile(
this.formData.file.file,
this.formData.file.name
)
);
}
if (this.formData.qingdaoFile) {
this.uploadQingdaoCertificate(val.ecomEntCode, this.base64ConvertFile(this.formData.qingdaoFile.file, this.formData.qingdaoFile.name));
this.uploadQingdaoCertificate(
val.ecomEntCode,
this.base64ConvertFile(
this.formData.qingdaoFile.file,
this.formData.qingdaoFile.name
)
);
}
this.msgSuccess("客户修改成功！");
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
......@@ -927,19 +1111,26 @@ export default {
certificateSerialNumber: "",
certificateIndexNumber: "",
file: null,
certificateExpirationTime: "", //证书到期时间
ebpcode: "", //电商平台代码
ebpname: "", //电商平台名称
consigneeShipperCode: "", //收发货人代码
consigneeShipperName: "", //收发货人名称
productionSaleEnterpriseCode: "", //生产销售企业代码
productionSaleEnterpriseName: "", //生产销售企业名称
};
this.choosePortCode = []
this.clearPortConfig(this.portConfig)
this.choosePortCode = [];
this.clearPortConfig(this.portConfig);
// this.handleRemove();
this.$emit("close");
},
clearPortConfig(obj) {
for (let key in obj) {
if (obj.hasOwnProperty(key)) {
if (typeof obj[key] === 'object' && obj[key] !== null) {
this.clearPortConfig(obj[key]); // 递归处理嵌套对象
if (typeof obj[key] === "object" && obj[key] !== null) {
this.clearPortConfig(obj[key]); // 递归处理嵌套对象
} else {
obj[key] = ''; // 设置为一个空字符串
obj[key] = ""; // 设置为一个空字符串
}
}
}
......@@ -957,7 +1148,7 @@ export default {
// this.formData.file = null;
// // this.delCertificate(); //删除证书
// }
}
},
},
};
</script>
......
......@@ -126,7 +126,8 @@
ref="entryTable"
:data="tableData"
:headerData="headerData"
:maxHeight="tableMaxheight"
:height="tableMaxheight + 'px'"
:maxHeight="tableMaxheight + 'px'"
:border="true"
:pagination="true"
:order="true"
......@@ -144,7 +145,12 @@
<template slot="optionColumn">
<el-table-column align="left" label="操作" width="150">
<template slot-scope="scope">
<el-button type="text" @click="downloadFile(scope.row)" :disabled="!scope.row.certificare">下载证书</el-button>
<el-button
type="text"
@click="downloadFile(scope.row)"
:disabled="!scope.row.certificare"
>下载证书</el-button
>
<!-- <el-button type="text" @click="downloadQingdaoFile(scope.row)" :disabled="!scope.row.certificare">下载青岛证书</el-button> -->
<el-button type="text" @click="update(scope.row)"> 修改 </el-button>
</template>
......@@ -163,7 +169,11 @@
</template>
<script>
import { getCustomerList,downloadCertificate, downloadQingdaoCertificate } from "@/api/system/customer-ai.js";
import {
getCustomerList,
downloadCertificate,
downloadQingdaoCertificate,
} from "@/api/system/customer-ai.js";
import { getPortList } from "@/api/system/user.js";
import DialogVue from "./dialog.vue";
export default {
......@@ -249,8 +259,8 @@ export default {
align: "left",
},
],
dict:{
port:[]
dict: {
port: [],
},
// dict: {
// orderRequester: [
......@@ -261,7 +271,7 @@ export default {
loadings: {
searchLoading: false,
},
tableMaxheight: null,
tableMaxheight: 500,
outerVisible: false,
dialogTitle: "",
editType: "",
......@@ -270,18 +280,25 @@ export default {
created() {
this.searchPortDictData();
this.search(0);
this.calculateTableHeight();
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
window.addEventListener("resize", this.calculateTableHeight);
},
beforeDestroy() {
window.removeEventListener("resize", this.calculateTableHeight);
},
methods: {
calculateTableHeight() {
this.tableMaxheight = window.innerHeight - 300;
},
//查询
search(val) {
this.loadings.searchLoading = true;
if (val == 0) {
this.page.pageIndex = 1;
}
let obj = {...this.sreachFormData};
let obj = { ...this.sreachFormData };
obj.pageIndex = this.page.pageIndex;
obj.pageSize = this.page.pageSize;
obj.endCreationTime = "";
......@@ -325,21 +342,21 @@ export default {
},
//下载证书
downloadFile(val) {
downloadCertificate(val.id,val.certificare).then((res)=>{
}).catch((err)=>{
console.log(err);
this.alertErrorMsg("证书下载失败，请联系管理员！");
})
downloadCertificate(val.id, val.certificare)
.then((res) => {})
.catch((err) => {
console.log(err);
this.alertErrorMsg("证书下载失败，请联系管理员！");
});
},
//下载青岛证书
downloadQingdaoFile(val) {
downloadQingdaoCertificate(val.id,val.certificare).then((res)=>{
}).catch((err)=>{
console.log(err);
this.alertErrorMsg("证书下载失败，请联系管理员！");
})
downloadQingdaoCertificate(val.id, val.certificare)
.then((res) => {})
.catch((err) => {
console.log(err);
this.alertErrorMsg("证书下载失败，请联系管理员！");
});
},
addCustomer() {
this.dialogTitle = "新增客户";
......@@ -347,11 +364,11 @@ export default {
this.outerVisible = true;
},
update(val) {
let data={
let data = {
...val,
file:null,
qingdaoFile:null
}
file: null,
qingdaoFile: null,
};
this.dialogTitle = "修改客户";
this.editType = "update";
this.outerVisible = true;
......
......@@ -4,7 +4,7 @@
title="新增模拟回执管理"
:visible.sync="outerVisible"
:show-close="false"
width="40%"
width="45%"
:close-on-click-modal="false"
:destroy-on-close="true"
v-loading="loadings.dialogLoading"
......@@ -287,7 +287,7 @@ export default {
.order-select-warp-ol {
::v-deep {
.el-select__input {
width: 40px !important;
width: 35px !important;
padding-top: 0 !important;
}
}
......
......@@ -182,7 +182,7 @@
</el-dropdown-menu>
</el-dropdown>
<!-- 运抵单申报按钮 -->
<el-button
<!-- <el-button
size="small"
type="primary"
class="dropdown-style-button"
......@@ -194,7 +194,7 @@
icon-class="fedexDeclareIcon"
></svg-icon>
运抵单申报
</el-button>
</el-button> -->
<!-- 离境单申报按钮 -->
<el-button
size="small"
......@@ -202,7 +202,11 @@
class="dropdown-style-button"
:loading="loadings.departureLoading"
@click="
declareData('departureLoading', '离境单申报', 'logisticsDeparture')
declareDataTime(
'departureLoading',
'离境单申报',
'logisticsDeparture'
)
"
>
<svg-icon
......@@ -243,9 +247,6 @@
<span style="font-weight: 700; color: #515a6e">订单编号：</span>
{{ selectedLogRow.orderno }}
</div>
<!-- <div slot="buttonLabel">
{{ selectedLogRow.allLogDataReceiptStatusPopoverType }}
</div> -->
</TablePopover>
</section>
<Table
......@@ -436,6 +437,11 @@
:showDialog="batchModifyVisible"
@cancelBatchModify="cancelBatchModify"
/>
<TimeDialog
:timeVisible="timeVisible"
:selected="selected"
@close="dialogClose"
/>
</div>
</template>
......@@ -458,6 +464,7 @@ import RevokeDialog from "./revokeDialog.vue";
import TemplateDownloadDialog from "./templateDownloadDialog.vue";
import ExportDialog from "./exportDialog.vue";
import BatchModify from "./batchModify.vue";
import TimeDialog from "./time-dialog.vue";
export default {
name: "ReportingData",
components: {
......@@ -466,6 +473,7 @@ export default {
TemplateDownloadDialog,
ExportDialog,
BatchModify,
TimeDialog,
},
data() {
return {
......@@ -641,6 +649,7 @@ export default {
templateDownloadVisible: false,
datasExportVisible: false,
batchModifyVisible: false,
timeVisible: false,
};
},
created() {
......@@ -669,6 +678,10 @@ export default {
});
},
methods: {
dialogClose() {
this.timeVisible = false;
this.search(0);
},
calculateTableHeight() {
this.tableMaxheight = window.innerHeight - 300;
},
......@@ -826,6 +839,14 @@ export default {
this.datasExportVisible = false;
this.loadings.exportDeclareLoading = false;
},
// 离镜申报
declareDataTime(loadingKey, dropdownName, dropdownCode) {
if (this.selected.length === 0) {
this.alertWarningMsg("请选择数据！");
return;
}
this.timeVisible = true;
},
/**
* 通用申报方法
......
<template>
<el-dialog
class="entryDialog classCUploadDialog"
title="离境单申报"
:visible.sync="timeVisible"
:show-close="false"
width="40%"
:close-on-click-modal="false"
:destroy-on-close="true"
v-loading="loadings.dialogLoading"
@close="close"
>
<div class="modelItem">
<el-form
class="fedexFormStyle"
ref="formData"
:model="formData"
label-position="top"
size="small"
>
<el-row :gutter="5">
<el-col :span="8">
<Formitem label="离境时间" prop="leaveTime" type="edit">
<!-- <el-select
type="text"
id="inputInner-edit-leaveTime"
v-model="formData.leaveTimel-date-picker"
clearable
filterable
placeholder=""
>
<el-option
v-for="item in operatorCode"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select> -->
<el-date-picker
class="inputInner--leaveTime"
id="inputInner-edit-leaveTime"
v-model="formData.leaveTime"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
prefix-icon="none"
value-format="yyyy-MM-dd HH:mm:ss"
/>
</Formitem>
</el-col>
</el-row>
</el-form>
</div>
<div class="dialogOption entrySave">
<el-button
class="entrySaveButton"
:disabled="loadings.submitLoading"
@click="submit"
>确 定</el-button
>
<el-button class="entrySaveButton" @click="close">关 闭</el-button>
</div>
</el-dialog>
</template>
<script>
import { declareUpload } from "@/api/declareData-api.js";
export default {
props: {
timeVisible: {
type: Boolean,
default: false,
},
selected: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
formData: {
leaveTime: "",
},
loadings: {
dialogLoading: false,
submitLoading: false,
},
loadingText: "",
};
},
methods: {
//数据保存
submit() {
let obj = {
...this.formData,
declareIds: this.selected.map((item) => item.declareId),
type: "logisticsDeparture",
};
this.$refs.formData.validate((valid) => {
if (valid) {
this.addapi(obj);
}
});
},
//新增
addapi(val) {
this.loadings.dialogLoading = true;
declareUpload(val)
.then((res) => {
if (res.code === "200") {
this.msgSuccess(res.message);
this.close();
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
}
})
.catch((err) => {
console.log(err);
this.loadings.dialogLoading = false;
});
},
close() {
this.formData = {
leaveTime: "",
};
this.loadings.dialogLoading = false;
this.$emit("close");
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
</style>
......@@ -168,11 +168,11 @@ export default {
// 新增菜单用，可以不麻烦后端---------
addMenuFn() {
let params = {
icon: "receipt",
menuName: "模拟回执管理",
icon: "",
menuName: "运抵单申报",
order: 1,
parentMenuId: 0,
physicalUrl: "/receipt", //-management
parentMenuId: 96,
physicalUrl: "/arrival-declare", //-management
url: "",
};
addMenu(params).then((res) => {
......
......@@ -299,13 +299,4 @@ export default {
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
.menuTree {
max-width: 350px;
max-height: 300px;
overflow: auto;
margin: 0 auto;
border: 1px solid #999;
padding: 10px;
}
</style>
......