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-23 16:42:57 +08:00
parent 644d6dbd44
commit bd888ec814
3 changed files with 106 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/emis/emisCommissionQuote/ecqExpressionPanel.vue
View File

@ -125,10 +125,10 @@
</template> </template>
<script> <script>
import { listEmisQuoteExpression, getEmisQuoteExpression, delEmisQuoteExpression, addEmisQuoteExpression, updateEmisQuoteExpression } from "@/api/emis/emisQuoteExpression"; import { listEmisCommissionExpression, getEmisCommissionExpression, delEmisCommissionExpression, addEmisCommissionExpression, updateEmisCommissionExpression } from "@/api/emis/emisCommissionExpression";
export default { export default {
name: "emisQuoteExpression", name: "EcqExpressionPanel",
props:{ props:{
value:{ value:{
type:Array, type:Array,
@ -208,7 +208,7 @@ export default {
let queryParams={ let queryParams={
quoteId:this.quoteId, quoteId:this.quoteId,
} }
listEmisQuoteExpression(queryParams).then(response => { listEmisCommissionExpression(queryParams).then(response => {
this.emisQuoteExpressionList = response.rows; this.emisQuoteExpressionList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -321,7 +321,7 @@ export default {
}, },
handleUpdateByQuoteId(row){ handleUpdateByQuoteId(row){
this.loading = true; this.loading = true;
getEmisQuoteExpression(row.id).then(response => { getEmisCommissionExpression(row.id).then(response => {
this.form = response.data; this.form = response.data;
this.loading = false; this.loading = false;
}); });
@ -344,13 +344,13 @@ export default {
}, },
submitFormByQuoteId(){ submitFormByQuoteId(){
if (this.form.id != null) { if (this.form.id != null) {
updateEmisQuoteExpression(this.form).then(response => { updateEmisCommissionExpression(this.form).then(response => {
// this.$modal.msgSuccess("修改成功"); // this.$modal.msgSuccess("修改成功");
// this.$emit("on-changed"); // this.$emit("on-changed");
this.getList(); this.getList();
}); });
} else { } else {
addEmisQuoteExpression(this.form).then(response => { addEmisCommissionExpression(this.form).then(response => {
// this.$modal.msgSuccess("添加成功"); // this.$modal.msgSuccess("添加成功");
// this.$emit("on-changed"); // this.$emit("on-changed");
this.getList(); this.getList();
@ -379,7 +379,7 @@ export default {
handleDeleteQuoteId(row) { handleDeleteQuoteId(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() { this.$modal.confirm('是否确认删除').then(function() {
return delEmisQuoteExpression(ids); return delEmisCommissionExpression(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
// this.$modal.msgSuccess("删除成功"); // this.$modal.msgSuccess("删除成功");

65
src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
View File

@ -8,11 +8,11 @@
<el-input v-model="form.quoteName" placeholder="请输入方案名称" /> <el-input v-model="form.quoteName" placeholder="请输入方案名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="所属国家" prop="country"> <el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker> <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="开始日期" prop="startDate"> <el-form-item label="开始日期" prop="startDate">
@ -52,11 +52,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="优先级" prop="priorityLevel"> <el-form-item label="优先级" prop="priorityLevel">
<el-input v-model="form.priorityLevel" placeholder="优先级" style="width:100px" /> <el-input v-model="form.priorityLevel" placeholder="优先级" style="width:100px" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@ -105,8 +105,13 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handelSelectSendArea()" @click="handelSelectStaff"
>选择员工</el-button> >选择员工</el-button>
<el-button
size="mini"
type="primary"
@click="handelSelectAllStaff"
>全部员工</el-button>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="" prop="empName" label-width="0px" style="margin-bottom: 0px;"> <el-form-item label="" prop="empName" label-width="0px" style="margin-bottom: 0px;">
@ -146,14 +151,10 @@
</el-row> </el-row>
</el-form> </el-form>
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="60%" :destroy-on-close="true" v-dialogDrag append-to-body>
<el-dialog :title="titleSendAreaForm" :visible.sync="openSendAreaForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body> <EmisStaffListPicker @on-changed="handleStaffFormChanged" @on-cancel="cancelStaffForm"></EmisStaffListPicker>
<QuoteSendAreaPanel :useSiteCode="form.useSiteCode" :useSiteName="form.useSite" :feeType="form.feeType" @on-changed="handleSendAreaFormChanged" @on-cancel="cancelSendAreaForm"></QuoteSendAreaPanel> </el-dialog>
</el-dialog>
<el-dialog :title="titleDispAreaForm" :visible.sync="openDispAreaForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
<QuoteDispAreaPanel :useSiteCode="form.useSiteCode" :useSiteName="form.useSite" :feeType="form.feeType" @on-changed="handleDispAreaFormChanged" @on-cancel="cancelDispAreaForm"></QuoteDispAreaPanel>
</el-dialog> -->
<div style="text-align: center;margin-bottom: 10px;"> <div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -165,36 +166,29 @@
</template> </template>
<script> <script>
import { listEmisCommissionQuote, getEmisCommissionQuote, delEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote"; import { getEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { listEmisQuoteSendArea, getEmisQuoteSendArea, delEmisQuoteSendArea, addEmisQuoteSendArea, updateEmisQuoteSendArea } from "@/api/emis/emisQuoteSendArea";
import { listEmisQuotePrice, getEmisQuotePrice, delEmisQuotePrice, addEmisQuotePrice, updateEmisQuotePrice } from "@/api/emis/emisQuotePrice";
import { listEmisQuoteDispArea, getEmisQuoteDispArea, delEmisQuoteDispArea, addEmisQuoteDispArea, updateEmisQuoteDispArea } from "@/api/emis/emisQuoteDispArea";
import {checkRole} from '@/utils/permission'
import {addDateTimeByDay,dateToStr} from '@/utils/custom' import {addDateTimeByDay,dateToStr} from '@/utils/custom'
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import EmisStaffListPicker from '@/views/emis/EmisBaseTools/EmisStaffListPicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import EcqExpressionPanel from '@/views/emis/emisCommissionQuote/ecqExpressionPanel.vue'; import EcqExpressionPanel from '@/views/emis/emisCommissionQuote/ecqExpressionPanel.vue';
import QuoteSendAreaPanel from '@/views/emis/emisQuoteSendArea/sendAreaPanel.vue';
import QuoteDispAreaPanel from '@/views/emis/emisQuoteDispArea/dispAreaPanel.vue';
export default { export default {
name: "emisCommissionQuoteForm", name: "emisCommissionQuoteForm",
props:{ props:{
quoteId:{ quoteId:{
type:Number type:[Number,Array]
} }
}, },
components: { components: {
CountryPicker,EmisSiteSimplePicker,TransLinePicker, CountryPicker,EmisSiteSimplePicker,EcqExpressionPanel,
TransProductPicker,EcqExpressionPanel, EmisStaffListPicker
QuoteSendAreaPanel,QuoteDispAreaPanel
}, },
dicts: ['emis_price_type','emis_fee_type','sys_currency_type','emis_commission_post','emis_biz_shipping_method'], dicts: ['emis_price_type','emis_fee_type','sys_currency_type','emis_commission_post','emis_biz_shipping_method'],
data() { data() {
@ -202,6 +196,8 @@ export default {
emisCommissionQuoteOptions: [], emisCommissionQuoteOptions: [],
// 遮罩层 // 遮罩层
loading: true, loading: true,
titleForm:null,
openForm:false,
// 表单参数 // 表单参数
form: {}, form: {},
isCopy:false, isCopy:false,
@ -238,8 +234,25 @@ export default {
}); });
}else{ }else{
this.reset(); this.reset();
this.form.blOpen="1";
} }
// this.getTreeselect(); },
handelSelectStaff(){
this.titleForm="选择员工";
this.openForm=true;
},
handelSelectAllStaff(){
this.form.empCode="-1";
this.form.empName="全部";
},
handleStaffFormChanged(empCodeStr,empNameStr){
this.form.empCode=empCodeStr;
this.form.empName=empNameStr;
this.openForm=false;
},
cancelStaffForm(){
this.openForm=false;
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

151
src/views/emis/emisCommissionQuote/index.vue
View File

@ -15,24 +15,26 @@
v-model="queryParams.quoteName" v-model="queryParams.quoteName"
:placeholder="$t('方案名称')" :placeholder="$t('方案名称')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="计算类型" prop="calcType"> <el-form-item label="计算类型" prop="calcType">
<el-input <el-select clearable v-model="queryParams.calcType" clearable placeholder="请选择" style="width:100%">
v-model="queryParams.calcType" <el-option label="按票计算" :value="1"></el-option>
:placeholder="$t('计算类型')" <el-option label="重量计算" :value="2"></el-option>
clearable <el-option label="体积计算" :value="3"></el-option>
@keyup.enter.native="handleQuery" <el-option label="包裹数" :value="4"></el-option>
/> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="岗位类型" prop="postType"> <el-form-item label="岗位类型" prop="postType">
<el-input <el-select v-model="queryParams.postType" placeholder="岗位类型" clearable filterable >
v-model="queryParams.postType" <el-option
:placeholder="$t('岗位类型')" v-for="item in dict.type.emis_commission_post"
clearable v-bind:key="item.value"
@keyup.enter.native="handleQuery" v-bind:label="item.label"
/> v-bind:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="运输方式" prop="transType"> <el-form-item label="运输方式" prop="transType">
<el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable > <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable >
@ -45,19 +47,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="blOpen"> <el-form-item label="启用状态" prop="blOpen">
<el-input <el-select v-model="queryParams.blOpen" clearable placeholder="启用状态" >
v-model="queryParams.blOpen" <el-option key="1" label="启用" :value="1"/>
:placeholder="$t('启用状态')" <el-option key="0" label="停用" :value="0"/>
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="员工编号" prop="empCode"> <el-form-item label="员工编号" prop="empCode">
<el-input <el-input
v-model="queryParams.empCode" v-model="queryParams.empCode"
:placeholder="$t('员工编号')" :placeholder="$t('员工编号')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="员工名称" prop="empName"> <el-form-item label="员工名称" prop="empName">
@ -65,7 +64,6 @@
v-model="queryParams.empName" v-model="queryParams.empName"
:placeholder="$t('员工名称')" :placeholder="$t('员工名称')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始日期" prop="startDate"> <el-form-item label="开始日期" prop="startDate">
@ -110,9 +108,9 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['emis:emisCommissionQuote:add']" v-hasPermi="['emis:emisCommissionQuote:add']"
>新增</el-button> >新增提成方案</el-button>
</el-col> </el-col>
<!--
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -123,7 +121,7 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['emis:emisCommissionQuote:edit']" v-hasPermi="['emis:emisCommissionQuote:edit']"
>修改</el-button> >修改</el-button>
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
@ -149,75 +147,46 @@
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <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>
-->
<!-- :emis_commission_post :emis_biz_shipping_method -->
<!-- <el-table-column :label="$t('提成方案编码')" align="center" prop="quoteCode" min-width="100" /> -->
<el-table-column :label="$t('方案名称')" align="center" prop="quoteName" min-width="100" /> <el-table-column :label="$t('方案名称')" align="center" prop="quoteName" min-width="100" />
<el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" /> <el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" >
<el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" />
<el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" />
<el-table-column :label="$t('启用状态')" align="center" prop="blOpen" 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="startDate" min-width="100" />
<el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="100" />
<el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <div v-if="scope.row.calcType == 1" style="color:red;">
size="mini" <span class="el-tag el-tag--info">按票计算</span>
type="text" </div>
icon="el-icon-edit" <div v-if="scope.row.calcType == 2" style="color:red;">
@click="handleUpdate(scope.row)" <span class="el-tag">重量计算</span>
v-hasPermi="['emis:emisCommissionQuote:edit']" </div>
>修改</el-button> <div v-if="scope.row.calcType == 3" style="color:green;">
<!-- <span class="el-tag el-tag--success el-tag--light">体积计算</span>
<el-button </div>
size="mini" <div v-if="scope.row.calcType == 4" >
type="text" <span class="el-tag el-tag--warning el-tag--light">包裹数</span>
icon="el-icon-delete" </div>
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisCommissionQuote:remove']"
>删除</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
</template>
</el-table-column>
<el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="blOpen" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blOpen==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.blOpen==0" type="danger">停用</el-tag>
</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="150" :show-overflow-tooltip="true" />
<el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
<el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
<!-- <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" /> -->
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
</XdTable> </XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body> <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -341,9 +310,9 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.currentId= row.quoteId; this.currentId= row.quoteId || this.ids;
this.openForm = true; this.openForm = true;
this.titleForm = "修改"; this.titleForm = "修改提成方案";
}, },
handleView(row) { handleView(row) {
this.quoteId=row.quoteId; this.quoteId=row.quoteId;