This commit is contained in:
linfso 2025-01-03 10:01:33 +08:00
parent 88a308b7de
commit ced569a5bd
5 changed files with 308 additions and 846 deletions

View File

@ -31,8 +31,6 @@
</div>
<elDateAdvPicker v-model="dateTimeRange" ></elDateAdvPicker>
<!-- <elDateSimplePicker placeholder="" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateSimplePicker> -->
</el-form-item>
</el-col>
</el-row>
@ -40,144 +38,41 @@
<el-col :span="15">
<el-form-item :label="$t('进仓状态')" prop="stockInFlag">
<el-select clearable v-model="queryParams.stockInFlag" placeholder="">
<el-option key="0" label="未进仓" value="0"></el-option>
<el-option key="1" label="已进仓" value="1"></el-option>
<el-option key="2" label="部分进仓" value="2"></el-option>
</el-select>
<el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="收款方式" clearable filterable style="width:100%">
<el-option label="企业微信收款" :value="3"></el-option>
<el-option label="对公付款" :value="4"></el-option>
<el-option label="微信支付" :value="1"></el-option>
<el-option label="支付宝支付" :value="2"></el-option>
<el-option label="其他" :value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="收退类型" prop="recType">
<el-select v-model="queryParams.recType" placeholder="" clearable filterable style="width:100%">
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('确认状态')" prop="confirmStatus">
<el-select clearable v-model="queryParams.confirmStatus" placeholder="">
<el-option key="0" label="未确认" value="0"></el-option>
<el-option key="1" label="已确认" value="1"></el-option>
<el-option key="2" label="部分确认" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.params.sendName"
:placeholder="$t('寄件人')"
clearable
/>
</el-form-item>
<el-form-item label="寄件人电话" prop="sendMobile">
<el-input
v-model="queryParams.params.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.params.sendCompany"
:placeholder="$t('寄件公司')"
clearable
/>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
<el-form-item label="支付状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="" clearable filterable style="width:100%">
<el-option label="未支付" :value="0"></el-option>
<el-option label="支付成功" :value="1"></el-option>
<el-option label="支付失败" :value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item> -->
</el-col>
</el-row>
</SearchForm>
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="queryKey" label-width="80px">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="2" label="2">账单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.queryKey"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-select v-model="queryParams.payType" placeholder="收款方式" clearable filterable style="width:100%">
<el-option label="企业微信收款" :value="3"></el-option>
<el-option label="对公付款" :value="4"></el-option>
<el-option label="微信支付" :value="1"></el-option>
<el-option label="支付宝支付" :value="2"></el-option>
<el-option label="其他" :value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="收退类型" prop="recType">
<el-select v-model="queryParams.recType" placeholder="" clearable filterable style="width:100%">
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="" prop="payMan">
<el-input
v-model="queryParams.payMan"
:placeholder="$t('支付人名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="payManCode">
<el-input
v-model="queryParams.payManCode"
:placeholder="$t('支付人编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="账单号" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
:placeholder="$t('账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="审核状态" prop="blAudit">
<el-select v-model="queryParams.blAudit" placeholder="" clearable filterable style="width:100%">
<el-option label="未审核" :value="0"></el-option>
<el-option label="审核通过" :value="1"></el-option>
<el-option label="审核不通过" :value="2"></el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerName">
<el-input
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="支付状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="" clearable filterable style="width:100%">
<el-option label="未支付" :value="0"></el-option>
<el-option label="支付成功" :value="1"></el-option>
<el-option label="支付失败" :value="2"></el-option>
</el-select>
</el-form-item>
</SearchForm>
<XdTable
slot="pageContent"
@ -197,6 +92,10 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
show-summary
:summary-method="getSummaries"
>
<div slot="toolbar">
@ -319,12 +218,13 @@
<script>
import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisSettlePayRecordForm from '@/views/emis/emisSettlePayRecord/emisSettlePayRecordForm';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisSettlePayRecord",
components: { elDateSimplePicker,emisSettlePayRecordForm },
components: { elDateAdvPicker,emisSettlePayRecordForm,SalemanPicker },
dicts: [
],
data() {
@ -525,6 +425,95 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
//指定列求和
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (
column.property === 'payMoney'
) {
const values = data.map(item => Number(item.payMoney));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留0位小数
}
else if (
column.property === 'satisfyMoney'
) {
const values = data.map(item => Number(item.satisfyMoney));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if (
column.property === 'allowanceMoney'
) {
const values = data.map(item => Number(item.allowanceMoney));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if(
column.property === 'deductionMoney'
){
const values = data.map(item => Number(item.deductionMoney));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
else if(
column.property === 'otherMoney'
){
const values = data.map(item => Number(item.otherMoney));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
});
console.log(sums);
return sums
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisSettlePayRecord/export', {

View File

@ -1,89 +1,49 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-row :gutter="0">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="24">
<el-form-item label="运单号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附件类型" prop="attachType">
<el-input v-model="form.attachType" placeholder="请输入附件类型" />
<el-form-item label="资料类型" prop="fileName">
<el-radio-group v-model="form.attachType" >
<el-radio :key="'3'" label="3">报关资料</el-radio>
<el-radio :key="'4'" label="4">清关资料</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="文件名称" prop="fileName">
<el-input v-model="form.fileName" placeholder="请输入文件名称" />
<el-form-item label="资料名称" prop="fileName">
<el-input v-model="form.fileName" placeholder="请输入资料名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="文件地址" prop="fileUrl">
<el-input v-model="form.fileUrl" placeholder="请输入文件地址" />
<el-form-item label="资料上传" prop="fileUrl">
<!-- <el-input v-model="form.fileUrl" placeholder="请输入文件地址" /> -->
<FileUpload :showTip="true" v-model="form.fileUrl" :isNeedUpload="true" :fileType="['jpg','png','bmp','pdf','zip','xls','xlsx']" :limit="10"></FileUpload>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="文件大小KB" prop="fileSiez">
<el-input v-model="form.fileSiez" placeholder="请输入文件大小KB" />
<el-form-item label="资料描述" prop="fileDesc">
<el-input v-model="form.fileDesc" type="textarea" placeholder="请输入资料描述" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="文件描述" prop="fileDesc">
<el-input v-model="form.fileDesc" placeholder="请输入文件描述" />
<!-- <el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="数据来源" prop="dataFrom">
<el-input v-model="form.dataFrom" placeholder="请输入数据来源" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核状态" prop="blAudit">
<el-input v-model="form.blAudit" placeholder="请输入审核状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核日期" prop="auditDate">
<el-date-picker clearable
v-model="form.auditDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审核日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核人" prop="auditManCode">
<el-input v-model="form.auditManCode" placeholder="请输入审核人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核站点" prop="auditSiteCode">
<el-input v-model="form.auditSiteCode" placeholder="请输入审核站点" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审核异常原因" prop="auditNote">
<el-input v-model="form.auditNote" placeholder="请输入审核异常原因" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="录单备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入录单备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col> -->
</el-form>
</el-row>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
@ -109,11 +69,17 @@ export default {
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
billCode: [
{ required: true, message: "运单号不能为空", trigger: "blur" }
],
delFlag: [
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
attachType: [
{ required: true, message: "附件类型不能为空", trigger: "blur" }
],
fileName: [
{ required: true, message: "文件名称不能为空", trigger: "blur" }
],
fileUrl: [
{ required: true, message: "文件地址不能为空", trigger: "blur" }
],
}
};
@ -133,7 +99,7 @@ export default {
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWaybillDeclareAttachment(this.id).then(response => {

View File

@ -1,133 +1,34 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="运单号" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="attachType">
<el-input
v-model="queryParams.attachType"
:placeholder="$t('附件类型')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="fileName">
<el-form-item label="资料名称" prop="fileName">
<el-input
v-model="queryParams.fileName"
:placeholder="$t('文件名称')"
:placeholder="$t('资料名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="fileUrl">
<el-input
v-model="queryParams.fileUrl"
:placeholder="$t('文件地址')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="fileSiez">
<el-input
v-model="queryParams.fileSiez"
:placeholder="$t('文件大小KB')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="fileDesc">
<el-input
v-model="queryParams.fileDesc"
:placeholder="$t('文件描述')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
:placeholder="$t('排序')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="dataFrom">
<el-input
v-model="queryParams.dataFrom"
:placeholder="$t('数据来源')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blAudit">
<el-input
v-model="queryParams.blAudit"
:placeholder="$t('审核状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="auditDate">
<el-date-picker clearable
v-model="queryParams.auditDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('审核日期')">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="auditManCode">
<el-input
v-model="queryParams.auditManCode"
:placeholder="$t('审核人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="auditSiteCode">
<el-input
v-model="queryParams.auditSiteCode"
:placeholder="$t('审核站点')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="auditNote">
<el-input
v-model="queryParams.auditNote"
:placeholder="$t('审核异常原因')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('录单备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="small"
storageName="emisWaybillDeclareAttachmentList_main"
:data="emisWaybillDeclareAttachmentList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -136,7 +37,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -146,10 +47,11 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisWaybillDeclareAttachment:add']"
>新增</el-button>
>上传资料</el-button>
</el-col>
<!--
<!-- v-hasPermi="['emis:emisWaybillAttachment:add']" -->
<!-- v-hasPermi="['emis:emisWaybillAttachment:edit']" -->
<el-col :span="1.5">
<el-button
type="success"
@ -158,9 +60,9 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWaybillDeclareAttachment:edit']"
>修改</el-button>
</el-col> -->
>修改资料</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -169,9 +71,10 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWaybillDeclareAttachment:remove']"
>删除</el-button>
</el-col>
<!-- v-hasPermi="['emis:emisWaybillAttachment:remove']" -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -179,98 +82,38 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWaybillDeclareAttachment:export']"
v-hasPermi="['emis:emisWaybillAttachment:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('资料类型')" align="center" prop="attachType" min-width="100">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('附件类型')" align="center" prop="attachType" min-width="100" />
<el-table-column :label="$t('文件名称')" align="center" prop="fileName" min-width="100" />
<el-table-column :label="$t('文件地址')" align="center" prop="fileUrl" min-width="100" />
<el-table-column :label="$t('文件大小KB')" align="center" prop="fileSiez" min-width="100" />
<el-table-column :label="$t('文件描述')" align="center" prop="fileDesc" min-width="100" />
<el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" />
<el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="100" />
<el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
<el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" min-width="100" />
<el-table-column :label="$t('审核异常原因')" align="center" prop="auditNote" min-width="100" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWaybillDeclareAttachment:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWaybillDeclareAttachment:remove']"
>删除</el-button> -->
<el-tag v-if="scope.row.attachType==3" type="warning">报关资料</el-tag>
<el-tag v-else-if="scope.row.attachType==4" type="info">清关资料</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('单证资料名称')" align="center" prop="fileName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('单证资料地址')" align="center" prop="fileUrl" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('资料描述')" align="center" prop="fileDesc" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
<el-table-column label="上传人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="上传网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="上传时间" align="center" prop="createTime" width="170"/>
<!-- <el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column label="修改时间" align="center" prop="updateTime" width="170"/> -->
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWaybillDeclareAttachmentForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillDeclareAttachmentForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWaybillDeclareAttachmentView :id="id" ></EmisWaybillDeclareAttachmentView>
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>
@ -280,7 +123,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisWaybillDeclareAttachmentForm from '@/views/emis/emisWaybillDeclareAttachment/emisWaybillDeclareAttachmentForm';
export default {
name: "emisWaybillDeclareAttachment",
name: "EmisWaybillDeclareAttachment",
components: { elDateSimplePicker,emisWaybillDeclareAttachmentForm },
dicts: [
],
@ -302,7 +145,7 @@ export default {
total: 0,
// 申报附件表格数据
emisWaybillDeclareAttachmentList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -346,26 +189,14 @@ export default {
/** 查询申报附件列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWaybillDeclareAttachment(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWaybillDeclareAttachmentList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

View File

@ -1,154 +1,95 @@
<template>
<div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="运单编号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<el-form-item label="货物编码" prop="goodsCode">
<el-input v-model="form.goodsCode" placeholder="请输入货物编码" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item label="货物名称" prop="goodsName">
<el-input v-model="form.goodsName" placeholder="请输入货物名称" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="规格型号" prop="goodsModel">
<el-input v-model="form.goodsModel" placeholder="请输入规格型号" />
<el-col :span="8">
<el-form-item label="数量" prop="cargoQty">
<el-input v-model="form.cargoQty" placeholder="请输入货物数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="毛重" prop="grossWeight">
<el-input v-model="form.grossWeight" placeholder="请输入毛重" />
<el-col :span="8">
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入货物单价" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="净重" prop="netWeight">
<el-input v-model="form.netWeight" placeholder="请输入净重" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="实际数量" prop="cargoQty">
<el-input v-model="form.cargoQty" placeholder="请输入实际数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常数量" prop="abnormalQty">
<el-input v-model="form.abnormalQty" placeholder="请输入异常数量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="重量" prop="weight">
<el-input v-model="form.weight" placeholder="请输入重量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="申报单价" prop="price">
<el-input v-model="form.price" placeholder="请输入申报单价" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="申报币种" prop="currency">
<el-input v-model="form.currency" placeholder="请输入申报币种" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="原产国" prop="nationArea">
<el-input v-model="form.nationArea" placeholder="请输入原产国" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="行邮税号" prop="taxNo">
<el-input v-model="form.taxNo" placeholder="请输入行邮税号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="海关编码" prop="hscode">
<el-input v-model="form.hscode" placeholder="请输入海关编码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="品牌" prop="brand">
<el-input v-model="form.brand" placeholder="请输入品牌" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="材质" prop="material">
<el-input v-model="form.material" placeholder="请输入材质" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="用途" prop="purpose">
<el-input v-model="form.purpose" placeholder="请输入用途" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="成分" prop="ingredients">
<el-input v-model="form.ingredients" placeholder="请输入成分" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="厂家" prop="manufacturer">
<el-input v-model="form.manufacturer" placeholder="请输入厂家" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="供应商" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="功能" prop="function">
<el-input v-model="form.function" placeholder="请输入功能" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="规格型号" prop="goodsModel">
<el-input v-model="form.goodsModel" placeholder="请输入规格型号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="长" prop="length">
<el-input v-model="form.length" placeholder="请输入长" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-form-item label="宽" prop="width">
<el-input v-model="form.width" placeholder="请输入长" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="高" prop="height">
<el-input v-model="form.height" placeholder="请输入高" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="体积" prop="volume">
<el-input v-model="form.volume" placeholder="请输入体积" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="条码" prop="barcode">
<el-input v-model="form.barcode" placeholder="请输入条码" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
@ -159,7 +100,7 @@ export default {
name: "emisWaybillDeclareGoodsForm",
props:{
id:{
type:Number
type:[Number,Array]
}
},
components: { },
@ -198,7 +139,7 @@ export default {
methods: {
initData() {
if(this.id !=null) {
this.loading = true;
getEmisWaybillDeclareGoods(this.id).then(response => {

View File

@ -1,243 +1,51 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsCode">
<el-input
v-model="queryParams.goodsCode"
:placeholder="$t('货物编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsName">
<el-input
v-model="queryParams.goodsName"
:placeholder="$t('货物名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="goodsModel">
<el-input
v-model="queryParams.goodsModel"
:placeholder="$t('规格型号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="grossWeight">
<el-input
v-model="queryParams.grossWeight"
:placeholder="$t('毛重')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="netWeight">
<el-input
v-model="queryParams.netWeight"
:placeholder="$t('净重')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="cargoQty">
<el-input
v-model="queryParams.cargoQty"
:placeholder="$t('实际数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="abnormalQty">
<el-input
v-model="queryParams.abnormalQty"
:placeholder="$t('异常数量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="unit">
<el-input
v-model="queryParams.unit"
:placeholder="$t('单位')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="weight">
<el-input
v-model="queryParams.weight"
:placeholder="$t('重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="price">
<el-input
v-model="queryParams.price"
:placeholder="$t('申报单价')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="currency">
<el-input
v-model="queryParams.currency"
:placeholder="$t('申报币种')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="nationArea">
<el-input
v-model="queryParams.nationArea"
:placeholder="$t('原产国')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="taxNo">
<el-input
v-model="queryParams.taxNo"
:placeholder="$t('行邮税号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="hscode">
<el-input
v-model="queryParams.hscode"
:placeholder="$t('海关编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="brand">
<el-input
v-model="queryParams.brand"
:placeholder="$t('品牌')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="material">
<el-input
v-model="queryParams.material"
:placeholder="$t('材质')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="purpose">
<el-input
v-model="queryParams.purpose"
:placeholder="$t('用途')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="ingredients">
<el-input
v-model="queryParams.ingredients"
:placeholder="$t('成分')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="manufacturer">
<el-input
v-model="queryParams.manufacturer"
:placeholder="$t('厂家')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="supplier">
<el-input
v-model="queryParams.supplier"
:placeholder="$t('供应商')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="function">
<el-input
v-model="queryParams.function"
:placeholder="$t('功能')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="length">
<el-input
v-model="queryParams.length"
:placeholder="$t('长')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="height">
<el-input
v-model="queryParams.height"
:placeholder="$t('高')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="volume">
<el-input
v-model="queryParams.volume"
:placeholder="$t('体积')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="barcode">
<el-input
v-model="queryParams.barcode"
:placeholder="$t('条码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
:placeholder="$t('排序')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="80px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="2"
/>
<!-- -->
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="查询时间范围" prop="">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker v-model="dateRange" ></elDateAdvPicker>
</el-form-item>
</el-col> -->
</el-row>
</el-col>
</el-row>
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
ref="refTable"
v-loading="loading"
border stripe
size="small"
:data="emisWaybillDeclareGoodsList"
@ -248,7 +56,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -258,10 +66,9 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisWaybillDeclareGoods:add']"
>新增</el-button>
v-hasPermi="['emis:emisWaybillCargo:add']"
>新增资料</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -270,9 +77,8 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisWaybillDeclareGoods:edit']"
>修改</el-button>
</el-col> -->
>修改资料</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -281,114 +87,52 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWaybillDeclareGoods:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisWaybillDeclareGoods:export']"
>导出</el-button>
</el-col> -->
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('货物编码')" align="center" prop="goodsCode" min-width="100" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<!-- <el-table-column :label="$t('货物编码')" align="center" prop="goodsCode" min-width="100" /> -->
<el-table-column :label="$t('货物名称')" align="center" prop="goodsName" min-width="100" />
<el-table-column :label="$t('规格型号')" align="center" prop="goodsModel" min-width="100" />
<el-table-column :label="$t('毛重')" align="center" prop="grossWeight" min-width="100" />
<el-table-column :label="$t('净重')" align="center" prop="netWeight" min-width="100" />
<el-table-column :label="$t('实际数量')" align="center" prop="cargoQty" min-width="100" />
<el-table-column :label="$t('异常数量')" align="center" prop="abnormalQty" min-width="100" />
<el-table-column :label="$t('单位')" align="center" prop="unit" min-width="100" />
<el-table-column :label="$t('重量')" align="center" prop="weight" min-width="100" />
<el-table-column :label="$t('申报单价')" align="center" prop="price" min-width="100" />
<el-table-column :label="$t('申报币种')" align="center" prop="currency" min-width="100" />
<el-table-column :label="$t('数量')" align="center" prop="cargoQty" min-width="100" />
<!-- <el-table-column :label="$t('异常数量')" align="center" prop="abnormalQty" min-width="100" /> -->
<!-- <el-table-column :label="$t('单位')" align="center" prop="unit" min-width="100" /> -->
<!-- <el-table-column :label="$t('重量')" align="center" prop="weight" min-width="100" /> -->
<el-table-column :label="$t('单价')" align="center" prop="price" min-width="100" />
<!-- <el-table-column :label="$t('货物币种')" align="center" prop="currency" min-width="100" /> -->
<el-table-column :label="$t('原产国')" align="center" prop="nationArea" min-width="100" />
<el-table-column :label="$t('行邮税号')" align="center" prop="taxNo" min-width="100" />
<el-table-column :label="$t('海关编码')" align="center" prop="hscode" min-width="100" />
<!-- <el-table-column :label="$t('海关编码')" align="center" prop="hscode" min-width="100" /> -->
<el-table-column :label="$t('品牌')" align="center" prop="brand" min-width="100" />
<el-table-column :label="$t('材质')" align="center" prop="material" min-width="100" />
<el-table-column :label="$t('用途')" align="center" prop="purpose" min-width="100" />
<el-table-column :label="$t('成分')" align="center" prop="ingredients" min-width="100" />
<el-table-column :label="$t('厂家')" align="center" prop="manufacturer" min-width="100" />
<el-table-column :label="$t('供应商')" align="center" prop="supplier" min-width="100" />
<el-table-column :label="$t('功能')" align="center" prop="function" min-width="100" />
<el-table-column :label="$t('长')" align="center" prop="length" min-width="100" />
<el-table-column :label="$t('高')" align="center" prop="height" min-width="100" />
<el-table-column :label="$t('体积')" align="center" prop="volume" min-width="100" />
<el-table-column :label="$t('条码')" align="center" prop="barcode" min-width="100" />
<el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWaybillDeclareGoods:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisWaybillDeclareGoods:remove']"
>删除</el-button> -->
</template>
<el-table-column :label="$t('规格')" align="center" prop="goodsModel" min-width="100" />
<el-table-column :label="$t('尺寸')" align="center" prop="length" min-width="170" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div >{{scope.row.length}}cm*{{scope.row.width}}cm*{{scope.row.height}}cm</div>
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWaybillDeclareGoodsForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillDeclareGoodsForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -396,7 +140,7 @@
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>
@ -406,7 +150,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisWaybillDeclareGoodsForm from '@/views/emis/emisWaybillDeclareGoods/emisWaybillDeclareGoodsForm';
export default {
name: "emisWaybillDeclareGoods",
name: "EmisWaybillDeclareGoods",
components: { elDateSimplePicker,emisWaybillDeclareGoodsForm },
dicts: [
],
@ -428,7 +172,7 @@ export default {
total: 0,
// 申报物品表格数据
emisWaybillDeclareGoodsList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -484,22 +228,13 @@ export default {
/** 查询申报物品列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisWaybillDeclareGoods(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisWaybillDeclareGoodsList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -533,7 +268,7 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.currentId= row.id|ids;
this.openForm = true;
this.titleForm = "修改";
},