aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-10-13 23:32:37 +08:00
parent b347fe46e4
commit a69c0ebc97
3 changed files with 218 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
View File

@ -61,7 +61,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisTmsCostFee:add']"
>新增</el-button>
>成本录入</el-button>
</el-col>
<el-col :span="1.5">
@ -86,6 +86,16 @@
v-hasPermi="['emis:emisTmsCostFee:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleReCalcProfit"
v-hasPermi="['emis:emisTmsCostProfit:edit']"
>利润重算</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -100,8 +110,12 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('成本序号')" align="center" prop="costNo" min-width="100" />
<el-table-column label="序号" align="center" prop="index" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('成本序号')" align="center" prop="costNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('成本名称')" align="center" prop="costName" min-width="100" /> -->
<el-table-column :label="$t('成本类型')" align="center" prop="feeType" min-width="100" >
<template slot-scope="scope">
@ -113,11 +127,37 @@
<dict-tag :options="dict.type.emis_cost_split_type" :value="scope.row.splitType"/>
</template>
</el-table-column>
<el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" min-width="100" />
<el-table-column :label="$t('总费用')" align="center" prop="costFee" min-width="100" />
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
<!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_trans_carrier" :value="scope.row.transType"/>
</template>
</el-table-column>
<el-table-column :label="$t('运输单号')" align="center" prop="transSignNo" min-width="100" />
<!-- <el-table-column :label="$t('供应商代码')" align="center" prop="supplierCode" min-width="100" /> -->
<el-table-column :label="$t('供应商名称')" align="center" prop="supplierName" min-width="150" />
<el-table-column :label="$t('发件地')" align="center" prop="sendPlace" min-width="100" />
<el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
<el-table-column :label="$t('成本费')" align="center" prop="costFee" min-width="100" />
<el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" />
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<!-- <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="100" />
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmCenterDate" min-width="100" />
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmCenterNote" min-width="100" />
@ -148,7 +188,7 @@ import emisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
export default {
name: "emisTmsCostFee",
components: { elDateSimplePicker,emisTmsCostFeeForm },
dicts: ['emis_cost_fee_type','emis_cost_split_type'],
dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_trans_carrier','emis_payment_type'],
data() {
return {
// 遮罩层
@ -201,29 +241,16 @@ export default {
/** 查询TMS运输成本账单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeConfirmCenterDate && '' != this.daterangeConfirmCenterDate) {
this.queryParams.params["beginConfirmCenterDate"] = this.daterangeConfirmCenterDate[0];
this.queryParams.params["endConfirmCenterDate"] = this.daterangeConfirmCenterDate[1];
}
if (null != this.daterangeConfirmSiteDate && '' != this.daterangeConfirmSiteDate) {
this.queryParams.params["beginConfirmSiteDate"] = this.daterangeConfirmSiteDate[0];
this.queryParams.params["endConfirmSiteDate"] = this.daterangeConfirmSiteDate[1];
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisTmsCostFee(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisTmsCostFeeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleReCalcProfit(){
},
/** 搜索按钮操作 */
handleQuery() {
@ -251,16 +278,16 @@ export default {
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
this.titleForm = "成本费用录入";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.currentId=row.id || this.ids;
this.openForm = true;
this.titleForm = "修改";
this.titleForm = "修改成本";
},
handleView(row) {
this.id=row.id;

170
src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
View File

@ -14,11 +14,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总费用" prop="costFee">
<el-input-number v-model="form.costFee" size="mini" placeholder="总费用" :min="1" :controls="false" :precision="2"></el-input-number>
<el-input-number v-model="form.costFee" style="width:100%" placeholder="总费用" :min="1" :controls="false" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -50,18 +55,7 @@
<el-input v-model="form.destPlace" placeholder="请输入目的地" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运输方式" prop="transType">
<el-input v-model="form.transType" placeholder="请输入运输方式" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="提单号/车次号/船次号" prop="transSignNo" label-width="200px">
<el-input v-model="form.transSignNo" placeholder="请输入运输工具标识号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="12">
<el-form-item label="分摊类型" prop="splitType">
<el-radio-group v-model="form.splitType">
<el-radio label="1" >按重量分摊</el-radio>
@ -70,11 +64,118 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运输方式" prop="transType">
<el-select clearable v-model="form.transType" placeholder="请选择" style="width:100%">
<el-option
v-for="dict in dict.type.emis_trans_carrier"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运输单号" prop="transSignNo">
<el-input v-model="form.transSignNo" placeholder="提单号/车次号/船次号/单号" />
</el-form-item>
</el-col>
<!-- <el-col :span="6">
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="供应商代码" prop="supplierCode">
<el-input v-model="form.supplierCode" placeholder="请输入供应商代码" />
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="关联单号" prop="billCode" >
<span slot="label">
<span style="color: red">运单列表</span>
</span>
<div style="display:inline-flex; width: 50%;" >
<el-input v-model="form.params.billCodeStr" rows="2" type="textarea" placeholder="请填写单号,多单请使用逗号隔开" />
<el-button type="primary" @click="addBillToApply">加入单号</el-button>
</div>
<el-table
class="cargoList"
:cell-style="{
'padding': '0px!important',
'padding-left': '0px!important',
'padding-right': '0px!important',
'font-size':'11px'
}"
:header-cell-style="{
'font-size':'11px'
}"
border
:data="form.billRelList"
size="mini"
style="width: 100%"
>
<!-- max-height="500px" -->
<el-table-column :label="$t('序号')" align="center" width="60">
<template slot-scope="scope">
<span > {{scope.$index+1}}</span>
</template>
</el-table-column>
<el-table-column prop="billCode" :label="$t('运单号')" align="center" width="170">
<template slot-scope="scope">
<span>{{ scope.row.billCode }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" width="120" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column prop="billFee" :label="$t('运费')" align="center" width="100">
<template slot-scope="scope">
{{scope.row.waybillDetail.freight}}
</template>
</el-table-column>
<!-- <el-table-column prop="canApplyFee" :label="$t('已收金额')" align="center" width="100">
<template slot-scope="scope">
{{scope.row.hasApplyFee}}
</template>
</el-table-column>
<el-table-column prop="openBillMoney" :label="$t('收款金额')" align="center" width="120">
<template slot-scope="scope">
<el-input-number :min="0.00" :max="scope.row.canApplyFee" v-model="scope.row.payMoney" placeholder="" :controls="false" :precision="2" @blur="(val)=>handleCalcFeeItem(scope.row)" @keyup.enter.native="handleCalcFeeItem(scope.row)" >
<span slot="suffix">(CNY)</span>
</el-input-number>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('发件人')" align="center" prop="waybillDetail.sendName" width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付方式')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" />
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<span class="icon iconfont"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
<!--
<el-col :span="24">
@ -116,6 +217,7 @@
<script>
import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
export default {
name: "emisTmsCostFeeForm",
@ -125,7 +227,7 @@ export default {
}
},
components: { },
dicts: ['emis_cost_fee_type','emis_cost_split_type'],
dicts: ['emis_cost_fee_type','emis_cost_split_type','emis_trans_carrier','emis_payment_type'],
data() {
return {
emisTmsCostFeeOptions: [],
@ -144,6 +246,10 @@ export default {
costFee: [
{ required: true, message: "成本费不能为空", trigger: ["blur","change"] }
],
tradeDate: [
{ required: true, message: "交易日期不能为空", trigger: ["blur","change"] }
],
}
};
},
@ -161,6 +267,28 @@ export default {
},
methods: {
async addBillToApply(){
this.form.billRelList=[];
// 总可开金额
let qParam={
billCode:this.form.params.billCodeStr,
pageNum:1,
pageSize:2000
}
// 查询子账单
let res=await listEmisSettleSubBill(qParam);
// console.log("===>=res==>",res)
if(res.code==200){
let subBillList = res.rows;
for(let i=0;i<subBillList.length;i++){
let itemSubBill=subBillList[i];
let relItem={...itemSubBill};
this.form.billRelList.push(relItem);
};
}
},
initData() {
if(this.id !=null) {
@ -190,6 +318,8 @@ export default {
splitType: null,
transType: null,
transSignNo: null,
supplierCode: null,
supplierName: null,
sendPlace: null,
destPlace: null,
costFee: null,
@ -212,15 +342,11 @@ export default {
confirmSiteNote: null,
confirmSiteCode: null,
remark: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null,
billRelList:null
billRelList:null,
params:{
billCodeStr:null
}
};
this.resetForm("form");
},

121
src/views/emis/emisTmsCostProfit/EmisTmsCostProfitList.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<el-form-item :label="$t('运单号')" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="standardFee">
<!-- <el-form-item label="" prop="standardFee">
<el-input
v-model="queryParams.standardFee"
:placeholder="$t('标准费')"
@ -57,11 +57,11 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
</SearchForm>
<XdTable v-loading="loading"
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisTmsCostProfitList"
@ -72,7 +72,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -81,32 +81,9 @@
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisTmsCostProfit:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
@click="handleReCalcProfit"
v-hasPermi="['emis:emisTmsCostProfit:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisTmsCostProfit:remove']"
>删除</el-button>
>利润重算</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -120,77 +97,23 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('标准费')" align="center" prop="standardFee" min-width="100" />
<el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
<el-table-column :label="$t('运输成本')" align="center" prop="costFee" min-width="100" />
<el-table-column :label="$t('运单利润')" align="center" prop="billProfit" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisTmsCostProfit:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisTmsCostProfit:remove']"
>删除</el-button> -->
</template>
</el-table-column>
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsCostProfitForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsCostProfitForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -230,7 +153,7 @@ export default {
total: 0,
// 运输运单利润统计表表格数据
emisTmsCostProfitList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -264,22 +187,16 @@ export default {
/** 查询运输运单利润统计表列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisTmsCostProfit(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisTmsCostProfitList = response.rows;
this.total = response.total;
this.loading = false;
});
},
handleReCalcProfit(){
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;