Skip to content

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

解决产品价格列表冲突

parents 300373a1 e05695b9
Show whitespace changes
Inline Side-by-side
Showing with 1589 additions and 308 deletions
src/api/ecw/customerCommissionInfo.js 0 → 100644
View file @ 69ddd604
import request from '@/utils/request'
// 创建客户佣金详情
export function createCustomerCommissionInfo(data) {
return request({
url: '/ecw/customer-commission-info/create',
method: 'post',
data: data
})
}
// 更新客户佣金详情
export function updateCustomerCommissionInfo(data) {
return request({
url: '/ecw/customer-commission-info/update',
method: 'put',
data: data
})
}
// 删除客户佣金详情
export function deleteCustomerCommissionInfo(id) {
return request({
url: '/ecw/customer-commission-info/delete?id=' + id,
method: 'delete'
})
}
// 获得客户佣金详情
export function getCustomerCommissionInfo(id) {
return request({
url: '/ecw/customer-commission-info/get?id=' + id,
method: 'get'
})
}
// 获得客户佣金详情分页
export function getCustomerCommissionInfoPage(query) {
return request({
url: '/ecw/customer-commission-info/page',
method: 'get',
params: query
})
}
// 导出客户佣金详情 Excel
export function exportCustomerCommissionInfoExcel(query) {
return request({
url: '/ecw/customer-commission-info/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/api/ecw/productBrandEmpower.js 0 → 100644
View file @ 69ddd604
import request from '@/utils/request'
// 创建商品品牌授权
export function createProductBrandEmpower(data) {
return request({
url: '/ecw/product-brand-empower/create',
method: 'post',
data: data
})
}
// 更新商品品牌授权
export function updateProductBrandEmpower(data) {
return request({
url: '/ecw/product-brand-empower/update',
method: 'put',
data: data
})
}
// 删除商品品牌授权
export function deleteProductBrandEmpower(id) {
return request({
url: '/ecw/product-brand-empower/delete?id=' + id,
method: 'delete'
})
}
// 获得商品品牌授权
export function getProductBrandEmpower(id) {
return request({
url: '/ecw/product-brand-empower/get?id=' + id,
method: 'get'
})
}
// 获得商品品牌授权分页
export function getProductBrandEmpowerPage(query) {
return request({
url: '/ecw/product-brand-empower/page',
method: 'get',
params: query
})
}
// 导出商品品牌授权 Excel
export function exportProductBrandEmpowerExcel(query) {
return request({
url: '/ecw/product-brand-empower/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/api/ecw/productBrank.js 0 → 100644
View file @ 69ddd604
import request from '@/utils/request'
// 创建品牌
export function createProductBrank(data) {
return request({
url: '/ecw/product-brank/create',
method: 'post',
data: data
})
}
// 更新品牌
export function updateProductBrank(data) {
return request({
url: '/ecw/product-brank/update',
method: 'put',
data: data
})
}
// 删除品牌
export function deleteProductBrank(id) {
return request({
url: '/ecw/product-brank/delete?id=' + id,
method: 'delete'
})
}
// 获得品牌
export function getProductBrank(id) {
return request({
url: '/ecw/product-brank/get?id=' + id,
method: 'get'
})
}
// 获得品牌分页
export function getProductBrankPage(query) {
return request({
url: '/ecw/product-brank/page',
method: 'get',
params: query
})
}
// 导出品牌 Excel
export function exportProductBrankExcel(query) {
return request({
url: '/ecw/product-brank/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/utils/dict.js
View file @ 69ddd604
...@@ -79,6 +79,13 @@ export const DICT_TYPE = { ...@@ -79,6 +79,13 @@ export const DICT_TYPE = {
ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type', ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status', ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
PWD_TYPE: 'pwd_type', PWD_TYPE: 'pwd_type',
BRAND_REG_TYPE: 'brand_registry_type',
BRAND_AUTH_STATUS: 'brand_authorization_status',
BRAND_CUSTOMER_CHARGING_MODEL: 'customer_charging_model',
COUNTRY: 'country', // 国家地区
AREA_CODE: 'area_code', // 区号
SOCIAL: 'customer_social_tools', // 社交软件
IS_DEFAULT: 'is_default', // 默认联系人
} }
......
src/views/ecw/customer/index.vue
View file @ 69ddd604
...@@ -11,25 +11,25 @@ ...@@ -11,25 +11,25 @@
</el-form-item> </el-form-item>
<el-form-item label="客户等级" prop="level"> <el-form-item label="客户等级" prop="level">
<el-select v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small"> <el-select v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="客户来源" prop="source"> <el-form-item label="客户来源" prop="source">
<el-select v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small"> <el-select v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="跟进客服" prop="customerService"> <el-form-item label="跟进客服" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small"> <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="客户状态" prop="status"> <el-form-item label="客户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -103,9 +103,9 @@ ...@@ -103,9 +103,9 @@
@pagination="getList"/> @pagination="getList"/>
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" prop="name"> <el-form-item label="客户名称" prop="name">
<el-input v-model="form.name" placeholder="请输入客户名称" /> <el-input v-model="form.name" placeholder="请输入客户名称" />
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="国家" prop="country"> <el-form-item label="国家" prop="country">
<el-select v-model="form.country" placeholder="请选择国家"> <el-select v-model="form.country" placeholder="请选择国家">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.COUNTRY)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户等级" prop="level"> <el-form-item label="客户等级" prop="level">
<el-select v-model="form.level" placeholder="请选择客户等级"> <el-select v-model="form.level" placeholder="请选择客户等级">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属代理" prop="agentId"> <el-form-item label="所属代理" prop="agentId">
<el-select v-model="form.agentId" placeholder="请选择所属代理"> <el-select v-model="form.agentId" placeholder="请选择所属代理">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户类别" prop="type"> <el-form-item label="客户类别" prop="type">
<el-select v-model="form.type" placeholder="请选择客户类别"> <el-select v-model="form.type" placeholder="请选择客户类别">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_TYPE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<el-form-item label="客户来源" prop="source"> <el-form-item label="客户来源" prop="source">
<el-select v-model="form.source" placeholder="请选择客户来源"> <el-select v-model="form.source" placeholder="请选择客户来源">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<el-form-item label="结算方式" prop="balance"> <el-form-item label="结算方式" prop="balance">
<el-select v-model="form.balance" placeholder="请选择结算方式"> <el-select v-model="form.balance" placeholder="请选择结算方式">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-form-item label="跟进客服" prop="customerService"> <el-form-item label="跟进客服" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择跟进客服"> <el-select v-model="form.customerService" placeholder="请选择跟进客服">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户状态" prop="status"> <el-form-item label="客户状态" prop="status">
<el-select v-model="form.status" placeholder="请选择客户状态"> <el-select v-model="form.status" placeholder="请选择客户状态">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -249,9 +249,7 @@ ...@@ -249,9 +249,7 @@
<el-input v-model="form.weightUnit" placeholder="请输入重货标准(CBM)" /> <el-input v-model="form.weightUnit" placeholder="请输入重货标准(CBM)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-form-item label="关联会员账号" prop="memberId"> <el-form-item label="关联会员账号" prop="memberId">
<el-input v-model="form.memberId" placeholder="请输入关联会员账号" /> <el-input v-model="form.memberId" placeholder="请输入关联会员账号" />
...@@ -260,6 +258,115 @@ ...@@ -260,6 +258,115 @@
<el-form-item label="部门" prop="department"> <el-form-item label="部门" prop="department">
<el-input v-model="form.department" placeholder="请输入部门" /> <el-input v-model="form.department" placeholder="请输入部门" />
</el-form-item> </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>联系人</span>
<el-button style="float: right;" size="small" type="primary" @click="form.customerContacts.push({department: undefined})">+</el-button>
</div>
<el-table
:data="form.customerContacts"
style="width: 100%"
>
<el-table-column
prop="department"
label="部门"
width=""
>
<template v-slot="{ row, column, $index }">
<el-input v-model="row.department" placeholder="请输入部门" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop="position"
label="职位"
width=""
>
<template v-slot="{row}">
<el-input v-model="row.position" placeholder="请输入职位" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop="name"
label="联系人"
>
<template v-slot="{row}">
<el-input v-model="row.name" placeholder="请输入联系人" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop="areaCode"
label="区号"
>
<template v-slot="{row}">
<el-select v-model="row.areaCode" placeholder="请选择区号">
<el-option v-for="dict in getDictDatas(DICT_TYPE.AREA_CODE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</template>
</el-table-column>
<el-table-column
prop="phoneNew"
label="联系方式"
>
<template v-slot="{row}">
<el-input v-model="row.phoneNew" placeholder="请输入联系方式" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop=""
label="关联账号"
>
</el-table-column>
<el-table-column
prop="social"
label="社交软件"
>
<template v-slot="{row}">
<el-select v-model="row.social" placeholder="请选择社交软件">
<el-option v-for="dict in getDictDatas(DICT_TYPE.SOCIAL)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</template>
</el-table-column>
<el-table-column
prop="socialNumber"
label="社交软件号码"
>
<template v-slot="{row}">
<el-input v-model="row.socialNumber" placeholder="请输入社交软件号码" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop="email"
label="邮箱"
>
<template v-slot="{row}">
<el-input v-model="row.email" placeholder="请输入邮箱" size="mini"/>
</template>
</el-table-column>
<el-table-column
prop="isDefault"
label="设为默认"
>
<template v-slot="{row}">
<el-select v-model="row.isDefault" placeholder="设为默认">
<el-option v-for="dict in getDictDatas(DICT_TYPE.IS_DEFAULT)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.isDefault)" />
</el-select>
</template>
</el-table-column>
<el-table-column
prop="name"
label="操作"
>
<template v-slot="{ row, column, $index }">
<el-button type="danger" @click="form.customerContacts.splice($index, 1)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-form-item label="发票抬头" prop="invoiceTitle"> <el-form-item label="发票抬头" prop="invoiceTitle">
<el-input v-model="form.invoiceTitle" placeholder="请输入发票抬头" /> <el-input v-model="form.invoiceTitle" placeholder="请输入发票抬头" />
</el-form-item> </el-form-item>
...@@ -307,6 +414,8 @@ export default { ...@@ -307,6 +414,8 @@ export default {
}, },
data() { data() {
return { return {
getDictDatas,
DICT_TYPE,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 导出遮罩层 // 导出遮罩层
...@@ -386,6 +495,7 @@ export default { ...@@ -386,6 +495,7 @@ export default {
source: undefined, source: undefined,
picture: undefined, picture: undefined,
customerService: undefined, customerService: undefined,
customerContacts: [],
promoter: undefined, promoter: undefined,
status: undefined, status: undefined,
founder: undefined, founder: undefined,
...@@ -426,7 +536,7 @@ export default { ...@@ -426,7 +536,7 @@ export default {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getCustomer(id).then(response => { getCustomer(id).then(response => {
this.form = response.data; this.form = { ...this.form, ...response.data };
this.open = true; this.open = true;
this.title = "修改客户"; this.title = "修改客户";
}); });
......
src/views/ecw/customerCommissionInfo/index.vue 0 → 100644
View file @ 69ddd604
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="佣金表id" prop="commissionId">
<el-input v-model="queryParams.commissionId" placeholder="请输入佣金表id" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择产品类型" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="产品属性" prop="productAttr">
<el-select v-model="queryParams.productAttr" placeholder="请选择产品属性" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="暗佣佣金" prop="darkCommission">
<el-input v-model="queryParams.darkCommission" placeholder="请输入暗佣佣金" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="暗佣货币" prop="darkCurrency">
<el-select v-model="queryParams.darkCurrency" placeholder="请选择暗佣货币" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="暗佣单位" prop="darkUnit">
<el-select v-model="queryParams.darkUnit" placeholder="请选择暗佣单位" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="暗佣上调" prop="darkAdjustCommission">
<el-input v-model="queryParams.darkAdjustCommission" placeholder="请输入暗佣上调" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="暗佣货币上调" prop="darkAdjustCurrency">
<el-select v-model="queryParams.darkAdjustCurrency" placeholder="请选择暗佣货币上调" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="暗佣单位上调" prop="darkAdjustUnit">
<el-select v-model="queryParams.darkAdjustUnit" placeholder="请选择暗佣单位上调" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="满减" prop="amount">
<el-input v-model="queryParams.amount" placeholder="请输入满减" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="满的货多少币" prop="amountCurrency">
<el-select v-model="queryParams.amountCurrency" placeholder="请选择满的货多少币" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="满多少的单位" prop="amountUnit">
<el-select v-model="queryParams.amountUnit" placeholder="请选择满多少的单位" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="返佣金的货币" prop="refundCurrency">
<el-select v-model="queryParams.refundCurrency" placeholder="请选择返佣金的货币" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="满返" prop="refund">
<el-input v-model="queryParams.refund" placeholder="请输入满返" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="返佣金的单位" prop="refundUnit">
<el-select v-model="queryParams.refundUnit" placeholder="请选择返佣金的单位" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:customer-commission-info:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:customer-commission-info:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="佣金表id" align="center" prop="commissionId" />
<el-table-column label="产品类型" align="center" prop="productType" />
<el-table-column label="产品属性" align="center" prop="productAttr" />
<el-table-column label="暗佣佣金" align="center" prop="darkCommission" />
<el-table-column label="暗佣货币" align="center" prop="darkCurrency">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="scope.row.darkCurrency" />
</template>
</el-table-column>
<el-table-column label="暗佣单位" align="center" prop="darkUnit">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_UNIT" :value="scope.row.darkUnit" />
</template>
</el-table-column>
<el-table-column label="暗佣上调" align="center" prop="darkAdjustCommission" />
<el-table-column label="暗佣货币上调" align="center" prop="darkAdjustCurrency">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="scope.row.darkAdjustCurrency" />
</template>
</el-table-column>
<el-table-column label="暗佣单位上调" align="center" prop="darkAdjustUnit">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_UNIT" :value="scope.row.darkAdjustUnit" />
</template>
</el-table-column>
<el-table-column label="满减" align="center" prop="amount" />
<el-table-column label="满的货多少币" align="center" prop="amountCurrency">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="scope.row.amountCurrency" />
</template>
</el-table-column>
<el-table-column label="满多少的单位" align="center" prop="amountUnit">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_UNIT" :value="scope.row.amountUnit" />
</template>
</el-table-column>
<el-table-column label="返佣金的货币" align="center" prop="refundCurrency">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="scope.row.refundCurrency" />
</template>
</el-table-column>
<el-table-column label="满返" align="center" prop="refund" />
<el-table-column label="返佣金的单位" align="center" prop="refundUnit">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_UNIT" :value="scope.row.refundUnit" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" 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="['ecw:customer-commission-info:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:customer-commission-info:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="佣金表id" prop="commissionId">
<el-input v-model="form.commissionId" placeholder="请输入佣金表id" />
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<el-select v-model="form.productType" placeholder="请选择产品类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="产品属性" prop="productAttr">
<el-select v-model="form.productAttr" placeholder="请选择产品属性">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="暗佣佣金" prop="darkCommission">
<el-input v-model="form.darkCommission" placeholder="请输入暗佣佣金" />
</el-form-item>
<el-form-item label="暗佣货币" prop="darkCurrency">
<el-select v-model="form.darkCurrency" placeholder="请选择暗佣货币">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="暗佣单位" prop="darkUnit">
<el-select v-model="form.darkUnit" placeholder="请选择暗佣单位">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="暗佣上调" prop="darkAdjustCommission">
<el-input v-model="form.darkAdjustCommission" placeholder="请输入暗佣上调" />
</el-form-item>
<el-form-item label="暗佣货币上调" prop="darkAdjustCurrency">
<el-select v-model="form.darkAdjustCurrency" placeholder="请选择暗佣货币上调">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="暗佣单位上调" prop="darkAdjustUnit">
<el-select v-model="form.darkAdjustUnit" placeholder="请选择暗佣单位上调">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="满减" prop="amount">
<el-input v-model="form.amount" placeholder="请输入满减" />
</el-form-item>
<el-form-item label="满的货多少币" prop="amountCurrency">
<el-select v-model="form.amountCurrency" placeholder="请选择满的货多少币">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="满多少的单位" prop="amountUnit">
<el-select v-model="form.amountUnit" placeholder="请选择满多少的单位">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="返佣金的货币" prop="refundCurrency">
<el-select v-model="form.refundCurrency" placeholder="请选择返佣金的货币">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="满返" prop="refund">
<el-input v-model="form.refund" placeholder="请输入满返" />
</el-form-item>
<el-form-item label="返佣金的单位" prop="refundUnit">
<el-select v-model="form.refundUnit" placeholder="请选择返佣金的单位">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_UNIT)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { createCustomerCommissionInfo, updateCustomerCommissionInfo, deleteCustomerCommissionInfo, getCustomerCommissionInfo, getCustomerCommissionInfoPage, exportCustomerCommissionInfoExcel } from "@/api/ecw/customerCommissionInfo";
export default {
name: "CustomerCommissionInfo",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 客户佣金详情列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
commissionId: null,
productType: null,
productAttr: null,
darkCommission: null,
darkCurrency: null,
darkUnit: null,
darkAdjustCommission: null,
darkAdjustCurrency: null,
darkAdjustUnit: null,
amount: null,
amountCurrency: null,
amountUnit: null,
refundCurrency: null,
refund: null,
refundUnit: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
commissionId: [{ required: true, message: "佣金表id不能为空", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getCustomerCommissionInfoPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
commissionId: undefined,
productType: undefined,
productAttr: undefined,
darkCommission: undefined,
darkCurrency: undefined,
darkUnit: undefined,
darkAdjustCommission: undefined,
darkAdjustCurrency: undefined,
darkAdjustUnit: undefined,
amount: undefined,
amountCurrency: undefined,
amountUnit: undefined,
refundCurrency: undefined,
refund: undefined,
refundUnit: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加客户佣金详情";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getCustomerCommissionInfo(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改客户佣金详情";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
updateCustomerCommissionInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createCustomerCommissionInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除客户佣金详情编号为"' + id + '"的数据项?').then(function() {
return deleteCustomerCommissionInfo(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有客户佣金详情数据项?').then(() => {
this.exportLoading = true;
return exportCustomerCommissionInfoExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
src/views/ecw/product/index.vue
View file @ 69ddd604
...@@ -191,33 +191,6 @@ ...@@ -191,33 +191,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="默认重货标准" prop="zhongLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.zhongLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="默认泡货标准" prop="paoLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.paoLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
</el-col>
</el-row>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -233,7 +206,6 @@ import { getProductAttrList } from "@/api/ecw/productAttr"; ...@@ -233,7 +206,6 @@ import { getProductAttrList } from "@/api/ecw/productAttr";
import { getProductTypeList } from "@/api/ecw/productType"; import { getProductTypeList } from "@/api/ecw/productType";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'; import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants'; import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants';
import { getZhongPaoPage } from "@/api/ecw/zhongPao";
import { uploadFile } from "@/api/infra/file"; import { uploadFile } from "@/api/infra/file";
export default { export default {
...@@ -252,12 +224,6 @@ export default { ...@@ -252,12 +224,6 @@ export default {
packagingList:[], packagingList:[],
//货柜位置 //货柜位置
locationList:[], locationList:[],
//重货默认开启状态
zhongLinjieFlag: true,
//泡货默认开启状态
paoLinjieFlag: true,
//重泡货默认配置
zhongPaoInfo: {},
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -297,8 +263,6 @@ export default { ...@@ -297,8 +263,6 @@ export default {
packaging:[{ required: true, message: "包装要求不能为空", trigger: "blur" }], packaging:[{ required: true, message: "包装要求不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }], containerLocation:[{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "默认方数不能为空", trigger: "blur" }], square:[{ required: true, message: "默认方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
// paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }], needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
}, },
...@@ -351,27 +315,8 @@ export default { ...@@ -351,27 +315,8 @@ export default {
this.getAttrList(); this.getAttrList();
this.getTypeList(); this.getTypeList();
this.getList(); this.getList();
this.getZhongPaoInfo();
}, },
methods: { methods: {
/**获取重泡货默认配置 */
getZhongPaoInfo() {
getZhongPaoPage({}).then(response => {
let list = response.data.list;
if (list && list.length > 0) {
this.zhongPaoInfo = list[0];
}
})
},
zhongpaoChange(type) {
if(type == 'zhong') {
this.setZhongValue();
} else if(type == 'pao') {
this.setPaoValue();
}
},
/** 获取产品属性列表 */ /** 获取产品属性列表 */
getAttrList() { getAttrList() {
getProductAttrList().then(response => { getProductAttrList().then(response => {
...@@ -463,8 +408,6 @@ export default { ...@@ -463,8 +408,6 @@ export default {
if(this.queryParams.typeId) { if(this.queryParams.typeId) {
this.form.typeId = this.queryParams.typeId; this.form.typeId = this.queryParams.typeId;
} }
this.setZhongValue();
this.setPaoValue();
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -480,34 +423,9 @@ export default { ...@@ -480,34 +423,9 @@ export default {
this.form.attrArray = attrArray; this.form.attrArray = attrArray;
this.open = true; this.open = true;
this.title = "修改商品"; this.title = "修改商品";
if(!this.form.zhongLinjie) {
this.setZhongValue();
}
if(!this.form.paoLinjie) {
this.setPaoValue();
}
}); });
}, },
setZhongValue() {
if(this.zhongLinjieFlag && this.zhongPaoInfo.zhongLinjie) {
this.form.zhongLinjie = parseFloat(this.zhongPaoInfo.zhongLinjie);
} else {
// this.form.zhongLinjie = null;
}
},
setPaoValue() {
if(this.paoLinjieFlag && this.zhongPaoInfo.paoLinjie) {
this.form.paoLinjie = parseFloat(this.zhongPaoInfo.paoLinjie);
} else {
// this.form.paoLinjie = null;
}
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.form); console.log(this.form);
......
src/views/ecw/productBrandEmpower/index.vue 0 → 100644
View file @ 69ddd604
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品品牌id" prop="productBrandId">
<el-input v-model="queryParams.productBrandId" placeholder="请输入商品品牌id" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="客户id" prop="customerId">-->
<!-- <el-input v-model="queryParams.customerId" placeholder="请输入客户id" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户联系人id" prop="customerContactsId">-->
<!-- <el-input v-model="queryParams.customerContactsId" placeholder="请输入客户联系人id" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<el-form-item label="客户关键词" prop="customerKey">
<el-input v-model="queryParams.customerKey" placeholder="请输入客户姓名或手机号进行搜索" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="授权开始时间">-->
<!-- <el-date-picker v-model="dateRangeStartTime" style="width: 240px" value-format="yyyy-MM-dd"-->
<!-- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="授权结束时间">-->
<!-- <el-date-picker v-model="dateRangeEndTime" style="width: 240px" value-format="yyyy-MM-dd"-->
<!-- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="授权文件URL" prop="fileUrl">-->
<!-- <el-input v-model="queryParams.fileUrl" placeholder="请输入授权文件URL" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<el-form-item label="收费标准" prop="feeScale">
<!-- <el-input v-model="queryParams.feeScale" placeholder="请输入收费标准" clearable @keyup.enter.native="handleQuery"/>-->
<el-select v-model="queryParams.feeScale" placeholder="请输入收费标准" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="授权状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择授权状态" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_AUTH_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="创建人id" prop="createUserId">-->
<!-- <el-input v-model="queryParams.createUserId" placeholder="请输入创建人id" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="创建人用户名" prop="createUsername">-->
<!-- <el-input v-model="queryParams.createUsername" placeholder="请输入创建人用户名" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="创建时间">-->
<!-- <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"-->
<!-- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:product-brand-empower:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:product-brand-empower:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="商品品牌id" align="center" prop="productBrandId" />
<el-table-column label="客户姓名" align="center" prop="customerId" />
<el-table-column label="客户手机" align="center" prop="customerContactsId" />
<el-table-column label="授权开始时间" align="center" prop="startTime" />
<el-table-column label="授权结束时间" align="center" prop="endTime" />
<!-- <el-table-column label="授权文件URL" align="center" prop="fileUrl" />-->
<el-table-column label="收费标准" align="center" prop="feeScale">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_CHARGING_MODEL" :value="scope.row.feeScale" />
</template>
</el-table-column>
<el-table-column label="授权状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BRAND_AUTH_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <el-table-column label="创建人id" align="center" prop="createUserId" />-->
<el-table-column label="创建人用户名" align="center" prop="createUsername" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="操作" 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="['ecw:product-brand-empower:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product-brand-empower:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="商品品牌id" prop="productBrandId">
<el-input v-model="form.productBrandId" placeholder="请输入商品品牌id" />
</el-form-item>
<!-- <el-form-item label="客户id" prop="customerId">-->
<!-- <el-input v-model="form.customerId" placeholder="请输入客户id" />-->
<!-- </el-form-item>-->
<el-form-item label="客户联系人id" prop="customerContactsId">
<el-input v-model="form.customerContactsId" placeholder="请输入客户联系人id" />
</el-form-item>
<el-form-item label="授权开始时间" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择授权开始时间" />
</el-form-item>
<el-form-item label="授权结束时间" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择授权结束时间" />
</el-form-item>
<el-form-item label="授权文件URL" prop="fileUrl">
<el-input v-model="form.fileUrl" placeholder="请输入授权文件URL" />
</el-form-item>
<el-form-item label="收费标准" prop="feeScale">
<el-input v-model="form.feeScale" placeholder="请输入收费标准" />
</el-form-item>
<el-form-item label="授权状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_AUTH_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="创建人id" prop="createUserId">
<el-input v-model="form.createUserId" placeholder="请输入创建人id" />
</el-form-item>
<el-form-item label="创建人用户名" prop="createUsername">
<el-input v-model="form.createUsername" placeholder="请输入创建人用户名" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { createProductBrandEmpower, updateProductBrandEmpower, deleteProductBrandEmpower, getProductBrandEmpower, getProductBrandEmpowerPage, exportProductBrandEmpowerExcel } from "@/api/ecw/productBrandEmpower";
export default {
name: "ProductBrandEmpower",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 商品品牌授权列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeStartTime: [],
dateRangeEndTime: [],
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
productBrandId: null,
customerId: null,
customerContactsId: null,
fileUrl: null,
feeScale: null,
status: null,
createUserId: null,
createUsername: null,
customerKey: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
productBrandId: [{ required: true, message: "商品品牌id不能为空", trigger: "blur" }],
customerId: [{ required: true, message: "客户id不能为空", trigger: "blur" }],
customerContactsId: [{ required: true, message: "客户联系人id不能为空", trigger: "blur" }],
fileUrl: [{ required: true, message: "授权文件URL不能为空", trigger: "blur" }],
feeScale: [{ required: true, message: "收费标准 0为无牌收费 1为有牌收费不能为空", trigger: "blur" }],
status: [{ required: true, message: "授权状态 1为未授权 0为已授权不能为空", trigger: "blur" }],
createUserId: [{ required: true, message: "创建人id不能为空", trigger: "blur" }],
createUsername: [{ required: true, message: "创建人用户名不能为空", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getProductBrandEmpowerPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
productBrandId: undefined,
customerId: undefined,
customerContactsId: undefined,
startTime: undefined,
endTime: undefined,
fileUrl: undefined,
feeScale: undefined,
status: undefined,
createUserId: undefined,
createUsername: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeStartTime = [];
this.dateRangeEndTime = [];
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加商品品牌授权";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getProductBrandEmpower(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改商品品牌授权";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
updateProductBrandEmpower(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createProductBrandEmpower(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除商品品牌授权编号为"' + id + '"的数据项?').then(function() {
return deleteProductBrandEmpower(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有商品品牌授权数据项?').then(() => {
this.exportLoading = true;
return exportProductBrandEmpowerExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
src/views/ecw/productBrank/index.vue 0 → 100644
View file @ 69ddd604
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="品牌中文标题" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入品牌中文标题" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="品牌英文标题" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入品牌英文标题" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="排序" prop="aorder">
<el-input v-model="queryParams.aorder" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="是否备案" prop="filing">-->
<!-- <el-select v-model="queryParams.filing" placeholder="请选择是否备案，字典" clearable size="small">-->
<!-- <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REGISTRY_TYPE)"-->
<!-- :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="是否备案" prop="filing">
<el-select v-model="queryParams.filing" placeholder="请选择是否备案" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:product-brank:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:product-brank:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键ID" align="center" prop="id" />
<el-table-column label="品牌中文标题" align="center" prop="titleZh" />
<el-table-column label="品牌英文标题" align="center" prop="titleEn" />
<el-table-column label="排序" align="center" prop="aorder" />
<el-table-column label="是否备案" align="center" prop="filing">
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :type="r in recordStatus" :value="scope.row.filing" />-->
<!-- </template>-->
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="scope.row.filing" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column> <el-table-column label="操作" 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="['ecw:product-brank:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product-brank:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="品牌中文标题" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入品牌中文标题" />
</el-form-item>
<el-form-item label="品牌英文标题" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入品牌英文标题" />
</el-form-item>
<el-form-item label="排序" prop="aorder">
<el-input v-model="form.aorder" placeholder="请输入排序" />
</el-form-item>
<!-- <el-form-item label="是否备案" prop="filing">-->
<!-- <el-radio-group v-model="form.filing">-->
<!-- <el-radio v-for="dict in recordStatus"-->
<!-- :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="是否备案" prop="filing">
<el-select v-model="form.filing" placeholder="请选择是否备案">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { createProductBrank, updateProductBrank, deleteProductBrank, getProductBrank, getProductBrankPage, exportProductBrankExcel } from "@/api/ecw/productBrank";
import { CommonStatusEnum } from '@/utils/constants';
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
export default {
name: "ProductBrank",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 品牌列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
titleZh: null,
titleEn: null,
aorder: null,
filing: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
},
recordStatus: getDictDatas(DICT_TYPE.BRAND_REG_TYPE),
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
if(this.queryParams!=null&&this.queryParams.filing===''){
this.queryParams.filing=null;
}
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getProductBrankPage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
titleZh: undefined,
titleEn: undefined,
aorder: undefined,
filing: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加品牌";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getProductBrank(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改品牌";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
updateProductBrank(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createProductBrank(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除品牌编号为"' + id + '"的数据项?').then(function() {
return deleteProductBrank(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有品牌数据项?').then(() => {
this.exportLoading = true;
return exportProductBrankExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
src/views/ecw/productPrice/index.vue
View file @ 69ddd604
...@@ -3,12 +3,30 @@ ...@@ -3,12 +3,30 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="运输方式" prop="transportType"> <el-form-item label="商品编码" prop="productCode">
<!-- <el-select v-model="queryParams.transportType" clearable> <el-input v-model="queryParams.productCode" placeholder="请输入商品编码" clearable @keyup.enter.native="handleQuery"/>
<el-option v-for="dict in transportDatas" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-form-item>
</el-select> -->
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" clearable /> <el-form-item label="海关编码" prop="customsCode">
<el-input v-model="queryParams.customsCode" placeholder="请输入海关编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="商品名称" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="商品类型" prop="typeId">
<el-select v-model="queryParams.typeId" placeholder="选择商品类型" clearable>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品特性" prop="attrId">
<el-select v-model="queryParams.attrId" placeholder="选择商品特性" clearable>
<el-option v-for="attr in attrList" :key="attr.id" :label="attr.attrName" :value="attr.id"/>
</el-select>
</el-form-item>
<el-form-item label="始发地" prop="startCityId"> <el-form-item label="始发地" prop="startCityId">
<el-select v-model="queryParams.startCityId" clearable> <el-select v-model="queryParams.startCityId" clearable>
<el-option v-for="city in startCityList" :key="city.id" :label="city.titleZh" :value="city.id" /> <el-option v-for="city in startCityList" :key="city.id" :label="city.titleZh" :value="city.id" />
...@@ -26,6 +44,12 @@ ...@@ -26,6 +44,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="blacklist">
<el-checkbox v-model="queryParams.blacklist"
:true-label="1" :false-label="0">黑名单</el-checkbox>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
...@@ -50,6 +74,36 @@ ...@@ -50,6 +74,36 @@
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="序号" prop="id" width="50" /> <el-table-column label="序号" prop="id" width="50" />
<el-table-column label="商品编码" align="center" prop="productCode" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.productCode }}
</div>
</template>
</el-table-column>
<el-table-column label="海关编码" align="center" prop="customsCode" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.customsCode }}
</div>
</template>
</el-table-column>
<el-table-column label="商品类型" align="center" prop="typeId">
<template slot-scope="scope">
<span>{{ getTypeName(scope.row.productDO.typeId) }}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" prop="productName" >
<template slot-scope="scope">
<div>
{{ scope.row.productDO.titleZh }}
</div>
</template>
</el-table-column>
<el-table-column prop="tansportType" label="运输方式" align="center" width="100"> <el-table-column prop="tansportType" label="运输方式" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -86,11 +140,11 @@ ...@@ -86,11 +140,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="auditStatus" align="center" label="是否审核" width="120"> <el-table-column prop="auditStatus" align="center" label="状态" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.auditStatus" @change="handleStatusChange(scope.row)"> <div>
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="parseInt(auditStatusItem.value)"/> {{ statusName(scope.row) }}
</el-select> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -106,6 +160,11 @@ ...@@ -106,6 +160,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:product-price:update']">修改</el-button> v-hasPermi="['ecw:product-price:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'blacklist')"
v-hasPermi="['ecw:product-price:update']">{{ scope.row.blacklist == 0 ? '加入黑名单' : '移除黑名单' }}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'auditStatus')"
v-hasPermi="['ecw:product-price:update']">{{scope.row.auditStatus == AuditStatusEnum.PASS ? '下架' : '上架'}}</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product-price:delete']">删除</el-button> --> v-hasPermi="['ecw:product-price:delete']">删除</el-button> -->
</template> </template>
...@@ -258,32 +317,6 @@ ...@@ -258,32 +317,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="重货标准" prop="zhongLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.zhongLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="泡货标准" prop="paoLinjie" v-if="false">
<el-row class="mb8">
<el-col :span="12">
<el-input v-model.number="form.paoLinjie" type="number">
<template slot="append">kg/cbm</template>
</el-input>
</el-col>
<el-col :span="10">
<el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
</el-col>
</el-row>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -299,7 +332,8 @@ import { createProductPrice, updateProductPrice, deleteProductPrice, getProductP ...@@ -299,7 +332,8 @@ import { createProductPrice, updateProductPrice, deleteProductPrice, getProductP
import { openedRouterList } from "@/api/ecw/warehouse"; import { openedRouterList } from "@/api/ecw/warehouse";
import { getCityList } from "@/api/ecw/region"; import { getCityList } from "@/api/ecw/region";
import { getProductTypeList } from "@/api/ecw/productType"; import { getProductTypeList } from "@/api/ecw/productType";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'; import { getProductAttrList } from "@/api/ecw/productAttr";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import { getCurrencyList } from '@/api/ecw/currency'; import { getCurrencyList } from '@/api/ecw/currency';
import { getUnitList } from '@/api/ecw/unit'; import { getUnitList } from '@/api/ecw/unit';
import { AuditStatusEnum} from '@/utils/constants' import { AuditStatusEnum} from '@/utils/constants'
...@@ -313,6 +347,8 @@ export default { ...@@ -313,6 +347,8 @@ export default {
}, },
data() { data() {
return { return {
//特性列表
attrList:[],
typeList: [], typeList: [],
product: null, product: null,
startCityList: [], //始发地城市 startCityList: [], //始发地城市
...@@ -326,10 +362,6 @@ export default { ...@@ -326,10 +362,6 @@ export default {
//货柜位置 //货柜位置
locationList:[], locationList:[],
//重货默认开启状态
zhongLinjieFlag: true,
//泡货默认开启状态
paoLinjieFlag: true,
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -377,17 +409,15 @@ export default { ...@@ -377,17 +409,15 @@ export default {
advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }], advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "货柜位置不能为空", trigger: "blur" }], containerLocation:[{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "方数不能为空", trigger: "blur" }], square:[{ required: true, message: "方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
// paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }], needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
}, },
lineList: [],
transportDatas: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE), transportDatas: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE),
advanceStatusDictDatas: getDictDatas(DICT_TYPE.ADVANCE_STATUS), advanceStatusDictDatas: getDictDatas(DICT_TYPE.ADVANCE_STATUS),
AuditStatusEnum: AuditStatusEnum, AuditStatusEnum: AuditStatusEnum,
auditStatusDictDatas: getDictDatas(DICT_TYPE.AUDIT_STATUS),
locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION), locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
lineList: []
}; };
}, },
...@@ -400,6 +430,25 @@ export default { ...@@ -400,6 +430,25 @@ export default {
return this.keyedChannel[id] ? this.keyedChannel[id].nameZh : null return this.keyedChannel[id] ? this.keyedChannel[id].nameZh : null
} }
}, },
getTypeName() {
return typeId => {
for(let index in this.typeList) {
let typeItem = this.typeList[index];
if(typeItem.id == typeId) {
return typeItem.titleZh;
}
}
}
},
statusName() {
return row => {
if(row.blacklist) return '黑名单';
if(row.auditStatus === AuditStatusEnum.PASS) return '已审核';
return '已下架';
}
},
transportName() { transportName() {
return transportType => { return transportType => {
return this.getDictDataLabel(this.DICT_TYPE.ECW_TRANSPORT_TYPE, transportType) return this.getDictDataLabel(this.DICT_TYPE.ECW_TRANSPORT_TYPE, transportType)
...@@ -471,6 +520,8 @@ export default { ...@@ -471,6 +520,8 @@ export default {
this.getTypeList(); this.getTypeList();
} }
this.getChannelList() this.getChannelList()
this.getAttrList();
this.getList(); this.getList();
//获取城市列表 //获取城市列表
this.getAllCityList(); this.getAllCityList();
...@@ -486,6 +537,13 @@ export default { ...@@ -486,6 +537,13 @@ export default {
getChannelList(){ getChannelList(){
getChannelList().then(res => this.channelList = res.data) getChannelList().then(res => this.channelList = res.data)
}, },
/** 获取产品属性列表 */
getAttrList() {
getProductAttrList().then(response => {
this.attrList = response.data;
})
},
/** 获取产品类型列表 */ /** 获取产品类型列表 */
getTypeList() { getTypeList() {
getProductTypeList().then(response => { getProductTypeList().then(response => {
...@@ -623,8 +681,6 @@ export default { ...@@ -623,8 +681,6 @@ export default {
this.form.dayLimit = this.product.dayLimit; this.form.dayLimit = this.product.dayLimit;
this.form.containerLocation = this.product.containerLocation; this.form.containerLocation = this.product.containerLocation;
this.form.square = this.product.square; this.form.square = this.product.square;
this.form.paoLinjie = this.product.paoLinjie;
this.form.zhongLinjie = this.product.zhongLinjie;
if(this.currecyList) { if(this.currecyList) {
let priceUnitId = this.currecyList[0].id; let priceUnitId = this.currecyList[0].id;
...@@ -639,8 +695,6 @@ export default { ...@@ -639,8 +695,6 @@ export default {
this.isUpdate = false; this.isUpdate = false;
this.open = true; this.open = true;
this.title = "添加路线价格"; this.title = "添加路线价格";
this.setZhongValue();
this.setPaoValue();
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -664,6 +718,24 @@ export default { ...@@ -664,6 +718,24 @@ export default {
}); });
}, },
updateStatus(row, type) {
if(type == 'blacklist') {
row.blacklist=row.blacklist == 0 ? 1 : 0;
} else if(type == 'auditStatus') {
row.auditStatus=row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
}
updateProductPrice(row).then(() => {
this.$modal.msgSuccess("修改成功");
}).catch(function() {
if(statusType == 'blacklist') {
row.blacklist = row.blacklist === 1 ? 0 : 1;
} else {
row.auditStatus = row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
}
});
},
checkSelectable() { checkSelectable() {
return !this.isUpdate; return !this.isUpdate;
...@@ -691,12 +763,13 @@ export default { ...@@ -691,12 +763,13 @@ export default {
this.$message.error('请选择线路'); this.$message.error('请选择线路');
return; return;
} }
let lineIdList = []; let lineChannelList = [];
//TODO ，lineChannelList实体空运的时候需要传出货渠道ID--shippingChannelId
this.lineList.map((item) => { this.lineList.map((item) => {
lineIdList.push(item.id); lineChannelList.push({lineId: item.id});
return item; return item;
}); });
this.form.lineIdList = lineIdList; this.form.lineChannelList = lineChannelList;
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
...@@ -741,28 +814,7 @@ export default { ...@@ -741,28 +814,7 @@ export default {
this.$download.excel(response, '${table.classComment}.xls'); this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
},
zhongpaoChange(type) {
if(type == 'zhong') {
this.setZhongValue();
} else if(type == 'pao') {
this.setPaoValue();
} }
},
setZhongValue() {
// console.log(this.product);
if(this.zhongLinjieFlag && this.product.zhongLinjie) {
this.form.zhongLinjie = parseFloat(this.product.zhongLinjie);
}
},
setPaoValue() {
if(this.paoLinjieFlag && this.product.paoLinjie) {
this.form.paoLinjie = parseFloat(this.product.paoLinjie);
}
},
} }
}; };
</script> </script>
......
src/views/ecw/warehouse/index.vue
View file @ 69ddd604
...@@ -571,6 +571,7 @@ export default { ...@@ -571,6 +571,7 @@ export default {
toRouteList(row, tradeType) { toRouteList(row, tradeType) {
this.routeQueryParam.id = row.id; this.routeQueryParam.id = row.id;
this.routeQueryParam.tradeType = tradeType; this.routeQueryParam.tradeType = tradeType;
this.routeQueryParam.pageNo = 1;
this.showRouteList = true; this.showRouteList = true;
this.routeLoadig = true; this.routeLoadig = true;
this.getRouteList(); this.getRouteList();
...@@ -580,6 +581,7 @@ export default { ...@@ -580,6 +581,7 @@ export default {
getRouteList() { getRouteList() {
routerList(this.routeQueryParam).then(response => { routerList(this.routeQueryParam).then(response => {
this.routeList = response.data.list; this.routeList = response.data.list;
this.routeCount = response.data.total;
this.routeLoadig = false; this.routeLoadig = false;
}); });
}, },
......
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