zhanbo.xu

feat: 根据需求优化和开发

No preview for this file type
......@@ -235,7 +235,7 @@
}
.entrySave {
margin-top: 64px;
margin-top: 50px;
text-align: center;
.el-button {
......
@import './variables.scss';
@import './mixin.scss';
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';
@import './btn.scss';
@import "./variables.scss";
@import "./mixin.scss";
@import "./transition.scss";
@import "./element-ui.scss";
@import "./sidebar.scss";
@import "./btn.scss";
@font-face {
font-family: FedExSans;
font-style: normal;
font-weight: 300;
src: url('../fonts/FedExSans_W-Light.woff') format("woff")
src: url("../fonts/FedExSans_W-Light.woff") format("woff");
}
@font-face {
font-family: FedExSans;
font-style: normal;
font-weight: 400;
src: url('../fonts/FedExSans_W-Regular.woff') format("woff")
src: url("../fonts/FedExSans_W-Regular.woff") format("woff");
}
@font-face {
font-family: FedExSans;
font-style: normal;
font-weight: 700;
src: url('../fonts/FedExSans_W-Bold.woff') format("woff")
src: url("../fonts/FedExSans_W-Bold.woff") format("woff");
}
@font-face {
font-family: FedExSansArabic;
font-style: normal;
font-weight: 700;
src: url('../fonts/FedExSans_W-Bold.woff') format("woff")
src: url("../fonts/FedExSans_W-Bold.woff") format("woff");
}
@font-face {
font-family: FedExSansArabic;
font-style: normal;
font-weight: 300;
src: url('../fonts/FedExSans_W-Light.woff') format("woff")
src: url("../fonts/FedExSans_W-Light.woff") format("woff");
}
@font-face {
font-family: FedExSansArabic;
font-style: normal;
font-weight: 400;
src: url('../fonts/FedExSans_W-Regular.woff') format("woff")
src: url("../fonts/FedExSans_W-Regular.woff") format("woff");
}
@font-face {
font-family: "iconfont";
font-style: normal;
font-weight: 200;
src: url("../fonts/fedex_table_fonticon.ttf?t=1748505224980")
format("truetype");
}
html,
......@@ -160,7 +167,8 @@ aside {
display: block;
line-height: 32px;
font-size: 16px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
color: #2c3e50;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......@@ -190,7 +198,7 @@ aside {
}
.text-center {
text-align: center
text-align: center;
}
.sub-navbar {
......@@ -201,7 +209,13 @@ aside {
text-align: right;
padding-right: 20px;
transition: 600ms ease position;
background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
background: linear-gradient(
90deg,
rgba(32, 182, 249, 1) 0%,
rgba(32, 182, 249, 1) 0%,
rgba(33, 120, 241, 1) 100%,
rgba(33, 120, 241, 1) 100%
);
.subtitle {
font-size: 20px;
......@@ -246,7 +260,6 @@ aside {
z-index: 1000 !important;
}
.el-checkbox__input.is-checked+.el-checkbox__label {
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #333333 !important;
}
......
......@@ -45,32 +45,6 @@
>
</el-table-column>
</el-table>
<!-- <Table
class="fedexDetialTable mt20"
:data="rowData.popoverData"
:headerData="receiptDataHead"
:selection="false"
:selectFixed="false"
:order="false"
:border="true"
:rowSelectDataType="false"
:pagination="false"
:page="1"
:totalCount="0"
:loading="tableLoading"
:emptyText="
loadingDatas &&
rowData &&
rowData.popoverData &&
!rowData.popoverData.length
? '数据加载中'
: $t('portEntry.emptyText')
"
:height="tableHeight"
:maxHeight="tableHeight"
rowKey="id"
>
</Table> -->
</div>
<el-button
slot="reference"
......
export default {
returnStatus: [
{ code: 'RECEIPT_CUSTOMS_CLEARANCE', name: '结关', value: '899' },
{ code: 'RECEIPT_RELEASE', name: '放行', value: '800' },
{ code: 'RECEIPT_MANUAL_REVIEW', name: '人工审核', value: '300' },
{ code: 'RECEIPT_CUSTOMS_WAREHOUSING', name: '海关入库', value: '120' },
{ code: 'RECEIPT_AUDIT_COMPLETED', name: '海关审结', value: '399' },
{ code: 'RECEIPT_CUSTOMS_REFUND', name: '海关退单', value: '100' },
{ code: 'RECEIPT_FAIL_SEND', name: '发送海关失败', value: '4' },
{ code: 'RECEIPT_SUCCESSFULLY_SENT', name: '发送海关成功', value: '3' },
{ code: 'RECEIPT_DECLARE_IN_PROGRESS', name: '电子口岸申报中', value: '2' },
{ code: 'RECEIPT_TEMPORARILY_STORE', name: '电子口岸已暂存', value: '1' },
{ code: "RECEIPT_CUSTOMS_CLEARANCE", name: "结关", value: "899" },
{ code: "RECEIPT_RELEASE", name: "放行", value: "800" },
{ code: "RECEIPT_MANUAL_REVIEW", name: "人工审核", value: "300" },
{ code: "RECEIPT_CUSTOMS_WAREHOUSING", name: "海关入库", value: "120" },
{ code: "RECEIPT_AUDIT_COMPLETED", name: "海关审结", value: "399" },
{ code: "RECEIPT_CUSTOMS_REFUND", name: "海关退单", value: "100" },
{ code: "RECEIPT_FAIL_SEND", name: "发送海关失败", value: "4" },
{ code: "RECEIPT_SUCCESSFULLY_SENT", name: "发送海关成功", value: "3" },
{ code: "RECEIPT_DECLARE_IN_PROGRESS", name: "电子口岸申报中", value: "2" },
{ code: "RECEIPT_TEMPORARILY_STORE", name: "电子口岸已暂存", value: "1" },
],
appType: [
{ code: 'DECLARE_APPTYPE_CHANGE', name: '变更', value: '2' },
{ code: 'DECLARE_APPTYPE_ADD', name: '新增', value: '1' },
{ code: "DECLARE_APPTYPE_CHANGE", name: "变更", value: "2" },
{ code: "DECLARE_APPTYPE_ADD", name: "新增", value: "1" },
],
currency: [
{ code: 'AED', name: '阿联酋迪拉姆', value: '138' },
{ code: 'ZAR', name: '南非兰特', value: '244' },
{ code: 'CAD', name: '加拿大元', value: '501' },
{ code: 'CHF', name: '瑞士法郎', value: '331' },
{ code: 'CNY', name: '人民币', value: '142' },
{ code: 'DKK', name: '丹麦克朗', value: '302' },
{ code: 'EUR', name: '欧元', value: '300' },
{ code: 'GBP', name: '英镑', value: '303' },
{ code: 'HKD', name: '港币', value: '110' },
{ code: 'HUF', name: '匈牙利福林', value: '321' },
{ code: 'JPY', name: '日本元', value: '116' },
{ code: 'KRW', name: '韩国圆', value: '133' },
{ code: 'MOP', name: '澳门元', value: '121' },
{ code: 'MXN', name: '墨西哥比索', value: '429' },
{ code: 'MYR', name: '马来西亚林吉特', value: '122' },
{ code: "AED", name: "阿联酋迪拉姆", value: "138" },
{ code: "ZAR", name: "南非兰特", value: "244" },
{ code: "CAD", name: "加拿大元", value: "501" },
{ code: "CHF", name: "瑞士法郎", value: "331" },
{ code: "CNY", name: "人民币", value: "142" },
{ code: "DKK", name: "丹麦克朗", value: "302" },
{ code: "EUR", name: "欧元", value: "300" },
{ code: "GBP", name: "英镑", value: "303" },
{ code: "HKD", name: "港币", value: "110" },
{ code: "HUF", name: "匈牙利福林", value: "321" },
{ code: "JPY", name: "日本元", value: "116" },
{ code: "KRW", name: "韩国圆", value: "133" },
{ code: "MOP", name: "澳门元", value: "121" },
{ code: "MXN", name: "墨西哥比索", value: "429" },
{ code: "MYR", name: "马来西亚林吉特", value: "122" },
],
unit: [
{
"code": "083",
"name": "盎司"
code: "083",
name: "盎司",
},
{
"code": "016",
"name": "把"
code: "016",
name: "把",
},
{
code: "042",
name: "百把",
},
{
code: "040",
name: "百副",
},
{
code: "043",
name: "百个",
},
{
code: "044",
name: "百片",
},
{
code: "149",
name: "百万贝可",
},
{
code: "049",
name: "百枝",
},
{
code: "041",
name: "百支",
},
{
code: "076",
name: "磅",
},
{
code: "125",
name: "包",
},
{
"code": "042",
"name": "百把"
code: "132",
name: "本",
},
{
"code": "040",
"name": "百副"
code: "163",
name: "部",
},
{
"code": "043",
"name": "百个"
code: "131",
name: "册",
},
{
"code": "044",
"name": "百片"
code: "071",
name: "长吨",
},
{
"code": "149",
"name": "百万贝可"
code: "089",
name: "寸",
},
{
"code": "049",
"name": "百枝"
code: "127",
name: "打",
},
{
"code": "041",
"name": "百支"
code: "136",
name: "袋",
},
{
"code": "076",
"name": "磅"
code: "077",
name: "担",
},
{
"code": "125",
"name": "包"
code: "045",
name: "刀",
},
{
"code": "132",
"name": "本"
code: "079",
name: "短担",
},
{
"code": "163",
"name": "部"
code: "072",
name: "短吨",
},
{
"code": "131",
"name": "册"
code: "026",
name: "对",
},
{
"code": "071",
"name": "长吨"
code: "070",
name: "吨",
},
{
"code": "089",
"name": "寸"
code: "133",
name: "发",
},
{
"code": "127",
"name": "打"
code: "022",
name: "份",
},
{
"code": "136",
"name": "袋"
code: "023",
name: "幅",
},
{
"code": "077",
"name": "担"
code: "019",
name: "副",
},
{
"code": "045",
"name": "刀"
code: "007",
name: "个",
},
{
"code": "079",
"name": "短担"
code: "014",
name: "根",
},
{
"code": "072",
"name": "短吨"
code: "047",
name: "公担",
},
{
"code": "026",
"name": "对"
code: "116",
name: "公制马力",
},
{
"code": "070",
"name": "吨"
code: "122",
name: "罐",
},
{
"code": "133",
"name": "发"
code: "096",
name: "毫升",
},
{
"code": "022",
"name": "份"
code: "141",
name: "合",
},
{
"code": "023",
"name": "幅"
code: "140",
name: "盒",
},
{
"code": "019",
"name": "副"
code: "005",
name: "架",
},
{
"code": "007",
"name": "个"
code: "011",
name: "件",
},
{
"code": "014",
"name": "根"
code: "075",
name: "斤",
},
{
"code": "047",
"name": "公担"
code: "029",
name: "井",
},
{
"code": "116",
"name": "公制马力"
code: "039",
name: "具",
},
{
"code": "122",
"name": "罐"
code: "018",
name: "卷",
},
{
"code": "096",
"name": "毫升"
code: "027",
name: "棵",
},
{
"code": "141",
"name": "合"
code: "036",
name: "克",
},
{
"code": "140",
"name": "盒"
code: "084",
name: "克拉",
},
{
"code": "005",
"name": "架"
code: "017",
name: "块",
},
{
"code": "011",
"name": "件"
code: "128",
name: "筐",
},
{
"code": "075",
"name": "斤"
code: "135",
name: "捆",
},
{
"code": "029",
"name": "井"
code: "101",
name: "立方尺",
},
{
"code": "039",
"name": "具"
code: "033",
name: "立方米",
},
{
"code": "018",
"name": "卷"
code: "099",
name: "立方英尺",
},
{
"code": "027",
"name": "棵"
code: "139",
name: "粒",
},
{
"code": "036",
"name": "克"
code: "080",
name: "两",
},
{
"code": "084",
"name": "克拉"
code: "003",
name: "辆",
},
{
"code": "017",
"name": "块"
code: "118",
name: "令",
},
{
"code": "128",
"name": "筐"
code: "129",
name: "罗",
},
{
"code": "135",
"name": "捆"
code: "126",
name: "箩",
},
{
"code": "101",
"name": "立方尺"
code: "086",
name: "码",
},
{
"code": "033",
"name": "立方米"
code: "134",
name: "枚",
},
{
"code": "099",
"name": "立方英尺"
code: "098",
name: "美加仑",
},
{
"code": "139",
"name": "粒"
code: "030",
name: "米",
},
{
"code": "080",
"name": "两"
code: "031",
name: "盘",
},
{
"code": "003",
"name": "辆"
code: "037",
name: "盆",
},
{
"code": "118",
"name": "令"
code: "121",
name: "批",
},
{
"code": "129",
"name": "罗"
code: "130",
name: "匹",
},
{
"code": "126",
"name": "箩"
code: "020",
name: "片",
},
{
"code": "086",
"name": "码"
code: "112",
name: "平方尺",
},
{
"code": "134",
"name": "枚"
code: "110",
name: "平方码",
},
{
"code": "098",
"name": "美加仑"
code: "032",
name: "平方米",
},
{
"code": "030",
"name": "米"
code: "111",
name: "平方英尺",
},
{
"code": "031",
"name": "盘"
code: "142",
name: "瓶",
},
{
"code": "037",
"name": "盆"
code: "060",
name: "千伏安",
},
{
"code": "121",
"name": "批"
code: "054",
name: "千个",
},
{
"code": "130",
"name": "匹"
code: "052",
name: "千盒",
},
{
"code": "020",
"name": "片"
code: "035",
name: "千克",
},
{
"code": "112",
"name": "平方尺"
code: "051",
name: "千块",
},
{
"code": "110",
"name": "平方码"
code: "146",
name: "千粒",
},
{
"code": "032",
"name": "平方米"
code: "147",
name: "千米",
},
{
"code": "111",
"name": "平方英尺"
code: "063",
name: "千升",
},
{
"code": "142",
"name": "瓶"
code: "061",
name: "千瓦",
},
{
"code": "060",
"name": "千伏安"
code: "062",
ext6: "KWH",
name: "千瓦时",
},
{
"code": "054",
"name": "千个"
code: "148",
name: "千英尺",
},
{
"code": "052",
"name": "千盒"
code: "058",
name: "千张",
},
{
"code": "035",
"name": "千克"
code: "053",
name: "千枝",
},
{
"code": "051",
"name": "千块"
code: "143",
name: "千支",
},
{
"code": "146",
"name": "千粒"
code: "050",
name: "千只",
},
{
"code": "147",
"name": "千米"
code: "170",
name: "人份",
},
{
"code": "063",
"name": "千升"
code: "048",
name: "扇",
},
{
"code": "061",
"name": "千瓦"
code: "095",
name: "升",
},
{
"code": "062",
"ext6": "KWH",
"name": "千瓦时"
code: "085",
name: "市尺",
},
{
"code": "148",
"name": "千英尺"
code: "081",
name: "市担",
},
{
"code": "058",
"name": "千张"
code: "025",
name: "双",
},
{
"code": "053",
"name": "千枝"
code: "073",
name: "司马担",
},
{
"code": "143",
"name": "千支"
code: "074",
name: "司马斤",
},
{
"code": "050",
"name": "千只"
code: "004",
name: "艘",
},
{
"code": "170",
"name": "人份"
code: "001",
name: "台",
},
{
"code": "048",
"name": "扇"
code: "006",
name: "套",
},
{
"code": "095",
"name": "升"
code: "015",
name: "条",
},
{
"code": "085",
"name": "市尺"
code: "123",
name: "桶",
},
{
"code": "081",
"name": "市担"
code: "034",
name: "筒",
},
{
"code": "025",
"name": "双"
code: "009",
name: "头",
},
{
"code": "073",
"name": "司马担"
code: "038",
name: "万个",
},
{
"code": "074",
"name": "司马斤"
code: "145",
name: "万粒",
},
{
"code": "004",
"name": "艘"
code: "144",
name: "万双",
},
{
"code": "001",
"name": "台"
code: "057",
name: "万套",
},
{
"code": "006",
"name": "套"
code: "059",
name: "万张",
},
{
"code": "015",
"name": "条"
code: "120",
name: "箱",
},
{
"code": "123",
"name": "桶"
code: "056",
name: "亿个",
},
{
"code": "034",
"name": "筒"
code: "055",
name: "亿支",
},
{
"code": "009",
"name": "头"
code: "067",
name: "英尺",
},
{
"code": "038",
"name": "万个"
code: "088",
name: "英寸",
},
{
"code": "145",
"name": "万粒"
code: "078",
name: "英担",
},
{
"code": "144",
"name": "万双"
code: "097",
name: "英加仑",
},
{
"code": "057",
"name": "万套"
code: "115",
name: "英制马力",
},
{
code: "124",
name: "扎",
},
{
code: "010",
name: "张",
},
{
code: "013",
name: "枝",
},
{
code: "012",
name: "支",
},
{
code: "008",
name: "只",
},
{
code: "028",
name: "株",
},
{
code: "021",
name: "组",
},
{
code: "002",
name: "座",
},
{
code: "046",
name: "疋",
},
],
};
"code": "059",
"name": "万张"
export const receiptStatus = () => {
return [
{
text: "未提交",
value: "99999",
},
{
"code": "120",
"name": "箱"
text: "已提交",
value: "0",
},
{
"code": "056",
"name": "亿个"
text: "xml报文加签失败",
value: "-2",
},
{
"code": "055",
"name": "亿支"
text: "xml报文上传失败",
value: "-3",
},
{
"code": "067",
"name": "英尺"
text: "电子口岸申报中",
value: "2",
},
{
"code": "088",
"name": "英寸"
text: "发送海关成功",
value: "3",
},
{
"code": "078",
"name": "英担"
text: "发送海关失败",
value: "4",
},
{
"code": "097",
"name": "英加仑"
text: "海关退单",
value: "100",
},
{
"code": "115",
"name": "英制马力"
text: "海关入库",
value: "120",
},
{
"code": "124",
"name": "扎"
text: "回执异常",
value: "-1",
},
];
};
export const listStatus = () => {
return [
{
text: "未提交",
value: "99999",
},
{
text: "已提交",
value: "0",
},
{
"code": "010",
"name": "张"
text: "xml报文加签失败",
value: "-2",
},
{
"code": "013",
"name": "枝"
text: "xml报文上传失败",
value: "-3",
},
{
"code": "012",
"name": "支"
text: "电子口岸申报中",
value: "2",
},
{
"code": "008",
"name": "只"
text: "发送海关成功",
value: "3",
},
{
"code": "028",
"name": "株"
text: "发送海关失败",
value: "4",
},
{
"code": "021",
"name": "组"
text: "海关退单",
value: "100",
},
{
"code": "002",
"name": "座"
text: "海关入库",
value: "120",
},
{
"code": "046",
"name": "疋"
}
]
}
\ No newline at end of file
text: "海关审结",
value: "399",
},
{
text: "放行",
value: "800",
},
{
text: "结关",
value: "899",
},
{
text: "回执异常",
value: "-1",
},
];
};
export const totalScoreStatus = () => {
return [
{
text: "未提交",
value: "99999",
},
{
text: "已提交",
value: "0",
},
{
text: "xml报文加签失败",
value: "-2",
},
{
text: "xml报文上传失败",
value: "-3",
},
{
text: "电子口岸申报中",
value: "2",
},
{
text: "发送海关成功",
value: "3",
},
{
text: "发送海关失败",
value: "4",
},
{
text: "海关退单",
value: "100",
},
// {
// text: "海关入库",
// value: "120",
// },
{
text: "海关审结",
value: "399",
},
{
text: "放行",
value: "800",
},
{
text: "结关",
value: "899",
},
{
text: "回执异常",
value: "-1",
},
];
};
......
......@@ -201,21 +201,49 @@
{{ scope.row.completedCount }}
</el-button>
/
<el-button type="text" @click.stop="linkChange(scope, 1)">
<el-button
type="text"
style="margin-left: 0"
@click.stop="linkChange(scope, 1)"
>
{{ scope.row.uncompletedCount }}
</el-button>
</template>
<template v-slot:listDontReleaseCount="scope">
清单放行:{{ scope.row.listReleaseCount }}/{{
scope.row.listDontReleaseCount
}}
<!-- <el-button type="text" style="margin-left: 0">
清单放行:
<el-button
type="text"
style="margin-left: 0"
@click.stop="linkChange(scope, 3)"
>
{{ scope.row.listReleaseCount }}
</el-button>
/
<el-button type="text">
<el-button
type="text"
style="margin-left: 0"
@click.stop="linkChange(scope, 4)"
>
{{ scope.row.listDontReleaseCount }}
</el-button> -->
</el-button>
</template>
<template v-slot:listDontReleaseCountEnd="scope">
清单结关:
<el-button
type="text"
style="margin-left: 0"
@click.stop="linkChange(scope, 5)"
>
{{ scope.row.listClearanceCount }}
</el-button>
/
<el-button
type="text"
style="margin-left: 0"
@click.stop="linkChange(scope, 6)"
>
{{ scope.row.listNotClearedCount }}
</el-button>
</template>
<template v-slot:arrivalInReceiptStatus="scope">
<TablePopover
......@@ -322,7 +350,7 @@ import {
import DialogVue from "./dialog.vue";
import DataPreview from "../reportingData/data-preview.vue";
import TimeDialog from "../reportingData/time-dialog.vue";
import { getPortInfo } from "@/api/system/customer-ai.js";
import { getCurrUserPortInfo } from "@/api/system/user.js";
export default {
name: "SupervisePlaceManage",
......@@ -388,6 +416,12 @@ export default {
slot: true,
},
{
name: "航班号",
value: "flightNumber",
width: "",
align: "left",
},
{
name: "清单审结进度",
value: "listReceiptStatus",
width: "",
......@@ -402,6 +436,13 @@ export default {
slot: true,
},
{
name: "清单结关进度",
value: "listDontReleaseCountEnd",
width: "",
align: "left",
slot: true,
},
{
name: "清单总分单回执",
value: "totalReceiptStatus",
width: "",
......@@ -499,7 +540,7 @@ export default {
},
//获取口岸子字典
searchPortDictData() {
getPortInfo()
getCurrUserPortInfo()
.then((res) => {
console.log(res);
if (res.code === "200") {
......@@ -567,8 +608,15 @@ export default {
},
// 运单号跳转
linkChange(record, type) {
const { billNo, completedLogisticsNo, uncompletedLogisticsNo } =
record.row;
const {
billNo,
completedLogisticsNo,
uncompletedLogisticsNo,
listReleaseLogisticsNo,
listDontReleaseLogisticsNo,
listClearanceLogisticsNo,
listNotClearedLogisticsNo,
} = record.row;
const query = { billNo, search: true };
if (+type === 1) {
query["logisticsNo"] = uncompletedLogisticsNo;
......@@ -576,6 +624,18 @@ export default {
if (+type === 2) {
query["logisticsNo"] = completedLogisticsNo;
}
if (+type === 3) {
query["logisticsNo"] = listReleaseLogisticsNo;
}
if (+type === 4) {
query["logisticsNo"] = listDontReleaseLogisticsNo;
}
if (+type === 5) {
query["logisticsNo"] = listClearanceLogisticsNo;
}
if (+type === 6) {
query["logisticsNo"] = listNotClearedLogisticsNo;
}
console.log(query, record);
this.$router.push({
......
......@@ -27,21 +27,87 @@
<el-transfer
v-model="transferValue"
:data="logisticsWaybillDimension"
:right-default-checked="currentItem"
filterable
target-order="push"
:props="{ label: 'itemChineseName', key: 'itemValue' }"
:titles="['未选内容', '已选内容']"
></el-transfer>
@right-check-change="choose"
>
<span
class="el-icon-arrow-up"
slot="right-footer"
style="margin-left: 10px; cursor: pointer"
@click="handleUp('transferValue')"
title="上移"
>
</span>
<span
class="el-icon-arrow-down"
slot="right-footer"
style="cursor: pointer; margin-left: 8px"
@click="handleDown('transferValue')"
title="下移"
>
</span>
<!-- <el-button
class="transer-footer"
size="mini"
>上移</el-button
> -->
<!-- <el-button
class="transer-footer"
slot="right-footer"
size="mini"
@click="handleDown('transferValue')"
>下移</el-button
> -->
</el-transfer>
</template>
<template v-if="radio === 6">
<el-transfer
v-model="transferValue1"
:data="commodityDetailDimension"
:right-default-checked="currentItem"
filterable
target-order="push"
:props="{ label: 'itemChineseName', key: 'itemValue' }"
:titles="['未选内容', '已选内容']"
></el-transfer>
@right-check-change="choose"
>
<span
class="el-icon-arrow-up"
slot="right-footer"
style="margin-left: 10px; cursor: pointer"
@click="handleUp('transferValue1')"
title="上移"
>
</span>
<span
class="el-icon-arrow-down"
slot="right-footer"
style="cursor: pointer; margin-left: 8px"
@click="handleDown('transferValue1')"
title="下移"
>
</span>
<!-- <el-button
class="transer-footer"
slot="right-footer"
style="margin-left: 10px"
size="mini"
@click="handleUp('transferValue1')"
>上移</el-button
>
<el-button
class="transer-footer"
slot="right-footer"
size="mini"
@click="handleDown('transferValue1')"
>下移</el-button
> -->
</el-transfer>
</template>
</div>
<div class="dialogOption entrySave revokeOperation">
......@@ -97,6 +163,7 @@ export default {
commodityDetailDimension: [],
logisticsWaybillDimension: [],
historyInfo: {},
currentItem: [],
};
},
watch: {
......@@ -104,6 +171,7 @@ export default {
if (val) {
this.customVisible = val;
this.getList();
this.radio = 3;
}
},
},
......@@ -171,6 +239,7 @@ export default {
? this.historyInfo.commodityDetailDimension
: this.historyInfo.defaultCommodityDetail;
}
this.currentItem = [];
},
formSubmit() {
......@@ -228,8 +297,62 @@ export default {
cancelModify(val) {
this.customVisible = false;
this.dialogLoading = false;
this.currentItem = [];
this.$emit("cancelModify", val);
},
//===============
//上移事件
handleUp(key) {
let self = this;
let item = self.currentItem;
let index;
if (item.length == 1) {
self[key].find((val, indexs, arr) => {
if (val == item[0]) {
index = indexs;
}
});
if (index == 0) {
self.msgError("已经到顶了");
return;
}
//改变的数组
let changeItem = JSON.parse(JSON.stringify(self[key][index - 1]));
self[key].splice(index - 1, 1);
self[key].splice(index, 0, changeItem);
} else {
self.msgError("只能选择一条数据进行上下移动");
return;
}
},
choose(value) {
this.currentItem = value;
}, //下移事件
handleDown(key) {
let self = this;
let item = self.currentItem;
let index;
if (item.length == 1) {
//选中值的下标
self[key].find((val, indexs, arr) => {
if (val == item) {
index = indexs;
}
});
if (index == self[key].length - 1) {
// 这里是length-1,因为下标值从0开始
self.msgError("已经到底了");
return;
}
let changeItem = JSON.parse(JSON.stringify(self[key][index]));
self[key].splice(index, 1);
self[key].splice(index + 1, 0, changeItem);
} else {
self.msgError("只能选择一条数据进行上下移动");
return;
}
},
// ===========
},
};
</script>
......@@ -239,13 +362,38 @@ export default {
::v-deep {
.el-transfer-panel .el-checkbox__inner {
height: 17px;
width: 13px;
width: 14px;
}
.el-button--primary,
.el-button--primary:hover,
.el-button--primary:focus {
color: #ff6200;
}
/* .el-transfer-panel__list.is-filterable {
padding-bottom: 40px;
} */
.el-transfer-panel__body {
height: 260px;
}
.el-transfer-panel__list.is-filterable {
height: 240px;
}
.is-with-footer {
.el-transfer-panel__list.is-filterable {
height: 205px;
}
}
.el-transfer__buttons {
display: inline-flex;
flex-direction: column;
.el-button + .el-button {
margin-left: 0;
}
}
.el-transfer-panel {
width: 235px;
height: 350px;
}
}
.revokeOperation {
......
......@@ -338,6 +338,7 @@ export default {
getHsCodeSingleSync({ id: record.skuCode }).then((res) => {
if (+res.code === 200) {
this.alertSuccessMsg(res.message);
this.search(0);
} else {
this.alertWarningMsg(res.message);
}
......
......@@ -21,7 +21,7 @@
>
<el-row :gutter="5">
<el-col :span="24">
<Formitem label="同步日期" prop="beginDate" type="edit">
<Formitem label="起始日期" prop="beginDate" type="edit">
<el-date-picker
class="inputInner--beginDate"
id="inputInner-edit-beginDate"
......@@ -76,7 +76,7 @@ export default {
{
required: true,
trigger: "change",
message: "同步日期不能为空!",
message: "起始日期不能为空!",
},
],
},
......
......@@ -535,7 +535,8 @@ import BatchModify from "./batchModify.vue";
import TimeDialog from "./time-dialog.vue";
import DataPreview from "./data-preview.vue";
import WeightAdjust from "./weight-adjust.vue";
import { getPortInfo } from "@/api/system/customer-ai.js";
import { getCurrUserPortInfo } from "@/api/system/user.js";
import { listStatus, receiptStatus, totalScoreStatus } from "../../utils/dict";
export default {
name: "ReportingData",
components: {
......@@ -573,6 +574,9 @@ export default {
},
tableData: [],
orderStatus: [],
waybillStatus: [],
listStatus: [],
totalScoreStatus: [],
headerData: [
{
name: "提运单号",
......@@ -617,59 +621,19 @@ export default {
align: "left",
slot: true,
columnKey: "orderReceiptStatus",
filters: [
{
text: "已提交",
value: "0",
},
{
text: "xml报文加签失败",
value: "-2",
},
{
text: "xml报文上传失败",
value: "-3",
},
{
text: "电子口岸申报中",
value: "2",
},
{
text: "发送海关成功",
value: "3",
},
{
text: "发送海关失败",
value: "4",
},
{
text: "海关退单",
value: "100",
},
{
text: "海关入库",
value: "120",
},
{
text: "回执异常",
value: "-1",
},
],
// filterMethod: this.filterMethodFn,
filterPlacement: "bottom-right",
filters: [...receiptStatus()],
},
// {
// name: "收款单回执",
// value: "",
// width: "",
// align: "left",
// slot: true,
// },
{
name: "运单回执",
value: "wayBillReceipt",
width: "",
align: "left",
slot: true,
columnKey: "wayBillReceipt",
filterPlacement: "bottom-right",
filters: [...receiptStatus()],
},
{
name: "清单回执",
......@@ -677,6 +641,9 @@ export default {
width: "",
align: "left",
slot: true,
columnKey: "listReceiptStatus",
filterPlacement: "bottom-right",
filters: [...listStatus()],
},
{
......@@ -685,6 +652,9 @@ export default {
width: "",
align: "left",
slot: true,
columnKey: "totalSplitOrderStatus",
filterPlacement: "bottom-right",
filters: [...totalScoreStatus()],
},
// {
// // release-v1.0.9
......@@ -818,13 +788,16 @@ export default {
},
methods: {
filterChange(value) {
this.orderStatus = value.orderReceiptStatus;
this.orderStatus = value?.orderReceiptStatus;
this.waybillStatus = value?.wayBillReceipt;
this.listStatus = value?.listReceiptStatus;
this.totalScoreStatus = value?.totalSplitOrderStatus;
console.log(value, this.orderStatus);
this.search(0);
},
//获取口岸子字典
searchPortDictData() {
getPortInfo()
getCurrUserPortInfo()
.then((res) => {
console.log(res);
if (res.code === "200") {
......@@ -919,6 +892,9 @@ export default {
obj.endCreateTime = obj.createTime[1];
}
obj.orderStatus = this.orderStatus;
obj.waybillStatus = this.waybillStatus;
obj.listStatus = this.listStatus;
obj.totalScoreStatus = this.totalScoreStatus;
searchDeclareData(obj)
.then((res) => {
if (res.code === "200") {
......@@ -958,6 +934,10 @@ export default {
dataSource: [],
ebcName: "",
};
// this.orderStatus = [];
// this.waybillStatus = [];
// this.listStatus = [];
// this.totalScoreStatus = [];
this.clearPort();
this.clearStatus();
},
......@@ -1451,11 +1431,35 @@ export default {
.el-table th.el-table__cell > .cell {
display: flex;
align-items: center;
gap: 30px;
justify-content: space-between;
cursor: pointer;
/* gap: 30px;
justify-content: space-between; */
&.highlight {
color: #007ab7;
.el-icon-arrow-down {
color: #007ab7;
}
}
}
.el-table__column-filter-trigger {
display: inline-flex;
height: 34px;
cursor: pointer;
align-items: center;
}
.el-table__column-filter-trigger i {
transform: scale(1);
padding-left: 5px;
font-family: "iconfont" !important;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
position: relative;
top: 1px;
}
.el-icon-arrow-down:before {
content: "\e7d6";
font-size: 18px;
}
}
}
......