Skip to content

J
jiedao-app-operator-master
Commit 174c47e8 authored by 我在何方's avatar 我在何方
Browse files
Options

请款单bug

parents f8bef492 3347d8e1
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 45 deletions
src/router/index.js
View file @ 174c47e8
......@@ -255,7 +255,7 @@ export const constantRoutes = [
path: '/customerCommissionInfo/:dictId(\\d+)',
component: (resolve) => require(['@/views/ecw/customerCommissionInfo/index'], resolve),
name: 'customerCommissionInfo',
meta: {title: '佣金详情', icon: '', activeMenu: '/customer/customerCommissionInfo'}
meta: {title: '佣金设置', icon: '', activeMenu: '/customer/customerCommissionInfo'}
},
{
path: 'edit/:customerId(\\d+)',
......@@ -306,7 +306,7 @@ export const constantRoutes = [
props: true,
name: 'discount1',
meta: {title: '订单折扣申请', icon: '', activeMenu: '/order/index'}
},
},
{
path: 'speciallight/:orderId(\\d+)',
component: (resolve) => import('@/views/ecw/order/special/light'),
......
src/views/dashboard/PanelGroup.vue
View file @ 174c47e8
......@@ -35,7 +35,7 @@
<div class="card-panel-text">
{{$t('待办事项')}}
</div>
<count-to :start-val="0" :end-val="data.todoCount" :duration="3200" class="card-panel-num" />
<count-to :start-val="0" :end-val="todoCount" :duration="3200" class="card-panel-num" />
</div>
</div>
</el-col>
......@@ -72,13 +72,15 @@
import CountTo from 'vue-count-to'
import {panelData} from '@/api/system/pannel'
import {checkPermi} from '@/utils/permission'
import {taskTodoCount} from '@/api/bpm/task'
export default {
components: {
CountTo
},
data(){
return {
data: null
data: null,
todoCount: 0
}
},
methods: {
......@@ -91,6 +93,9 @@ export default {
panelData().then(res => {
this.data = res.data
})
taskTodoCount().then(res => {
this.todoCount = res.data
})
}
}
</script>
......
src/views/ecw/customer/edit.vue
View file @ 174c47e8
<template xmlns="">
<div>
<el-row type="flex" style="margin-top: 15px;margin-bottom: 15px" justify="center">
<el-col :xs="24" :sm="24" :md="24" :lg="22" :xl="20">
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
......@@ -103,7 +102,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="!!(customerId !== '0' && form.customerService)">
<el-select v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(!!(customerId !== '0' && form.customerService) || isCustomerServiceConfirmed)">
<el-option v-for="item in serviceUserList"
:key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
......@@ -169,7 +168,7 @@
</el-col>
<el-col :span="24">
<el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
<el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" />
<el-switch v-model="form.arrivalConfirm" :active-value="1" :inactive-value="0" />
</el-form-item>
</el-col>
<el-col :span="13">
......@@ -282,7 +281,7 @@
>
<template v-slot = "{row}">
<el-form-item label="">
<el-select v-model="row.userid" remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
<el-select v-model="row.userid" clearable remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
<el-option v-for="(item,index) in userMemberUser" :value="item.id" :key="index" :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
</el-select>
</el-form-item>
......@@ -430,7 +429,7 @@ import {customerDropDownList} from "@/api/ecw/customerCommissionInfo";
export default {
name: "edit",
props: {
customerId: String
customerId: String,
},
components: {
Template,
......@@ -438,6 +437,7 @@ export default {
CustomerLineTable
},
created() {
this.isCustomerServiceConfirmed = this.$route.query.isCustomerServiceConfirmed ? true : false
this.getCustomerSelect()
this.reset()
this.getUserMemberUserFn()
......@@ -462,6 +462,10 @@ export default {
} else {
// 新建客户
this.handleAddContact()
if(this.isCustomerServiceConfirmed){
console.log(this.userId);
this.form.customerService = this.userId
}
}
getNodeList().then(r => {
......@@ -489,6 +493,7 @@ export default {
},
data(){
return {
isCustomerServiceConfirmed:false,
getDictDatas,
DICT_TYPE,
......@@ -595,6 +600,9 @@ export default {
}
},
selectBD(val){
if(!val){
return
}
let i = this.selectMemberList.find(item => item.id === val);
if(i === undefined){
this.selectMemberList.push(this.memberList.find(item => item.id === val))
......@@ -642,6 +650,8 @@ export default {
return;
}
// 添加的提交
//我的客户页面跳转直接
form.isCustomerServiceConfirmed = true;
createCustomer(form).then(response => {
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
......@@ -752,6 +762,9 @@ export default {
}
},
computed: {
userId(){
return this.$store.state.user.id
},
userMemberUser(){
let list = this.memberList.filter(item => {
return this.selectMemberList.findIndex(i => i.id === item.id) < 0
......
src/views/ecw/customer/index.vue
View file @ 174c47e8
......@@ -19,7 +19,7 @@
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type"></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
......@@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select clearable v-model="form.country" :placeholder="$t('请选择国家')">
<el-select clearable v-model="queryParams.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in countryList"
:key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
</el-select>
......@@ -50,7 +50,7 @@
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="form.level" >
<el-select clearable v-model="queryParams.creditLevel" >
<el-option v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
......@@ -71,7 +71,7 @@
v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
</el-col>
<el-col :span="1.5" >
<el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="transferShow = true;" :loading="exportLoading"
<el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="transferShow = true;"
v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -529,6 +529,8 @@ export default {
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
},
// 表单参数
form: {},
......@@ -651,6 +653,19 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams = {
pageNo: 1,
pageSize: 10,
number: null,
name: null,
level: null,
source: null,
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
}
this.handleQuery();
},
/** 新增按钮操作 */
......
src/views/ecw/customerCommissionInfo/index.vue
View file @ 174c47e8
......@@ -4,7 +4,7 @@
<el-card class="box-card" style="padding: 10px">
<div slot="header" class="clearfix">
<el-row>
<el-col :span="5">
<el-col :span="8">
<el-form-item :label="$t('客户名称')" prop="customerId">
<div style="display: flex">
<el-input readonly="readonly" :placeholder="$t('请输入选择客户')" v-model="customerName"></el-input>
......
src/views/ecw/customerConfirm/index.vue
View file @ 174c47e8
......@@ -19,7 +19,7 @@
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type"></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
......@@ -50,7 +50,7 @@
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="form.level" >
<el-select clearable v-model="queryParams.creditLevel" >
<el-option v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
......@@ -67,6 +67,10 @@
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})"
v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -364,6 +368,8 @@ export default {
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
},
// 表单参数
form: {},
......@@ -479,6 +485,19 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams = {
pageNo: 1,
pageSize: 10,
number: null,
name: null,
level: null,
source: null,
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
}
this.handleQuery();
},
/** 新增按钮操作 */
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 174c47e8
......@@ -20,7 +20,7 @@
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type"></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
......@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select clearable v-model="form.country" :placeholder="$t('请选择国家')">
<el-select clearable v-model="queryParams.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in countryList"
:key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
</el-select>
......@@ -51,7 +51,7 @@
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="form.level" >
<el-select clearable v-model="queryParams.creditLevel" >
<el-option v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
......@@ -73,7 +73,7 @@
</el-col>
<el-col :span="1.5">
<el-col :span="1.5" >
<el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="batchTransferShow = true;" :loading="exportLoading"
<el-button :disabled="selectCustomerList.length === 0" type="primary" size="mini" @click="batchTransferShow = true;"
v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
</el-col>
</el-col>
......@@ -193,6 +193,8 @@ export default {
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
},
// 表单参数
form: {},
......@@ -312,6 +314,19 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams = {
pageNo: 1,
pageSize: 10,
number: null,
name: null,
level: null,
source: null,
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
}
this.handleQuery();
},
/** 新增按钮操作 */
......
src/views/ecw/financial/creatCollection.vue
View file @ 174c47e8
......@@ -413,6 +413,7 @@
<!-- <div slot="header" class="card-title">添加未收客户款项</div> -->
<!-- 搜索工作栏 -->
<el-form
v-if="open"
:model="queryParams"
ref="queryForm"
size="small"
......@@ -519,7 +520,6 @@
@selection-change="handleSelectionChange"
row-key="id"
height="calc(100vh - 480px)"
:key="dialogTableKey"
>
<el-table-column type="selection" width="55" :reserve-selection="true"> </el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
......@@ -719,7 +719,11 @@ export default {
discountForm: {},
selectListRow: {},
selectListIndex: 0,
<<<<<<< HEAD
flag: false,
=======
flag: false
>>>>>>> 3347d8e14b3cd6aa37bc7fd0fc22c20d16f19a7f
};
},
async created() {
......
src/views/ecw/myCustomerService/index.vue
View file @ 174c47e8
......@@ -20,7 +20,7 @@
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type"></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
......@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select clearable v-model="form.country" :placeholder="$t('请选择国家')">
<el-select clearable v-model="queryParams.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in countryList"
:key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
</el-select>
......@@ -51,7 +51,7 @@
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="form.level" >
<el-select clearable v-model="queryParams.creditLevel" >
<el-option v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
......@@ -179,6 +179,8 @@ export default {
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
},
// 表单参数
form: {},
......@@ -299,11 +301,24 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams = {
pageNo: 1,
pageSize: 10,
number: null,
name: null,
level: null,
source: null,
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
}
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.$router.push('/customer/add-edit/0')
this.$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})
// this.reset();
// this.open = true;
// this.title = "添加客户";
......
src/views/ecw/oceanCustomer/index.vue
View file @ 174c47e8
......@@ -20,7 +20,7 @@
<el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" multiple v-model="queryParams.type"></dict-selector>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
......@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('国家')" prop="source">
<el-select clearable v-model="form.country" :placeholder="$t('请选择国家')">
<el-select clearable v-model="queryParams.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in countryList"
:key="dict.id" :label="dict.nameZh" :value="parseInt(dict.id)" />
</el-select>
......@@ -51,7 +51,7 @@
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('信用等级')" prop="department">
<el-select clearable v-model="form.level" >
<el-select clearable v-model="queryParams.creditLevel" >
<el-option v-for="(item,index) in creditList" :label="item.nameZh" :key="index" :value="item.id" ></el-option>
</el-select>
</el-form-item>
......@@ -295,6 +295,19 @@ export default {
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.queryParams = {
pageNo: 1,
pageSize: 10,
number: null,
name: null,
level: null,
source: null,
customerService: null,
status: null,
department: null,
creditLevel:null,
country:null,
}
this.handleQuery();
},
/** 新增按钮操作 */
......
src/views/ecw/order/edit.vue
View file @ 174c47e8
......@@ -291,7 +291,7 @@
</div>
<div>
<el-form-item :label="$t('外部仓库')" prop="isExternalWarehouse">
<el-checkbox label="" :checked="!!form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
<el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
</el-form-item>
<div v-if="form.isExternalWarehouse" class="pl-50">
<div v-for="(item, index) in form.externalWarehouseDtoList" class="flex" :key="index">
......@@ -583,7 +583,7 @@ export default {
computed:{
// 是否已完成入仓
inWarehouse(){
return this.form.inWarehouseState && this.form.inWarehouseState > 201
return !!this.form.inWarehouseState && this.form.inWarehouseState > 201
},
exportCityList(){
return this.tradeCityList.filter(item => item.type == 2 || item.type == 3)
......@@ -739,7 +739,13 @@ export default {
},
'form.isExternalWarehouse'(isExternalWarehouse){
// 勾选外部仓则添加一个默认的，取消则删除默认的空的
this.$set(this.form, 'externalWarehouseDtoList', isExternalWarehouse ? [{}] : [])
if(!isExternalWarehouse){
this.$set(this.form, 'externalWarehouseDtoList', [])
}else if(!this.form.externalWarehouseDtoList.length){
this.$set(this.form, 'externalWarehouseDtoList', [{}])
}
},
// 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
selectedRouter(val){
......
src/views/ecw/order/prepayDeal.vue
View file @ 174c47e8
......@@ -384,7 +384,7 @@
'handlerParams.orderExceptionHandlerResult'(val){
if(val == 'no_pay'){
this.showWorkFlow = true
}
}else this.showWorkFlow = false
}
},
computed: {
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 174c47e8
......@@ -586,7 +586,7 @@ export default {
}
return orderWarehouseIn({
...this.form1,
brandType: this.form1.brand ? 1 : 0,
brandType: this.warehousing.brandType,
orderId: this.warehousing.orderId,
orderItemId: undefined,
orderNo: this.warehousing.orderNo,
......@@ -616,7 +616,7 @@ export default {
// 入仓修改
return orderWarehouseInUpdateApply({
...this.form,
brandType: this.form.brand ? 1 : 0,
brandType: this.warehousing.brandType,
orderId: this.warehousing.orderId,
orderItemId: this.warehousing.orderItemId,
orderNo: this.warehousing.orderNo,
......@@ -643,7 +643,7 @@ export default {
// 首次入仓
return orderWarehouseIn({
...this.form,
brandType: (this.form.brand && this.form.brand !== '0') ? 1 : 0,
brandType: this.warehousing.brandType,
orderId: this.warehousing.orderId,
orderItemId: this.warehousing.orderItemId,
orderNo: this.warehousing.orderNo,
......
src/views/ecw/productPrice/batchEdit.vue
View file @ 174c47e8
......@@ -9,10 +9,16 @@
<div slot="header" style="font-size:20px;">
{{$t('价格设置')}}
<span>
<el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
<!-- <el-checkbox label="" @change="form.needPay=$event ? 1 : 0">{{$t('预付')}}</el-checkbox> -->
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
</span>
</div>
<el-form-item :label="$t('预付')" prop="needPay" >
<el-radio-group v-model="form.needPay">
<el-radio :label="1">预付</el-radio>
<el-radio :label="0">均可</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" defaultable />
</el-form-item>
......@@ -187,7 +193,7 @@
</el-form>
<div style="margin: 20px 0">
<el-button @click="submitForm" type="primary">{{$t('确认提交')}}</el-button>
<el-button @click="submitForm" type="primary" :loading="loading">{{$t('确认提交')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('返回上一页')}}</el-button>
</div>
</div>
......@@ -225,7 +231,7 @@ export default {
titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }], */
transportPrice: [{ required: true, message: this.$t("海运费不能为空"), trigger: "blur" }],
clearancePrice: [{ required: true, message: this.$t("清关费不能为空"), trigger: "blur" }],
advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }],
/* advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }], */
//containerLocation: [{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
//square: [{ required: true, message: "方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
......@@ -238,7 +244,8 @@ export default {
unitList: [],
productTypeList: [],
productDisabled: true,
lineList: [] //路线数组
lineList: [], //路线数组
loading: false
}
},
computed: {
......@@ -378,10 +385,12 @@ export default {
if(data.lineChannelList.length < 1){
return this.$message.error(this.$t('请选择需要修改的路线'))
}
this.loading = true
batchUpdateProductPrice(data).then(response => {
this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.replace('/lineProject/product-price?' + (new URLSearchParams(this.$route.query)).toString())
})
.finally(res => this.loading = false)
});
},
}
......
src/views/ecw/productPrice/edit.vue
View file @ 174c47e8
......@@ -63,10 +63,16 @@
<div slot="header" style="font-size:20px;">
{{$t('价格设置')}}
<span>
<el-checkbox label="" v-model="needPay">{{$t('预付')}}</el-checkbox>
<el-checkbox v-if="$route.query.action != 'batchUpdate'" label="" v-model="needPay">{{$t('预付')}}</el-checkbox>
<el-checkbox label="" v-model="stepPrice">{{$t('阶梯定价')}}</el-checkbox>
</span>
</div>
<el-form-item :label="$t('预付')" prop="needPay" v-if="$route.query.action == 'batchUpdate'" >
<el-radio-group v-model="form.needPay">
<el-radio :label="1">预付</el-radio>
<el-radio :label="0">均可</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable />
</el-form-item>
......@@ -194,7 +200,7 @@
</el-form>
<div style="margin: 20px 0">
<el-button @click="submitForm" type="primary" v-if="!readonly">{{$t('确认提交')}}</el-button>
<el-button @click="submitForm" type="primary" v-if="!readonly" :loading="loading">{{$t('确认提交')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('返回上一页')}}</el-button>
</div>
</div>
......@@ -241,7 +247,8 @@ export default {
productTypeList: [],
productDisabled: true,
readonly: false,
lineList: [] //路线数组
lineList: [], //路线数组
loading: false
}
},
computed: {
......@@ -455,10 +462,11 @@ export default {
// 修改单条路线
if (this.$route.query.action == 'update') {
this.loading = true
return updateProductPrice(data).then(res => {
this.$modal.msgSuccess(this.$t("请求成功"));
this.$router.back()
})
}).finally(res => this.loading = false)
}
// 批量修改（单个商品的单个路线，多个路线，或者全部路线）的提交
......@@ -491,10 +499,11 @@ export default {
return this.$message.error(this.$t('请选择需要修改的路线'))
}
data.productIdList = [this.form.productId]
this.loading = true
batchUpdateProductPrice(data).then(response => {
this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())
})
}).finally(res => this.loading = false)
return;
}
// 添加的提交
......@@ -504,10 +513,11 @@ export default {
if((this.form.priceType == 0 && !this.form.transportPrice) || (this.form.priceType == 1 && !this.form.allPrice)){
return this.$message.error(this.$t('运费/全包价不能为0'))
}
this.loading = true
createProductPrice(data).then(response => {
this.$modal.msgSuccess(this.$t("请求成功"));
this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())
});
}).finally(res => this.loading = 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