Skip to content

J
jiedao-app-operator-master
Commit 6e3467db authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents 41f396ad fdc43df0
Hide whitespace changes
Inline Side-by-side
Showing with 997 additions and 805 deletions
src/api/ecw/financial.js
View file @ 6e3467db
...@@ -46,20 +46,20 @@ export function getReceiptList(query) { ...@@ -46,20 +46,20 @@ export function getReceiptList(query) {
} }
// 核销收款单 // 核销收款单
export function receiptVerification(id) { // export function receiptVerification(id) {
return request({ // return request({
url: '/ecw/receipt/verification/' + id, // url: '/ecw/receipt/verification/' + id,
method: 'GET' // method: 'GET'
}) // })
} // }
// 反核销收款单 // 反核销收款单
export function receiptVerificationCancel(id) { // export function receiptVerificationCancel(id) {
return request({ // return request({
url: '/ecw/receipt/verificationCancel/' + id, // url: '/ecw/receipt/verificationCancel/' + id,
method: 'GET' // method: 'GET'
}) // })
} // }
// 获取收款单详情 // 获取收款单详情
export function getReceiptInfoByIds(query) { export function getReceiptInfoByIds(query) {
......
src/api/ecw/order.js
View file @ 6e3467db
...@@ -163,7 +163,7 @@ export function orderWarehouseIn(data){ ...@@ -163,7 +163,7 @@ export function orderWarehouseIn(data){
}) })
} }
// 入仓 // 入仓修改
export function orderWarehouseInUpdateApply(data){ export function orderWarehouseInUpdateApply(data){
return request({ return request({
url: '/order/order-warehouse-in/update-apply', url: '/order/order-warehouse-in/update-apply',
...@@ -171,6 +171,13 @@ export function orderWarehouseInUpdateApply(data){ ...@@ -171,6 +171,13 @@ export function orderWarehouseInUpdateApply(data){
data data
}) })
} }
// 获取入仓修改审批单详情-审批使用
export function getWarehouseUpdateApprovalInfo(id) {
return request({
url: '/order/order-warehouse-in/get-update-approval-info?formId=' + id,
method: 'get'
})
}
// 入仓完成 // 入仓完成
export function orderWarehouseInFinish(data){ export function orderWarehouseInFinish(data){
......
src/components/DictSelector/index.vue
View file @ 6e3467db
<template> <template>
<div class="dict-selector"> <div class="dict-selector">
<el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder" clearable :multiple="multiple" :disabled="disabled"> <el-select v-if="formType == 'select'" v-model="valueSync" :placeholder="placeholder" clearable :multiple="multiple" :disabled="disabled" @change="val => $emit('change', val)">
<el-option v-for="dict in formattedList" <el-option v-for="dict in formattedList"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
......
src/views/bpm/processInstance/detail.vue
View file @ 6e3467db
...@@ -177,6 +177,11 @@ export default { ...@@ -177,6 +177,11 @@ export default {
processId: this.processInstance.businessKey, processId: this.processInstance.businessKey,
type: 1 type: 1
}, },
warehouse_update: {
component: "warehouseDetails",
processId: this.processInstance.businessKey,
type: 4
},
container_modify: { container_modify: {
component: "shippingDetail", component: "shippingDetail",
processId: this.processInstance.businessKey, processId: this.processInstance.businessKey,
......
src/views/ecw/customer/query.vue
View file @ 6e3467db
...@@ -168,6 +168,34 @@ ...@@ -168,6 +168,34 @@
<dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="row.filing" /> <dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="row.filing" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="授权开始">
<template v-slot="{row}">
{{parseTime(row.startTime)}}
</template>
</el-table-column>
<el-table-column label="授权结束">
<template v-slot="{row}">
{{parseTime(row.endTime)}}
</template>
</el-table-column>
<el-table-column label="授权证明">
<template v-slot="{row}">
<div v-if="!!row.fileUrl && row.fileUrl.length > 0">
<span v-for="(item, index) in row.fileUrl.split(',')">
<a :href="item" target="_blank">附件{{ index + 1 }}</a>,
</span>
</div>
</template>
</el-table-column>
<el-table-column
prop="feeScale"
:formatter="(row) => getDictDataLabel(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL, row.feeScale)"
label="收费标准">
</el-table-column>
<el-table-column
prop="createUsername"
label="添加人">
</el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
......
src/views/ecw/customerCommissionInfo/index.vue
View file @ 6e3467db
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :rules="rules" :model="form" ref="form" :inline="true" > <el-form class="demo-ruleForm" label-position="left" label-width="110px" :rules="rules" :model="form" ref="form" >
<el-row> <el-card class="box-card" style="padding: 10px">
<el-col :span="24"> <div slot="header" class="clearfix">
<el-form-item label="客户名称" prop="customerId"> <el-row>
<el-select <el-col :span="5">
v-model="customerForm.name" <el-form-item label="客户名称" prop="customerId">
filterable <el-select
placeholder="请输入关键词" v-model="customerForm.name"
@change="changefn"> filterable
<el-option placeholder="请输入关键词"
v-for="item in customeList" @change="changefn">
:key="item.id" <el-option
:value="item.id.toString()" v-for="item in customeList"
:label="item.name" :key="item.id"
> :value="item.id.toString()"
{{ item.number }}|{{ item.name }}|{{ item.defaultContactPhone }} :label="item.name"
</el-option> >
</el-select> {{ item.number }}|{{ item.name }}|{{ item.defaultContactPhone }}
</el-form-item> </el-option>
</el-col> </el-select>
</el-row> </el-form-item>
<el-row> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="运输方式" prop="transportId"> <el-form-item label="运输方式" prop="transportId">
<div style="width: 130px;"> <div>
<custom-selectors-dictionary v-model="form.transportId" <custom-selectors-dictionary v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
:options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="始发地" prop="departureId">
<div style="width: 130px;">
<custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.departureId"
:options="exportCityList"></custom-selectors-dictionary>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="目的地" prop="objectiveId">
<div style="width: 130px;">
<custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.objectiveId"
:options="importCityList"></custom-selectors-dictionary>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="报关方式" prop="customsType">
<div style="width: 130px;">
<custom-selectors-dictionary v-model="form.customsType"
:options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="备案" prop="approval">
<div style="width: 130px;">
<custom-selectors-dictionary v-model="form.approval"
:options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="佣金类型(明佣、暗佣)">
<el-radio-group v-model="form.type">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" v-show="item.value != 0" :label="parseInt(item.value)"
:key="index">{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="返佣类型" v-if="form.type == 2">
<el-radio-group v-model="form.darkReturnType">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_DARK_TYPE)" :label="parseInt(item.value)"
:key="index">{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="ming-servant" v-if="form.type == 1">
<div class="label">佣金</div>
<div class="content">
<div>
<el-input v-model="mingServantFrom[0].refund"></el-input>
</div>
<div>
<custom-selectors-dictionary v-model="mingServantFrom[0].refundCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div>
<custom-selectors-dictionary v-model="mingServantFrom[0].refundUnit" label-key="titleZh" value-key="id"
:options="weightList"></custom-selectors-dictionary>
</div>
</div>
</div>
<el-form v-if="form.type == 2 && form.darkReturnType == 1">
<el-form-item label="商品类型" v-for="(item,index) in darkServantAndProductForm" :key="index">
<div class="shanping-type">
<div class="tool">
<custom-selectors-dictionary v-model="item.productType" :options="commodity" label-key="titleZh"
value-key="id"></custom-selectors-dictionary>
</div>
<div class="box">
<div class="label">
商品特性
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.productAttr" label-key="attrName" value-key="id"
:options="commodityType"></custom-selectors-dictionary>
</div>
</div>
<div class="box">
<div class="label">
佣金
</div>
<div class="custom">
<el-input v-model="item.darkCommission"></el-input>
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.darkCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.darkUnit" label-key="titleZh" value-key="id"
:options="weightList"></custom-selectors-dictionary>
</div>
</div> </div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="始发地" prop="departureId">
<div> <div>
<el-button type="primary" @click="addToFn(1)" v-if="darkServantAndProductForm.length - 1 === index">添加</el-button> <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.departureId"
:options="exportCityList"></custom-selectors-dictionary>
</div> </div>
</div> </el-form-item>
</el-form-item> </el-col>
</el-form> </el-row>
<div class="column" v-if="form.type == 2 && form.darkReturnType == 2"> <el-row>
<div style="margin-bottom: 10px" v-for="(item,index) in darkServantAndRebateForm" :key="index"> <el-col :span="5">
<div class="label"> <el-form-item label="目的地" prop="objectiveId">
佣金: <div>
</div> <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.objectiveId"
<div class="content"> :options="importCityList"></custom-selectors-dictionary>
<div class="item label">满</div>
<div class="item">
<el-input v-model="item.amount"></el-input>
</div> </div>
<div class="item"> </el-form-item>
<custom-selectors-dictionary v-model="item.amountCurrency" </el-col>
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary> <el-col :span="5">
<el-form-item label="报关方式" prop="customsType">
<div>
<custom-selectors-dictionary v-model="form.customsType"
:options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary>
</div> </div>
<div class="item"> </el-form-item>
<custom-selectors-dictionary v-model="item.amountUnit" </el-col>
label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary> <el-col :span="5">
<el-form-item label="备案" prop="approval">
<div>
<custom-selectors-dictionary v-model="form.approval"
:options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary>
</div> </div>
</div> </el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="24">
<el-form-item label-width="150px" label="佣金类型(明佣、暗佣)">
<el-radio-group v-model="form.type">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" v-show="item.value != 0" :label="parseInt(item.value)"
:key="index">{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="返佣类型" v-if="form.type == 2">
<el-radio-group v-model="form.darkReturnType">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_DARK_TYPE)" :label="parseInt(item.value)"
:key="index">{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="ming-servant" v-if="form.type == 1">
<div class="label">佣金</div>
<div class="content"> <div class="content">
<div class="item label">返</div> <div>
<div class="item"> <el-input v-model="mingServantFrom[0].refund"></el-input>
<el-input v-model="item.refund"></el-input>
</div> </div>
<div class="item"> <div>
<custom-selectors-dictionary v-model="item.refundCurrency" <custom-selectors-dictionary v-model="mingServantFrom[0].refundCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary> :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div> </div>
<div class="item"> <div>
<custom-selectors-dictionary v-model="item.refundUnit" <custom-selectors-dictionary v-model="mingServantFrom[0].refundUnit" label-key="titleZh" value-key="id"
label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary> :options="weightList"></custom-selectors-dictionary>
</div> </div>
</div> </div>
<el-button type="primary" @click="addToFn(2)" v-show="darkServantAndRebateForm.length -1 === index">添加</el-button>
</div> </div>
</div> <el-form v-if="form.type == 2 && form.darkReturnType == 1">
<div class="mingServantAndDarkServant" v-if="form.type == 3"> <el-form-item label="商品类型" v-for="(item,index) in darkServantAndProductForm" :key="index">
<div class="box"> <div class="shanping-type">
<div class="label">暗佣佣金：</div> <div class="tool">
<div class="content"> <custom-selectors-dictionary v-model="item.productType" :options="commodity" label-key="titleZh"
<div class="item"> value-key="id"></custom-selectors-dictionary>
<el-input v-model="mingServantAnddarkServant[0].refund"></el-input> </div>
<div class="box">
<div class="label">
商品特性
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.productAttr" label-key="attrName" value-key="id"
:options="commodityType"></custom-selectors-dictionary>
</div>
</div>
<div class="box">
<div class="label">
佣金
</div>
<div class="custom">
<el-input v-model="item.darkCommission"></el-input>
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.darkCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div class="custom">
<custom-selectors-dictionary v-model="item.darkUnit" label-key="titleZh" value-key="id"
:options="weightList"></custom-selectors-dictionary>
</div>
</div>
<div>
<el-button type="primary" @click="addToFn(1)" v-if="darkServantAndProductForm.length - 1 === index">添加</el-button>
</div>
</div> </div>
<div class="item"> </el-form-item>
<custom-selectors-dictionary v-model="mingServantAnddarkServant[0].refundCurrency" </el-form>
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary> <div class="column" v-if="form.type == 2 && form.darkReturnType == 2">
<div style="margin-bottom: 10px" v-for="(item,index) in darkServantAndRebateForm" :key="index">
<div class="label">
佣金:
</div> </div>
<div class="item"> <div class="content">
<custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="mingServantAnddarkServant[0].refundUnit" <div class="item label">满</div>
:options="weightList"></custom-selectors-dictionary> <div class="item">
<el-input v-model="item.amount"></el-input>
</div>
<div class="item">
<custom-selectors-dictionary v-model="item.amountCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div class="item">
<custom-selectors-dictionary v-model="item.amountUnit"
label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary>
</div>
</div> </div>
<div class="content">
<div class="item label">返</div>
<div class="item">
<el-input v-model="item.refund"></el-input>
</div>
<div class="item">
<custom-selectors-dictionary v-model="item.refundCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div class="item">
<custom-selectors-dictionary v-model="item.refundUnit"
label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary>
</div>
</div>
<el-button type="primary" @click="addToFn(2)" v-show="darkServantAndRebateForm.length -1 === index">添加</el-button>
</div> </div>
</div> </div>
<div class="title"> <div class="mingServantAndDarkServant" v-if="form.type == 3">
<span class="label">成本价：</span>原价-暗佣佣金 <div class="box">
</div> <div class="label">暗佣佣金：</div>
<div class="box"> <div class="content">
<div class="label">销售价上调：</div> <div class="item">
<div class="content"> <el-input v-model="mingServantAnddarkServant[0].refund"></el-input>
<div class="item"> </div>
<el-input v-model="mingServantAnddarkServant[0].darkAdjustCommission"></el-input> <div class="item">
</div> <custom-selectors-dictionary v-model="mingServantAnddarkServant[0].refundCurrency"
<div class="item"> :options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
<custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustCurrency" </div>
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary> <div class="item">
<custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="mingServantAnddarkServant[0].refundUnit"
:options="weightList"></custom-selectors-dictionary>
</div>
</div> </div>
<div class="item"> </div>
<custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustUnit" label-key="titleZh" value-key="id" <div class="title">
:options="weightList"></custom-selectors-dictionary> <span class="label">成本价 = 原价-暗佣佣金</span>
</div>
<div class="box">
<div class="label">销售价上调：</div>
<div class="content">
<div class="item">
<el-input v-model="mingServantAnddarkServant[0].darkAdjustCommission"></el-input>
</div>
<div class="item">
<custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustCurrency"
:options="getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"></custom-selectors-dictionary>
</div>
<div class="item">
<custom-selectors-dictionary v-model="mingServantAnddarkServant[0].darkAdjustUnit" label-key="titleZh" value-key="id"
:options="weightList"></custom-selectors-dictionary>
</div>
</div> </div>
</div> </div>
<div class="title">
<span class="label"> 实际佣金返点 = 销售价-成本价</span>
</div>
</div> </div>
<div class="title"> </el-col>
<span class="label"> 实际佣金返点：</span>销售价-成本价 </el-row>
</div> <el-row>
</div> <el-col :span="12" style="margin-top: 20px">
</el-col> <el-button style="width:200px;margin: 0 40px" type="primary" @click="submitForm">确定</el-button>
</el-row> <el-button style="width:200px" @click="cancel">取消</el-button>
<el-row> </el-col>
<el-col :span="12" style="margin-top: 20px"> </el-row>
<el-button style="width:200px;margin: 0 40px" type="primary" @click="submitForm">确定</el-button> </el-card>
<el-button style="width:200px" @click="cancel">取消</el-button>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -320,11 +323,6 @@ export default { ...@@ -320,11 +323,6 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
customerId: [{required: true, message: "客户名称不能为空", trigger: "blur"}], customerId: [{required: true, message: "客户名称不能为空", trigger: "blur"}],
departureId: [{required: true, message: "始发地不能为空", trigger: "blur"}],
transportId: [{required: true, message: "运输方式不能为空", trigger: "blur"}],
objectiveId: [{required: true, message: "目的地不能为空", trigger: "blur"}],
customsType: [{required: true, message: "报关类别不能为空", trigger: "blur"}],
approval: [{required: true, message: "产品备案不能为空", trigger: "blur"}],
}, },
customerShow: true, customerShow: true,
id:undefined,//佣金id id:undefined,//佣金id
...@@ -618,11 +616,11 @@ export default { ...@@ -618,11 +616,11 @@ export default {
} }
.title { .title {
margin: 15px 0; margin: 25px 0;
text-align: left;
.label { .label {
vertical-align: middle; vertical-align: middle;
font-size: 14px; font-size: 16px;
color: #606266; color: #606266;
font-weight: 700; font-weight: 700;
} }
......
src/views/ecw/financial/creatCollection.vue
View file @ 6e3467db
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="card"> <el-card class="card amountCard">
<div slot="header" class="card-title">订单信息</div> <div slot="header" class="card-title">订单信息</div>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -114,21 +114,6 @@ ...@@ -114,21 +114,6 @@
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column label="箱数" align="center" prop="num" />
<el-table-column label="体积/重量" align="center" prop="weight" /> <el-table-column label="体积/重量" align="center" prop="weight" />
<!-- <el-table-column label="发货人" align="center" prop="consignorName" />
<el-table-column label="收货人" align="center" prop="consigneeName" /> -->
<!-- <el-table-column label="订单状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:type="DICT_TYPE.ORDER_STATUS"
:value="scope.row.status"
/>
</template>
</el-table-column> -->
<!-- <el-table-column label="收款类型" align="center" prop="paymentType">
<template slot-scope="scope">
<dict-selector :type="DICT_TYPE.PAYMENT_TYPE" v-model="scope.row.paymentType"></dict-selector>
</template>
</el-table-column> -->
<el-table-column label="收入类型" align="center" prop="feeType"> <el-table-column label="收入类型" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
...@@ -149,29 +134,9 @@ ...@@ -149,29 +134,9 @@
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="核销比例" align="center" prop="totalAmount">
<template slot-scope="scope">
<span>{{ scope.row.totalAmount }}%</span>
</template>
</el-table-column> -->
<!-- <el-table-column label="已收金额" align="center" prop="unitPrice">
<template slot-scope="scope">
<span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="本次实收金额" align="center" prop="amount">
<template slot-scope="scope">
<el-input v-model="scope.row.amount">
<template slot="append">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-input>
</template>
</el-table-column> -->
</el-table> </el-table>
<el-descriptions :column="1" border class="card"> <el-descriptions :column="2" border class="card">
<el-descriptions-item v-for="(v, index) in form.receiptAccountList" :label="`收款账户${index + 1}`" :key="index"> <!-- <el-descriptions-item v-for="(v, index) in form.receiptAccountList" :label="`收款账户${index + 1}`" :key="index">
<div style="display: flex"> <div style="display: flex">
<el-form-item <el-form-item
label="" label=""
...@@ -207,7 +172,7 @@ ...@@ -207,7 +172,7 @@
<el-button type="text" v-if="index === 0" @click="form.receiptAccountList = [...form.receiptAccountList, {}]">添加收款账户</el-button> <el-button type="text" v-if="index === 0" @click="form.receiptAccountList = [...form.receiptAccountList, {}]">添加收款账户</el-button>
<el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">删除</span></el-button> <el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">删除</span></el-button>
</div> </div>
</el-descriptions-item> </el-descriptions-item> -->
<el-descriptions-item label="是否需要开票"> <el-descriptions-item label="是否需要开票">
<el-form-item <el-form-item
...@@ -230,68 +195,6 @@ ...@@ -230,68 +195,6 @@
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- <div class="card">
<el-form-item
label="收款附件"
label-width="120px"
style="margin-bottom: 0; width: 33%; display: inline-block"
prop="wenjian"
>
<el-upload
class="upload-demo"
:action="uploadFileUrl"
:headers="headers"
:on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload"
:on-error="handleUploadError"
:before-remove="beforeRemove"
multiple
>
<el-button size="small" type="primary">上传附件</el-button>
</el-upload>
</el-form-item>
<el-form-item
label="水单号:"
label-width="120px"
style="
margin-bottom: 0;
width: 31%;
margin-left: 2%;
display: inline-block;
"
prop="waterBillNo"
required
error="水单号不能为空"
>
<el-input
v-model="form.waterBillNo"
maxlength="200"
placeholder="请输入水单号"
></el-input>
</el-form-item>
<el-form-item
label="实收日期:"
label-width="120px"
style="
margin-bottom: 0;
width: 31%;
margin-left: 2%;
display: inline-block;
"
prop="payedAt"
required
error="实收日期不能为空"
>
<el-date-picker
clearable
v-model="form.payedAt"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
type="date"
placeholder="选择实收日期"
/>
</el-form-item>
</div> -->
</el-card> </el-card>
<el-card v-if="showInvoice" class="card"> <el-card v-if="showInvoice" class="card">
<div slot="header" class="card-title">开票资料</div> <div slot="header" class="card-title">开票资料</div>
...@@ -375,7 +278,126 @@ ...@@ -375,7 +278,126 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="card amountCard"> <el-card class="card">
<div slot="header" class="card-title">应收账单</div>
<el-table :data="form.receiptAccountList" border :key="form.receiptAccountList.length">
<el-table-column label="应收币种" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="应收金额" align="center" prop="receivableAmount" />
<el-table-column align="center" width="220">
<template #header>
核销基准币种（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）汇率
</template>
<template slot-scope="scope">
<template v-if="scope.row.type !== 'total'">
<span v-if="showCurrencyId === scope.row.currencyId">{{ scope.row.writeOffRate }}</span>
<el-form-item
v-else
label=""
label-width="0"
style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.writeOffRate`"
>
<el-input v-model="scope.row.writeOffRate"></el-input>
</el-form-item>
</template>
<template v-else>
应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
</template>
</el-table-column>
<el-table-column align="center" prop="writeOffAmount">
<template #header>
核销基准金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
</el-table-column>
<el-table-column label="收款账户" align="center">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.type !== 'total'"
label=""
label-width="0"
style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.platformAccountId`"
>
<el-select
v-model="scope.row.platformAccountId"
placeholder="请选择收款账户"
>
<el-option
v-for="item in bankData"
:key="item.id"
:label="item.baAccountName + '(' + item.baAccountNum + ')'"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="收款币种" align="center">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.type !== 'total'"
label=""
label-width="0"
style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.collectionCurrencyId`"
>
<dict-selector
:type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
v-model="scope.row.collectionCurrencyId"
@change="val => currencyIdChange(val, scope.row, scope.$index)"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="收款汇率" align="center">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.type !== 'total'"
label=""
label-width="0"
style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.collectionRate`"
>
<el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
</el-form-item>
<span v-else>收款总金额</span>
</template>
</el-table-column>
<el-table-column label="收款金额" align="center" prop="collectionAmount">
<template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else>
<div v-if="scope.row.collectionAmount[0]">美元: {{ scope.row.collectionAmount[0] }}</div>
<div v-if="scope.row.collectionAmount[1]">人民币: {{ scope.row.collectionAmount[1] }}</div>
<div v-if="scope.row.collectionAmount[2]">奈拉: {{ scope.row.collectionAmount[2] }}</div>
</div>
<!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
</template>
</el-table-column>
</el-table>
<el-descriptions :column="2" border class="card">
<el-descriptions-item label="账单汇率有效期">
<el-form-item
label=""
label-width="0"
style="margin-bottom: 0"
prop="rateValidateDate"
>
<el-date-picker
v-model="form.rateValidateDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-descriptions-item>
</el-descriptions>
</el-card>
<!-- <el-card class="card amountCard">
<el-descriptions :column="2" border> <el-descriptions :column="2" border>
<template v-for="(item, index) in form.receivableDetailList"> <template v-for="(item, index) in form.receivableDetailList">
<el-descriptions-item :label="index === 0 ? '应收总金额' : ''" :key="index+3"> <el-descriptions-item :label="index === 0 ? '应收总金额' : ''" :key="index+3">
...@@ -398,40 +420,6 @@ ...@@ -398,40 +420,6 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<!-- <el-descriptions-item label="">-</el-descriptions-item>
<el-descriptions-item>
<template v-if="showCurrencyId !== 2" slot="label">
汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
<el-form-item
v-if="showCurrencyId !== 2"
label=""
label-width="0"
style="margin-bottom: 0"
prop="addressPhone"
required
error="请输入汇率"
>
<el-input v-model="form.addressPhone"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="">-</el-descriptions-item>
<el-descriptions-item>
<template v-if="showCurrencyId !== 3" slot="label">
汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
<el-form-item
v-if="showCurrencyId !== 3"
label=""
label-width="0"
style="margin-bottom: 0"
prop="taxRate"
required
error="请输入汇率"
>
<el-input v-model="form.taxRate"></el-input>
</el-form-item>
</el-descriptions-item> -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
...@@ -439,10 +427,10 @@ ...@@ -439,10 +427,10 @@
{{ form.receivableTotalAmount }} {{ form.receivableTotalAmount }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card> -->
</el-form> </el-form>
<div slot="footer" style="margin: 20px 0"> <div slot="footer" style="margin: 20px 0">
<el-button type="primary" @click="submitForm(1)">保 存</el-button> <el-button type="primary" :loading="saveBtnLoading" @click="submitForm(1)">保 存</el-button>
<el-button type="primary" @click="submitForm(0)">{{ id ? '修 改' : '新 增' }}</el-button> <el-button type="primary" @click="submitForm(0)">{{ id ? '修 改' : '新 增' }}</el-button>
</div> </div>
<el-dialog <el-dialog
...@@ -591,7 +579,19 @@ ...@@ -591,7 +579,19 @@
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价美元" align="center" prop="unitPrice" /> <!-- <el-table-column label="单价美元" align="center" prop="unitPrice" /> -->
<el-table-column label="单价" align="center" prop="unitPrice">
<template slot-scope="scope">
<span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount">
<template slot-scope="scope">
<span>{{ scope.row.totalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total > 0" v-show="total > 0"
...@@ -636,11 +636,16 @@ export default { ...@@ -636,11 +636,16 @@ export default {
loading1: false, loading1: false,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload", // 上传的图片服务器地址
form: { form: {
receiptAccountList: [{}], // receiptAccountList: [{}],
receivableDetailList: [ // receivableDetailList: [
{ amount: 0, currencyId: 1, rate: 0 }, // { amount: 0, currencyId: 1, rate: 0 },
{ amount: 0, currencyId: 2, rate: 0 }, // { amount: 0, currencyId: 2, rate: 0 },
{ amount: 0, currencyId: 3, rate: 0 } // { amount: 0, currencyId: 3, rate: 0 }
// ],
receiptAccountList: [
// { currencyId: 1, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
// { currencyId: 2, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
// { currencyId: 3, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
] ]
}, },
creatorData: [], creatorData: [],
...@@ -670,7 +675,8 @@ export default { ...@@ -670,7 +675,8 @@ export default {
tradeCityList: [], tradeCityList: [],
id: 0, id: 0,
receiptId: 0, receiptId: 0,
currencyList: [] currencyList: [],
saveBtnLoading: false
}; };
}, },
async created() { async created() {
...@@ -687,13 +693,31 @@ export default { ...@@ -687,13 +693,31 @@ export default {
this.list = [...res.data] this.list = [...res.data]
}) })
getReceiptAccountList({ id: this.id }).then(res => { getReceiptAccountList({ id: this.id }).then(res => {
if (res.data.length > 0) {
// totalAmount
res.data = [...res.data, {
type: 'total',
writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0),
collectionAmount: [0, 0, 0]
}]
}
this.$set(this.form, 'receiptAccountList', [...res.data]) this.$set(this.form, 'receiptAccountList', [...res.data])
this.$nextTick(() => {
this.form.receiptAccountList.forEach((item, index) => {
this.rateChange(item, index)
});
})
}) })
} }
if (that.$route.query.receiptId && that.$route.query.receiptId !== '0') { if (that.$route.query.receiptId && that.$route.query.receiptId !== '0') {
this.receiptId = this.$route.query.receiptId; this.receiptId = this.$route.query.receiptId;
getReceivableInfoByIds({ id: this.receiptId }).then(res => { getReceivableInfoByIds({ id: this.receiptId }).then(res => {
this.list = [{...res.data}] this.list = [{...res.data}]
// this.list = [
// { collectionAmount: 100, currencyId: 2 },
// { collectionAmount: 100, currencyId: 3 },
// { collectionAmount: 100, currencyId: 3 },
// ]
// this.$set(this.form, 'supplierId', res.data.supplierId) // this.$set(this.form, 'supplierId', res.data.supplierId)
this.calculation() this.calculation()
}) })
...@@ -761,49 +785,146 @@ export default { ...@@ -761,49 +785,146 @@ export default {
} }
}, },
methods: { methods: {
currencyIdChange(val, row, index) {
row.collectionCurrencyId = val
if (val == row.currencyId) row.collectionRate = 1
else {
if (row.currencyId == 1 && val == 2) row.collectionRate = this.UStoRMB()
if (row.currencyId == 1 && val == 3) row.collectionRate = this.UStoNAN()
if (row.currencyId == 2 && val == 1) row.collectionRate = this.RMBtoUS()
if (row.currencyId == 2 && val == 3) row.collectionRate = this.RMBtoNAN()
if (row.currencyId == 3 && val == 1) row.collectionRate = this.NANtoUS()
if (row.currencyId == 3 && val == 2) row.collectionRate = this.NANtoRMB()
}
this.rateChange(row, index)
},
rateChange(row, index) {
row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, row.receivableAmount))
this.form.receiptAccountList[index] = {...row}
setTimeout(() => {
// 收款总计
const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]
this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
}, 100)
},
calculation() { calculation() {
const copyList = this.form.receiptAccountList
this.form.receiptAccountList = []
const dollarList = this.list.filter(v => v.currencyId === 1) const dollarList = this.list.filter(v => v.currencyId === 1)
const dollar = dollarList.length > 0 ? dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0) : 0 let dollar
if (dollarList.length > 0) {
dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0)
const t = copyList.find(v => v.currencyId == 1)
this.form.receiptAccountList = [
{
currencyId: 1,
receivableAmount: dollar,
writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? 1 : this.showCurrencyId === 2 ? this.UStoRMB() : this.UStoNAN()),
platformAccountId: t?.platformAccountId || '',
collectionCurrencyId: t?.collectionCurrencyId || '',
collectionRate: t?.collectionRate || ''
}
]
this.calculationCount(dollar, 1)
}
const rmbList = this.list.filter(v => v.currencyId === 2) const rmbList = this.list.filter(v => v.currencyId === 2)
const rmb = rmbList.length > 0 ? rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0) : 0 let rmb
if (rmbList.length > 0) {
rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0)
const t = copyList.find(v => v.currencyId == 2)
this.form.receiptAccountList = [
...this.form.receiptAccountList,
{
currencyId: 2,
receivableAmount: rmb,
writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? this.RMBtoUS() : this.showCurrencyId === 2 ? 1 : this.RMBtoNAN()),
platformAccountId: t?.platformAccountId || '',
collectionCurrencyId: t?.collectionCurrencyId || '',
collectionRate: t?.collectionRate || ''
}
]
this.calculationCount(rmb, 2)
}
const nairaList = this.list.filter(v => v.currencyId === 3) const nairaList = this.list.filter(v => v.currencyId === 3)
const naira = nairaList.length > 0 ? nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0) : 0 let naira
if (nairaList.length > 0) {
naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.totalAmount || 0), 0)
const t = copyList.find(v => v.currencyId == 3)
this.form.receiptAccountList = [
...this.form.receiptAccountList,
{
currencyId: 3,
receivableAmount: naira,
writeOffRate: t?.writeOffRate || (this.showCurrencyId === 1 ? this.NANtoUS() : this.showCurrencyId === 2 ? this.NANtoRMB() : 1),
platformAccountId: t?.platformAccountId || '',
collectionCurrencyId: t?.collectionCurrencyId || '',
collectionRate: t?.collectionRate || ''
}
]
this.calculationCount(naira, 3)
}
if (this.form.receiptAccountList.length > 0) {
// totalAmount
const totalt = this.form.receiptAccountList.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
this.form.receiptAccountList = [...this.form.receiptAccountList, {
type: 'total',
writeOffAmount: totalt,
collectionAmount: [0, 0, 0]
}]
this.form.receivableTotalAmount = totalt
}
// receiptAccountList: [
// { currencyId: 1, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
// { currencyId: 2, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
// { currencyId: 3, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
// ]
if (this.showCurrencyId === 1) { // 美元 if (this.showCurrencyId === 1) { // 美元
const usCount = NP.plus(dollar, NP.times(this.RMBtoUS(), rmb), NP.times(this.NANtoUS(), naira)) // const usCount = NP.plus(dollar, NP.times(this.RMBtoUS(), rmb), NP.times(this.NANtoUS(), naira))
this.form.receivableDetailList[0].rate = 1 // this.form.receivableDetailList[0].rate = 1
this.form.receivableDetailList[0].amount = usCount // this.form.receivableDetailList[0].amount = usCount
this.form.receivableDetailList[1].rate || (this.form.receivableDetailList[1].rate = this.UStoRMB()) // this.form.receivableDetailList[1].rate || (this.form.receivableDetailList[1].rate = this.UStoRMB())
this.form.receivableDetailList[2].rate || (this.form.receivableDetailList[2].rate = this.UStoNAN()) // this.form.receivableDetailList[2].rate || (this.form.receivableDetailList[2].rate = this.UStoNAN())
this.form.receivableTotalAmount = usCount // this.form.receivableTotalAmount = usCount
this.calculationCount(usCount) // this.calculationCount(usCount)
} else if (this.showCurrencyId === 2) { // 人民币 } else if (this.showCurrencyId === 2) { // 人民币
const rmbCount = NP.plus(rmb, NP.times(this.UStoRMB(), dollar), NP.times(this.NANtoRMB(), naira)) // const rmbCount = NP.plus(rmb, NP.times(this.UStoRMB(), dollar), NP.times(this.NANtoRMB(), naira))
this.form.receivableDetailList[1].rate = 1 // this.form.receivableDetailList[1].rate = 1
this.form.receivableDetailList[1].amount = usCount // this.form.receivableDetailList[1].amount = usCount
this.form.receivableDetailList[0].rate || (this.form.receivableDetailList[0].rate = this.RMBtoUS()) // this.form.receivableDetailList[0].rate || (this.form.receivableDetailList[0].rate = this.RMBtoUS())
this.form.receivableDetailList[2].rate || (this.form.receivableDetailList[2].rate = this.RMBtoNAN()) // this.form.receivableDetailList[2].rate || (this.form.receivableDetailList[2].rate = this.RMBtoNAN())
this.form.receivableTotalAmount = rmbCount // this.form.receivableTotalAmount = rmbCount
this.calculationCount(rmbCount) // this.calculationCount(rmbCount)
} else if (this.showCurrencyId === 3) { // 奈拉 } else if (this.showCurrencyId === 3) { // 奈拉
const nairaCount = NP.plus(naira, NP.times(this.UStoNAN(), dollar), NP.times(this.RMBtoNAN(), rmb)) // const nairaCount = NP.plus(naira, NP.times(this.UStoNAN(), dollar), NP.times(this.RMBtoNAN(), rmb))
this.form.receivableDetailList[2].rate = 1 // this.form.receivableDetailList[2].rate = 1
this.form.receivableDetailList[2].amount = nairaCount // this.form.receivableDetailList[2].amount = nairaCount
this.form.receivableDetailList[0].rate || (this.form.receivableDetailList[0].rate = this.NANtoUS()) // this.form.receivableDetailList[0].rate || (this.form.receivableDetailList[0].rate = this.NANtoUS())
this.form.receivableDetailList[1].rate || (this.form.receivableDetailList[1].rate = this.NANtoRMB()) // this.form.receivableDetailList[1].rate || (this.form.receivableDetailList[1].rate = this.NANtoRMB())
this.form.receivableTotalAmount = nairaCount // this.form.receivableTotalAmount = nairaCount
this.calculationCount(nairaCount) // this.calculationCount(nairaCount)
} }
this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
}, },
calculationCount(usCount) { calculationCount(usCount, type) {
if (this.showCurrencyId === 1) { const index = this.form.receiptAccountList.findIndex(v => v.currencyId == type)
this.form.receivableDetailList[2].amount = NP.times(this.form.receivableDetailList[2].rate, usCount) const t = this.form.receiptAccountList[index]
this.form.receivableDetailList[1].amount = NP.times(this.form.receivableDetailList[1].rate, usCount) if (t) {
} else if (this.showCurrencyId === 2) { t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount)
this.form.receivableDetailList[2].amount = NP.times(this.form.receivableDetailList[2].rate, usCount) this.rateChange(t, index)
this.form.receivableDetailList[0].amount = NP.times(this.form.receivableDetailList[0].rate, usCount)
} else if (this.showCurrencyId === 3) {
this.form.receivableDetailList[1].amount = NP.times(this.form.receivableDetailList[1].rate, usCount)
this.form.receivableDetailList[0].amount = NP.times(this.form.receivableDetailList[0].rate, usCount)
} }
}, },
RMBtoUS() { RMBtoUS() {
...@@ -839,10 +960,10 @@ export default { ...@@ -839,10 +960,10 @@ export default {
} }
}) })
}, },
subtractItem(index) { // subtractItem(index) {
this.form.receiptAccountList.splice(index, 1) // this.form.receiptAccountList.splice(index, 1)
this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList]) // this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
}, // },
getReceivableListByIds() { getReceivableListByIds() {
}, },
...@@ -901,14 +1022,17 @@ export default { ...@@ -901,14 +1022,17 @@ export default {
this.open = false; this.open = false;
}, },
submitForm(addType) { submitForm(addType) {
this.saveBtnLoading = true
const params = {...this.form, addType} const params = {...this.form, addType}
params.receiptAccountList = params.receiptAccountList params.receiptAccountList.length = params.receiptAccountList.length - 1
// params.receiptAccountList = params.receiptAccountList.map(v => Object.assign(v, { }))
delete params.receivableDetail delete params.receivableDetail
if (this.list && this.list.length > 0) { if (this.list && this.list.length > 0) {
params.receivableVOList = this.list params.receivableVOList = this.list
} }
if (params.receivableVOList.length === 0) { if (params.receivableVOList.length === 0) {
this.$modal.msgError("请添加未收客户款项"); this.$modal.msgError("请添加未收客户款项");
this.saveBtnLoading = false
return return
} }
if (addType === 1) { if (addType === 1) {
...@@ -929,11 +1053,13 @@ export default { ...@@ -929,11 +1053,13 @@ export default {
if (this.id && this.id !== '0') { if (this.id && this.id !== '0') {
updateReceipt(params).then(res => { updateReceipt(params).then(res => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.saveBtnLoading = false
this.$router.back(); this.$router.back();
}) })
} else { } else {
createReceipt(params).then(res => { createReceipt(params).then(res => {
this.$modal.msgSuccess("保存成功"); this.$modal.msgSuccess("保存成功");
this.saveBtnLoading = false
this.$router.back(); this.$router.back();
}) })
} }
...@@ -957,11 +1083,13 @@ export default { ...@@ -957,11 +1083,13 @@ export default {
if (this.id && this.id !== '0') { if (this.id && this.id !== '0') {
updateReceipt(params).then(res => { updateReceipt(params).then(res => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.saveBtnLoading = false
this.$router.back(); this.$router.back();
}) })
} else { } else {
createReceipt(params).then(res => { createReceipt(params).then(res => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.saveBtnLoading = false
this.$router.back(); this.$router.back();
}) })
} }
......
src/views/ecw/financial/openInvoice.vue
View file @ 6e3467db
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-descriptions-item label="纳税人识别号">{{ invoiceData.taxpayer }}</el-descriptions-item> <el-descriptions-item label="纳税人识别号">{{ invoiceData.taxpayer }}</el-descriptions-item>
<el-descriptions-item label="地址">{{ invoiceData.addressPhone }}</el-descriptions-item> <el-descriptions-item label="地址">{{ invoiceData.addressPhone }}</el-descriptions-item>
<el-descriptions-item label="开户行">{{ invoiceData.accountBank }}</el-descriptions-item> <el-descriptions-item label="开户行">{{ invoiceData.accountBank }}</el-descriptions-item>
<el-descriptions-item label="税率"> <el-descriptions-item label="税率%">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="invoiceData.taxRate"></el-input> <el-input v-model="invoiceData.taxRate"></el-input>
</el-form-item> </el-form-item>
...@@ -57,24 +57,36 @@ ...@@ -57,24 +57,36 @@
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column label="箱数" align="center" prop="num" />
<el-table-column label="体积/重量" align="center" prop="weight"></el-table-column> <el-table-column label="体积/重量" align="center" prop="weight"></el-table-column>
<el-table-column label="费用类型" align="center" prop="feeType"> <el-table-column label="收入类型" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.ECW_TRANSPORT_TYPE" :type="DICT_TYPE.FEE_TYPE"
:value="scope.row.feeType" :value="scope.row.feeType"
></dict-tag> ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" prop="unitPrice" /> <el-table-column label="单价金额" align="center" prop="unitPrice">
<el-table-column label="总金额" align="center" prop="totalAmount" /> <template slot-scope="scope">
<el-table-column label="税额" align="center"> <span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount">
<template slot-scope="scope">
<span>{{ scope.row.totalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="税额" align="center" prop="tax">
<template slot-scope="scope"> <template slot-scope="scope">
无 <span>{{ scope.row.tax }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="价税合计" align="center"> <el-table-column label="价税合计" align="center" prop="taxAndTotalAmount">
<template slot-scope="scope"> <template slot-scope="scope">
无 <span>{{ scope.row.taxAndTotalAmount }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -99,6 +111,7 @@ ...@@ -99,6 +111,7 @@
<script> <script>
import { DICT_TYPE } from "@/utils/dict"; import { DICT_TYPE } from "@/utils/dict";
import { getReceiptInvoicing, getInvoicingItem, updateReceiptInvoicing } from "@/api/ecw/financial"; import { getReceiptInvoicing, getInvoicingItem, updateReceiptInvoicing } from "@/api/ecw/financial";
import NP from 'number-precision'
export default { export default {
name: "OpenInvoice", name: "OpenInvoice",
...@@ -118,9 +131,9 @@ export default { ...@@ -118,9 +131,9 @@ export default {
} }
}, },
methods: { methods: {
getData() { async getData() {
this.loading = true; this.loading = true;
getReceiptInvoicing(this.id).then((res) => { await getReceiptInvoicing(this.id).then((res) => {
this.invoiceData = res.data; this.invoiceData = res.data;
this.invoiceData.invoicingTypeId = this.invoiceData.invoicingTypeId || '' this.invoiceData.invoicingTypeId = this.invoiceData.invoicingTypeId || ''
// if (!this.invoiceData.info || this.invoiceData.info.length == 0) { // if (!this.invoiceData.info || this.invoiceData.info.length == 0) {
...@@ -129,9 +142,15 @@ export default { ...@@ -129,9 +142,15 @@ export default {
this.loading = false; this.loading = false;
}); });
getInvoicingItem({ id: this.id }).then(res => { getInvoicingItem({ id: this.id }).then(res => {
res.data.map(v => {
v.tax = NP.times(v.totalAmount, this.invoiceData.taxRate/100)
v.taxAndTotalAmount = NP.plus(v.totalAmount, NP.times(v.totalAmount, this.invoiceData.taxRate/100))
})
const t = { const t = {
orderNo: '合计', orderNo: '合计',
totalAmount: res.data.reduce((total, curr) => total + curr.totalAmount, 0) totalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.totalAmount), 0),
tax: res.data.reduce((total, curr) => NP.plus(total, curr.tax), 0),
taxAndTotalAmount: res.data.reduce((total, curr) => NP.plus(total, curr.taxAndTotalAmount), 0)
} }
this.list = [...res.data, t] this.list = [...res.data, t]
}) })
...@@ -148,8 +167,98 @@ export default { ...@@ -148,8 +167,98 @@ export default {
}) })
}, },
getSummaries(param) { getSummaries(param) {
return ['收款人', this.invoiceData.payeeName, '核销人', this.invoiceData.writeOffName, '开票人', this.invoiceData.issuerName, '', '价税合计大写', 444]; const t = this.list[this.list.length - 1].taxAndTotalAmount
return ['收款人', this.invoiceData.payeeName, '核销人', this.invoiceData.writeOffName, '开票人', this.invoiceData.issuerName, '', '价税合计大写', this.convertCurrency(t)];
}, },
convertCurrency(money) {
//汉字的数字
var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
//基本单位
var cnIntRadice = new Array('', '拾', '佰', '仟');
//对应整数部分扩展单位
var cnIntUnits = new Array('', '万', '亿', '兆');
//对应小数部分单位
var cnDecUnits = new Array('角', '分', '毫', '厘');
//整数金额时后面跟的字符
var cnInteger = '整';
//整型完以后的单位
var cnIntLast = '元';
//最大处理的数字
var maxNum = 999999999999999.9999;
//金额整数部分
var integerNum;
//金额小数部分
var decimalNum;
//输出的中文金额字符串
var chineseStr = '';
//分离金额后用的数组，预定义
var parts;
// 传入的参数为空情况
if(money === '') {
return '';
}
money = parseFloat(money)
if(money >= maxNum){
return ''
}
// 传入的参数为0情况
if (money === 0) {
chineseStr = cnNums[0] + cnIntLast + cnInteger;
return chineseStr
}
// 转为字符串
money = money.toString();
// indexOf 检测某字符在字符串中首次出现的位置 返回索引值（从0 开始） -1 代表无
if (money.indexOf('.') == -1) {
integerNum = money;
decimalNum = ''
}else{
parts = money.split('.');
integerNum = parts[0];
decimalNum = parts[1].substr(0,4);
}
//转换整数部分
if(parseInt(integerNum,10) > 0){
let zeroCount = 0;
let IntLen = integerNum.length
for(let i = 0; i < IntLen; i++){
let n = integerNum.substr(i,1);
let p = IntLen - i - 1;
let q = p / 4;
let m = p % 4;
if( n == '0'){
zeroCount ++ ;
}else{
if(zeroCount > 0){
chineseStr += cnNums[0]
}
zeroCount = 0;
chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
}
if(m == 0 && zeroCount < 4){
chineseStr += cnIntUnits[q];
}
}
// 最后+ 元
chineseStr += cnIntLast;
}
// 转换小数部分
if(decimalNum != ''){
let decLen = decimalNum.length;
for(let i = 0; i <decLen; i++){
let n = decimalNum.substr(i,1);
if(n != '0'){
chineseStr += cnNums[Number(n)] + cnDecUnits[i]
}
}
}
if(chineseStr == ''){
chineseStr += cnNums[0] + cnIntLast + cnInteger;
}else if(decimalNum == ''){
chineseStr += cnInteger;
}
return chineseStr
}
}, },
}; };
</script> </script>
......
src/views/ecw/financial/printVoucher.vue
View file @ 6e3467db
...@@ -100,18 +100,11 @@ ...@@ -100,18 +100,11 @@
id:0 id:0
} }
}, },
created() { async created() {
let that = this let that = this
if(that.$route.query.id){
that.id = that.$route.query.id
that.getCollectionData()
getInvoicingItem({id: this.id}).then(res => {
this.list = res.data
})
}
listSimpleUsers().then(res =>that.creatorData = res.data) listSimpleUsers().then(res =>that.creatorData = res.data)
getBankAccountPage(that.params).then(res =>that.bankData = res.data.list) getBankAccountPage(that.params).then(res =>that.bankData = res.data.list)
listSimpleDepts().then(res =>{ await listSimpleDepts().then(res =>{
res.data.forEach((item)=>{ res.data.forEach((item)=>{
if(item.parentId==0){ if(item.parentId==0){
...@@ -130,12 +123,20 @@ ...@@ -130,12 +123,20 @@
}) })
}) })
if(that.$route.query.id){
that.id = that.$route.query.id
that.getCollectionData()
getInvoicingItem({id: this.id}).then(res => {
this.list = res.data
})
}
}, },
methods: { methods: {
getCollectionData(){ getCollectionData(){
let that = this let that = this
getReceiptInfoByIds({id:that.id}).then(res =>{ getReceiptInfoByIds({id:that.id}).then(res =>{
that.form = res.data that.form = res.data
that.form.departmentName = that.deptData.find(v => v.id == that.form.departmentId).name
}) })
}, },
print(){ print(){
......
src/views/ecw/financial/receiptDetail.vue
View file @ 6e3467db
...@@ -16,17 +16,6 @@ ...@@ -16,17 +16,6 @@
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">订单信息</div> <div slot="header" class="card-title">订单信息</div>
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
style="padding: 10px; margin-bottom: 10px"
>添加未收客户款项</el-button
>
</el-col> -->
<el-table :data="list" border> <el-table :data="list" border>
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="唛头" align="center" prop="marks" /> <el-table-column label="唛头" align="center" prop="marks" />
...@@ -37,21 +26,6 @@ ...@@ -37,21 +26,6 @@
</el-table-column> </el-table-column>
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column label="箱数" align="center" prop="num" />
<el-table-column label="体积/重量" align="center" prop="weight" /> <el-table-column label="体积/重量" align="center" prop="weight" />
<!-- <el-table-column label="发货人" align="center" prop="consignorName" />
<el-table-column label="收货人" align="center" prop="consigneeName" /> -->
<!-- <el-table-column label="订单状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:type="DICT_TYPE.ORDER_STATUS"
:value="scope.row.status"
/>
</template>
</el-table-column> -->
<!-- <el-table-column label="收款类型" align="center" prop="paymentType">
<template slot-scope="scope">
<dict-selector :type="DICT_TYPE.PAYMENT_TYPE" v-model="scope.row.paymentType"></dict-selector>
</template>
</el-table-column> -->
<el-table-column label="收入类型" align="center" prop="feeType"> <el-table-column label="收入类型" align="center" prop="feeType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
...@@ -72,68 +46,15 @@ ...@@ -72,68 +46,15 @@
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="核销比例" align="center" prop="totalAmount">
<template slot-scope="scope">
<span>{{ scope.row.totalAmount }}%</span>
</template>
</el-table-column> -->
<!-- <el-table-column label="已收金额" align="center" prop="unitPrice">
<template slot-scope="scope">
<span>{{ scope.row.unitPrice }}</span>
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="本次实收金额" align="center" prop="amount">
<template slot-scope="scope">
<el-input v-model="scope.row.amount">
<template slot="append">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-input>
</template>
</el-table-column> -->
</el-table> </el-table>
<el-descriptions :column="1" border class="card"> <el-descriptions :column="2" border class="card">
<el-descriptions-item v-for="(v, index) in form.platformAccountIdList" :label="`收款账户${index + 1}`" :key="index"> <!-- <el-descriptions-item v-for="(v, index) in form.platformAccountIdList" :label="`收款账户${index + 1}`" :key="index">
<div style="display: flex"> <div style="display: flex">
<!-- <el-form-item
label=""
label-width="0"
style="margin-bottom: 0; margin-right: 12px"
:prop="`platformAccountIdList[${index}].platformAccountId`"
required
error="请选择收款账户"
>
<el-select
v-model="v.platformAccountId"
placeholder="请选择收款账户"
>
<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=""
label-width="0"
style="margin-bottom: 0; margin-right: 12px"
:prop="`platformAccountIdList[${index}].currencyId`"
required
error="请选择币种"
>
<dict-selector
:type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
v-model="v.currencyId"
/>
</el-form-item> -->
<el-button type="text" v-if="index === 0" @click="form.platformAccountIdList = [...form.platformAccountIdList, {}]">添加收款账户</el-button> <el-button type="text" v-if="index === 0" @click="form.platformAccountIdList = [...form.platformAccountIdList, {}]">添加收款账户</el-button>
<el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">删除</span></el-button> <el-button type="text" v-if="index > 0" @click="subtractItem(index)"><span style="color: red">删除</span></el-button>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
-->
<el-descriptions-item label="是否需要开票"> <el-descriptions-item label="是否需要开票">
<span>{{ form.openInvoice == 1 ? '需要' : '不需要' }}</span> <span>{{ form.openInvoice == 1 ? '需要' : '不需要' }}</span>
<!-- <el-select <!-- <el-select
...@@ -208,7 +129,7 @@ ...@@ -208,7 +129,7 @@
<el-table-column label="水单号" align="center" prop="billNo" /> <el-table-column label="水单号" align="center" prop="billNo" />
<el-table-column label="水单附件" align="center" prop="attr"> <el-table-column label="水单附件" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attr"> <template slot-scope="scope" v-if="scope.row.attr">
<el-link v-for="(v, i) in scope.row.attr" :href="v.url" :key="i" type="primary" target="_blank">{{ v.name }}</el-link> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
...@@ -219,7 +140,7 @@ ...@@ -219,7 +140,7 @@
<el-table-column label="操作" align="center" width="200"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">删除</el-button> <el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">删除</el-button>
<el-button type="text">详情</el-button> <el-button type="text" @click="detailClick(scope.row)">详情</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)">核销</el-button> <el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)">核销</el-button>
<el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)">反核销</el-button> <el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)">反核销</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">编辑</el-button> <el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">编辑</el-button>
...@@ -228,8 +149,90 @@ ...@@ -228,8 +149,90 @@
</el-table> </el-table>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-descriptions :column="2" border> <div slot="header" class="card-title">应收账单</div>
<template v-for="(item, index) in form.receivableDetailList"> <el-table :data="form.receiptAccountList" border>
<el-table-column label="应收币种" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
</template>
</el-table-column>
<el-table-column label="应收金额" align="center" prop="receivableAmount" />
<el-table-column align="center" width="220">
<template #header>
核销基准币种（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）汇率
</template>
<template slot-scope="scope">
<template v-if="scope.row.type !== 'total'">
<span>{{ scope.row.writeOffRate }}</span>
</template>
<template v-else>
应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
</template>
</el-table-column>
<el-table-column align="center" prop="writeOffAmount">
<template #header>
核销基准金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template>
</el-table-column>
<el-table-column label="收款账户" align="center">
<template slot-scope="scope" v-if="scope.row.type !== 'total'">
{{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }}
</template>
</el-table-column>
<el-table-column label="收款币种" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" />
</template>
</el-table-column>
<el-table-column label="收款汇率" align="center">
<template slot-scope="scope">
<!-- <el-form-item
v-if="scope.row.type !== 'total'"
label=""
label-width="0"
style="margin-bottom: 0"
:prop="`receiptAccountList.${scope.$index}.collectionRate`"
>
<el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
</el-form-item> -->
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionRate }}</span>
<span v-else>收款总金额</span>
</template>
</el-table-column>
<el-table-column label="收款金额" align="center" prop="collectionAmount">
<template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else>
<div v-if="scope.row.collectionAmount[0]">美元: {{ scope.row.collectionAmount[0] }}</div>
<div v-if="scope.row.collectionAmount[1]">人民币: {{ scope.row.collectionAmount[1] }}</div>
<div v-if="scope.row.collectionAmount[2]">奈拉: {{ scope.row.collectionAmount[2] }}</div>
</div>
<!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
</template>
</el-table-column>
</el-table>
<el-descriptions :column="2" border class="card">
<el-descriptions-item label="账单汇率有效期">
{{ parseTime(form.rateValidateDate) }}
<!-- <el-form-item
label=""
label-width="0"
style="margin-bottom: 0"
prop="rateValidateDate"
>
<el-date-picker
v-model="form.rateValidateDate"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card hexiaoCard">
<el-descriptions :column="3" border>
<!-- <template v-for="(item, index) in form.receivableDetailList">
<el-descriptions-item :label="index === 0 ? '应收总金额' : ''" :key="index+3"> <el-descriptions-item :label="index === 0 ? '应收总金额' : ''" :key="index+3">
{{ item.amount }} {{ item.amount }}
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="index + 1" /> <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="index + 1" />
...@@ -240,13 +243,13 @@ ...@@ -240,13 +243,13 @@
</template> </template>
<span v-if="showCurrencyId !== item.currencyId">{{ item.rate }}</span> <span v-if="showCurrencyId !== item.currencyId">{{ item.rate }}</span>
</el-descriptions-item> </el-descriptions-item>
</template> </template> -->
<el-descriptions-item> <!-- <el-descriptions-item>
<template slot="label"> <template slot="label">
应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template> </template>
{{ form.receivableTotalAmount }} {{ form.receivableTotalAmount }}
</el-descriptions-item> </el-descriptions-item> -->
<el-descriptions-item label="已核销总金额"> <el-descriptions-item label="已核销总金额">
<el-tag>{{ verificationData.usCount }}美元</el-tag> <el-tag>{{ verificationData.usCount }}美元</el-tag>
<el-tag>{{ verificationData.rmbCount }}人民币</el-tag> <el-tag>{{ verificationData.rmbCount }}人民币</el-tag>
...@@ -281,18 +284,19 @@ ...@@ -281,18 +284,19 @@
<div>{{ remainingAmount.nairaAmount }}奈拉</div> <div>{{ remainingAmount.nairaAmount }}奈拉</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="收款账户" required prop="accountNo" error="收款账户不能为空"> <el-form-item label="收款账户" prop="accountNo" :rules="{ required: true, trigger: ['blur', 'change'], message: '收款账户不能为空' }">
<el-select v-model="addForm.accountNo" placeholder="请选择收款账户" style="width: 220px"> <el-select v-if="!isView" v-model="addForm.accountNo" placeholder="请选择收款账户" style="width: 220px">
<el-option v-for="item in bankData" :key="item.id" :label="item.baAccountName + '(' + item.baAccountNum + ')'" :value="item.id" /> <el-option v-for="item in bankData" :key="item.id" :label="item.baAccountName + '(' + item.baAccountNum + ')'" :value="item.id" />
</el-select> </el-select>
<span v-else>{{ addForm.accountNo }}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="实收日期" label="实收日期"
prop="amountDate" prop="amountDate"
required :rules="{ required: true, trigger: ['blur', 'change'], message: '实收日期不能为空' }"
error="实收日期不能为空"
> >
<el-date-picker <el-date-picker
v-if="!isView"
clearable clearable
v-model="addForm.amountDate" v-model="addForm.amountDate"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -300,35 +304,37 @@ ...@@ -300,35 +304,37 @@
type="date" type="date"
placeholder="选择实收日期" placeholder="选择实收日期"
/> />
<span v-else>{{ addForm.amountDate }}</span>
</el-form-item> </el-form-item>
<div style="display: flex;"> <div style="display: flex;">
<el-form-item <el-form-item
label="实收" label="实收"
prop="amount" prop="amount"
required :rules="{ required: true, trigger: ['blur', 'change'], message: '实收不能为空' }"
error="实收不能为空"
> >
<el-input v-model="addForm.amount" style="width: 220px; margin-right: 12px"></el-input> <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>
<el-form-item <el-form-item
label-width="0px" label-width="0px"
prop="currencyId" prop="currencyId"
required :rules="{ required: true, trigger: ['blur', 'change'], message: '币种不能为空' }"
error="币种不能为空"
> >
<dict-selector :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" v-model="addForm.currencyId" /> <dict-selector v-if="!isView" :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" v-model="addForm.currencyId" @change="val => currencyIdChange(val)"/>
<!-- <span v-else>{{ addForm.currencyId }}</span> -->
<dict-tag v-else :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="addForm.currencyId" />
</el-form-item> </el-form-item>
</div> </div>
<el-form-item <el-form-item
v-if="showCurrencyId != addForm.currencyId" v-if="showCurrencyId != addForm.currencyId"
prop="rate" prop="rate"
required :rules="{ required: true, trigger: ['blur', 'change'], message: '汇率不能为空' }"
error="汇率不能为空"
> >
<template slot="label"> <template slot="label">
汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template> </template>
<el-input v-model="addForm.rate" style="width: 220px"></el-input> <el-input v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
<span v-else>{{ addForm.rate }}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="showCurrencyId != addForm.currencyId" v-if="showCurrencyId != addForm.currencyId"
...@@ -336,13 +342,14 @@ ...@@ -336,13 +342,14 @@
<template slot="label"> <template slot="label">
金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template> </template>
<!-- <el-input v-model="addForm.rate"></el-input> --> <span>{{ addForm.writeOffAmount }}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="收款附件" label="水单附件"
prop="attr" prop="attr"
> >
<el-upload <el-upload
v-if="!isView"
class="upload-demo" class="upload-demo"
:action="uploadFileUrl" :action="uploadFileUrl"
:headers="headers" :headers="headers"
...@@ -355,17 +362,20 @@ ...@@ -355,17 +362,20 @@
> >
<el-button size="small" type="primary">上传附件</el-button> <el-button size="small" type="primary">上传附件</el-button>
</el-upload> </el-upload>
<div v-else>
<div v-for="(v, i) in addForm.attr" :key="i"><el-link :href="v.url" type="primary" target="_blank">{{ v.name }}</el-link></div>
</div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="水单号" label="水单号"
prop="billNo" prop="billNo"
required :rules="{ required: true, trigger: ['blur', 'change'], message: '水单号不能为空' }"
error="水单号不能为空"
> >
<el-input v-model="addForm.billNo" style="width: 220px"></el-input> <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"> <div slot="footer" v-if="!isView">
<el-button type="primary" @click="saveFrom">{{ saveBtnText }}</el-button> <el-button type="primary" @click="saveFrom">{{ saveBtnText }}</el-button>
<el-button @click="hiddenDialog">取 消</el-button> <el-button @click="hiddenDialog">取 消</el-button>
</div> </div>
...@@ -388,7 +398,8 @@ import { ...@@ -388,7 +398,8 @@ import {
receiptItemVerificationCancel, receiptItemVerificationCancel,
updateReceiptItem, updateReceiptItem,
receiptItemBatchVerification, receiptItemBatchVerification,
receiptItemAllVerification receiptItemAllVerification,
getReceiptAccountList
} from "@/api/ecw/financial"; } from "@/api/ecw/financial";
import { getCurrencyPage } from "@/api/ecw/currency"; import { getCurrencyPage } from "@/api/ecw/currency";
import NP from 'number-precision' import NP from 'number-precision'
...@@ -412,8 +423,9 @@ export default { ...@@ -412,8 +423,9 @@ export default {
}, },
addForm: {}, addForm: {},
detailed: [], detailed: [],
dialogTitle: '添加收款明细', dialogTitle: '添加银行实收明细',
saveBtnText: '添 加', saveBtnText: '添 加',
isView: false,
multipleSelection: [], multipleSelection: [],
currencyList: [], currencyList: [],
verificationData: { verificationData: {
...@@ -453,14 +465,17 @@ export default { ...@@ -453,14 +465,17 @@ export default {
} }
}, },
watch: { watch: {
'addForm.currencyId'(newVal) { // 'addForm.currencyId'(newVal) {
this.currencyIdChange(newVal) // this.currencyIdChange(newVal)
} // },
'addForm.rate'() {
this.setWriteOffAmount()
},
}, },
async created() { async created() {
// 获取汇率 // 获取汇率
await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list) await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
await getBankAccountPage(this.params).then((res) => (this.bankData = res.data.list));
if (this.$route.query.id) { if (this.$route.query.id) {
this.id = this.$route.query.id; this.id = this.$route.query.id;
await getReceiptInfoByIds({ id: this.id }).then(res => { await getReceiptInfoByIds({ id: this.id }).then(res => {
...@@ -472,11 +487,43 @@ export default { ...@@ -472,11 +487,43 @@ export default {
await getInvoicingItem({ id: this.id }).then(res => { await getInvoicingItem({ id: this.id }).then(res => {
this.list = [...res.data] this.list = [...res.data]
}) })
getReceiptAccountList({ id: this.id }).then(res => {
if (res.data.length > 0) {
// totalAmount
res.data = [...res.data, {
type: 'total',
writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0),
collectionAmount: [0, 0, 0]
}]
}
// 收款总计
const dollarList = res.data.filter(v => v.collectionCurrencyId == 1)
const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
const rmbList = res.data.filter(v => v.collectionCurrencyId == 2)
const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
const nairaList = res.data.filter(v => v.collectionCurrencyId == 3)
const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount || 0), 0)
res.data[res.data.length -1].collectionAmount = [dollar, rmb, naira]
// this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
this.$set(this.form, 'receiptAccountList', [...res.data])
this.$nextTick(() => {
// this.form.receiptAccountList.forEach((item, index) => {
// this.rateChange(item, index)
// });
})
})
} }
getBankAccountPage(this.params).then((res) => (this.bankData = res.data.list));
this.getList() this.getList()
}, },
methods: { methods: {
setWriteOffAmount() {
this.$set(this.addForm, 'writeOffAmount', NP.times(this.addForm.rate || 0, this.addForm.amount || 0))
},
calculation() { calculation() {
const verificationList = this.detailed.filter(v => v.status === 1) const verificationList = this.detailed.filter(v => v.status === 1)
const dollarList = verificationList.filter(v => v.currencyId === 1) const dollarList = verificationList.filter(v => v.currencyId === 1)
...@@ -543,16 +590,18 @@ export default { ...@@ -543,16 +590,18 @@ export default {
}, },
currencyIdChange(val) { currencyIdChange(val) {
val = Number(val) val = Number(val)
let rate
if(val === this.showCurrencyId) { if(val === this.showCurrencyId) {
this.addForm.rate = 1 rate = 1
} else { } else {
if (this.showCurrencyId === 1 && val === 2) this.addForm.rate = this.RMBtoUS() if (this.showCurrencyId === 1 && val === 2) rate = this.RMBtoUS()
else if (this.showCurrencyId === 1 && val === 3) this.addForm.rate = this.NANtoUS() else if (this.showCurrencyId === 1 && val === 3) rate = this.NANtoUS()
else if (this.showCurrencyId === 2 && val === 1) this.addForm.rate = this.UStoRMB() else if (this.showCurrencyId === 2 && val === 1) rate = this.UStoRMB()
else if (this.showCurrencyId === 2 && val === 3) this.addForm.rate = this.NANtoRMB() else if (this.showCurrencyId === 2 && val === 3) rate = this.NANtoRMB()
else if (this.showCurrencyId === 3 && val === 1) this.addForm.rate = this.UStoNAN() else if (this.showCurrencyId === 3 && val === 1) rate = this.UStoNAN()
else if (this.showCurrencyId === 3 && val === 2) this.addForm.rate = this.RMBtoNAN() else if (this.showCurrencyId === 3 && val === 2) rate = this.RMBtoNAN()
} }
this.$set(this.addForm, 'rate', rate)
}, },
getList() { getList() {
getReceivableItem({ id: this.id }).then(res => { getReceivableItem({ id: this.id }).then(res => {
...@@ -593,10 +642,19 @@ export default { ...@@ -593,10 +642,19 @@ export default {
toEdit() { toEdit() {
return this.$router.push("creatCollection?id=" + this.id); return this.$router.push("creatCollection?id=" + this.id);
}, },
detailClick(row) {
this.openAddDialog = true
this.dialogTitle = '银行实收明细详情'
this.isView = true
setTimeout(() => {
this.addForm = { ...row }
}, 0)
},
editClick(row) { editClick(row) {
this.openAddDialog = true this.openAddDialog = true
this.dialogTitle = '编辑收款明细' this.dialogTitle = '编辑银行实收明细'
this.saveBtnText = '提 交' this.saveBtnText = '提 交'
this.isView = false
setTimeout(() => { setTimeout(() => {
this.addForm = { ...row } this.addForm = { ...row }
}, 0) }, 0)
...@@ -662,12 +720,12 @@ export default { ...@@ -662,12 +720,12 @@ export default {
verificationAll() { verificationAll() {
this.$modal this.$modal
.confirm("您确认要全部核销吗？") .confirm("您确认要全部核销吗？")
.then(function () { .then(() => {
return receiptItemAllVerification(this.id); return receiptItemAllVerification(this.id);
}) })
.then(() => { .then(() => {
this.getList();
this.$modal.msgSuccess("核销成功"); this.$modal.msgSuccess("核销成功");
this.$router.back();
}) })
.catch(() => {}); .catch(() => {});
}, },
...@@ -677,7 +735,8 @@ export default { ...@@ -677,7 +735,8 @@ export default {
handleAddReceiptItem() { handleAddReceiptItem() {
this.addForm = {} this.addForm = {}
this.openAddDialog = true this.openAddDialog = true
this.dialogTitle = '添加收款明细' this.isView = false
this.dialogTitle = '添加银行实收明细'
this.saveBtnText = '添 加' this.saveBtnText = '添 加'
}, },
handleUploadSuccess(res, file, fileList) { handleUploadSuccess(res, file, fileList) {
...@@ -734,4 +793,12 @@ export default { ...@@ -734,4 +793,12 @@ export default {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
} }
.hexiaoCard {
::v-deep .el-descriptions-item__label {
width: 11%;
}
::v-deep .el-descriptions-item__content {
width: 22%;
}
}
</style> </style>
\ No newline at end of file
src/views/ecw/financial/voucher.vue
View file @ 6e3467db
...@@ -113,7 +113,11 @@ ...@@ -113,7 +113,11 @@
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款单号" align="center" prop="receiptNo" /> <el-table-column label="收款单号" align="center" prop="receiptNo">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="自编号" align="center" prop="orderNo" /> --> <!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
<el-table-column label="订单号" align="center" prop="orderNo" /> <el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="客户名称" align="center" prop="customerName" /> <el-table-column label="客户名称" align="center" prop="customerName" />
...@@ -154,43 +158,44 @@ ...@@ -154,43 +158,44 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.state === 0 || scope.row.state == 1 || scope.row.state == 5" v-if="scope.row.state === 0 || scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3"
size="mini" size="mini"
type="text" type="text"
@click="handleAdd(scope.row.id)" @click="handleAdd(scope.row.id)"
>编辑</el-button >编辑</el-button
> >
<el-button <!-- <el-button
v-if="scope.row.state == 1" v-if="scope.row.state == "
size="mini" size="mini"
type="text" type="text"
@click="verificationClick(scope.row)" @click="verificationClick(scope.row)"
>核销</el-button >核销</el-button
> > -->
<el-button <el-button
v-if="scope.row.state != 1 && scope.row.state != 5" v-if="scope.row.state == 4 || scope.row.state == 5 || scope.row.state == 6"
size="mini" size="mini"
type="text" type="text"
@click="verificationCancelClick(scope.row)" @click="verificationCancelClick(scope.row)"
>反核销</el-button >反核销</el-button
> >
<el-button <el-button
v-if="scope.row.state == 3" v-if="scope.row.state == 5"
size="mini" size="mini"
type="text" type="text"
@click="openInvoice(scope.row.id)" @click="openInvoice(scope.row.id)"
>开票</el-button >开票</el-button
> >
<el-button v-if="scope.row.state === 0" size="mini" type="text" @click="deleteClick(scope.row)">删除</el-button> <el-button v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3" size="mini" type="text" @click="verificationCancelClick(scope.row)">收款</el-button>
<el-button v-if="scope.row.state == 0 || scope.row.state == 1" size="mini" type="text" @click="deleteClick(scope.row)">删除</el-button>
<el-button <el-button
v-if="scope.row.state != 5" v-if="scope.row.state != 0"
size="mini" size="mini"
type="text" type="text"
@click="toprint(scope.row.id)" @click="toprint(scope.row.id)"
>打印</el-button >打印</el-button
> >
<el-button <el-button
v-if="scope.row.state != 5" v-if="scope.row.state != 0"
size="mini" size="mini"
type="text" type="text"
@click="exportReceipt(scope.row.id)" @click="exportReceipt(scope.row.id)"
...@@ -241,8 +246,8 @@ import { DICT_TYPE } from "@/utils/dict"; ...@@ -241,8 +246,8 @@ import { DICT_TYPE } from "@/utils/dict";
import CustomerSelector from "@/components/CustomerSelector"; import CustomerSelector from "@/components/CustomerSelector";
import { import {
getReceiptList, getReceiptList,
receiptVerification, // receiptVerification,
receiptVerificationCancel, // receiptVerificationCancel,
receiptExportExcel, receiptExportExcel,
deleteReceipt deleteReceipt
} from "@/api/ecw/financial"; } from "@/api/ecw/financial";
......
src/views/ecw/order/associatedOrder.vue
View file @ 6e3467db
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人"></el-table-column> <el-table-column label="操作人" prop="creator">
<template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间"> <el-table-column label="操作时间">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
...@@ -85,6 +89,7 @@ import { ...@@ -85,6 +89,7 @@ import {
} from "@/api/ecw/associatedOrder"; } from "@/api/ecw/associatedOrder";
import {getDictDatas,DICT_TYPE} from '@/utils/dict' import {getDictDatas,DICT_TYPE} from '@/utils/dict'
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {listSimpleUsers} from "@/api/system/user";
export default { export default {
name: "associatedOrder", name: "associatedOrder",
props:{ props:{
...@@ -114,7 +119,8 @@ export default { ...@@ -114,7 +119,8 @@ export default {
list:[], list:[],
DICT_TYPE, DICT_TYPE,
getDictDatas, getDictDatas,
multipleSelection:[] multipleSelection:[],
userList:[]
} }
}, },
created() { created() {
...@@ -125,13 +131,13 @@ export default { ...@@ -125,13 +131,13 @@ export default {
this.orderDetails = r.data; this.orderDetails = r.data;
} }
}) })
listSimpleUsers().then(r => this.userList = r.data)
}, },
methods:{ methods:{
getList(){ getList(){
guanlianList(this.params).then(r => { guanlianList(this.params).then(r => {
if(r.code === 0){ if(r.code === 0){
this.list = r.data this.list = r.data
console.log( this.list[0])
} }
}) })
}, },
......
src/views/ecw/order/components/warehouseDetails.vue
View file @ 6e3467db
...@@ -124,6 +124,12 @@ ...@@ -124,6 +124,12 @@
{{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}} {{ FeeDetails.details && FeeDetails.details.reason ? FeeDetails.details.reason :''}}
</div> </div>
</div> </div>
<div v-if="type === 4">
<p>申请理由</p>
<div>
{{ FeeDetails.details || '' }}
</div>
</div>
</div> </div>
</template> </template>
...@@ -133,7 +139,13 @@ import { ...@@ -133,7 +139,13 @@ import {
warehouseApprovalGetById, warehouseApprovalGetById,
warehouseAreaPositionList warehouseAreaPositionList
} from "@/api/ecw/batchSingleApplication"; } from "@/api/ecw/batchSingleApplication";
import {applicationGetOrderByProcessId, feeApplicationGet, getOrder, getOrderPage,} from "@/api/ecw/order"; import {
applicationGetOrderByProcessId,
feeApplicationGet,
getOrder,
getOrderPage,
getWarehouseUpdateApprovalInfo
} from '@/api/ecw/order'
import { getChannelList } from '@/api/ecw/channel'; import { getChannelList } from '@/api/ecw/channel';
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {getSupplierPage} from "@/api/ecw/supplier"; import {getSupplierPage} from "@/api/ecw/supplier";
...@@ -221,6 +233,12 @@ export default { ...@@ -221,6 +233,12 @@ export default {
}) })
}); });
break; break;
case 4:
// 入仓修改
getWarehouseUpdateApprovalInfo(this.processInstanceID).then(r => {
this.FeeDetails.details = r.data.details
})
break
} }
} }
......
src/views/ecw/order/mutexOrder.vue
View file @ 6e3467db
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人"></el-table-column> <el-table-column label="操作人">
<template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="createTime"> <el-table-column label="操作时间" prop="createTime">
<template v-slot="{row}">{{ <template v-slot="{row}">{{
parseTime(row.orderBackVO.createTime) parseTime(row.orderBackVO.createTime)
...@@ -85,6 +89,7 @@ import { ...@@ -85,6 +89,7 @@ import {
} from "@/api/ecw/mutexOrder"; } from "@/api/ecw/mutexOrder";
import {getDictDatas,DICT_TYPE} from '@/utils/dict' import {getDictDatas,DICT_TYPE} from '@/utils/dict'
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {listSimpleUsers} from "@/api/system/user";
export default { export default {
name: "mutexOrder", name: "mutexOrder",
props:{ props:{
...@@ -104,7 +109,8 @@ export default { ...@@ -104,7 +109,8 @@ export default {
list:[], list:[],
DICT_TYPE, DICT_TYPE,
getDictDatas, getDictDatas,
multipleSelection:[] multipleSelection:[],
userList:[]
} }
}, },
created() { created() {
...@@ -115,6 +121,7 @@ export default { ...@@ -115,6 +121,7 @@ export default {
this.orderDetails = r.data; this.orderDetails = r.data;
} }
}) })
listSimpleUsers().then(r => this.userList = r.data)
}, },
methods:{ methods:{
getList(){ getList(){
......
src/views/ecw/order/transferWarehousing.vue
View file @ 6e3467db
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<el-divider content-position="left"> <el-divider content-position="left">
货物信息 货物信息
</el-divider> </el-divider>
<el-table :data=" orderDetails.orderItemVOList && orderDetails.orderItemVOList.length > 0 ? orderDetails.orderItemVOList : [] "> <el-table :show-summary="true" :summary-method="totalFn" :data=" orderDetails.orderItemVOList && orderDetails.orderItemVOList.length > 0 ? orderDetails.orderItemVOList : [] ">
<el-table-column type="index" label="序号"></el-table-column> <el-table-column width="80" type="index" label="序号"></el-table-column>
<el-table-column label="品名"> <el-table-column label="品名">
<template v-slot="{row}"> <template v-slot="{row}">
<div>{{ row.prodTitleZh }}</div> <div>{{ row.prodTitleZh }}</div>
...@@ -18,22 +18,21 @@ ...@@ -18,22 +18,21 @@
</el-table-column> </el-table-column>
<el-table-column label="填单货物属性"> <el-table-column label="填单货物属性">
<template v-slot="{row}"> <template v-slot="{row}">
<el-descriptions size="mini" :column="1"> <el-descriptions size="mini" :column="2">
<el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item> <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
<el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item> <el-descriptions-item label="箱数">{{ row.num }}</el-descriptions-item>
<el-descriptions-item label="体积">{{ row.volume }}</el-descriptions-item> <el-descriptions-item label="体积">{{ row.volume }}m³</el-descriptions-item>
<el-descriptions-item label="重量"> <el-descriptions-item label="重量">{{row.weight}}Kg</el-descriptions-item>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库货物属性"> <el-table-column label="入库货物属性">
<template v-slot="{row}"> <template v-slot="{row}">
<el-descriptions size="mini" :column="4"> <el-descriptions size="mini" :column="2">
<el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item> <el-descriptions-item label="品牌">{{ row.brand }}</el-descriptions-item>
<el-descriptions-item label="箱数"> {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum :'' }}</el-descriptions-item> <el-descriptions-item label="箱数"> {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum :'' }}</el-descriptions-item>
<el-descriptions-item label="体积">{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}</el-descriptions-item> <el-descriptions-item label="体积">{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.volume :'' }}m³</el-descriptions-item>
<el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}</el-descriptions-item> <el-descriptions-item label="重量"> {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : '' }}Kg</el-descriptions-item>
</el-descriptions> </el-descriptions>
</template> </template>
</el-table-column> </el-table-column>
...@@ -238,6 +237,22 @@ export default { ...@@ -238,6 +237,22 @@ export default {
this.$router.back(); this.$router.back();
} }
}) })
},
totalFn({ columns, data }){
// 体积，数量，重量 W:入仓
let volume = 0,num = 0,weight = 0;
let Wvolume = 0 ,Wnum = 0,Wweight = 0;
data.forEach(i => {
volume += Number(i.volume)
num += Number(i.num)
weight += Number(i.weight)
Wvolume += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.volume : 0);
Wnum += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.num : 0)
Wweight += Number(i.warehouseInInfoVO ? i.warehouseInInfoVO.weight : 0)
})
let text = `下单统计：${num}箱 ${volume}m³ ${weight}Kg`
let text2 =` 入仓统计：${Wnum}箱 ${Wvolume}m³ ${Wweight}Kg`
return ['合计：',text,text2]
} }
}, },
} }
......
src/views/member/user/index.vue
View file @ 6e3467db
...@@ -113,7 +113,11 @@ ...@@ -113,7 +113,11 @@
<el-table :data="operationLogList"> <el-table :data="operationLogList">
<el-table-column label="标题" prop="title"></el-table-column> <el-table-column label="标题" prop="title"></el-table-column>
<el-table-column label="操作内容" prop="content"></el-table-column> <el-table-column label="操作内容" prop="content"></el-table-column>
<el-table-column label="操作人" prop="userId"></el-table-column> <el-table-column label="操作人" prop="userId">
<template v-slot="{row}">
{{list.find(i => i.id == row.userId).identityName}}
</template>
</el-table-column>
<el-table-column label="操作时间"> <el-table-column label="操作时间">
<template v-slot:default ="scope"> <template v-slot:default ="scope">
{{parseTime(scope.row.createTime) }} {{parseTime(scope.row.createTime) }}
...@@ -533,6 +537,7 @@ export default { ...@@ -533,6 +537,7 @@ export default {
if(valid && this.IdDetails.status === 3){ if(valid && this.IdDetails.status === 3){
let res = await new Promise((resolve)=>{ let res = await new Promise((resolve)=>{
this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', { this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', {
distinguishCancelAndClose: true,
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -542,7 +547,8 @@ export default { ...@@ -542,7 +547,8 @@ export default {
resolve(r) resolve(r)
}) })
}) })
p.auditPass = res === 'confirm' ? true : false; if(res === 'close') return
else p.auditPass = res === 'confirm' ? true : false;
} else if(valid) { } else if(valid) {
p.auditPass = false; p.auditPass = false;
} else { } else {
...@@ -572,12 +578,14 @@ export default { ...@@ -572,12 +578,14 @@ export default {
if(valid && this.enterpriseFrom.status === 3){ if(valid && this.enterpriseFrom.status === 3){
let res = await new Promise((resolve)=>{ let res = await new Promise((resolve)=>{
this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', { this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', {
distinguishCancelAndClose: true,
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(r =>resolve(r)).catch(r => resolve(r)) }).then(r =>resolve(r)).catch(r => resolve(r))
}) })
p.auditPass = res === 'confirm' ? true : false; if (res === 'close') return
else p.auditPass = res === 'confirm' ? true : false;
}else if(valid){ }else if(valid){
p.auditPass = false; p.auditPass = false;
}else { }else {
...@@ -621,7 +629,8 @@ export default { ...@@ -621,7 +629,8 @@ export default {
this.$message.success('添加成功!'); this.$message.success('添加成功!');
this.enterpriseFrom.status = 2 this.enterpriseFrom.status = 2
this.enterpriseFrom.auditTime = new Date().getTime() this.enterpriseFrom.auditTime = new Date().getTime()
this.getEnterpriseFn(); this.getEnterpriseFn();
this.getList()
} }
}) })
} }
......
src/views/member/user/underReview.vue
View file @ 6e3467db
...@@ -73,62 +73,20 @@ ...@@ -73,62 +73,20 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope" > <template slot-scope="scope" >
<el-button size="mini" type="text" @click="guarantee(scope.row)">保函/证书</el-button> <el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text" @click="identityFn(scope.row , '1')">身份证审核</el-button>
<el-button size="mini" type="text" @click="operationLogFn(scope.row)">操作日志</el-button>
<el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text" @click="identityFn(scope.row , '1')">身份证</el-button>
<el-button size="mini" type="text" @click="identityFn(scope.row, '2')">营业执照</el-button>
<el-button size="mini" type="text" @click="deleteFn(scope.row)">删 除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList"/> @pagination="getList"/>
<el-dialog
title="保函/证书"
:visible.sync="guaranteeShow"
:before-close="()=>{guaranteeUrl = ''; guaranteeShow = false;}"
width="50%">
<el-form>
<el-form-item label="保函/证书">
<el-row :gutter="20" type="flex" justify="center" >
<el-col :span="12"><el-input v-model="guaranteeUrl" ></el-input></el-col>
<el-col :span="4"><div style="height: 45px;overflow: hidden;">
<file-upload v-model="guaranteeUrl" :fileType="['png', 'jpg', 'jpeg','pdf']" :limit="1" :isShowTip="false"></file-upload>
</div></el-col>
<el-col :span="6">
<div>可上传图片,pdf文档</div>
</el-col>
</el-row>
</el-form-item>
</el-form>
<div style="text-align: center;"><el-button @click="setGuarantee">保 存</el-button></div>
</el-dialog>
<el-dialog
title="操作日志"
:visible.sync="operationLogShow"
width="50%">
<el-table :data="operationLogList">
<el-table-column label="标题" prop="title"></el-table-column>
<el-table-column label="操作内容" prop="content"></el-table-column>
<el-table-column label="操作人" prop="userId"></el-table-column>
<el-table-column label="操作时间">
<template v-slot:default ="scope">
{{parseTime(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column label="操作ip" prop="ip"></el-table-column>
</el-table>
<pagination v-show="totalLog > 0" :total="totalLog" :page.sync="operationLogFrom.page" :limit.sync="operationLogFrom.row"
@pagination="getOperationLogList"/>
</el-dialog>
<el-dialog <el-dialog
title="认证" title="认证"
:visible.sync="attestationShow" :visible.sync="attestationShow"
width="80%"> width="80%">
<div class="details"> <div class="details">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" >
<el-tab-pane label="身份证" name="1" v-if="this.publicObj && this.publicObj.identityAuditStatus !== 0 && this.publicObj.identityAuditStatus !== undefined"> <el-tab-pane label="身份证" name="1">
<div style="padding:0 40px;box-sizing: border-box;"> <div style="padding:0 40px;box-sizing: border-box;">
<el-form ref="formId" label-position="left" label-width="100px" :rules="rulesId" :model="IdDetails" > <el-form ref="formId" label-position="left" label-width="100px" :rules="rulesId" :model="IdDetails" >
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
...@@ -167,53 +125,6 @@ ...@@ -167,53 +125,6 @@
<el-button type="primary" @click="idCardAuditFn(3)">审核不通过</el-button> <el-button type="primary" @click="idCardAuditFn(3)">审核不通过</el-button>
<el-button @click="attestationShow = false">取 消</el-button> <el-button @click="attestationShow = false">取 消</el-button>
</div> </div>
<div v-if="IdDetails.status === 2 || IdDetails.status === 3" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="setMemberUserUpdateIdCard">修 改</el-button>
<el-button @click="attestationShow = false">取 消</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="营业执照" name="2" >
<div style="width: 500px;padding:0 40px;box-sizing: border-box;">
<el-form :rules="rulesEnterprise" :model="enterpriseFrom" label-position="left" ref="formEnter" label-width="100px">
<el-form-item label="企业名称" prop="name">
<el-input v-model="enterpriseFrom.name" ></el-input>
</el-form-item>
<el-form-item label="企业法人" prop="legalName">
<el-input v-model="enterpriseFrom.legalName" ></el-input>
</el-form-item>
<el-form-item label="证件号码" prop="cardNumber">
<el-input v-model="enterpriseFrom.cardNumber"></el-input>
</el-form-item>
<el-form-item label="证件照" prop="img1">
<div>
<el-input readonly style="margin-bottom: 20px" v-model="enterpriseFrom.img1"></el-input>
<ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img1"></ImageUpload>
</div>
</el-form-item>
<el-form-item label="附件">
<el-input readonly v-model="enterpriseFrom.img2"></el-input>
<ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img2"></ImageUpload>
</el-form-item>
<el-form-item label="审核状态">{{getDictDatas(DICT_TYPE.AUDIT_STATUS)[enterpriseFrom.status].label}}</el-form-item>
<el-form-item v-if="enterpriseFrom.status === 2 || enterpriseFrom.status === 3" label="审核时间">{{parseTime(enterpriseFrom.auditTime)}}</el-form-item>
<el-form-item v-if="enterpriseFrom.status === 1 || enterpriseFrom.status === 3" label="审核备注">
<el-input v-model="enterpriseFrom.auditRemark" :disabled="enterpriseFrom.status === 3" type="textarea"></el-input>
</el-form-item>
</el-form>
<div v-if="enterpriseFrom.status === 1" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="certificateVerificationFn(2)">审核通过</el-button>
<el-button type="primary" @click="certificateVerificationFn(3)">审核不通过</el-button>
<el-button @click="attestationShow = false">取 消</el-button>
</div>
<div v-if="enterpriseFrom.status === 2 || enterpriseFrom.status === 3" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="setMemberUserUpdateEnterprise">修 改</el-button>
<el-button @click="attestationShow = false">取 消</el-button>
</div>
<div v-if="enterpriseFrom.status === 0" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="submit">上 传</el-button>
<el-button @click="attestationShow = false">取 消</el-button>
</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -302,12 +213,6 @@ export default { ...@@ -302,12 +213,6 @@ export default {
img1: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }], img1: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
img2: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }], img2: [{ required: true, message: "身份正面照不能为空", trigger: ['blur','change'] }],
}, },
rulesEnterprise: {
name: [{required: true, message: "企业名称不能为空", trigger: "blur"}],
legalName: [{required: true, message: "企业法人不能为空", trigger: "blur"}],
cardNumber: [{required: true, message: "证件号码不能为空", trigger: "blur"}],
img1: [{required: true, message: "证件照不能为空", trigger: ['blur','change']}],
},
publicObj:undefined, publicObj:undefined,
operationLogShow:false, operationLogShow:false,
guaranteeShow:false, guaranteeShow:false,
...@@ -417,22 +322,7 @@ export default { ...@@ -417,22 +322,7 @@ export default {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// 保函证书
guarantee(row) {
this.publicObj = row;
this.guaranteeShow = true;
this.guaranteeUrl = row.backLetterImg;
},
// 操作日志
operationLogFn(row){
this.publicObj = row;
this.operationLogFrom.page = 1;
this.operationLogFrom.userId = row.id
this.operationLogShow = true;
this.operationLogList = [];
this.getOperationLogList();
},
getOperationLogList(){ getOperationLogList(){
operationLogApi(this.operationLogFrom).then(r=>{ operationLogApi(this.operationLogFrom).then(r=>{
if(r.code === 0){ if(r.code === 0){
...@@ -454,18 +344,7 @@ export default { ...@@ -454,18 +344,7 @@ export default {
this.attestationShow = true; this.attestationShow = true;
this.activeName = val; this.activeName = val;
this.publicObj = row; this.publicObj = row;
if(val == 1){ this.getIdentityDetails();
this.getIdentityDetails();
}else {
this.getEnterpriseFn();
}
},
handleClick(val){
if(val.name == 1){
this.getIdentityDetails();
}else {
this.getEnterpriseFn();
}
}, },
getIdentityDetails(){ getIdentityDetails(){
this.resetId(); this.resetId();
...@@ -497,99 +376,9 @@ export default { ...@@ -497,99 +376,9 @@ export default {
if(r.code === 0){ if(r.code === 0){
this.$message.success('修改成功'); this.$message.success('修改成功');
this.getList() this.getList()
this.getIdentityDetails() this.attestationShow = false;
}
})
},
// 企业证书审核
certificateVerificationFn(val){
let p = {
auditStatus:val,
userCardAuthId:this.enterpriseFrom.id,
auditRemark:this.enterpriseFrom.auditRemark
}
if(val === 2){
p.auditRemark = undefined
}
memberUserAuditEnterprise(p).then(r => {
if(r.code === 0){
this.getList()
this.getEnterpriseFn();
}
})
},
setMemberUserUpdateIdCard(){
this.$refs.formId.validate(async valid =>{
let p ={
cardNumber:this.IdDetails.cardNumber,
cardType:this.IdDetails.cardType,
img1:this.IdDetails.img1,
img2:this.IdDetails.img2,
name:this.IdDetails.name,
userCardAuthId:this.IdDetails.id,
};
if(valid && this.IdDetails.status === 3){
let res = await new Promise((resolve)=>{
this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(r =>{
resolve(r)
}).catch((r)=>{
resolve(r)
})
})
p.auditPass = res === 'confirm' ? true : false;
} else if(valid) {
p.auditPass = false;
} else {
return
}
memberUserUpdateIdCard(p).then(r => {
if(r.code === 0){
this.$message.success('修改成功')
if(p.auditPass === true ){
this.getIdentityDetails()
}
this.getList()
}
})
})
},
setMemberUserUpdateEnterprise(){
this.$refs.formEnter.validate(async valid =>{
let p = {
cardNumber:this.enterpriseFrom.cardNumber,
img1:this.enterpriseFrom.img1,
img2:this.enterpriseFrom.img2,
legalName:this.enterpriseFrom.legalName,
name:this.enterpriseFrom.name,
userEnterpriseAuthId:this.enterpriseFrom.id,
}
if(valid && this.enterpriseFrom.status === 3){
let res = await new Promise((resolve)=>{
this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(r =>resolve(r)).catch(r => resolve(r))
})
p.auditPass = res === 'confirm' ? true : false;
}else if(valid){
p.auditPass = false;
}else {
return
} }
memberUserUpdateEnterprise(p).then(r =>{
if(r.code === 0){
if(p.auditPass === 3){
this.getEnterpriseFn();
}
this.getList()
this.$message.success('修改成功');
}
})
}) })
}, },
authentication(row){ authentication(row){
......
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