Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
6d5138b9 1 parent f4f41588

订单详情修改，接口增加，退出修改菜单增加

Expand all
Inline Side-by-side
Showing 29 changed files with 237 additions and 988 deletions
import request from '@/utils/request'
/**
* 运单、口岸、站点、预审查看详情（CD类都有）
* @param id
* @param pageIndex
* @param pageSize
* @returns
*/
export function getConsInfo(data) {
return request({
url: '/bus-employees/chm/qry/staff/consInfo',
method: 'post',
data: data,
})
}
/**
* 申报日志查看C类
* @param {} data
* @returns
*/
export function getLogC(data) {
return request({
url: '/bus-customer/declared/list/conId',
method: 'post',
data: data,
})
}
/**
* 申报日志查看D类
* @param {} data
* @returns
*/
export function getLogD(data) {
return request({
url: '/bus-customer/consignment/back/info',
method: 'post',
data: data,
})
}
/**
* D类文件图片查询（右侧）
* @param id
* @param pageIndex
* @param pageSize
* @returns
*/
export function getAttachment(data) {
return request({
url: '/bus-employees/attachment/paged/query',
method: 'post',
data: data,
})
}
/**
* 获取汇率
* @returns
*/
export function getExchangeRate() {
return request({
url: '/manager-server/dicEntries/getExchangeRate',
method: 'get',
})
}
/**
* 获取文件
* @returns
*/
export function getFiles(data) {
return request({
url: '/manager-server/attachment/list/slipIdForPic',
method: 'post',
data: data,
})
}
/**
* 预审通过/不通过/保存
* {
"consignmentId":0,//运单id Long
"flag":1,//流程标志，2为保存，1为审批通过，0为审批不通过 Integer
"rejectRemark": "",//审批备注 String
"portPreAuditFlag":null, //口岸是否预审 String
"approvalTimeFirst":null ,//第一次审批时间 Data
"attachmentsList":[{
"id":0,
"name":"",//文件名
"rotateAngle":90,//顺时针旋转角度
"documentsCheck":1//预审中心的申报单证是否打勾/0=否，1=是
}]
}
* @returns
*/
// export function approval(data) {
// return request({
// url: '/bus-employees/rde/op/approval',
// method: 'post',
// data: data,
// })
// }
export function saveApproval(data) {
let formData = new FormData();
if (data.pic == null) {
formData.append("pic", null);
} else {
formData.append("pic", data.pic, data.info.origFileName);
}
formData.append("info", JSON.stringify(data.info));
return request({
url: '/bus-employees/rde/op/detail/save',
method: 'post',
data: formData,
})
}
/**
* 审批通过
*@param pic * 旋转附件
*@param info * 参数json
* @returns
*/
export function approved(data) {
let formData = new FormData();
if (data.pic == null) {
formData.append("pic", null);
} else {
formData.append("pic", data.pic, data.info.origFileName);
}
formData.append("info", JSON.stringify(data.info));
return request({
url: '/bus-employees/rde/op/approved',
method: 'post',
data: formData,
})
}
/**
* 审批不通过
*@param chmId * 运单id
*@param remark * 审批备注
* @returns
*/
export function approvalReject(data) {
return request({
url: '/bus-employees/rde/op/reject',
method: 'post',
data: data,
})
}
//委托书盖章
/**
* @param pic * 图片
* @param info * 其余参数
*/
export function rdeimgStamp(data) {
let formData = new FormData();
if (data.pic == null) {
formData.append("pic", null);
} else {
formData.append("pic", data.pic, data.info.origFileName);
}
formData.append("info", JSON.stringify(data.info));
return request({
url: '/bus-employees/rde/op/execute/stamp',
method: 'post',
data: formData,
})
}
// //委托书盖章
// /**
// * @param attachmentId * 附件id
// * @param pickUpCityId * 取件城市id
// * @param fileName * 文件名
// * @param consignmentId * 运单id
// * @param rotateAngle * 旋转角度
// */
// export function rdeimgStamp(data) {
// return request({
// url: '/bus-employees/rde/op/stamp',
// method: 'post',
// data: data
// })
// }
//撤销盖章
/**
* @param chmId * 运单id
*/
export function rdeimgRestamp(data) {
return request({
url: '/bus-employees/rde/op/cancel/stamp',
method: 'post',
data: data
})
}
// //撤销盖章
// /**
// * @param attachmentsPicDtoList * 附件表对象
// * @param consignmentId * 运单id
// */
// export function rdeimgRestamp(data) {
// return request({
// url: '/bus-employees/rde/op/stamp/retract',
// method: 'post',
// data: data
// })
// }
//下载清关文件
/**
* @param consignmentId * 运单id
*/
export function downloadEntryFiles(data) {
return request({
url: '/bus-employees/attachment/download/pdforzip/' + data.consignmentId,
method: 'get',
data: data
})
}
//下载清关文件
/**
* @param id * 运单id
* @param report * 0预览1打印
*/
export function rdeEntryFileView(data) {
return request({
url: '/bus-customer/pdf/print/report',
method: 'post',
data: data
})
}
//切换图片保存旋转
/**
* @param chmId * 运单id
* @param attachmentId * 附件id
* @param origFileName * 文件名去掉back_
* @param pic 附件流
*/
export function setImgRoate(data) {
let formData = new FormData();
if (data.pic != null) {
formData.append("pic", data.pic, data.info.origFileName);
} else {
formData.append('pic', null)
}
formData.append('info', JSON.stringify(data.info))
return request({
url: '/bus-employees/rde/op/revolve',
method: 'post',
data: formData
})
}
//图片选择状态保存
/**
* @param attachmentId * 附件id
* @param isDocumentCheck * 勾选状态
*/
export function setDocumentCheck(data) {
return request({
url: '/bus-employees/rde/op/select',
method: 'post',
data: data
})
}
//图片选择状态保存
/**
* @param id * 运单id
*/
export function getFileDataFromPort(data) {
return request({
url: '/bus-employees/port/op/paged/query',
method: 'post',
data: data
})
}
//图片选择状态保存
/**
* @param consignmentCode * 运单号
* @param consignmentId * 运单id
* @param list * {
* fileName
* fileSavePath
* fileSize
* selectTypeCode
* uploadTime
* uploadUser
* }
*/
export function saveImgFileTypeData(data) {
return request({
url: '/bus-employees/port/op/document/classify',
method: 'post',
data: data
})
}
\ No newline at end of file
import request from '@/utils/request'
//审批效验
//订单详情
/**
*/
export function check(data) {
export function getOrderDetailData(data) {
return request({
url: '/bus-employees/rde/op/approve/check',
method: 'post',
data: data
})
}
//审批
/**
*/
export function isApproval(data) {
return request({
url: '/bus-employees/rde/op/IsApproval',
method: 'post',
url: '/bus-customer/exportOrder/info/' + data.orderId,
method: 'get',
data: data
})
}
//查找是否有新的预审信息
//订单详情
/**
*/
export function getNewApprovalType(data) {
export function getOrderLogata(data) {
return request({
url: '/bus-employees/chmConsignmentApproveController/getSendPromptMessageInfo',
url: '/bus-customer/exportOrder/receipt/' + data.orderNo,
method: 'get',
data: data
})
......
......@@ -2,10 +2,18 @@ import request from '@/utils/request'
// 登录方法
export function login(loginName, password, rememberMe, equipmentType, userAgent, selectedLocale) {
// const data = {
// loginName,
// password,
// rememberMe
// }
const data = {
loginName,
password,
rememberMe
"email": "247908967@qq.com",
"name": "肖玉兰",
"phone": 18221643976,
"port": "TSN",
"purpleId": 6,
"role": 170
}
return request({
url: '/bus-customer/login',
......
......@@ -831,7 +831,7 @@ input:disabled {
.fedexDetialTable {
width: auto;
height: 100%;
// height: 100%;
position: relative;
.el-table::before {
......
<template>
<div>
<el-table :data="tableData" style="width: 100%" border height="220px">
<el-table-column prop="index" label="序号" width="80"></el-table-column>
<el-table-column prop="productNumber" label="企业商品编号" width="150"></el-table-column>
<el-table-column prop="productName" label="商品企业商品名称" width="180"></el-table-column>
<el-table-column prop="description" label="企业商品描述" width="150"></el-table-column>
<el-table-column prop="code" label="条码" width="150"></el-table-column>
<el-table-column prop="unit" label="计量单位" width="100">
<template slot-scope="scope">
<span>{{ scope.row.unit }}</span>
<i class="el-icon-top" style="margin-left: 5px;"></i>
</template>
</el-table-column>
<el-table-column prop="currency" label="币制" width="80"></el-table-column>
<el-table-column prop="quantity" label="数量" width="80"></el-table-column>
<el-table-column prop="unitPrice" label="单价" width="100"></el-table-column>
<el-table-column prop="totalPrice" label="总价" width="100"></el-table-column>
<el-table-column prop="notes" label="备注" width="300"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-link type="primary" @click="handleExpand(scope.$index)">展开</el-link>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
name: "ProductDetailTable",
data() {
return {
tableData: [
{
index: 1,
productNumber: "6704200000",
productName: "真人发发夹",
description: "测试内容",
code: "485607096",
unit: "↑",
currency: "美元",
quantity: 1,
unitPrice: "645.78",
totalPrice: "645.78",
notes: "山东电子口岸已写，加签后上传"
},
{
index: 2,
productNumber: "6704200000",
productName: "真人发发夹",
description: "测试内容",
code: "2145860720",
unit: "↑",
currency: "美元",
quantity: 2,
unitPrice: "645.78",
totalPrice: "645.78",
notes: "山东电子口岸已写，加签后上传"
},
{
index: 3,
productNumber: "6704200000",
productName: "真人发发夹",
description: "测试内容",
code: "2145860720",
unit: "↑",
currency: "美元",
quantity: 3,
unitPrice: "645.78",
totalPrice: "645.78",
notes: "山东电子口岸已写，加签后上传"
},
{
index: 4,
productNumber: "6704200000",
productName: "真人发发夹",
description: "测试内容",
code: "2145860720",
unit: "↑",
currency: "美元",
quantity: 1,
unitPrice: "635.78",
totalPrice: "635.78",
notes: "山东电子口岸已写，加签后上传"
}
// 更多数据项...
]
};
},
methods: {
handleExpand(index) {
console.log(`展开第 ${index + 1} 行数据`);
}
}
}
</script>
<style scoped lang="scss">
.el-table {
font-size: 14px;
//border: 1px solid red;
//height: 180px;
overflow: auto;
}
.el-icon-top {
color: #409eff;
font-size: 12px;
}
</style>
<template>
<div>
<table class="custom-table">
<thead>
<tr>
<th v-for="(header, index) in headers" :key="index">{{ header }}</th>
<th v-if="showActionColumn">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(row, index) in tableData" :key="index">
<td>{{ row.status }}</td>
<td>{{ row.time }}</td>
<td>{{ row.description }}</td>
<td v-if="showActionColumn">
<span class="action-link" @click="handleDownload(row, index)">
下载回执
</span>
</td>
</tr>
</tbody>
</table>
</div>
</template>
<script>
export default {
name: "ReceiptInfoTable",
props: {
// 控制操作列是否显示
showActionColumn: {
type: Boolean,
default: true, // 默认显示操作列
},
},
data() {
return {
headers: ["回执状态", "状态时间", "回执描述"],
tableData: [
{
status: "山东电子口岸已上传",
time: "2024-11-08 15:31:58",
description:
"订单变更申请报关单【f291cda6-f664-4bf5-8edc-bcc012f8775】单证不存在，不可报单申报，报文业务主键【24HX-11-40-3722960DYB】",
},
{
status: "山东电子口岸已上传",
time: "2024-11-08 15:31:58",
description: "山东电子口岸已上传",
},
{
status: "山东电子口岸已保存",
time: "2024-11-08 15:30:45",
description: "山东电子口岸已保存，加签后上传",
},
],
};
},
methods: {
// 处理点击下载回执的事件
handleDownload(row, index) {
console.log("下载回执触发：", row, index);
// 示例下载逻辑，可以根据实际需求添加下载操作
alert(`开始下载回执：第 ${index + 1} 行`);
},
},
};
</script>
<style scoped lang="scss">
.custom-table {
width: 100%;
border-collapse: collapse;
font-size: 14px;
table-layout: fixed;
background-color: white;
}
.custom-table th,
.custom-table td {
border: 1px solid #ccc;
padding: 8px 12px;
text-align: left;
word-wrap: break-word;
}
.custom-table thead {
background-color: #f5f5f5;
}
.custom-table th {
font-weight: bold;
}
.custom-table tr:nth-child(odd) {
background-color: #fafafa;
}
.action-link {
color: #409eff;
cursor: pointer;
text-decoration: none;
}
.action-link:hover {
text-decoration: underline;
}
</style>
......@@ -189,7 +189,7 @@ export default {
cancel: this.$t("system.close"),
}
).then(() => {
this.$store.dispatch("LogOut").then(() => {
this.$store.dispatch("FedLogOut").then(() => {
location.href = process.env.VUE_APP_BASE_LOGINOUT;
});
});
......
......@@ -90,7 +90,7 @@ export const constantRoutes = [
]
},
{
path: '/',
path: '/export',
component: Layout,
hidden: false,
redirect: 'index',
......@@ -106,6 +106,7 @@ export const constantRoutes = [
path: '/exportBillDetail',
component: (resolve) => require(['@/views/exportBillDetail/index'], resolve),
hidden: true,
name:'ExportBillDetail',
meta: { title: '出口订单详情', icon: '' },
},
{
......@@ -168,7 +169,7 @@ export const constantRoutes = [
]
},
{
path: '/',
path: '/summary',
component: Layout,
hidden: false,
redirect: 'index',
......@@ -188,6 +189,45 @@ export const constantRoutes = [
}
]
},
{
path: '/system',
component: Layout,
hidden: false,
redirect: 'index',
meta: { title: '系统管理', icon: 'fedexQueue' },
children: [
{
path: '/portConfig',
component: (resolve) => require(['@/views/portConfig/index'], resolve),
hidden: false,
meta: { title: '口岸信息管理', icon: '' }
},
{
path: '/userConfig',
component: (resolve) => require(['@/views/userConfig/index'], resolve),
hidden: false,
meta: { title: '客户管理', icon: '' }
},
{
path: '/passwordIpConfig',
component: (resolve) => require(['@/views/passwordIpConfig/index'], resolve),
hidden: false,
meta: { title: '密码机管理', icon: '' }
},
{
path: '/userRoleConfig',
component: (resolve) => require(['@/views/userRoleConfig/index'], resolve),
hidden: false,
meta: { title: '用户管理权限', icon: '' }
},
{
path: '/roleConfig',
component: (resolve) => require(['@/views/roleConfig/index'], resolve),
hidden: false,
meta: { title: '角色管理权限', icon: '' }
},
]
},
]
export default new Router({
......
This diff is collapsed. Click to expand it.
<template>
<Table
class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable"
:data="tableData"
:headerData="bodyHeader"
:order="true"
:border="false"
:pagination="false"
:pageSizes="[20, 30, 50, 100]"
noLabel="序号"
rowKey="index"
emptyText="暂无数据"
:rowStyleType="true"
:rowStyleOption="{
key: 'isError',
value: 1,
className: 'tableErrorRow',
}"
:expandRowKeys="expandRowKeys"
>
<template slot="optionColumn">
<el-table-column
header-align="center"
align="center"
label="操作"
width="120"
>
<template slot-scope="scope">
<!-- 展开/收起 -->
<el-button
type="text"
@click="
expandRowKeys.includes(scope.row.index)
? closeEdit()
: editDetail(scope.row)
"
>
<!-- 收起 -->
<span v-show="expandRowKeys.includes(scope.row.index)">
<svg-icon icon-class="upIcon" />
{{ $t("entry.detial.form.up") }}
</span>
<!-- 展开 -->
<span v-show="!expandRowKeys.includes(scope.row.index)"
><svg-icon icon-class="downIcon" />
{{ $t("entry.detial.form.down") }}
</span>
</el-button>
</template>
</el-table-column>
</template>
</Table>
</template>
<script>
export default {
props: {
tableData: {
type: Array,
default() {
return [];
},
},
bodyHeader: {
type: Array,
default() {
return [];
},
},
},
data() {
return {
expandRowKeys: [],
};
},
methods: {},
};
</script>
<style scoped lang="scss">
.fedexDetialTable {
max-height: 310px;
}
</style>
<template>
<Table
class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable"
ref="entryTable"
:data="tableData"
:headerData="headerData"
:maxHeight="300"
:border="false"
:pagination="false"
:order="false"
:page="1"
:pageSizes="[20, 30, 50, 100]"
:totalCount="0"
:selection="false"
:selectFixed="false"
:rowSelectDataType="false"
></Table>
</template>
<script>
export default {
name: "ReceiptInfoTable",
props: {
tableData: {
type: Array,
default() {
return [];
},
},
headerData: {
type: Array,
default() {
return [
{
name: "回执状态",
value: "",
width: "",
align: "left",
},
{
name: "状态时间",
value: "",
width: "",
align: "left",
},
{
name: "回执描述",
value: "",
width: "",
align: "left",
},
];
},
},
},
data() {
return {};
},
methods: {},
};
</script>
<style scoped lang="scss">
.fedexDetialTable {
max-height: 310px;
}
</style>
<template>
<!-- 表体 -->
<Table
class="fedexDetialTable"
:data="tableData"
:headerData="headerData"
@rowClick="rowClick"
maxHeight="300px"
:order="false"
:border="false"
:pagination="false"
:pageSizes="[20, 30, 50, 100]"
:highlightCurrentRow="false"
>
<template v-slot:skuCode="scope">
<el-tooltip
class="item"
effect="dark"
:content="scope.row.model"
placement="right"
>
<span>{{ scope.row.skuCode }}</span>
</el-tooltip>
</template>
<template v-slot:knockdownNumber="scope">
<span
>{{ scope.row.knockdownNumber | clearNull }}
{{ scope.row.knockdownUnit | clearNull }}</span
>
</template>
<template v-slot:qtyLegalFirst="scope">
<span
>{{ scope.row.qtyLegalFirst | clearNull }}
{{ scope.row.unitLegalFirst | clearNull }}</span
>
</template>
<template v-slot:qtyLegalSecond="scope">
<span
>{{ scope.row.qtyLegalSecond | clearNull }}
{{ scope.row.unitLegalSecond | clearNull }}</span
>
</template>
<template v-slot:amount="scope">
<span
>{{ scope.row.amount | clearNull }}
{{ scope.row.currency | clearNull }}</span
>
</template>
</Table>
</template>
<script>
export default {
props: {
tableData: {
type: Array,
default: null,
},
headerData: {
type: Array,
default: null,
},
activeDetial: {
type: Object,
default: null,
},
dictData: {
type: Object,
default: null,
},
},
data() {
return {
formData: this.activeDetial,
expandRowKeys: [],
unit: [],
levyType: [],
currency: [],
country: [],
};
},
watch: {
activeDetial(val) {
if (val == null) {
this.expandRowKeys = [];
}
this.formData = val;
},
detialsData(val) {
this.tableData = val;
},
},
methods: {
rowClick(val) {
this.$emit("rowClick", val);
},
},
filters: {
clearNull(value) {
if (value == null) {
return "";
} else {
return value;
}
},
},
};
</script>
<style lang="scss" scoped>
::v-deep .el-table tr {
background-color: #f2f2f2 !important;
border: 0;
}
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
background-color: #f2f2f2 !important;
}
</style>
<template>
<el-dialog
:title="$t('declaration.indexD.dialogTitle')"
:visible="bodyDialogVisible"
width="65%"
center
@close="closeDialog"
@open="openDialog"
>
<!-- 表头 -->
<el-form
class="fedexFormStyle"
ref="bodyDialogForm"
v-loading="dialogLoading"
:model="formInfo"
label-position="top"
:disabled="disabled"
>
<el-row :gutter="5">
<!-- 中文品名 -->
<el-col :span="8">
<Formitem
:label="$t('entry.detial.form.label1')"
:type="type"
prop="inputItem"
:disabled="false"
>
<el-input
type="text"
:id="'inputInner-' + type + '-inputItem'"
v-model="formInfo.inputItem"
@blur="inputItemBlur"
></el-input>
</Formitem>
</el-col>
<!-- 商品编号 -->
<el-col :span="8">
<Formitem
:label="$t('entry.detial.form.label3')"
:type="type"
prop="skuCode"
:disabled="false"
>
<el-input
type="text"
:id="'inputInner-' + type + '-skuCode'"
v-model="formInfo.skuCode"
@blur="inputItemBlur"
></el-input>
</Formitem>
</el-col>
<!-- 商品名称 -->
<el-col :span="8">
<Formitem
:label="$t('entry.skuCodeDialog.table.label2')"
:type="type"
prop="skuName"
:disabled="false"
>
<el-input
type="text"
:id="'inputInner-' + type + '-skuName'"
v-model="formInfo.skuName"
@blur="inputItemBlur"
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5" v-for="(rowItem, idx) in rowList" :key="idx">
<el-col :span="6" v-for="(item, index) in rowItem" :key="index">
<Formitem :label="item.element" :prop="item.key" :disabled="false">
<el-input
v-if="
item.element != '品牌类型' && item.element != '出口享惠情况'
"
type="text"
:id="'inputInner--' + item.key"
v-model="elementForm[item.key]"
></el-input>
<el-select
v-else-if="item.element == '品牌类型'"
:id="'inputInner--' + item.key"
v-model="elementForm[item.key]"
placeholder=""
>
<el-option
v-for="(val, idx) in dictData.brandType"
:key="idx"
:label="val.name"
:value="val.code"
></el-option>
</el-select>
<el-select
v-else-if="item.element == '出口享惠情况'"
:id="'inputInner--' + item.key"
v-model="elementForm[item.key]"
placeholder=""
>
<el-option
v-for="(val, idx) in dictData.exportBenefits"
:key="idx"
:label="val.name"
:value="val.code"
></el-option>
</el-select>
</Formitem>
</el-col>
</el-row>
</el-form>
</el-dialog>
</template>
<script>
import { getHscode } from "@/api/detial-api.js";
export default {
props: {
formInfo: {
type: Object,
default: null,
},
dictData: {
type: Object,
default: null,
},
bodyDialogVisible: {
type: Boolean,
default: null,
},
disabled: {
type: Boolean,
default() {
return false;
},
},
type: {
type: String,
default: "",
},
},
data() {
return {
visible: this.bodyDialogVisible,
dialogLoading: false,
rowList: [],
elementForm: {
element0: "",
element1: "",
element2: "",
element3: "",
element4: "",
element5: "",
element6: "",
element7: "",
element8: "",
element9: "",
element10: "",
element11: "",
element12: "",
element13: "",
element14: "",
element15: "",
element16: "",
element17: "",
element18: "",
element19: "",
element20: "",
},
};
},
watch: {},
methods: {
inputItemBlur(val) {
this.$emit("inputItemBlur", this.activeDetial);
},
closeDialog() {
(this.elementForm = {
element0: "",
element1: "",
element2: "",
element3: "",
element4: "",
element5: "",
element6: "",
element7: "",
element8: "",
element9: "",
element10: "",
element11: "",
element12: "",
element13: "",
element14: "",
element15: "",
element16: "",
element17: "",
element18: "",
element19: "",
element20: "",
}),
(this.rowList = []);
this.visible = false;
this.$emit("closeDialog", this.visible);
},
openDialog() {
this.dialogLoading = true;
let arr = this.formInfo.model.split("|");
arr.forEach((item, index) => {
if (item.split(":")[0] != "品名") {
if (item.split(":")[0] == "品牌类型") {
this.elementForm[`element${index}`] = item.split(":")[1]
? "brandType_" + item.split(":")[1]
: "";
} else if (item.split(":")[0] == "出口享惠情况") {
this.elementForm[`element${index}`] = item.split(":")[1]
? "exportBenefits_" + item.split(":")[1]
: "";
} else {
this.elementForm[`element${index}`] = item.split(":")[1]
? item.split(":")[1]
: "";
}
}
});
return new Promise((resolve, reject) => {
getHscode({
condition: this.formInfo.skuCode,
pageIndex: 1,
pageSize: 20,
})
.then((res) => {
if (res.code === "200") {
this.rowList = []
let codeInfo = res.data.extra.hsCodes;
let elementList = this.hscodeElementInfo(codeInfo[0]);
let elementItem = [];
let arr = [];
elementList.forEach((item, index) => {
if (item.element != "品名") {
if (elementItem.length < 4) {
elementItem.push(item);
if (index == elementList.length - 1) {
arr.push(elementItem);
// this.rowList.push(elementItem);
elementItem = [];
}
} else {
// this.rowList.push(elementItem);
arr.push(elementItem);
elementItem = [];
if (index == elementList.length - 1) {
elementItem.push(item);
// this.rowList.push(elementItem);
arr.push(elementItem);
} else {
elementItem.push(item);
}
}
}
});
this.rowList = arr;
this.dialogLoading = false;
resolve();
} else {
this.alertWarningMsg(res.message);
reject();
}
})
.catch((err) => {
reject();
});
});
},
},
filters: {
clearNull(value) {
if (value == null) {
return "";
} else {
return value;
}
},
},
};
</script>
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
......@@ -174,7 +174,9 @@
<span>{{ scope.row.returnStatus }}</span>
</template>
<template v-slot:orderNo="scope">
<el-button type="text">{{ scope.row.orderNo }}</el-button>
<el-button type="text" @click="view(scope.row)">{{
scope.row.orderNo
}}</el-button>
</template>
</Table>
</div>
......@@ -325,6 +327,13 @@ export default {
},
//导出
downloadData() {},
//查询详情
view(val) {
this.$router.push({
name: "ExportBillDetail",
params: { data: val },
});
},
//文本域展示状态切换
textareaFocus(val) {
this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true;
......
......@@ -1309,8 +1309,8 @@
</template>
<script>
import ReceiptInfoTable from "@/components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "@/components/ProductDetailTable/index.vue";
import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "../components/ProductDetailTable/index.vue";
export default {
name: "exportTransportDetail.vue",
......
......@@ -290,7 +290,6 @@
</template>
<script>
import {getAllExportingBills, getAllListBills} from "@/api/query/query";
import PopoverTextarea from "@/components/PopoverTextarea/index.vue";
export default {
......@@ -395,15 +394,6 @@ export default {
}
},
created() {
getAllListBills({
pageIndex: 1,
pageSize: 20
}).then((res) => {
console.log('res', res)
this.tableData = res.data.value;
this.total = res.data.totalItems;
debugger;
})
},
methods: {
input() {
......
......@@ -417,8 +417,8 @@
</template>
<script>
import ReceiptInfoTable from "@/components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "@/components/ProductDetailTable/index.vue";
import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "../components/ProductDetailTable/index.vue";
export default {
name: "exportTransportDetail.vue",
......
......@@ -584,8 +584,8 @@
</template>
<script>
import ReceiptInfoTable from "@/components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "@/components/ProductDetailTable/index.vue";
import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "../components/ProductDetailTable/index.vue";
export default {
name: "index.vue",
......
......@@ -154,7 +154,6 @@
</template>
<script>
import {getAllExportingBills, getAllTransportBills} from "@/api/query/query";
export default {
name: "index",
......@@ -256,15 +255,6 @@ export default {
}
},
created() {
getAllTransportBills({
pageIndex: 1,
pageSize: 20
}).then((res) => {
console.log('res', res)
this.tableData = res.data.value;
this.total = res.data.totalItems;
debugger;
})
},
methods: {
tableSelect(val) {
......
......@@ -489,8 +489,8 @@
</template>
<script>
import ReceiptInfoTable from "@/components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "@/components/ProductDetailTable/index.vue";
import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "../components/ProductDetailTable/index.vue";
export default {
name: "index.vue",
......
......@@ -205,7 +205,6 @@
split-button
type="primary"
v-loading="loadings.dropDownLoading"
:disabled="selected.length == 0"
@command="dropdownChange"
@click="declareData"
>
......@@ -220,7 +219,7 @@
>
<el-dropdown-item
:command="{ code: 'order', name: '订单申报' }"
></el-dropdown-item>
>订单申报</el-dropdown-item>
<el-dropdown-item :command="{ code: 'waybill', name: '物流单申报' }"
>物流单申报</el-dropdown-item
>
......@@ -565,7 +564,8 @@ export default {
downloadData() {},
//申报
declareData() {
this.loadings.dropDownLoading = true;
if(this.selected.length > 0){
this.loadings.dropDownLoading = true;
let obj = {
declareIds: [],
type: this.dropdownCode,
......@@ -586,6 +586,9 @@ export default {
console.log(err);
this.loadings.dropDownLoading = false;
});
}else{
this.alertWarningMsg('请选择数据！')
}
},
//切换申报模式
dropdownChange(val) {
......