Skip to content

J
jiedao-app-operator-master
Commit cd16f157 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 cd6cff39 a772b730
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 106 deletions
src/components/CustomerFollow/index.vue
View file @ cd16f157
......@@ -162,6 +162,7 @@ export default {
if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
this.customerContactsList = r.data
this.customerFollow.form.customerId = this.customerId
this.customerFollow.form.bizId = this.id
})
listServiceUser().then(r => {
this.serviceUserList = r.data
......
src/views/ecw/customerComplaint/index.vue
View file @ cd16f157
......@@ -52,27 +52,43 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('客货投诉')" align="center" prop="code" >
</el-table-column>
<el-table-column :label="$t('投诉类型')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" >
<template slot-scope="scope">
<div>{{ formatCustomerName(scope.row.customerId) }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('投诉类型')" align="center" prop="type">
<el-table-column :label="$t('投诉日期')" align="center" width="180">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" />
<span>{{ parseTime(scope.row.createTime)}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderId" />
<el-table-column :label="$t('提单号')" align="center" prop="ladingbillId" />
<el-table-column :label="$t('投诉内容')" align="center" prop="content" />
<el-table-column :label="$t('处理状态')" align="center" prop="status">
<el-table-column :label="$t('登记客服')" align="center" prop="adminNickname">
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<el-table-column :label="$t('提单号')" align="center" prop="ladingbillId" />
<el-table-column :label="$t('订单号')" align="center" prop="orderId" />
<el-table-column :label="$t('处理时间')" align="center" prop="handleAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<span>{{ parseTime(scope.row.handleAt)}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('赔付金额')" align="center" prop="handleAt" width="180">
<template slot-scope="scope">
{{scope.row.indemnity || '0.00'}}
<dict-tag
:value="scope.row.currencyUnit"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
......@@ -194,8 +210,7 @@
<el-dialog :title="title" :visible.sync="openCustomer" width="900px" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<div class="formShow">
<el-form ref="form" :inline="true" :model="form" label-width="80px">
<el-form-item :label="$t('客户名称')+':'">
<div>{{ formatCustomerName(form.customerId) }}</div>
</el-form-item>
......@@ -216,7 +231,6 @@
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" />
</el-form-item>
</div>
</div>
<el-form-item :label="$t('投诉内容')+':'" >
<div>{{form.content|| $t('无')}}</div>
</el-form-item>
......@@ -536,7 +550,7 @@ export default {
this.exportLoading = true;
return exportCustomerComplaintExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.$download.excel(response, '客户投诉列表.xls');
this.exportLoading = false;
}).catch(() => {});
},
......
src/views/ecw/financial/creatCollection.vue
View file @ cd16f157
......@@ -88,7 +88,7 @@
<!-- </el-descriptions> -->
</el-card>
<el-card class="card amountCard">
<div slot="header" class="card-title">{{ $t('订单信息') }}</div>
<div slot="header" class="card-title">{{ $t('应收明细') }}</div>
<el-col :span="1.5">
<el-button
type="primary"
......@@ -1139,21 +1139,22 @@ export default {
}
// params.receiptAccountList.length = params.receiptAccountList.length - 1
params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
var saveStatus = true
params.receiptAccountList.map(v => {
if(!v.platformAccountId){
saveStatus = false
}
var bankname = this.bankData.filter(item=>item.id == v.platformAccountId)
if(bankname.length>0){
v.platformAccountName = bankname[0].baAccountName
v.platformAccountNo = bankname[0].baAccountNum
v.platformAccountBlankName = bankname[0].baBankName
params.receiptAccountList.forEach(v => {
if(v.type!='total'){
if(!v.platformAccountId){
saveStatus = false
}
var bankname = this.bankData.filter(item=>item.id == v.platformAccountId)
if(bankname.length>0){
v.platformAccountName = bankname[0].baAccountName
v.platformAccountNo = bankname[0].baAccountNum
v.platformAccountBlankName = bankname[0].baBankName
}
delete v.discountTotal
v.writeOffRate = Number(v.writeOffRate)
}
delete v.discountTotal
v.writeOffRate = Number(v.writeOffRate)
return v
})
if(!saveStatus){
this.$modal.msgError(this.$t('请添加收款账户'));
......@@ -1178,10 +1179,11 @@ export default {
});
if (valid) {
this.saveBtnLoading = true
params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
if (this.id && this.id != 0) {
updateReceipt(params).then(res => {
this.$modal.msgSuccess(this.$t('修改成功'));
this.$router.back();
this.$store.dispatch('tagsView/delCurrentView')
}).finally(() => {
this.saveBtnLoading = false
})
......@@ -1189,7 +1191,7 @@ export default {
params.currencyId = this.showCurrencyId
createReceipt(params).then(res => {
this.$modal.msgSuccess(this.$t('保存成功'));
this.$router.back();
this.$store.dispatch('tagsView/delCurrentView')
}).finally(() => {
this.saveBtnLoading = false
})
......@@ -1201,11 +1203,12 @@ export default {
this.$refs.form.validate ((valid)=>{
if (valid) {
this.saveBtnLoading = true
params.receiptAccountList.splice(params.receiptAccountList.length - 1,1)
if (this.id && this.id != 0) {
if(params.state==0) params.state = 1
updateReceipt(params).then(res => {
this.$modal.msgSuccess(this.$t('修改成功'));
this.$router.back();
this.$store.dispatch('tagsView/delCurrentView')
}).finally(() => {
this.saveBtnLoading = false
})
......@@ -1213,7 +1216,7 @@ export default {
params.currencyId = this.showCurrencyId
createReceipt(params).then(res => {
this.$modal.msgSuccess(this.$t('新增成功'));
this.$router.back();
this.$store.dispatch('tagsView/delCurrentView')
}).finally(() => {
this.saveBtnLoading = false
})
......
src/views/ecw/financial/printVoucher.vue
View file @ cd16f157
......@@ -5,18 +5,18 @@
<div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">捷道货运收款单</div>
<table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
<tr>
<td style="font-weight: bold;width:12.5%">部门</td>
<td style="width:12.5%">{{form?form.departmentName:'无'}}</td>
<td style="font-weight: bold;width:12.5%">客户名称</td>
<td colspan="2" style="width: 25%;">{{form?form.customerName:'无'}}</td>
<td style="font-weight: bold;width:12.5%">收款日期</td>
<td colspan="2" style="width: 25%;">{{form?form.payedAt:'无'}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
<td style="width:12.5%">{{form?form.departmentName:$t('无')}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td>
<td colspan="2" style="width: 25%;">{{form?form.customerName:$t('无')}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td>
<td colspan="2" style="width: 25%;">{{parseTime(date)||$t('无')}}</td>
</tr>
<tr>
<td style="font-weight: bold;width:12.5%">收款单号</td>
<td style="width:12.5%">{{form?form.receiptNo:'无'}}</td>
<td style="font-weight: bold;width:12.5%">备注</td>
<td colspan="4" style="width: 50%;">{{form?form.remark:'无'}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('收款单号')}}</td>
<td style="width:12.5%">{{form?form.receiptNo:$t('无')}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('备注')}}</td>
<td colspan="4" style="width: 50%;">{{form?form.remark:$t('无')}}</td>
</tr>
<tr>
<td colspan="8">Form/To:{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:''}}>{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:''}}</td>
......@@ -24,14 +24,14 @@
</table>
<table border="1" style="width: 100%;text-align: center;border-collapse: collapse; border-top: 0;">
<tr>
<th style="width: 12.5%;">序号</th>
<th style="width: 12.5%;">提单号</th>
<th style="width: 12.5%;">订单号</th>
<th style="width: 12.5%;">品名</th>
<th style="width: 12.5%;">收入类型</th>
<th style="width: 12.5%;">金额</th>
<th style="width: 12.5%;">币种</th>
<th style="width: 12.5%;">优惠金额</th>
<th style="width: 12.5%;">{{$t('序号')}}</th>
<th style="width: 12.5%;">{{$t('提单号')}}</th>
<th style="width: 12.5%;">{{$t('订单号')}}</th>
<th style="width: 12.5%;">{{$t('品名')}}</th>
<th style="width: 12.5%;">{{$t('收入类型')}}</th>
<th style="width: 12.5%;">{{$t('金额')}}</th>
<th style="width: 12.5%;">{{$t('币种')}}</th>
<th style="width: 12.5%;">{{$t('优惠金额')}}</th>
</tr>
<tr v-for="(item, index) in list" :key="index">
<td>{{ index + 1 }}</td>
......@@ -44,38 +44,38 @@
<td>{{ item.discountTotal||0 }}</td>
</tr>
<tr v-for="(items, indexs) in receiptAccountList" :key="indexs">
<td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />应收合计</td>
<td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />{{$t('应收合计')}}</td>
<td ><span v-if="items.discountTotal>0">{{ `${items.receivableAmount - items.discountTotal }(${items.receivableAmount} - ${items.discountTotal})` }}</span>
<span v-else>{{ `${items.receivableAmount - items.discountTotal }` }}</span>
</td>
<td>汇率</td>
<td>{{$t('汇率')}}</td>
<td>{{ items.collectionRate}}</td>
<td>收款金额(<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />)</td>
<td>{{$t('收款金额')}}(<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />)</td>
<td colspan="3">{{ items.collectionAmount}}</td>
</tr>
</table>
<div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
银行信息
{{$t('银行信息')}}
</div>
<div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;" v-for="(bankTiem,index) in detailed" :key="index">
<div style="padding:6px 0;width: 12.5%;text-align: center;border-right: 1px solid #666;" >
<p style="margin: 0;word-break: break-all;">户名：{{bankTiem.accountName}}</p>
<p style="margin: 0;word-break: break-all;">银行名称：{{bankTiem.accountBankName||''}}</p>
<p style="margin: 0;word-break: break-all;">{{$t('户名')}}：{{bankTiem.accountName}}</p>
<p style="margin: 0;word-break: break-all;">{{$t('银行名称')}}：{{bankTiem.accountBankName||''}}</p>
<p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.accountNo}}</p>
</div>
<div style="padding:6px 0;width: 87.5%;text-align: center;">
<p style="margin: 0;">实收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.writeOffAmount}}¥</p>
<p style="margin: 0;">{{$t('实收')}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.writeOffAmount}}¥</p>
<!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
</div>
</div>
<div style="display: flex;align-items: center;border: 1px solid #666;">
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">主管</div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('主管')}}</div>
<div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">会计</div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('会计')}}</div>
<div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">出纳</div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('出纳')}}</div>
<div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;border-right: 1px solid #666;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">经手人</div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('经手人')}}</div>
<div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;"></div>
</div>
</div>
......@@ -120,7 +120,8 @@
deptArr:[],
id:0,
orderData:{},
detailed:[]
detailed:[],
date:''
}
},
async created() {
......@@ -206,7 +207,14 @@
getList() {
getReceivableItem({ id: this.id }).then(res => {
this.detailed = res.data
this.detailed.forEach(item=>{
if(!this.date){
this.date = item.amountDate
}else if(this.date<item.amountDate){
this.date = item.amountDate
}
})
})
},
getCollectionData(){
let that = this
......
src/views/ecw/financial/receiptDetail.vue
View file @ cd16f157
......@@ -15,7 +15,7 @@
</el-descriptions>
</el-card>
<el-card class="card">
<div slot="header" class="card-title">{{ $t('订单信息') }}</div>
<div slot="header" class="card-title">{{ $t('应收明细') }}</div>
<el-table :data="list" border>
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column :label="$t('唛头')" align="center" prop="marks" />
......@@ -108,51 +108,7 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<div slot="header" class="card-title">{{ $t('银行收款明细') }}</div>
<div>
<el-button type="primary" plain size="mini" @click="batchVerification" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
<el-button type="primary" plain size="mini" @click="handleAddReceiptItem" style="padding: 10px; margin-bottom: 10px">{{ $t('添加收款明细') }}</el-button>
</div>
<el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column>
<el-table-column :label="$t('序号')" type="index" align="center" width="50"></el-table-column>
<el-table-column :label="$t('收款账户')" align="center" prop="accountName" />
<el-table-column :label="$t('实收金额')" align="center" prop="amount" />
<el-table-column :label="$t('实收币种')" align="center" prop="marks">
<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="$t('汇率')" align="center" prop="rate" />
<el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />
<el-table-column :label="$t('实收日期')" align="center" prop="amountDate">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.amountDate, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column :label="$t('水单号')" align="center" prop="billNo" />
<el-table-column :label="$t('水单附件')" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attr">
<div v-for="(v, i) in scope.row.attr" :key="i"><el-link :href="v.url" type="primary" target="_blank">{{ v.name }}</el-link></div>
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<span>{{ scope.row.status == 0 ? $t('待核销') : $t('已核销') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
<el-button type="text" @click="detailClick(scope.row)">{{ $t('详情') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
<el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">{{ $t('编辑') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card class="card">
<div slot="header" class="card-title">{{ $t('收款信息') }}</div>
<el-table :data="form.receiptAccountList" border>
......@@ -241,6 +197,51 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<div slot="header" class="card-title">{{ $t('银行收款明细') }}</div>
<div>
<el-button type="primary" plain size="mini" @click="batchVerification" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
<el-button type="primary" plain size="mini" @click="handleAddReceiptItem" style="padding: 10px; margin-bottom: 10px">{{ $t('添加收款明细') }}</el-button>
</div>
<el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column>
<el-table-column :label="$t('序号')" type="index" align="center" width="50"></el-table-column>
<el-table-column :label="$t('收款账户')" align="center" prop="accountName" />
<el-table-column :label="$t('实收金额')" align="center" prop="amount" />
<el-table-column :label="$t('实收币种')" align="center" prop="marks">
<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="$t('汇率')" align="center" prop="rate" />
<el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />
<el-table-column :label="$t('实收日期')" align="center" prop="amountDate">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.amountDate, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column :label="$t('水单号')" align="center" prop="billNo" />
<el-table-column :label="$t('水单附件')" align="center" prop="attr">
<template slot-scope="scope" v-if="scope.row.attr">
<div v-for="(v, i) in scope.row.attr" :key="i"><el-link :href="v.url" type="primary" target="_blank">{{ v.name }}</el-link></div>
</template>
</el-table-column>
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<span>{{ scope.row.status == 0 ? $t('待核销') : $t('已核销') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" width="200">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
<el-button type="text" @click="detailClick(scope.row)">{{ $t('详情') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
<el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
<el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">{{ $t('编辑') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card class="card hexiaoCard">
<el-descriptions :column="3" border>
<el-descriptions-item :label="$t('已核销总金额')">
......
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