Skip to content

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

2024-06-06提交

parent c9a5acdb
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 224 deletions
src/api/ecw/financial.js
View file @ 6d4a4433
...@@ -140,6 +140,14 @@ export function getReceivableItem(query) { ...@@ -140,6 +140,14 @@ export function getReceivableItem(query) {
}) })
} }
//lanbm 2024-06-05 add
export function getReceivableItem2(id) {
return request({
url: '/ecw/receipt-item/get?id=' + id,
method: 'get'
})
}
// 根据收款单ID获得收款账户细列表 // 根据收款单ID获得收款账户细列表
export function getReceiptAccountList(query) { export function getReceiptAccountList(query) {
return request({ return request({
......
src/views/report/BankReceiptDetails/index.vue
View file @ 6d4a4433
...@@ -222,13 +222,14 @@ ...@@ -222,13 +222,14 @@
v-hasPermi="['ecw:payment:detail:cancelWriteOff']" v-hasPermi="['ecw:payment:detail:cancelWriteOff']"
>{{ $t("反核销") }}</el-button >{{ $t("反核销") }}</el-button
> >
<!--
<el-button <el-button
v-if="scope.row.status == 0" v-if="scope.row.status == 0"
type="text" type="text"
@click="editClick(scope.row)" @click="editClick(scope.row)"
v-hasPermi="['ecw:payment:detail:bankEdit']" v-hasPermi="['ecw:payment:detail:bankEdit']"
>{{ $t("编辑") }}</el-button >{{ $t("编辑") }}</el-button
> >-->
<el-button <el-button
v-if="scope.row.status == 2" v-if="scope.row.status == 2"
type="text" type="text"
...@@ -309,10 +310,11 @@ ...@@ -309,10 +310,11 @@
append-to-body append-to-body
> >
<div style="padding: 0 24px"> <div style="padding: 0 24px">
<el-form ref="addForm" :model="addForm" label-width="250px"> <el-form ref="addForm" label-width="250px">
<el-form-item :label="$t('收款单号')">{{ <el-form-item :label="$t('收款单号')">
form.receiptNo <el-input disabled v-model="form.receipt_no" style="width: 220px"></el-input>
}}</el-form-item> </el-form-item>
<!--
<el-form-item :label="$t('剩余应收金额')"> <el-form-item :label="$t('剩余应收金额')">
<template v-if="surplusData.length == 0"> 0 </template> <template v-if="surplusData.length == 0"> 0 </template>
<div v-else> <div v-else>
...@@ -322,159 +324,39 @@ ...@@ -322,159 +324,39 @@
> >
</div> </div>
</div> </div>
</el-form-item> </el-form-item>-->
<el-form-item <el-form-item :label="$t('收款账户')" prop="accountNo">
:label="$t('收款账户')" <el-input disabled
prop="accountNo" v-model="form.accountBankName"
:rules="{
required: true,
trigger: ['blur', 'change'],
message: $t('收款账户不能为空'),
}"
>
<el-select
v-if="!isView"
filterable
clear
v-model="addForm.accountId"
:placeholder="$t('请选择收款账户')"
style="width: 220px" style="width: 220px"
@change="accountChange" ></el-input>
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>
<span v-else
>{{ addForm.accountNo
}}{{ "(" + addForm.accountName + ")" }}</span
>
</el-form-item> </el-form-item>
<el-form-item <el-form-item :label="$t('实收日期')" prop="amountDate">
:label="$t('实收日期')" <el-date-picker disabled
prop="amountDate" v-model="form.amountDate"
:rules="{
required: true,
trigger: ['blur', 'change'],
message: $t('实收日期不能为空'),
}"
>
<el-date-picker
v-if="!isView"
clearable
v-model="addForm.amountDate"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
type="date" type="date"
:placeholder="$t('选择实收日期')" style="width: 150px"
/> value-format="yyyy-MM-dd"
<span v-else>{{ addForm.amountDate }}</span> ></el-date-picker>
</el-form-item> </el-form-item>
<div style="display: flex"> <div style="display: flex">
<el-form-item <el-form-item :label="$t('实收')" prop="amount">
:label="$t('实收')" <el-input v-model="form.amount" disabled style="width: 100px"></el-input>
prop="amount" {{ form.currencyName }}
:rules="{
required: true,
trigger: ['blur', 'change'],
message: $t('实收不能为空'),
}"
>
<el-input
v-if="!isView"
v-model="addForm.amount"
style="width: 220px; margin-right: 12px"
@input="setWriteOffAmount"
></el-input>
<span v-else>{{ addForm.amount }}</span>
</el-form-item>
<el-form-item
label-width="0px"
prop="currencyId"
:rules="{
required: true,
trigger: ['blur', 'change'],
message: $t('币种不能为空'),
}"
>
<el-select
v-model="addForm.currencyId"
:placeholder="$t('请选择')"
:disabled="isView"
@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>
</div> </div>
<el-form-item <el-form-item prop="rate" :label="$t('兑核销基准币种汇率')">
v-if="showCurrencyId != addForm.currencyId" <el-input v-model="form.rate" disabled style="width: 220px"></el-input>
prop="rate" </el-form-item>
:rules="{ <el-form-item :label="$t('兑核销基准币种金额')">
required: true, <el-input disabled
trigger: ['blur', 'change'], v-model="form.writeOffAmount"
message: $t('兑核销基准币种汇率不能为空'),
}"
>
<template slot="label">
<span
:title="
$t(
'实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率'
)
"
>{{ $t("兑核销基准币种汇率") }}（{{
getCurrencyLabel(showCurrencyId)
}}）</span
>
</template>
<el-input
v-if="!isView"
v-model="addForm.rate"
style="width: 220px" style="width: 220px"
></el-input> ></el-input>
<span v-else>{{ addForm.rate }}</span>
</el-form-item>
<el-form-item v-if="showCurrencyId != addForm.currencyId">
<template slot="label">
{{ $t("兑核销基准币种金额") }}（{{
getCurrencyLabel(showCurrencyId)
}}）
</template>
<span>{{
addForm.writeOffAmount
? parseFloat(addForm.writeOffAmount).toFixed(2)
: ""
}}</span>
</el-form-item> </el-form-item>
<el-form-item :label="$t('水单附件')" prop="attr"> <el-form-item :label="$t('水单附件')" prop="attr">
<el-upload <div>
v-if="!isView" <div v-for="(v, i) in form.attr" :key="i">
class="upload-demo"
:action="uploadFileUrl"
:headers="headers"
:on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload"
:on-error="handleUploadError"
:before-remove="beforeRemove"
:file-list="addForm.attr"
multiple
>
<el-button size="small" type="primary">{{
$t("上传附件")
}}</el-button>
</el-upload>
<div v-else>
<div v-for="(v, i) in addForm.attr" :key="i">
<el-link :href="v.url" type="primary" target="_blank">{{ <el-link :href="v.url" type="primary" target="_blank">{{
v.name v.name
}}</el-link> }}</el-link>
...@@ -482,15 +364,10 @@ ...@@ -482,15 +364,10 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('水单号')" prop="billNo"> <el-form-item :label="$t('水单号')" prop="billNo">
<el-input <el-input v-model="form.billNo" disabled style="width: 220px"></el-input>
v-if="!isView"
v-model="addForm.billNo"
style="width: 220px"
></el-input>
<span v-else>{{ addForm.billNo }}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" v-if="!isView"> <div slot="footer" v-show="false">
<el-button type="primary" @click="saveFrom">{{ <el-button type="primary" @click="saveFrom">{{
saveBtnText saveBtnText
}}</el-button> }}</el-button>
...@@ -503,6 +380,7 @@ ...@@ -503,6 +380,7 @@
<script> <script>
import { getPageList, test } from "@/api/report/bankReceiptDetail"; import { getPageList, test } from "@/api/report/bankReceiptDetail";
import { getReceivableItem2 } from "@/api/ecw/financial";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@/assets/styles/vue-treeselect.css"; import "@/assets/styles/vue-treeselect.css";
import { getCurrencyPage } from "@/api/ecw/currency"; import { getCurrencyPage } from "@/api/ecw/currency";
...@@ -787,16 +665,6 @@ export default { ...@@ -787,16 +665,6 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getModel(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改V值";
});
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
...@@ -851,39 +719,6 @@ export default { ...@@ -851,39 +719,6 @@ export default {
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal
.confirm("是否确认删除选中数据项?")
.then(function () {
return del(id);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
// 执行导出
this.$modal
.confirm("是否确认导出所有测试数据项?")
.then(() => {
this.exportLoading = true;
return exportExcel(params);
})
.then((response) => {
this.$download.excel(response, "${table.classComment}.xls");
this.exportLoading = false;
})
.catch(() => {});
},
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
...@@ -943,15 +778,19 @@ export default { ...@@ -943,15 +778,19 @@ export default {
}); });
}, },
detailClick(row) { detailClick(row) {
// this.getsurplusData(); let id = row.id;
getReceivableItem2(id).then((response) => {
this.form = response.data;
//收款单号
this.form.receipt_no = row.receiptNo;
//实收币种
this.form.currencyName = this.getCurrencyLabel(row.currencyId);
//水单附件
this.form.attr = row.attr;
this.openAddDialog = true; this.openAddDialog = true;
this.dialogTitle = this.$t("银行实收明细详情"); this.dialogTitle = this.$t("银行实收明细详情");
this.isView = true; this.isView = true;
/* });
setTimeout(() => {
this.addForm = { ...row };
this.setWriteOffAmount();
}, 0);*/
}, },
editClick(row) { editClick(row) {
//this.getsurplusData(); //this.getsurplusData();
......
src/views/report/salesreport/index.vue
View file @ 6d4a4433
...@@ -68,9 +68,6 @@ ...@@ -68,9 +68,6 @@
<el-row :gutter="10" class="panel-group" style="margin: 5px"> <el-row :gutter="10" class="panel-group" style="margin: 5px">
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleGoTo"> <div class="card-panel" @click="handleGoTo">
<div class="card-panel-icon-wrapper icon-shopping">
<svg-icon icon-class="shopping" class-name="card-panel-icon" />
</div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
{{ $t("业绩总览 Total") }} {{ $t("业绩总览 Total") }}
...@@ -86,9 +83,6 @@ ...@@ -86,9 +83,6 @@
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleGoTo"> <div class="card-panel" @click="handleGoTo">
<div class="card-panel-icon-wrapper icon-message">
<svg-icon icon-class="message" class-name="card-panel-icon" />
</div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
{{ $t("海运拼柜") }} {{ $t("海运拼柜") }}
...@@ -104,9 +98,6 @@ ...@@ -104,9 +98,6 @@
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleGoTo"> <div class="card-panel" @click="handleGoTo">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="date" class-name="card-panel-icon" />
</div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
{{ $t("专线空运") }} {{ $t("专线空运") }}
...@@ -124,9 +115,6 @@ ...@@ -124,9 +115,6 @@
<el-row :gutter="10" class="panel-group" style="margin: 5px"> <el-row :gutter="10" class="panel-group" style="margin: 5px">
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleGoTo"> <div class="card-panel" @click="handleGoTo">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="peoples" class-name="card-panel-icon" />
</div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
{{ $t("成交总览 Total") }} {{ $t("成交总览 Total") }}
...@@ -142,9 +130,6 @@ ...@@ -142,9 +130,6 @@
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleGoTo"> <div class="card-panel" @click="handleGoTo">
<div class="card-panel-icon-wrapper icon-shopping">
<svg-icon icon-class="time-range" class-name="card-panel-icon" />
</div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
{{ $t("首次成交") }} {{ $t("首次成交") }}
...@@ -379,7 +364,7 @@ export default { ...@@ -379,7 +364,7 @@ export default {
let vR = salesReportRespAll1.filter( let vR = salesReportRespAll1.filter(
(r) => r.strMonth === item.name (r) => r.strMonth === item.name
); );
result ="统计月份:"+ item.name + "<br/>"; result = "统计月份:" + item.name + "<br/>";
result += result +=
"Total:" + "Total:" +
vR[0].curValue + vR[0].curValue +
...@@ -694,8 +679,8 @@ export default { ...@@ -694,8 +679,8 @@ export default {
.card-panel-description { .card-panel-description {
font-weight: bold; font-weight: bold;
margin: 26px; margin: 10px;
margin-left: 0px; margin-left: 10px;
.card-panel-text { .card-panel-text {
line-height: 18px; line-height: 18px;
......
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