Skip to content

J
jiedao-app-operator-master
Commit a79d96a7 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-06-10提交

parent c901bd59
Hide whitespace changes
Inline Side-by-side
Showing with 619 additions and 319 deletions
src/views/ecw/financial/receiptDetail.vue
View file @ a79d96a7
......@@ -787,7 +787,6 @@ import { getToken } from "@/utils/auth";
import { listSimpleDepts } from "@/api/system/dept";
import { getCustomer } from "@/api/ecw/customer";
import { getExchangeRatePage } from "@/api/ecw/exchangeRate";
import {
getReceiptInfoByIds,
getInvoicingItem,
......@@ -1012,7 +1011,6 @@ export default {
}
this.$set(this.form, "receiptAccountList", res.data);
// 收款总计
let num;
let amountList = [];
this.currencyList.forEach((item, index) => {
......@@ -1065,7 +1063,6 @@ export default {
});
});
}
this.getList();
},
methods: {
......
src/views/ecw/order/detail.vue
View file @ a79d96a7
......@@ -576,6 +576,7 @@
<print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
<!--查看提货单 lanbm 2024-06-03-->
<print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
<!--入仓记录 lanbm 2024-06-10 add-->
<warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" :type="type" @openPackHistory="openPackHistory" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
<el-dialog :title="$t('付款人')" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
<el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
......
src/views/ecw/warehouse/index.vue
View file @ a79d96a7
......@@ -698,6 +698,13 @@
style="width: 400px"
></el-input>
</el-form-item>
<!--lanbm 2024-06-10 添加的落款信息配置信息 -->
<el-form-item :label="$t('落款左边信息')">
<textarea v-model="lineform.lkLeft" style="width: 400px" rows="8" > </textarea>
</el-form-item>
<el-form-item :label="$t('落款右边信息')">
<textarea v-model="lineform.lkRight" style="width: 400px" rows="8"> </textarea>
</el-form-item>
</template>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -898,7 +905,6 @@ export default {
selectDeptList: [],
//需要绑定部门的仓库id
deptWarhouse: null,
//洲际列表
continentsList: [],
//国家列表
......@@ -931,13 +937,9 @@ export default {
open: false,
templateOpen: false,
dateRangeCreateTime: [],
serviceOpen: false,
isUpdate: false,
nodeList: [],
routeLoadig: false,
showRouteList: false,
routeList: [],
......@@ -996,6 +998,8 @@ export default {
minPrice: 0,
tempTitleZh: "",
tempTitleEn: "",
lkLeft: "",
lkRight: "", //lanbm 2024-06-10 添加的落款配置信息
recipientInfo: {
companyAddress: "",
companyAddressEn: "",
......@@ -1458,6 +1462,7 @@ export default {
},
submitLineForm() {
//ecw_warehouse_line
let otherService = this.lineform.otherService;
// 如果不存在送货上门，则过滤提货异常
if (!otherService.includes("2")) {
......@@ -1475,6 +1480,8 @@ export default {
recipientInfo: this.lineform.recipientInfo,
tempTitleZh: this.lineform.tempTitleZh,
tempTitleEn: this.lineform.tempTitleEn,
lkLeft:this.lineform.lkLeft,
lkRight:this.lineform.lkRight,//lanbm 2024-06-10 add
}).then((res) => {
this.$modal.msgSuccess(this.$t("操作成功"));
this.getRouteList();
......
src/views/report/BankReceiptDetails/index.vue
View file @ a79d96a7
......@@ -335,118 +335,164 @@
<el-button @click="dialogVisible = false">{{ $t("取消") }}</el-button>
</span>
</el-dialog>
<el-dialog
v-if="openAddDialog"
:visible.sync="openAddDialog"
:title="dialogTitle"
width="50%"
append-to-body
>
<div style="padding: 0 24px">
<el-form ref="addForm" label-width="250px">
<el-form-item :label="$t('收款单号')">
<el-input
:disabled="isEdit"
v-model="form.receipt_no"
style="width: 220px"
></el-input>
</el-form-item>
<el-form ref="form" :model="form" label-width="250px">
<el-form-item :label="$t('收款单号')">
<el-input
disabled
v-model="form.receipt_no"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item :label="$t('剩余应收金额')">
<span v-if="amount">
{{ amount }}{{ getCurrencyLabel(currency) }}</span
>
</el-form-item>
<el-form-item :label="$t('收款账户')" prop="accountNo">
<el-select
:disabled="isEdit"
filterable
clear
v-model="form.accountId"
:placeholder="$t('请选择收款账户')"
style="width: 220px"
@change="accountChange"
v-el-select-loadmore="loadmore"
<el-form-item :label="$t('剩余应收金额')">
<span>
{{ form.syValue }}</span
>
</el-form-item>
<el-form-item :label="$t('收款账户')" prop="accountNo">
<el-select
:disabled="isEdit"
filterable
clear
v-model="form.accountId"
:placeholder="$t('请选择收款账户')"
style="width: 250px"
@change="accountChange"
v-el-select-loadmore="loadmore"
>
<el-option
v-for="item in bankData"
:key="item.id"
:label="item.baAccountName + '(' + item.baAccountNum + ')'"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('实收日期')" prop="amountDate">
<el-date-picker
:disabled="isEdit"
v-model="form.amountDate"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item :label="$t('实收')" prop="amount">
<el-input
v-model="form.amount"
:disabled="isEdit"
style="width: 100px"
></el-input>
<el-select
v-model="form.currencyId"
:disabled="isEdit"
:placeholder="$t('请选择')"
@change="(val) => currencyIdChange(val)"
>
<el-option
v-for="item in currencyList"
:key="item.id"
:label="$i18n.locale == 'zh_CN' ? item.titleZh : item.titleEn"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item prop="rate">
<template slot="label">
<span
:title="
$t(
'实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率'
)
"
>{{ $t("兑核销基准币种汇率") }}（{{
getCurrencyLabel(showCurrencyId)
}}）</span
>
<el-option
v-for="item in bankData"
:key="item.id"
:label="item.baAccountName + '(' + item.baAccountNum + ')'"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('实收日期')" prop="amountDate">
<el-date-picker
:disabled="isEdit"
v-model="form.amountDate"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<div style="display: flex">
<el-form-item :label="$t('实收')" prop="amount">
<el-input
v-model="form.amount"
:disabled="isEdit"
style="width: 100px"
></el-input>
{{ form.currencyName }}
</el-form-item>
</div>
<el-form-item prop="rate" :label="$t('兑核销基准币种汇率')">
<el-input
v-model="form.rate"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item :label="$t('兑核销基准币种金额')">
<el-input
:disabled="isEdit"
v-model="form.writeOffAmount"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item :label="$t('水单附件')" prop="attr">
<div>
<div v-for="(v, i) in form.attr" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{
v.name
}}</el-link>
</div>
</template>
<el-input
v-model="form.rate"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item>
<template slot="label">
{{ $t("兑核销基准币种金额") }}（{{
getCurrencyLabel(showCurrencyId)
}}）
</template>
<el-input
:disabled="isEdit"
v-model="form.writeOffAmount"
style="width: 220px"
></el-input>
</el-form-item>
<el-form-item :label="$t('水单附件')" prop="attr">
<el-upload
v-if="!isView"
class="upload-demo"
:action="uploadFileUrl"
:headers="headers"
:on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload"
:on-error="handleUploadError"
:before-remove="beforeRemove"
:file-list="form.attr"
multiple
>
<el-button size="small" type="primary">{{
$t("上传附件")
}}</el-button>
</el-upload>
<div v-else>
<div v-for="(v, i) in form.attr" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{
v.name
}}</el-link>
</div>
</el-form-item>
<el-form-item :label="$t('水单号')" prop="billNo">
<el-input
v-model="form.billNo"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button type="primary" @click="saveFrom">{{
saveBtnText
}}</el-button>
<el-button @click="hiddenDialog">{{ $t("取消") }}</el-button>
</div>
</div>
</el-form-item>
<el-form-item :label="$t('水单号')" prop="billNo">
<el-input
v-model="form.billNo"
:disabled="isEdit"
style="width: 220px"
></el-input>
</el-form-item>
</el-form>
<div slot="footer">
<el-button type="primary" @click="saveFrom">{{
saveBtnText
}}</el-button>
<el-button @click="hiddenDialog">{{ $t("取消") }}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getPageList, test } from "@/api/report/bankReceiptDetail";
<script>
import { getPageList } from "@/api/report/bankReceiptDetail";
import { getReceivableItem2 } from "@/api/ecw/financial";
import Treeselect from "@riophae/vue-treeselect";
import "@/assets/styles/vue-treeselect.css";
import { getBankAccountPage } from "@/api/ecw/bankAccount";
import { getCurrencyPage } from "@/api/ecw/currency";
import { getToken } from "@/utils/auth";
import { getExchangeRatePage } from "@/api/ecw/exchangeRate";
import {
deleteReceiptItem, //删除收款单明细
updateReceiptItem,
receiptItemCreate,
financeReceiptItemWriteOff2,
cancelFinanceReceiptApproval,
cancelFinanceReceiptApprovalNo,
......@@ -463,8 +509,14 @@ export default {
},
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload",
//上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
// 遮罩层
loading: true,
UpLoading: undefined,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
......@@ -510,6 +562,10 @@ export default {
eDate4: undefined, //实收日期
creator: undefined, //创建人
},
params: {
page: 1,
rows: 100,
},
currencyList: [],
// 非单个禁用
single: true,
......@@ -526,15 +582,21 @@ export default {
pageSize: 20,
},
pages: 1,
rateList: [],
};
},
async created() {
getBankAccountPage(this.codePage).then((res) => {
await getBankAccountPage(this.codePage).then((res) => {
this.bankData = res.data.list;
this.pages = res.data.total / this.codePage.pageSize + 1;
});
// 获取汇率
await getExchangeRatePage(this.params).then(
(res) => (this.rateList = res.data.list)
);
//币种
await getCurrencyPage(this.params).then(
(res) => (this.currencyList = res.data.list)
);
......@@ -562,6 +624,11 @@ export default {
else return 1;
},
},
watch: {
"form.rate"() {
this.setWriteOffAmount();
},
},
methods: {
// 懒加载
loadmore() {
......@@ -584,10 +651,35 @@ export default {
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
currencyIdChange(val) {
val = Number(val);
let rate;
if (val === this.showCurrencyId) {
rate = 1;
} else {
rate = this.getRate(val, 1);
}
this.$set(this.form, "rate", rate);
var sR = (rate * this.form.amount).toFixed(6);
this.$set(this.form, "writeOffAmount", sR);
},
accountChange(val) {
let data = this.bankData.find((item) => item.id == val);
this.$set(this.form, "accountName", data.baAccountName || "");
this.$set(this.form, "accountNo", data.baAccountNum || "");
this.$set(this.form, "accountBankName", data.baBankName || "");
},
//获取汇率
getRate(sourceCurrencyId, targetCurrencyId) {
//let json1 = JSON.stringify(this.rateList);
//alert(json1);
let rate = this.rateList.find(
(v) =>
v.sourceCurrencyId === sourceCurrencyId &&
v.targetCurrencyId === targetCurrencyId
);
if (rate) return rate.currencyRate;
return "";
},
/** 表单重置 */
reset() {
......@@ -615,6 +707,38 @@ export default {
resetQuery() {
this.reset();
},
hiddenDialog() {
this.openAddDialog = false;
},
saveFrom() {
this.$refs.form.validate((valid) => {
if (valid) {
if (this.form.id) {
const params = { ...this.form };
/*
params.attr &&
(params.attr = params.attr.map((v) => v.url).join(","));
*/
updateReceiptItem(params).then((res) => {
this.$modal.msgSuccess(this.$t("修改成功"));
this.openAddDialog = false;
this.getList();
});
return;
}
const params = { ...this.form };
params.attr &&
(params.attr = params.attr.map((v) => v.url).join(","));
params.receiptId = this.id;
receiptItemCreate(params).then((res) => {
this.$modal.msgSuccess(this.$t("新增成功"));
this.openAddDialog = false;
this.getList();
});
}
});
},
//银行明细反核销
verificationCancelClick() {
if (!this.reason) {
......@@ -871,8 +995,12 @@ export default {
this.form.receipt_no = row.receiptNo;
//实收币种
this.form.currencyName = this.getCurrencyLabel(row.currencyId);
//水单附件
this.form.attr = row.attr;
//水单附件 分解附件路径
this.form.attr = response.data.attr
? response.data.attr
.split(",")
.map((t) => ({ name: t.slice(t.lastIndexOf("/") + 1), url: t }))
: [];
this.openAddDialog = true;
this.dialogTitle = this.$t("银行实收明细详情");
this.isView = true;
......@@ -889,6 +1017,12 @@ export default {
this.form.currencyName = this.getCurrencyLabel(row.currencyId);
//水单附件
this.form.attr = row.attr;
let bank = this.bankData.find(
(v) => v.baAccountNum == this.form.accountNo
);
if (bank) this.form.accountId = bank.id;
this.openAddDialog = true;
this.dialogTitle = this.$t("编辑银行实收明细");
this.saveBtnText = this.$t("提交");
......@@ -908,6 +1042,43 @@ export default {
})
.catch(() => {});
},
handleUploadSuccess(res, file, fileList) {
let arr = [];
setTimeout(() => {
fileList.forEach((item) => {
arr.push({
name: item.name,
url: item.response ? item.response.data : item.url,
});
});
this.form.attr = arr;
}, 300);
this.UpLoading.close();
},
handleBeforeUpload() {
this.UpLoading = this.$loading({
lock: true,
text: this.$t("上传中"),
background: "rgba(0, 0, 0, 0.7)",
});
},
handleUploadError() {
this.$message({
type: "error",
message: this.$t("上传失败"),
});
this.UpLoading.close();
},
beforeRemove(file, fileList) {
return this.$confirm(this.$t("确定移除") + "?").then((res) => {
setTimeout(() => {
this.form.attr = fileList.map((v) => ({
name: v.name,
url: v.response ? v.response.data : v.url,
}));
}, 300);
});
},
},
};
</script>
src/views/report/BankReceiptDetails/index2.vue
View file @ a79d96a7
......@@ -8,7 +8,7 @@
v-show="showSearch"
label-width="120px"
>
<el-form-item label="收款单编号" prop="fuhao">
<el-form-item label="收款单编号" prop="receiptNo">
<el-input
v-model="queryParams.receiptNo"
placeholder="收款单编号"
......@@ -29,65 +29,81 @@
clearable
/>
</el-form-item>
<el-form-item label="创建人" prop="fuhao">
<el-form-item label="创建人" prop="creator">
<el-input
v-model="queryParams.fuhao"
v-model="queryParams.creator"
placeholder="创建人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="fuhao">
<el-form-item label="创建时间" prop="createDate">
<el-date-picker
v-model="queryParams.sDate"
type="month"
v-model="queryParams.sDate1"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输起始月"
/>
<el-date-picker
v-model="queryParams.eDate"
type="month"
v-model="queryParams.eDate1"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输截止月"
/>
</el-form-item>
<el-form-item label="提交审批时间" prop="titleZh">
<el-form-item label="提交审批时间" prop="spDate">
<el-date-picker
v-model="queryParams.sDate"
type="month"
v-model="queryParams.sDate2"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输起始月"
/>
<el-date-picker
v-model="queryParams.eDate"
type="month"
v-model="queryParams.eDate2"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输截止月"
/>
</el-form-item>
<el-form-item label="审批通过时间" prop="titleZh">
<el-form-item label="审批通过时间" prop="tgDate">
<el-date-picker
v-model="queryParams.sDate"
type="month"
v-model="queryParams.sDate3"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输起始月"
/>
<el-date-picker
v-model="queryParams.eDate"
type="month"
v-model="queryParams.eDate3"
type="date"
style="width: 150px"
value-format="yyyy-MM"
value-format="yyyy-MM-dd"
clearable
placeholder="请输截止月"
/>
</el-form-item>
<el-form-item label="实收日期" prop="ssDate">
<el-date-picker
v-model="queryParams.sDate4"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
clearable
placeholder="请输起始月"
/>
<el-date-picker
v-model="queryParams.eDate4"
type="date"
style="width: 150px"
value-format="yyyy-MM-dd"
clearable
placeholder="请输截止月"
/>
......@@ -97,164 +113,190 @@
>搜索</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="handleAdd">
{{ $t("批量提交审核") }}</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['report:vz:create']"
>
{{ $t("批量提交审核") }}</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
v-show="false"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['my:test:export']"
>
{{ $t("导出") }}</el-button
>
</el-col>
<el-col :span="1.5"> </el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-card class="card">
<el-table
ref="multipleTable"
:data="detailed"
border
row-key="id"
@selection-change="handleSelectionChange"
<el-table
ref="multipleTable"
v-loading="loading"
:data="list"
border
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" :reserve-selection="true">
</el-table-column>
<el-table-column
:label="$t('序号')"
type="index"
align="center"
width="50"
></el-table-column>
<el-table-column
:label="$t('收款单编号')"
align="center"
prop="receiptNo"
>
<el-table-column type="selection" width="50" :reserve-selection="true">
</el-table-column>
<el-table-column
:label="$t('序号')"
type="index"
align="center"
width="50"
></el-table-column>
<el-table-column
:label="$t('收款账户')"
align="center"
prop="accountName"
/>
<el-table-column :label="$t('实收金额')" align="center" prop="amount" />
<el-table-column :label="$t('实收币种')" align="center" prop="marks">
<template slot-scope="scope">
{{ getCurrencyLabel(scope.row.currencyId) }}
</template>
</el-table-column>
<el-table-column :label="$t('汇率')" align="center" prop="rate" />
<el-table-column align="center" prop="writeOffAmount">
<template #header>
{{ $t("兑核销基准金额") }}（{{ getCurrencyLabel(showCurrencyId) }}）
</template>
</el-table-column>
<el-table-column
:label="$t('实收日期')"
align="center"
prop="amountDate"
>
</el-table-column>
<el-table-column :label="$t('水单号')" align="center" prop="billNo" />
<el-table-column :label="$t('水单附件')" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attr">
<div v-for="(v, i) in scope.row.attr" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{
v.name
}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:type="DICT_TYPE.RECEIPT_ITEM_STATE"
:value="scope.row.status"
/>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button
v-if="scope.row.status == 0"
v-hasPermi="['ecw:payment:detail:delete']"
type="text"
@click="deleteClick(scope.row)"
>{{ $t("删除") }}</el-button
>
<el-button
v-if="scope.row.status == 0"
type="text"
@click="detailClick(scope.row)"
v-hasPermi="['ecw:payment:detail:detail']"
>{{ $t("详情") }}</el-button
>
<!--核销 改 提交 lanbm 2024-05-29 -->
<el-button
v-if="scope.row.status == 0"
type="text"
@click="
$router.push(`bankDetail?id=` + id + `&bankId=` + scope.row.id)
"
v-hasPermi="['ecw:payment:detail:writeOff']"
>{{ $t("提交") }}</el-button
>
<el-button
v-if="scope.row.status == 1"
type="text"
@click="showCancel(scope.$index)"
v-hasPermi="['ecw:payment:detail:cancelWriteOff']"
>{{ $t("反核销") }}</el-button
>
<el-button
v-if="scope.row.status == 0"
type="text"
@click="editClick(scope.row)"
v-hasPermi="['ecw:payment:detail:bankEdit']"
>{{ $t("编辑") }}</el-button
>
<el-button
v-if="scope.row.status == 2"
type="text"
@click="cancelClick(scope.$index, 1)"
v-hasPermi="['ecw:payment:detail:cancelDetailApproval']"
>{{ $t("取消审核") }}</el-button
>
<el-button
v-if="scope.row.status == 3"
type="text"
@click="cancelClick(scope.$index, 2)"
v-hasPermi="['ecw:payment:detail:cancelWriteOffNo']"
>{{ $t("取消反核销审核") }}</el-button
>
<el-button
v-if="scope.row.status == 3 || scope.row.status == 2"
type="text"
@click="
$router.push(
`/bpm/process-instance/detail?id=` + scope.row.bmpId
)
"
v-hasPermi="['ecw:payment:detail:approval']"
>{{ $t("审核详情") }}</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<template slot-scope="scope">
<span style="color: #1890ff" @click="paymentDetail1(scope.row)">{{
scope.row.receiptNo
}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('订单编号')" align="center" prop="orderNo">
<template slot-scope="scope">
<span style="color: #1890ff" @click="paymentDetail2(scope.row)">{{
scope.row.orderNo
}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('提单编号')" align="center" prop="tidanNo">
<template slot-scope="scope">
<span style="color: #1890ff" @click="paymentDetail3(scope.row)">{{
scope.row.tidanNo
}}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('收款账户')"
align="center"
prop="accountName"
/>
<el-table-column :label="$t('实收金额')" align="center" prop="amount" />
<el-table-column :label="$t('实收币种')" align="center" prop="marks">
<template slot-scope="scope">
{{ getCurrencyLabel(scope.row.currencyId) }}
</template>
</el-table-column>
<el-table-column :label="$t('汇率')" align="center" prop="rate" />
<el-table-column align="center" prop="writeOffAmount">
<template #header>
{{ $t("兑核销基准金额") }}（{{ getCurrencyLabel(showCurrencyId) }}）
</template>
</el-table-column>
<el-table-column :label="$t('实收日期')" align="center" prop="amountDate">
</el-table-column>
<el-table-column :label="$t('水单号')" align="center" prop="billNo" />
<el-table-column :label="$t('水单附件')" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attrList">
<div v-for="(v, i) in scope.row.attrList" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{
v.name
}}</el-link>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:type="DICT_TYPE.RECEIPT_ITEM_STATE"
:value="scope.row.status"
/>
</template>
</el-table-column>
<el-table-column :label="$t('创建人')" align="center" prop="creator" />
<el-table-column
:label="$t('创建时间')"
align="center"
prop="createTime"
/>
<el-table-column
:label="$t('提交审批时间')"
align="center"
prop="createTimeBpm"
/>
<el-table-column
:label="$t('审批通过时间')"
align="center"
prop="updateTimeBpm"
/>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button
v-if="scope.row.status == 0"
v-hasPermi="['ecw:payment:detail:delete']"
type="text"
@click="deleteClick(scope.row)"
>{{ $t("删除") }}</el-button
>
<el-button
v-if="scope.row.status == 0"
type="text"
@click="detailClick(scope.row)"
v-hasPermi="['ecw:payment:detail:detail']"
>{{ $t("详情") }}</el-button
>
<el-button
v-if="scope.row.status == 0"
type="text"
@click="
$router.push(
`bankDetail?id=` +
scope.row.receiptId +
`&bankId=` +
scope.row.id
)
"
v-hasPermi="['ecw:payment:detail:writeOff']"
>{{ $t("提交") }}</el-button
>
<el-button
v-if="scope.row.status == 1"
type="text"
@click="showCancel(scope.$index)"
v-hasPermi="['ecw:payment:detail:cancelWriteOff']"
>{{ $t("反核销") }}</el-button
>
<el-button
v-if="scope.row.status == 0"
type="text"
@click="editClick(scope.row)"
v-hasPermi="['ecw:payment:detail:bankEdit']"
>{{ $t("编辑") }}</el-button
>
<el-button
v-if="scope.row.status == 2"
type="text"
@click="cancelClick(scope.$index, 1)"
v-hasPermi="['ecw:payment:detail:cancelDetailApproval']"
>{{ $t("取消审核") }}</el-button
>
<el-button
v-if="scope.row.status == 3"
type="text"
@click="cancelClick(scope.$index, 2)"
v-hasPermi="['ecw:payment:detail:cancelWriteOffNo']"
>{{ $t("取消反核销审核") }}</el-button
>
<el-button
v-if="scope.row.status == 3 || scope.row.status == 2"
type="text"
@click="
$router.push(`/bpm/process-instance/detail?id=` + scope.row.bmpId)
"
v-hasPermi="['ecw:payment:detail:approval']"
>{{ $t("审核详情") }}</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog :title="detailTitle" :visible.sync="detailShow" width="30%">
<div class="cancel_content">
......@@ -527,16 +569,15 @@
</el-dialog>
</div>
</template>
<script>
<script>
import { getPageList } from "@/api/report/bankReceiptDetail";
import helpIcon from "@/assets/images/help.png";
import { getBankAccountPage } from "@/api/ecw/bankAccount";
import { getToken } from "@/utils/auth";
import { listSimpleDepts } from "@/api/system/dept";
import { getCustomer } from "@/api/ecw/customer";
import { getExchangeRatePage } from "@/api/ecw/exchangeRate";
import { getPageList, test } from "@/api/report/bankReceiptDetail";
import {
getReceiptInfoByIds,
getInvoicingItem,
......@@ -563,13 +604,17 @@ import NP from "number-precision";
export default {
data() {
return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload", // 上传的图片服务器地址
uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload",
//上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
// 显示搜索条件
showSearch: true,
id: 0,
form: {},
list: [],
exportLoading: false,
detailedList: [],
openAddDialog: false,
bankData: [],
......@@ -577,6 +622,23 @@ export default {
page: 1,
rows: 100,
},
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
receiptNo: undefined, //收款单编号
orderNo: undefined, //订单编号
tidanNo: undefined, //提单编号
sDate1: undefined,
eDate1: undefined, //收款明细创建日期
sDate2: undefined,
eDate2: undefined, //提交审批日期
sDate3: undefined,
eDate3: undefined, //审批通过日期
sDate4: undefined,
eDate4: undefined, //实收日期
creator: undefined, //创建人
},
addForm: {},
detailed: [],
deptData: [],
......@@ -617,14 +679,6 @@ export default {
pageSize: 20,
},
pages: 1,
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
receiptNo: undefined, //收款单编号
orderNo: undefined, //订单编号
tidanNo: undefined, //提单编号
},
};
},
computed: {
......@@ -735,9 +789,21 @@ export default {
this.bankData = res.data.list;
this.pages = res.data.total / this.codePage.pageSize + 1;
});
if (this.$route.query.id) {
this.id = this.$route.query.id;
await getReceiptInfoByIds({ id: this.id }).then((res) => {
this.getList();
},
methods: {
// 懒加载
loadmore() {
this.codePage.pageNo++;
// 大于页码不请求了
console.log(111);
if (this.codePage.pageNo > this.pages) {
return;
}
this.getCodeList();
},
getInfo(sId) {
getReceiptInfoByIds({ id: sId }).then((res) => {
this.form = res.data;
let dept = this.deptData.filter(
(itt) => itt.id == res.data.departmentId
......@@ -746,10 +812,10 @@ export default {
this.form.departmentName = dept[0].name;
}
});
await getInvoicingItem({ id: this.id }).then((res) => {
getInvoicingItem({ id: sId }).then((res) => {
this.list = [...res.data];
});
getReceiptAccountList({ id: this.id }).then((res) => {
getReceiptAccountList({ id: sId }).then((res) => {
if (res.data.length > 0) {
res.data = [
...res.data,
......@@ -768,7 +834,6 @@ export default {
}
this.$set(this.form, "receiptAccountList", res.data);
// 收款总计
let num;
let amountList = [];
this.currencyList.forEach((item, index) => {
......@@ -820,20 +885,6 @@ export default {
}
});
});
}
this.getList();
},
methods: {
// 懒加载
loadmore() {
this.codePage.pageNo++;
// 大于页码不请求了
console.log(111);
if (this.codePage.pageNo > this.pages) {
return;
}
this.getCodeList();
},
getCodeList() {
setTimeout(() => {
......@@ -1132,8 +1183,7 @@ export default {
if (rate) return rate.currencyRate;
return "";
},
getList() {
/*
getList2() {
getReceivableItem({ id: this.id }).then((res) => {
this.detailed = res.data.map((v) => ({
...v,
......@@ -1145,7 +1195,9 @@ export default {
.map((t) => ({ name: t.slice(t.lastIndexOf("/") + 1), url: t }))
: [],
}));
});*/
});
},
getList() {
this.loading = true;
// 处理查询参数
let params = { ...this.queryParams };
......@@ -1186,6 +1238,7 @@ export default {
return this.$router.push("creatCollection?id=" + this.id);
},
detailClick(row) {
this.getInfo(row.id);
this.getsurplusData();
this.openAddDialog = true;
this.dialogTitle = this.$t("银行实收明细详情");
......@@ -1196,6 +1249,7 @@ export default {
}, 0);
},
editClick(row) {
this.getInfo(row.id);
this.getsurplusData();
this.openAddDialog = true;
this.dialogTitle = this.$t("编辑银行实收明细");
......@@ -1310,6 +1364,62 @@ export default {
hiddenDialog() {
this.openAddDialog = false;
},
/** 表单重置 */
reset() {
this.queryParams = {
pageNo: 1,
pageSize: 10,
receiptNo: undefined, //收款单编号
orderNo: undefined, //订单编号
tidanNo: undefined, //提单编号
sDate1: undefined,
eDate1: undefined, //收款明细创建日期
sDate2: undefined,
eDate2: undefined, //提交审批日期
sDate3: undefined,
eDate3: undefined, //审批通过日期
creator: undefined, //创建人
};
},
/** 批量提交审核 */
handleAdd() {
if (this.ids.length == 0) {
this.$message.error(this.$t("请选择需要批量提交的收款明细。"));
return;
}
let objDataList = [];
for (var i = 0; i < this.ids.length; i++) {
//选中项中都是待提交的记录
if (this.ids[i].status != 0) {
this.$message.error(this.$t("选择中有不符合提交条件的收款明细。"));
return;
}
var objData = {
receiptId: this.ids[i].receiptId, //收款单ID
receiptNo: this.ids[i].receiptNo, //收款单编号
receiptItemId: this.ids[i].id, //收款明细ID
};
objDataList.push(objData);
}
this.$modal
.confirm(this.$t("您确认要提交审核吗" + "?"))
.then(() => {
financeReceiptItemWriteOff2(objDataList).then((res) => {
this.$message.success(this.$t("提交成功"));
//刷新列表
this.getList();
});
})
.catch(() => {});
},
/** 重置按钮操作 */
resetQuery() {
this.reset();
},
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
handleAddReceiptItem() {
this.getsurplusData();
this.addForm = {};
......@@ -1355,11 +1465,26 @@ export default {
}, 300);
});
},
paymentDetail1(row) {
//到收款单详情 lanbm 2024-05-18 add
const id = row.receiptId;
return this.$router.push("/financial/receiptDetail?id=" + id);
},
paymentDetail2(row) {
//到订单详情 lanbm 2024-05-18 add
const id = row.id;
return this.$router.push("/financial/receiptDetail?id=" + id);
},
paymentDetail3(row) {
//到提单详情 lanbm 2024-05-18 add
const id = row.id;
return this.$router.push("/financial/receiptDetail?id=" + id);
},
},
};
</script>
<style scoped lang="scss">
<style scoped lang="scss">
.app-container {
::v-deep .el-descriptions-item__label {
width: 200px;
......@@ -1398,4 +1523,3 @@ export default {
margin-bottom: 10px;
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment