Skip to content

J
jiedao-app-operator-master
Commit d4741548 authored by chenwei's avatar chenwei
Browse files
Options

feat✨: 修改1/21 日问题

parent a6aca14d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 439 additions and 456 deletions
src/api/ecw/financial.js
View file @ d4741548
......@@ -35,19 +35,29 @@ export function getReceiptList(data) {
// 获取应收款列表
export function getReceivableList(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/receivable/page",
method: "get",
params: query
method: "post",
params,
data: query
})
}
// 获取应收款总额
export function getReceivableAmount(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/receivable/page/amount",
method: "get",
params: query
method: "post",
params,
data: query
})
}
......@@ -285,10 +295,15 @@ export function deletePayable(id) {
// 获取应付款列表
export function getPayableList(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/payable/page",
method: "get",
params: query
method: "post",
params,
data: query
})
}
......@@ -328,10 +343,15 @@ export function commissionPayment(data) {
// 获取付款单列表
export function getPaymentList(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/payment/page",
method: "get",
params: query
method: "post",
params,
data: query
})
}
......@@ -439,20 +459,32 @@ export function paymentVerifyCancel(data) {
}
//获取佣金应付款
export function payablePage(params) {
export function payablePage(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/commission-payable/page",
method: "get",
params
method: "post",
params,
data: query
})
}
//获取佣金付款单
export function commissionPaymentPage(params) {
export function commissionPaymentPage(query) {
let params = {
page: query.page,
rows: query.rows
}
return request({
url: "/ecw/commission-payment/page",
method: "get",
params
method: "post",
params,
data: query
})
}
......
src/views/ecw/bankAccount/index.vue
View file @ d4741548
......@@ -164,9 +164,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('收入归属')" prop="baIncomeBelong">
<el-select v-model="form.baIncomeBelong" :placeholder="$t('请选择收入归属')" clearable>
<dict-selector :type="DICT_TYPE.ATTRIBUTION_OF_INCOME" v-model="form.baIncomeBelong" clearable></dict-selector>
<!-- <el-select v-model="form.baIncomeBelong" :placeholder="$t('请选择收入归属')" clearable>
<el-option v-for="countryItem in countryList" :key="countryItem.id" :label="$l(countryItem, 'title')" :value="countryItem.id" />
</el-select>
</el-select> -->
</el-form-item>
<el-form-item :label="$t('余额')" prop="baBalance">
<el-input v-model="form.baBalance" :placeholder="$t('请输入开户银行地址')" />
......
src/views/ecw/financial/payable.vue
View file @ d4741548
......@@ -12,23 +12,23 @@
<el-input style="max-width: 188px" v-model="queryParams.payableNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('始发仓')">
<el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发仓')" clearable>
<el-select v-model="queryParams.departureIdList" multiple :placeholder="$t('请选择始发仓')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')">
<el-select v-model="queryParams.objectiveId" :placeholder="$t('请选择目的仓')" clearable>
<el-select v-model="queryParams.objectiveIdList" multiple :placeholder="$t('请选择目的仓')" clearable>
<el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('运输方式')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" clearable />
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" multiple v-model="queryParams.transportIdList" formatter="number" clearable />
</el-form-item>
</el-row>
<el-row>
<!--lanbm 2024-05-17 add-->
<el-form-item label="时间节点" prop="dateType">
<el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
<el-select v-model="queryParams.dateTypeList" multiple :placeholder="$t('请选择时间类型')" clearable size="small">
<el-option v-for="item in dateTypes" :key="item.value" :label="$l(item, 'label')" :value="item.value" />
</el-select>
</el-form-item>
......@@ -42,7 +42,7 @@
<el-input style="max-width: 188px" v-model="queryParams.supplierName" :placeholder="$t('请输入供应商名称')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('费用类型')">
<dict-selector :type="DICT_TYPE.FEE_TYPE" v-model="queryParams.feeType" clearable></dict-selector>
<dict-selector :type="DICT_TYPE.FEE_TYPE" multiple v-model="queryParams.feeTypeList" clearable></dict-selector>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery">{{ $t("查找") }}</el-button>
......
src/views/ecw/financial/paymentVoucher.vue
View file @ d4741548
......@@ -8,12 +8,12 @@
<el-input style="max-width: 188px" v-model="queryParams.paymentNo" :placeholder="$t('请输入付款单号')" clearable @keyup.enter.native="handleQuery"></el-input>
</el-form-item>
<el-form-item :label="$t('供应商')">
<el-select clearable v-model="queryParams.supplierId" :placeholder="$t('请选择供应商')">
<el-select clearable v-model="queryParams.supplierIdList" multiple :placeholder="$t('请选择供应商')">
<el-option v-for="supplier in allSupplier" :key="supplier.id" :label="supplier.companyZh" :value="supplier.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('业务员')">
<el-select v-model="queryParams.salesmanName" filterable :placeholder="$t('请选择业务员')" clearable>
<el-select v-model="queryParams.salesmanNameList" multiple filterable :placeholder="$t('请选择业务员')" clearable>
<el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.nickname" />
</el-select>
</el-form-item>
......@@ -21,10 +21,10 @@
<el-date-picker v-model="queryParams.beginCreateTime" type="datetimerange" value-format="yyyy-MM-dd" range-separator="到" :start-placeholder="$t('请选择日期')" :end-placeholder="$t('请选择日期')"> </el-date-picker>
</el-form-item>
<el-form-item :label="$t('状态')">
<dict-selector clearable :type="DICT_TYPE.ECW_PAYMENT_STATE" v-model="queryParams.state"></dict-selector>
<dict-selector clearable :type="DICT_TYPE.ECW_PAYMENT_STATE" multiple v-model="queryParams.stateList"></dict-selector>
</el-form-item>
<el-form-item :label="$t('发票状态')">
<el-select clearable v-model="queryParams.invoiceStatus" :placeholder="$t('请选择是否开票')">
<el-select clearable v-model="queryParams.invoiceStatusList" multiple :placeholder="$t('请选择是否开票')">
<el-option :label="$t('未开票')" value="0" />
<el-option :label="$t('已开票')" value="1" />
</el-select>
......
src/views/ecw/financial/receiptDetail.vue
View file @ d4741548
......@@ -225,7 +225,9 @@
<el-descriptions-item :label="$t('账单汇率有效期')">
{{ parseTime(form.rateValidateDate) }}
</el-descriptions-item>
<el-descriptions-item :label="$t('核销误差兑额外费用主币种金额')"> </el-descriptions-item>
<el-descriptions-item :label="$t('核销误差兑额外费用主币种金额')">
{{ form.writeOffDiffMainCurrency }}
</el-descriptions-item>
</el-descriptions>
</el-card>
......@@ -689,7 +691,6 @@
width="160"
>
<template slot-scope="scope">
{{ row }}
<el-input-number style="width: 136px" @change="changeCurrentItemWirteOff(scope.row.id)" v-if="!isView && addForm.writeOffAmount" :min="0" :precision="2" :controls="false" v-model="scope.row.writeOffAmount"></el-input-number>
<span v-else>{{ scope.row.writeOffAmount }}</span>
</template>
......
src/views/ecw/financial/receivable.vue
View file @ d4741548
......@@ -10,80 +10,75 @@
<!-- 搜索工作栏 -->
<el-card v-show="showSearch">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px" class="card">
<el-row>
<el-form-item :label="$t('始发地')">
<el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发地')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的地')">
<el-select v-model="queryParams.objectiveId" :placeholder="$t('请选择目的地')" clearable>
<el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('运输方式')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" clearable />
</el-form-item>
<el-form-item :label="$t('控货')">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" v-model="queryParams.isCargoControl" clearable />
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('订单状态')">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status" clearable />
</el-form-item>
<el-form-item :label="$t('报关方式')">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable />
</el-form-item>
<el-form-item :label="$t('订单号')">
<el-input style="max-width: 188px" v-model="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('品名')">
<el-input style="max-width: 188px" v-model="queryParams.title" :placeholder="$t('请输入品名')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('提单号')">
<el-input style="max-width: 188px" v-model="queryParams.tidanNo" :placeholder="$t('请输入提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('唛头')">
<el-input style="max-width: 188px" v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('费用类型')">
<dict-selector :type="DICT_TYPE.FEE_TYPE" v-model="queryParams.feeType" clearable></dict-selector>
</el-form-item>
<!-- <el-form-item :label="$t('发货人')">
<el-form-item :label="$t('始发地')">
<el-select class="custom-form-item" v-model="queryParams.departureIdList" multiple :placeholder="$t('请选择始发地')" clearable>
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的地')">
<el-select class="custom-form-item" v-model="queryParams.objectiveIdList" multiple :placeholder="$t('请选择目的地')" clearable>
<el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('运输方式')">
<dict-selector class="custom-form-item" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" multiple v-model="queryParams.transportIdList" formatter="number" clearable />
</el-form-item>
<el-form-item :label="$t('控货')">
<dict-selector class="custom-form-item" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" v-model="queryParams.isCargoControl" clearable />
</el-form-item>
<el-form-item :label="$t('订单状态')">
<dict-selector class="custom-form-item" :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" clearable />
</el-form-item>
<el-form-item :label="$t('报关方式')">
<dict-selector class="custom-form-item" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypeList" clearable />
</el-form-item>
<el-form-item :label="$t('订单号')">
<el-input class="custom-form-item" v-model="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('品名')">
<el-input class="custom-form-item" v-model="queryParams.title" :placeholder="$t('请输入品名')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('提单号')">
<el-input class="custom-form-item" v-model="queryParams.tidanNo" :placeholder="$t('请输入提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('唛头')">
<el-input class="custom-form-item" v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('费用类型')">
<dict-selector class="custom-form-item" :type="DICT_TYPE.FEE_TYPE" multiple v-model="queryParams.feeTypeList" clearable></dict-selector>
</el-form-item>
<!-- <el-form-item :label="$t('发货人')">
<customer-selector
v-model="queryParams.consignorNameOrPhone"
@change="consignor = $event"
clearable
/>
</el-form-item> -->
<el-form-item label="发货人:">
<el-input style="max-width: 188px" v-model="queryParams.consignorNameOrPhone" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('收货人')">
<el-input style="max-width: 188px" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery" />
<!-- <customer-selector
<el-form-item label="发货人:">
<el-input class="custom-form-item" v-model="queryParams.consignorNameOrPhone" :placeholder="$t('请输入发货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('收货人')">
<el-input class="custom-form-item" v-model="queryParams.consigneeNameOrPhone" :placeholder="$t('请输入收货人')" clearable @keyup.enter.native="handleQuery" />
<!-- <customer-selector
v-model="queryParams.consigneeNameOrPhone"
@change="consignor = $event"
clearable
/> -->
</el-form-item>
<el-form-item :label="$t('创建时间')">
<!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
<el-date-picker v-model="dateType" type="datetimerange" range-separator="-" value-format="yyyy-MM-dd" :start-placeholder="$t('请选择日期')" :end-placeholder="$t('请选择日期')"> </el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</el-form-item>
</el-row>
</el-form-item>
<el-form-item :label="$t('创建时间')">
<!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
<el-date-picker placement="bottom-start" v-model="dateType" type="datetimerange" range-separator="-" value-format="yyyy-MM-dd" :start-placeholder="$t('请选择日期')" :end-placeholder="$t('请选择日期')"> </el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
<div v-loading="loading">
<el-row :gutter="10" class="mb8 pad-t20">
<el-row :gutter="0" class="mb8 pad-t20">
<div class="card-title">
<div class="gird-cell">
<div>{{ $t("合计：") }}</div>
......@@ -264,6 +259,9 @@ export default {
</script>
<style scoped>
::v-deep .custom-form-item {
width: 200px;
}
.card {
margin-top: 20px;
}
......
src/views/ecw/financial/voucher.vue
View file @ d4741548
......@@ -9,13 +9,13 @@
<el-input style="max-width: 188px" v-model="queryParams.receiptNo" :placeholder="$t('请输入收款单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('客户名称')">
<customer-selector v-model="queryParams.customerId" @change="changeCustomerId" clearable />
<customer-selector multiple v-model="queryParams.customerIdList" clearable />
</el-form-item>
<el-form-item :label="$t('状态')">
<dict-selector :type="DICT_TYPE.ECW_RECEIPT_STATE" v-model="queryParams.state" clearable />
<dict-selector multiple :type="DICT_TYPE.ECW_RECEIPT_STATE" v-model="queryParams.stateList" clearable />
</el-form-item>
<el-form-item :label="$t('业务员')">
<el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择业务员')" clearable>
<el-select multiple v-model="queryParams.salesmanIdList" :placeholder="$t('请选择业务员')" clearable>
<el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
......@@ -324,6 +324,9 @@ export default {
queryParams: {
page: 1,
rows: 20,
customerIdList: null,
stateList: null,
salesmanIdList: [],
numberNo: null,
dateType: null,
date: null,
......@@ -370,6 +373,10 @@ export default {
}
},
activated() {
const orderNo = this.$route.query.orderNo || ""
if (orderNo) {
this.queryParams.numberNo = orderNo
}
this.getList()
},
created() {
......
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