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-11-14 23:26:46 +08:00
parent a8f5abe9c7
commit 41c18e4543
7 changed files with 225 additions and 1823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/emis/emisCommissionProfit.js
View File

@ -42,3 +42,13 @@ export function delEmisCommissionProfit(id) {
method: 'delete'
})
}
// 批量计算员工提成
export function batchReCalcProfitByBillCode(billCode) {
return request({
url: '/emis/emisCommissionProfit/batchReCalcProfitByBillCode',
method: 'get',
params: {billCode: billCode},
})
}

4
src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
View File

@ -7,6 +7,7 @@
ref="popoverRef"
:popper-options="{ boundariesElement: '.el-form', removeOnDestroy: true }"
@show="queryData"
:disabled="disabled"
>
<div >
<el-table
@ -38,10 +39,13 @@
ref="inputValue"
:value="slable"
:placeholder="placeholder"
:disabled="disabled"
@input="onInput"
@click.native="onClick"
@blur="onBlur"
@clear="onClear"
clearable
>
<template slot="suffix">

129
src/views/emis/emisCommissionDtl/emisCommissionDtlForm.vue
View File

@ -3,8 +3,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="提成费用类型" prop="feeType">
<el-select v-model="form.feeType" placeholder="提成费用类型" style="width:100%">
<el-form-item label="提成类型" prop="feeType">
<el-select v-model="form.feeType" placeholder="提成费用类型" style="width:100%" :disabled="form.id!=null">
<el-option
v-for="dict in dict.type.emis_commission_fee_type"
:key="dict.value"
@ -14,101 +14,41 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提成员工" prop="empCode" >
<EmisUserSimplePicker0 :placeholder="$t('提成员工')" v-model="form.empCode" @onChange="onSelectUser" :disabled="form.id!=null"></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="员工名称" prop="empName">
<el-input v-model="form.empName" placeholder="" />
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="提成金额" prop="money">
<el-input v-model="form.money" placeholder="请输入提成金额" />
<el-input v-model="form.money" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="月份" prop="billMonth">
<el-input v-model="form.billMonth" placeholder="请输入月份" />
</el-form-item>
<el-col :span="18">
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="运单号" prop="billCode">
<el-input v-model="form.billCode" placeholder="请输入运单号" />
<el-input v-model="form.billCode" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="月份" prop="billMonth">
<el-date-picker size="mini" style="width:100%" v-model="form.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="提成备注" prop="feeRemark">
<el-input v-model="form.feeRemark" placeholder="请输入费用备注" />
<el-form-item label="备注" prop="feeRemark">
<el-input v-model="form.feeRemark" type="textarea" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="员工编号" prop="empCode">
<el-input v-model="form.empCode" placeholder="请输入员工编号" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="员工名称" prop="empName">
<el-input v-model="form.empName" placeholder="请输入员工名称" />
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="财务确认状态" prop="blConfirmCenter">
<el-input v-model="form.blConfirmCenter" placeholder="请输入财务确认状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="财务确认日期" prop="confirmCenterDate">
<el-date-picker clearable
v-model="form.confirmCenterDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择财务确认日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="财务确认备注" prop="confirmCenterNote">
<el-input v-model="form.confirmCenterNote" placeholder="请输入财务确认备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="财务确认人" prop="confirmCenterManCode">
<el-input v-model="form.confirmCenterManCode" placeholder="请输入财务确认人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="财务确认站点" prop="confirmCenterCode">
<el-input v-model="form.confirmCenterCode" placeholder="请输入财务确认站点" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="站点确认状态" prop="blConfirmSite">
<el-input v-model="form.blConfirmSite" placeholder="请输入站点确认状态" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="站点确认日期" prop="confirmSiteDate">
<el-date-picker clearable
v-model="form.confirmSiteDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择站点确认日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="站点确认人" prop="confirmSiteManCode">
<el-input v-model="form.confirmSiteManCode" placeholder="请输入站点确认人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="网点确认备注" prop="confirmSiteNote">
<el-input v-model="form.confirmSiteNote" placeholder="请输入网点确认备注" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="确认网点代码" prop="confirmSiteCode">
<el-input v-model="form.confirmSiteCode" placeholder="请输入确认网点代码" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col> -->
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
@ -121,6 +61,7 @@
<script>
import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
export default {
name: "emisCommissionDtlForm",
@ -129,7 +70,7 @@ export default {
type:Number
}
},
components: { },
components: { EmisUserSimplePicker0 },
dicts: ['emis_commission_fee_type'],
data() {
return {
@ -140,12 +81,13 @@ export default {
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
feeType: [
{ required: true, message: "提成类型不能为空", trigger: ["blur",'change'] }
],
delFlag: [
{ required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
feeType: [
{ required: true, message: "提成类型不能为空", trigger: ["blur",'change'] }
],
}
};
},
@ -174,13 +116,16 @@ export default {
}else{
this.reset();
}
// this.getTreeselect();
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
onSelectUser(item){
this.form.empCode=item.empCode;
this.form.empName=item.empName;
},
// 表单重置
reset() {
this.form = {

180
src/views/emis/emisCommissionDtl/index.vue
View File

@ -1,8 +1,16 @@
<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="feeType" label-width="120px">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="运单号" prop="billCode">
<el-input
type="textarea"
rows="2"
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
/>
</el-form-item>
<el-form-item label="提成类型" prop="feeType">
<el-select v-model="queryParams.feeType" placeholder="提成费用类型" clearable filterable >
<el-option
v-for="item in dict.type.emis_commission_fee_type"
@ -16,27 +24,17 @@
<el-form-item label="账单月份" prop="billMonth">
<el-date-picker size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
/>
</el-form-item>
<el-form-item label="" prop="empCode">
<!-- <el-form-item label="" prop="empCode">
<el-input
v-model="queryParams.empCode"
:placeholder="$t('员工编号')"
clearable
/>
</el-form-item>
<el-form-item label="" prop="empName">
<el-input
v-model="queryParams.empName"
:placeholder="$t('员工名称')"
clearable
/>
</el-form-item> -->
<el-form-item label="员工名称" prop="empName">
<EmisUserSimplePicker0 :placeholder="$t('提成员工')" v-model="queryParams.empCodeTmp" @onChange="onSelectUser" ></EmisUserSimplePicker0>
</el-form-item>
</SearchForm>
@ -44,9 +42,12 @@
<XdTable v-loading="loading"
border stripe
size="small"
size="mini"
:data="emisCommissionDtlList"
:showSearch.sync="showSearch"
storageName="emisCommissionDtl_main_240702"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@ -64,8 +65,9 @@
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisCommissionDtl:add']"
>新增特殊提成</el-button>
>新增提成</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@ -75,9 +77,10 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisCommissionDtl:edit']"
>修改</el-button>
>修改提成</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="danger"
plain
@ -87,7 +90,18 @@
@click="handleDelete"
v-hasPermi="['emis:emisCommissionDtl:remove']"
>删除</el-button>
</el-col> -->
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleBatchReCalc"
v-hasPermi="['emis:emisCommissionDtl:add']"
>批量重算</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -102,46 +116,16 @@
</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">
<el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="120" >
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
<span>{{ scope.row.empName }}</span>
</template>
</el-table-column>
<!-- <span>{{ scope.row.empName }}</span><span v-if="scope.row.empCode!=-1">({{ scope.row.empCode }})</span> -->
<!-- <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> -->
<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 :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
<el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
<el-table-column :label="$t('月份')" align="center" prop="billMonth" min-width="100" />
<el-table-column :label="$t('提成费用类型')" align="center" prop="feeType" min-width="150" >
<el-table-column :label="$t('提成类型')" align="center" prop="feeType" min-width="120" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_commission_fee_type" :value="scope.row.feeType"/>
</template>
@ -169,25 +153,36 @@
<emisCommissionDtlForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCommissionDtlForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCommissionDtlView :id="id" ></EmisCommissionDtlView>
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="formBatch" :model="formBatch" size="mini" label-width="60px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('运单号')" prop="billCode">
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">
<el-button type="primary" @click="submitFormBatch">确 定</el-button>
<el-button @click="cancelBatch">取 消</el-button>
</div>
</el-dialog>
-->
</div>
</template>
<script>
import { batchReCalcProfitByBillCode } from "@/api/emis/emisCommissionProfit";
import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCommissionDtlView from '@/views/emis/emisCommissionDtl/emisCommissionDtlView';
import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
export default {
name: "emisCommissionDtl",
components: { elDateSimplePicker,emisCommissionDtlForm },
components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0 },
dicts: ['emis_commission_fee_type'],
data() {
return {
@ -212,6 +207,10 @@ export default {
openForm: false,
titleForm: "",
titleBatch:"",
openBatch: false,
// 弹出展示层
id:null,
titleView:"",
@ -234,6 +233,7 @@ export default {
billCode: null,
feeRemark: null,
empCode: null,
empCodeTmp: null,
empName: null,
blConfirmCenter: null,
confirmCenterDate: null,
@ -248,6 +248,9 @@ export default {
remark: null,
delFlag: null,
},
formBatch:{
billCode:null,
}
};
},
created() {
@ -257,30 +260,16 @@ export default {
/** 查询员工提成明细表列表 */
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];
}
listEmisCommissionDtl(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisCommissionDtlList = response.rows;
this.total = response.total;
this.loading = false;
});
},
onSelectUser(item){
this.queryParams.empCode=null;
this.queryParams.empName=item.empName;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -312,9 +301,30 @@ export default {
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
handleBatchReCalc(){
this.formBatch.billCode=null;
this.titleBatch="批量重算";
this.openBatch=true;
},
cancelBatch(){
this.openBatch=false;
},
async submitFormBatch(){
if(this.formBatch.billCode==null || this.formBatch.billCode==''){
this.$modal.msgError("输入单号后回车");
return;
}
this.loading = true;
let res=await batchReCalcProfitByBillCode(this.formBatch.billCode);
this.loading = false;
this.openBatch=false;
this.getList();
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.currentId= row.id||this.ids;
this.openForm = true;
this.titleForm = "修改";
},

93
src/views/emis/emisCommissionProfit/index.vue
View File

@ -1,16 +1,6 @@
<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="settleType">
<el-input
v-model="queryParams.settleType"
:placeholder="$t('提成类型')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="30" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billMonth">
<el-input
v-model="queryParams.billMonth"
@ -19,15 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="empCode">
<el-input
v-model="queryParams.empCode"
:placeholder="$t('员工编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="empName">
<el-input
v-model="queryParams.empName"
@ -36,14 +17,12 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
size="mini"
:data="emisCommissionProfitList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -102,52 +81,15 @@
</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 :label="$t('提成编号')" align="center" prop="profitNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('提成名称')" align="center" prop="profitName" min-width="100" /> -->
<!-- <el-table-column :label="$t('提成类型')" align="center" prop="settleType" min-width="100" /> -->
<el-table-column :label="$t('月份')" align="center" prop="billMonth" min-width="100" />
<el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
<!-- <el-table-column :label="$t('结算开始时间')" align="center" prop="startDate" min-width="100" /> -->
<!-- <el-table-column :label="$t('结算结束时间')" align="center" prop="endDate" min-width="100" /> -->
<el-table-column :label="$t('提成金额')" align="center" prop="money" min-width="100" />
<el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
<el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
<!-- <el-table-column :label="$t('是否已提')" align="center" prop="blHasProfit" min-width="100" /> -->
<!-- <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" />
<el-table-column :label="$t('财务确认日期')" align="center" prop="auditDate" min-width="100" />
@ -283,35 +225,6 @@ export default {
/** 查询员工提成表列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeStartDate && '' != this.daterangeStartDate) {
this.queryParams.params["beginStartDate"] = this.daterangeStartDate[0];
this.queryParams.params["endStartDate"] = this.daterangeStartDate[1];
}
if (null != this.daterangeEndDate && '' != this.daterangeEndDate) {
this.queryParams.params["beginEndDate"] = this.daterangeEndDate[0];
this.queryParams.params["endEndDate"] = this.daterangeEndDate[1];
}
if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
}
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];
}
listEmisCommissionProfit(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisCommissionProfitList = response.rows;
this.total = response.total;

37
src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
View File

@ -4,11 +4,15 @@
<div class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<el-tab-pane label="海陆空批次列表" name="billList" >
<BigBatchPanel @onSelect="onSelectBill"> </BigBatchPanel>
<BigBatchPanel @onCreate="onCreateBatch"> </BigBatchPanel>
</el-tab-pane>
<el-tab-pane label="批次编辑" name="batchEdit" v-if="openCreateNew" >
<BigBatchEditForm @on-changed="handleFormChanged" @on-cancel="cancelForm"></BigBatchEditForm>
</el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.settleBillNo" :label="'账单:'+item.settleBillNo" closable >
<BillDetailPanel :settleBillNo="item.settleBillNo"></BillDetailPanel>
</el-tab-pane>
</el-tabs>
</div>
</div>
@ -31,6 +35,7 @@ export default {
return {
activeTab:'billList',
billTabs:[],
openCreateNew:false,
};
},
created() {
@ -38,6 +43,11 @@ export default {
methods: {
handleTabsClick(){
},
onCreateBatch(){
this.openCreateNew=true;
this.activeTab='batchEdit';
},
onSelectBill(item) {
let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo);
@ -48,16 +58,25 @@ export default {
this.activeTab=item.settleBillNo;
}
},
handleFormChanged(){
this.openCreateNew=false;
this.activeTab="billList";
},
cancelForm(){
this.openCreateNew=false;
this.activeTab="billList";
},
removeTab(targetName) {
var self=this;
let tabs = self.billTabs;
self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName);
if(self.billTabs.length>0){
this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo;
}else{
this.activeTab="billList";
}
// var self=this;
// let tabs = self.billTabs;
// self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName);
// if(self.billTabs.length>0){
// this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo;
// }else{
// this.activeTab="billList";
// }
},

1595
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
View File

File diff suppressed because it is too large Load Diff