|
|
|
|
@ -1,76 +1,77 @@
|
|
|
|
|
<template> |
|
|
|
|
<div class="content_max"> |
|
|
|
|
<!-- 配送服务类型 --> |
|
|
|
|
<div class="el_Storage"> |
|
|
|
|
<span class="el_table_span">配送服务类型</span> |
|
|
|
|
<el-select |
|
|
|
|
class="el_Cselect" |
|
|
|
|
v-model="form.dispatchServiceType" |
|
|
|
|
filterable |
|
|
|
|
placeholder="选择计费类型" |
|
|
|
|
style="width: 240px" |
|
|
|
|
@change="chargetype" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in Warehousebillingmode" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</div> |
|
|
|
|
<!-- 配送计费模式 --> |
|
|
|
|
<div class="el_select_check"> |
|
|
|
|
<div class="el_Storage el_Service"> |
|
|
|
|
<span class="el_table_span name">配送计费模式</span> |
|
|
|
|
<div class="el_row_f1"> |
|
|
|
|
<div class="el_Storage el_flex " style=" margin-right: 20px"> |
|
|
|
|
<span class="el_table_span">配送服务类型</span> |
|
|
|
|
<el-select |
|
|
|
|
v-model="form.dispatchPricingType" |
|
|
|
|
class="el_Cselect" |
|
|
|
|
v-model="form.dispatchServiceType" |
|
|
|
|
filterable |
|
|
|
|
placeholder="请选择配送计费模式" |
|
|
|
|
:popper-append-to-body="false" |
|
|
|
|
style="width: 760px" |
|
|
|
|
multiple |
|
|
|
|
@remove-tag="removeTag" |
|
|
|
|
placeholder="选择计费类型" |
|
|
|
|
style="width: 310px" |
|
|
|
|
@change="chargetype" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in ServiceList" |
|
|
|
|
v-for="item in Warehousebillingmode" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
> |
|
|
|
|
<el-checkbox v-model="item.check" @change="isChecked(item)"> |
|
|
|
|
{{ item.label }} |
|
|
|
|
</el-checkbox> |
|
|
|
|
</el-option> |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<!-- 是否区分品类 --> |
|
|
|
|
<div class="el_Storage"> |
|
|
|
|
<span class="el_table_span">是否区分品类</span> |
|
|
|
|
<el-radio-group |
|
|
|
|
@change="categoryChange" |
|
|
|
|
v-model="form.dispatchIsByCategory" |
|
|
|
|
class="el_Cselect" |
|
|
|
|
> |
|
|
|
|
<el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{ |
|
|
|
|
item.label |
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
<!-- 配送计费模式 --> |
|
|
|
|
<div class="el_select_check el_flex"> |
|
|
|
|
<div class="el_Storage el_Service el_flex" > |
|
|
|
|
<span class="el_table_span name">配送计费模式</span> |
|
|
|
|
<el-select |
|
|
|
|
v-model="form.dispatchPricingType" |
|
|
|
|
filterable |
|
|
|
|
placeholder="请选择配送计费模式" |
|
|
|
|
:popper-append-to-body="false" |
|
|
|
|
style="width: 310px" |
|
|
|
|
multiple |
|
|
|
|
@remove-tag="removeTag" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in ServiceList" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
> |
|
|
|
|
<el-checkbox v-model="item.check" @change="isChecked(item)"> |
|
|
|
|
{{ item.label }} |
|
|
|
|
</el-checkbox> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<!-- 是否区分品类 --> |
|
|
|
|
<div class="el_Storage el_flex el_te" style="margin-left: 20px;"> |
|
|
|
|
<span class="el_table_span">是否区分品类</span> |
|
|
|
|
<el-radio-group |
|
|
|
|
@change="categoryChange" |
|
|
|
|
v-model="form.dispatchIsByCategory" |
|
|
|
|
class="el_Cselect el_fx" style=" width: 300px;" |
|
|
|
|
> |
|
|
|
|
<el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{ |
|
|
|
|
item.label |
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 是否有遗留件 --> |
|
|
|
|
<div class="el_Storage"> |
|
|
|
|
<span class="el_table_span">是否有遗留件</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchIsLeaveBehind" class="el_Cselect"> |
|
|
|
|
<el-radio v-for="item in Leftoverparts" :key="item.label" :label="item.value">{{ |
|
|
|
|
item.label |
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
<!-- 是否有遗留件 --> |
|
|
|
|
<div class="el_Storage el_flex" style="margin-left: 20px;"> |
|
|
|
|
<span class="el_table_span">是否有遗留件</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchIsLeaveBehind" class="el_Cselect el_fx" style=" width: 300px;"> |
|
|
|
|
<el-radio v-for="item in Leftoverparts" :key="item.label" :label="item.value">{{ |
|
|
|
|
item.label |
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 商配/市配 --> |
|
|
|
|
<div class="el_Storage" v-if="WarehousebillingmodeTitle && categoriesState"> |
|
|
|
|
<div class="el_Storage" v-if="form.dispatchServiceType && categoriesState"> |
|
|
|
|
<el-tabs class="demo-tabs"> |
|
|
|
|
<el-tab-pane |
|
|
|
|
:label="WarehousebillingmodeTitle" |
|
|
|
|
@ -81,7 +82,7 @@
|
|
|
|
|
<div class="el_Commercial_ercial" v-if="StateDelivery"> |
|
|
|
|
<!-- 按件计费 --> |
|
|
|
|
<template v-for="Item in Commercialcial" :key="Item.title"> |
|
|
|
|
<div class="el_Storage" v-if="Item.state"> |
|
|
|
|
<div class="el_Storage el_margin" v-if="Item.state"> |
|
|
|
|
<div class="Storage-cont"> |
|
|
|
|
<!-- 标题 --> |
|
|
|
|
<span class="el_table_span">{{ Item.title }}</span> |
|
|
|
|
@ -91,9 +92,10 @@
|
|
|
|
|
v-loading="Item.Storageloading" |
|
|
|
|
element-loading-text="Loading..." |
|
|
|
|
> |
|
|
|
|
<div class="el_table_span"> |
|
|
|
|
<div class="el_table_id">序号</div> |
|
|
|
|
<div class="el_table_title">产品品类</div> |
|
|
|
|
<div class="el_table_span el_table_border"> |
|
|
|
|
<div class="el_table_id"><span>序号</span></div> |
|
|
|
|
<div class="el_table_title"><span>产品品类</span></div> |
|
|
|
|
<div class="el_table_operation"><span>操作</span></div> |
|
|
|
|
</div> |
|
|
|
|
<!-- 表格循环 --> |
|
|
|
|
<div class="el_table_td" v-for="item in Item.sequence" :key="item.id"> |
|
|
|
|
@ -108,7 +110,7 @@
|
|
|
|
|
clearable |
|
|
|
|
reserve-keyword |
|
|
|
|
placeholder="请选择品类" |
|
|
|
|
style="width: 240px" |
|
|
|
|
style="width: 100px" |
|
|
|
|
remote-show-suffix |
|
|
|
|
:remote-method="categoriesearch" |
|
|
|
|
@focus="categoriesSearchfocus(item)" |
|
|
|
|
@ -126,15 +128,14 @@
|
|
|
|
|
@click="storageplus(Item, item.id)" |
|
|
|
|
v-if="item.plus" |
|
|
|
|
class="el_table_operation_span_b" |
|
|
|
|
>+</span |
|
|
|
|
><el-icon style="margin-right: 3px"><CirclePlus /></el-icon>新增</span |
|
|
|
|
> |
|
|
|
|
<span |
|
|
|
|
@click="storagereduce(Item, item.id)" |
|
|
|
|
v-if="item.reduce" |
|
|
|
|
class="el_table_operation_span_a" |
|
|
|
|
>-</span |
|
|
|
|
><el-icon style="margin-right: 3px"><Delete /></el-icon>删除</span |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
@ -148,6 +149,7 @@
|
|
|
|
|
<!-- 附加费计费 --> |
|
|
|
|
<div class="el_Surchargebilling"> |
|
|
|
|
<span class="el_title_span">附加费计费</span> |
|
|
|
|
<div class="el_fj"> |
|
|
|
|
<!-- 是否有分货费 --> |
|
|
|
|
<div class="el_Storage"> |
|
|
|
|
<span class="el_table_span">是否有分货费</span> |
|
|
|
|
@ -168,7 +170,7 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 是否有上楼费 --> |
|
|
|
|
<div class="el_Storage el_upstairs"> |
|
|
|
|
<div class="el_Storage "> |
|
|
|
|
<div class="el_upstairs_a"> |
|
|
|
|
<span class="el_table_span">是否有上楼费</span> |
|
|
|
|
<el-radio-group |
|
|
|
|
@ -181,8 +183,9 @@
|
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div class="el_upstairs_b" v-if="UpstairsState"> |
|
|
|
|
</div> |
|
|
|
|
<div class="el_Storage "> |
|
|
|
|
<div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge"> |
|
|
|
|
<span class="el_table_span">是否配置免费层数</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect"> |
|
|
|
|
<el-radio v-for="item in Numberlayers" :key="item.label" :label="item.value">{{ |
|
|
|
|
@ -191,7 +194,7 @@
|
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
<!-- 是否有平移费 --> |
|
|
|
|
<div class="el_Storage"> |
|
|
|
|
<span class="el_table_span">是否有平移费</span> |
|
|
|
|
@ -217,7 +220,7 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 附加费品类 --> |
|
|
|
|
<div class="el_Storage" v-if="SurchargeState"> |
|
|
|
|
<div class="el_Storage" v-if="form.dispatchIsCategorySubjoin"> |
|
|
|
|
<div class="Storage-cont"> |
|
|
|
|
<span class="el_table_span">附加费品类</span> |
|
|
|
|
<!-- 表格 --> |
|
|
|
|
@ -266,7 +269,6 @@
|
|
|
|
|
class="el_table_operation_span_a" |
|
|
|
|
>-</span |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
@ -292,7 +294,7 @@
|
|
|
|
|
</el-radio-group> |
|
|
|
|
</div> |
|
|
|
|
<!-- 最低计费方式 --> |
|
|
|
|
<div class="el_Minimumbilling_b" v-if="MinimumState"> |
|
|
|
|
<div class="el_Minimumbilling_b" v-if="form.dispatchIsMinCost"> |
|
|
|
|
<span class="el_table_span">最低计费方式</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchMinCostMode" class="el_Cselect"> |
|
|
|
|
<el-radio v-for="item in Billingmethod" :key="item.label" :label="item.value">{{ |
|
|
|
|
@ -305,7 +307,7 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 最低计费类型 --> |
|
|
|
|
<div class="el_Storage" v-if="MinimumState"> |
|
|
|
|
<div class="el_Storage" v-if="form.dispatchIsMinCost"> |
|
|
|
|
<span class="el_table_span">最低计费类型</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchMinCostType" class="el_Cselect"> |
|
|
|
|
<el-radio v-for="item in chargetypeSelect" :key="item.label" :label="item.value">{{ |
|
|
|
|
@ -315,7 +317,7 @@
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<!-- 是否向上判断 --> |
|
|
|
|
<div class="el_Storage" v-if="!MinimumState"> |
|
|
|
|
<div class="el_Storage" v-if="!form.dispatchIsMinCost"> |
|
|
|
|
<span class="el_table_span">是否向上判断</span> |
|
|
|
|
<el-radio-group v-model="form.dispatchIsUpwardJudgment" class="el_Cselect"> |
|
|
|
|
<el-radio v-for="item in Upwardjudgment" :key="item.label" :label="item.value">{{ |
|
|
|
|
@ -339,7 +341,8 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
|
|
|
|
|
import { deepClone } from '@/utils/util'; |
|
|
|
|
import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js'; |
|
|
|
|
import { submit } from '@/api/base/region'; |
|
|
|
|
import { $_priceTemplate ,$_putpriceTemplate} from '@/api/financialsector/index'; //价格模板 |
|
|
|
|
import { $_priceTemplate, $_putpriceTemplate } from '@/api/financialsector/index'; //价格模板 |
|
|
|
|
const $route = useRoute(); //获取地址栏参数 |
|
|
|
|
const emit = defineEmits(['request-data']); |
|
|
|
|
defineComponent({ |
|
|
|
|
emits: ['request-data'], |
|
|
|
|
@ -353,18 +356,18 @@ console.log(props, '来自父页面参数');
|
|
|
|
|
const formCopy = ref(null); //拷贝的数据 |
|
|
|
|
const form = ref({ |
|
|
|
|
dispatchServiceType: '', //仓储计费类型 |
|
|
|
|
dispatchIsByCategory: '0', //是否区分品类 |
|
|
|
|
dispatchIsLeaveBehind: '0', //是否有遗留件 |
|
|
|
|
dispatchIsSortFee: '0', //是否有分货费 |
|
|
|
|
dispatchIsOperateFee: '0', //是否有操作装卸费 |
|
|
|
|
dispatchIsStairsCarryingCharge: '0', //是否有上楼费 |
|
|
|
|
dispatchIsByCategory: 0, //是否区分品类 |
|
|
|
|
dispatchIsLeaveBehind: 0, //是否有遗留件 |
|
|
|
|
dispatchIsSortFee: 0, //是否有分货费 |
|
|
|
|
dispatchIsOperateFee: 0, //是否有操作装卸费 |
|
|
|
|
dispatchIsStairsCarryingCharge: 0, //是否有上楼费 |
|
|
|
|
dispatchIsFeeFloor: null, //是否配置免费层数 |
|
|
|
|
dispatchIsShiftingCharge: '0', //是否有平移费 |
|
|
|
|
dispatchIsCategorySubjoin: '0', //附加费 |
|
|
|
|
dispatchIsMinCost: '0', //是否最低计费 |
|
|
|
|
dispatchIsShiftingCharge: 0, //是否有平移费 |
|
|
|
|
dispatchIsCategorySubjoin: 0, //附加费 |
|
|
|
|
dispatchIsMinCost: 0, //是否最低计费 |
|
|
|
|
dispatchMinCostMode: null, //最低计费方式 |
|
|
|
|
dispatchMinCostType: '1', //最低计费类型 |
|
|
|
|
dispatchIsUpwardJudgment: '0', //是否向上判断 |
|
|
|
|
dispatchMinCostType: 1, //最低计费类型 |
|
|
|
|
dispatchIsUpwardJudgment: 0, //是否向上判断 |
|
|
|
|
}); |
|
|
|
|
const SelectOpin = ref(null); //当前点击的品类搜索框 |
|
|
|
|
// 是否向上判断 |
|
|
|
|
@ -463,10 +466,8 @@ const CommercialcialDisplay = () => {
|
|
|
|
|
// 是否面配置楼层 |
|
|
|
|
const UpstairsChange = val => { |
|
|
|
|
if (val == 1) { |
|
|
|
|
UpstairsState.value = true; |
|
|
|
|
form.value.dispatchIsFeeFloor = '0'; //初始化参数 |
|
|
|
|
form.value.dispatchIsFeeFloor = 0; //初始化参数 |
|
|
|
|
} else { |
|
|
|
|
UpstairsState.value = false; |
|
|
|
|
form.value.dispatchIsFeeFloor = null; //初始化参数 |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
@ -480,14 +481,13 @@ const categoryChange = val => {
|
|
|
|
|
}; |
|
|
|
|
// 是否最低计费展示 |
|
|
|
|
const MinimumChange = val => { |
|
|
|
|
if (val == 1) { |
|
|
|
|
MinimumState.value = true; |
|
|
|
|
form.value.dispatchMinCostMode = '1'; |
|
|
|
|
console.log(val); |
|
|
|
|
if (val) { |
|
|
|
|
form.value.dispatchMinCostMode = 1; |
|
|
|
|
form.value.dispatchIsUpwardJudgment = null; //向上判断 |
|
|
|
|
} else { |
|
|
|
|
MinimumState.value = false; |
|
|
|
|
form.value.dispatchMinCostMode = null; |
|
|
|
|
form.value.dispatchIsUpwardJudgment = '0'; //向上判断 |
|
|
|
|
form.value.dispatchIsUpwardJudgment = 0; //向上判断 |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
// 点击菜单 |
|
|
|
|
@ -632,38 +632,27 @@ const categoriesduce = id => {
|
|
|
|
|
|
|
|
|
|
function updateDictionary(targetArray, dictionaryType) { |
|
|
|
|
getDictionaryBiz(dictionaryType) |
|
|
|
|
.then(res => { |
|
|
|
|
.then(async res => { |
|
|
|
|
console.log(res, '字典'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
if (res.data.data.length) { |
|
|
|
|
res.data.data.forEach(item => { |
|
|
|
|
targetArray.push({ |
|
|
|
|
value: item.dictKey, |
|
|
|
|
value: Number(item.dictKey), |
|
|
|
|
label: item.dictValue, |
|
|
|
|
id: item.id, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 是否类型 |
|
|
|
|
if (dictionaryType == 'price_yes_no') { |
|
|
|
|
Leftoverparts.value = { ...Distinguishcategories.value }; //是否有遗留件 |
|
|
|
|
Distributionfee.value = { ...Distinguishcategories.value }; //是否有分货费 |
|
|
|
|
Operatingfee.value = { ...Distinguishcategories.value }; //是否有操作/装卸费 |
|
|
|
|
upstairs.value = { ...Distinguishcategories.value }; //是否有上楼费 |
|
|
|
|
Numberlayers.value = { ...Distinguishcategories.value }; //是否配置免费层数 |
|
|
|
|
Translationfee.value = { ...Distinguishcategories.value }; //是否有平移费 |
|
|
|
|
Surchargefee.value = { ...Distinguishcategories.value }; //附加费是否统一计费 |
|
|
|
|
Minimumbilling.value = { ...Distinguishcategories.value }; //是否最低计费 |
|
|
|
|
Upwardjudgment.value = { ...Distinguishcategories.value }; //是否向上判断 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//服务类型 |
|
|
|
|
if (dictionaryType == 'dispatch_pricing_type') { |
|
|
|
|
Commercialcial.value = []; //清空服务类型 |
|
|
|
|
res.data.data.forEach(res => { |
|
|
|
|
let data = { |
|
|
|
|
title: res.dictValue, // 标题 |
|
|
|
|
id: res.dictKey, //码表ID |
|
|
|
|
id: Number(res.dictKey), //码表ID |
|
|
|
|
state: false, //是否显示 |
|
|
|
|
Storageloading: false, //加载效果 |
|
|
|
|
sequence: [ |
|
|
|
|
@ -683,6 +672,184 @@ function updateDictionary(targetArray, dictionaryType) {
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// 是否类型 |
|
|
|
|
if (dictionaryType == 'price_yes_no') { |
|
|
|
|
Leftoverparts.value = { ...Distinguishcategories.value }; //是否有遗留件 |
|
|
|
|
Distributionfee.value = { ...Distinguishcategories.value }; //是否有分货费 |
|
|
|
|
Operatingfee.value = { ...Distinguishcategories.value }; //是否有操作/装卸费 |
|
|
|
|
upstairs.value = { ...Distinguishcategories.value }; //是否有上楼费 |
|
|
|
|
Numberlayers.value = { ...Distinguishcategories.value }; //是否配置免费层数 |
|
|
|
|
Translationfee.value = { ...Distinguishcategories.value }; //是否有平移费 |
|
|
|
|
Surchargefee.value = { ...Distinguishcategories.value }; //附加费是否统一计费 |
|
|
|
|
Minimumbilling.value = { ...Distinguishcategories.value }; //是否最低计费 |
|
|
|
|
Upwardjudgment.value = { ...Distinguishcategories.value }; //是否向上判断 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 编辑回显 |
|
|
|
|
if (props.templateData.request) { |
|
|
|
|
let request = props.templateData.request; |
|
|
|
|
form.value = await deepClone(request); |
|
|
|
|
|
|
|
|
|
form.value.dispatchPricingType = request.dispatchPricingType |
|
|
|
|
? request.dispatchPricingType.split(',').map(Number) |
|
|
|
|
: []; //服务类型 |
|
|
|
|
|
|
|
|
|
ServiceList.value.forEach(dataItem => { |
|
|
|
|
if (form.value.dispatchPricingType.includes(dataItem.value)) { |
|
|
|
|
dataItem.check = true; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
if (request.dispatchIsByCategory) { |
|
|
|
|
categoriesState.value = true; //区分品类 |
|
|
|
|
console.log(categoriesState.value, '是否区分品类'); |
|
|
|
|
} |
|
|
|
|
// 配送服务类型标题 |
|
|
|
|
WarehousebillingmodeTitle.value = Warehousebillingmode.value.find( |
|
|
|
|
res => res.value == form.value.dispatchServiceType |
|
|
|
|
).label; |
|
|
|
|
StateDelivery.value = true; //显示表格 |
|
|
|
|
// 显示那些表格 |
|
|
|
|
Commercialcial.value.forEach(dataItem => { |
|
|
|
|
// 检查当前dataItem的id是否为1, 2, 或 3 且 dispatchPricingType数组包含这个id |
|
|
|
|
if ( |
|
|
|
|
[1, 2, 3].includes(dataItem.id) && |
|
|
|
|
form.value.dispatchPricingType.includes(dataItem.id) |
|
|
|
|
) { |
|
|
|
|
dataItem.state = true; |
|
|
|
|
} else { |
|
|
|
|
// 如果需要，这里可以添加处理其他情况的逻辑，默认情况下不设置state或设置为false |
|
|
|
|
// 例如 dataItem.state = false; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
// 按件计费回显 |
|
|
|
|
if (request.dispatchPieceCategory) { |
|
|
|
|
let piece = Commercialcial.value.find(res => res.id == 1); |
|
|
|
|
piece.sequence = []; |
|
|
|
|
request.dispatchPieceCategorys.forEach((res, index) => { |
|
|
|
|
console.log(piece, '按件显示'); |
|
|
|
|
piece.sequence.push({ |
|
|
|
|
Additionalcategories: [ |
|
|
|
|
{ |
|
|
|
|
label: res.name, |
|
|
|
|
value: res.id, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
StateName: 'storage', |
|
|
|
|
Warehousecategory: res.id, |
|
|
|
|
id: index + 1, |
|
|
|
|
plus: true, |
|
|
|
|
reduce: !index ? false : true, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// 按重量 |
|
|
|
|
if (request.dispatchWeightCategory) { |
|
|
|
|
let piece = Commercialcial.value.find(res => res.id == 2); |
|
|
|
|
piece.sequence = []; |
|
|
|
|
request.dispatchWeightCategorys.forEach((res, index) => { |
|
|
|
|
console.log(piece, '按件显示'); |
|
|
|
|
piece.sequence.push({ |
|
|
|
|
Additionalcategories: [ |
|
|
|
|
{ |
|
|
|
|
label: res.name, |
|
|
|
|
value: res.id, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
StateName: 'storage', |
|
|
|
|
Warehousecategory: res.id, |
|
|
|
|
id: index + 1, |
|
|
|
|
plus: true, |
|
|
|
|
reduce: !index ? false : true, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// 按方 |
|
|
|
|
if (request.dispatchCubeCategory) { |
|
|
|
|
let piece = Commercialcial.value.find(res => res.id == 3); |
|
|
|
|
piece.sequence = []; |
|
|
|
|
request.dispatchCubeCategorys.forEach((res, index) => { |
|
|
|
|
console.log(piece, '按件显示'); |
|
|
|
|
piece.sequence.push({ |
|
|
|
|
Additionalcategories: [ |
|
|
|
|
{ |
|
|
|
|
label: res.name, |
|
|
|
|
value: res.id, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
StateName: 'storage', |
|
|
|
|
Warehousecategory: res.id, |
|
|
|
|
id: index + 1, |
|
|
|
|
plus: true, |
|
|
|
|
reduce: !index ? false : true, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 附加品类回显 |
|
|
|
|
if (request.dispatchSubjoinCategory) { |
|
|
|
|
AdditionalcategoriesList.value = []; |
|
|
|
|
console.log('执行1'); |
|
|
|
|
request.dispatchSubjoinCategorys.forEach((res, index) => { |
|
|
|
|
console.log('执行2'); |
|
|
|
|
AdditionalcategoriesList.value.push({ |
|
|
|
|
Additionalcategories: [ |
|
|
|
|
{ |
|
|
|
|
label: res.name, |
|
|
|
|
value: res.id, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
StateName: 'additional', |
|
|
|
|
Warehousecategory: res.id, |
|
|
|
|
id: index + 1, |
|
|
|
|
plus: true, |
|
|
|
|
reduce: !index ? false : true, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// function updateSequence(requestCategorys, commercialId, stateName) { |
|
|
|
|
// let piece = Commercialcial.value.find(res => res.id == commercialId); |
|
|
|
|
// if (!piece) return; // 确保找到了相应的部分再继续 |
|
|
|
|
|
|
|
|
|
// piece.sequence = []; // 重置sequence防止数据累加 |
|
|
|
|
// requestCategorys.forEach((res, index) => { |
|
|
|
|
// piece.sequence.push({ |
|
|
|
|
// Additionalcategories: [{ |
|
|
|
|
// label: res.name, |
|
|
|
|
// value: res.id, |
|
|
|
|
// }], |
|
|
|
|
// StateName: stateName, |
|
|
|
|
// Warehousecategory: res.id, |
|
|
|
|
// id: index + 1, |
|
|
|
|
// plus: true, |
|
|
|
|
// reduce: !index ? false : true, |
|
|
|
|
// }); |
|
|
|
|
// console.log(piece, `按${stateName}显示`); // 根据状态显示不同的日志 |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// // 按件计费回显 |
|
|
|
|
// if (request.dispatchPieceCategory) { |
|
|
|
|
// updateSequence(request.dispatchPieceCategorys, 1, "storage"); |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// // 按重量 |
|
|
|
|
// if (request.dispatchWeightCategory) { |
|
|
|
|
// updateSequence(request.dispatchWeightCategorys, 2, "storage"); |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// // 按方 |
|
|
|
|
// if (request.dispatchCubeCategory) { |
|
|
|
|
// updateSequence(request.dispatchCubeCategorys, 3, "storage"); |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// // 附加品类回显 |
|
|
|
|
// if (request.dispatchSubjoinCategory) { |
|
|
|
|
// AdditionalcategoriesList.value = []; // 重置数组 |
|
|
|
|
// updateSequence(request.dispatchSubjoinCategorys, 0, "additional"); |
|
|
|
|
// } |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
.catch(() => {}) |
|
|
|
|
.finally(() => {}); |
|
|
|
|
@ -694,8 +861,7 @@ const categoriesSearchfocus = item => {
|
|
|
|
|
}; |
|
|
|
|
// 附加费是否按品类计费 |
|
|
|
|
const SurchargeChange = val => { |
|
|
|
|
if (val == 1) { |
|
|
|
|
SurchargeState.value = true; |
|
|
|
|
if (val) { |
|
|
|
|
AdditionalcategoriesList.value = [ |
|
|
|
|
{ |
|
|
|
|
id: 1, |
|
|
|
|
@ -706,8 +872,6 @@ const SurchargeChange = val => {
|
|
|
|
|
Additionalcategories: [], |
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
} else { |
|
|
|
|
SurchargeState.value = false; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
// 附加品类的搜索 |
|
|
|
|
@ -747,12 +911,10 @@ const onLoad = () => {
|
|
|
|
|
}; |
|
|
|
|
onLoad(); |
|
|
|
|
// 保存事件 |
|
|
|
|
const handleSubmit = async() => { |
|
|
|
|
const handleSubmit = async () => { |
|
|
|
|
await emit('request-data'); //通知父页面传递数据 |
|
|
|
|
console.log(props, 'props'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!props.templateData.TemplateName) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请输入模板名称', |
|
|
|
|
@ -772,16 +934,14 @@ const handleSubmit = async() => {
|
|
|
|
|
form.value.brandId = props.templateData.brand; //品牌ID |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!form.value.dispatchServiceType){ |
|
|
|
|
if (!form.value.dispatchServiceType) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请选择配送服务类型', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if(!form.value.dispatchPricingType.length){ |
|
|
|
|
if (!form.value.dispatchPricingType.length) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请选择配送计费模式', |
|
|
|
|
type: 'warning', |
|
|
|
|
@ -789,7 +949,7 @@ const handleSubmit = async() => {
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
form.value.serviceType=props.templateData.ServiceType.join(',');//顶部选择的服务类型 |
|
|
|
|
form.value.serviceType = props.templateData.ServiceType.join(','); //顶部选择的服务类型 |
|
|
|
|
console.log(form.value, '初始表单'); |
|
|
|
|
console.log(Commercialcial.value, 'Commercialcial'); |
|
|
|
|
// 初始化数据 |
|
|
|
|
@ -810,30 +970,32 @@ const handleSubmit = async() => {
|
|
|
|
|
return true; // 表示检查未通过 |
|
|
|
|
} |
|
|
|
|
Submit[submitField] = item.sequence.map(res => res.Warehousecategory).join(','); // 根据类型处理 |
|
|
|
|
console.log(Submit[submitField], '123'); |
|
|
|
|
return false; // 表示检查已通过 |
|
|
|
|
} |
|
|
|
|
// 选择了是否区分品类才进行处理数据 |
|
|
|
|
console.log(categoriesState.value, 'categoriesState.value'); |
|
|
|
|
if (categoriesState.value) { |
|
|
|
|
for (const res of form.value.dispatchPricingType) { |
|
|
|
|
let shouldReturn = false; |
|
|
|
|
switch (res) { |
|
|
|
|
case '1': |
|
|
|
|
case 1: |
|
|
|
|
shouldReturn = checkAndProcessServiceType( |
|
|
|
|
'1', |
|
|
|
|
1, |
|
|
|
|
'请填写完整按件处理', |
|
|
|
|
'dispatchPieceCategory' |
|
|
|
|
); |
|
|
|
|
break; |
|
|
|
|
case '2': |
|
|
|
|
case 2: |
|
|
|
|
shouldReturn = checkAndProcessServiceType( |
|
|
|
|
'2', |
|
|
|
|
2, |
|
|
|
|
'请填写完整按重量处理', |
|
|
|
|
'dispatchWeightCategory' |
|
|
|
|
); |
|
|
|
|
break; |
|
|
|
|
case '3': |
|
|
|
|
case 3: |
|
|
|
|
shouldReturn = checkAndProcessServiceType( |
|
|
|
|
'3', |
|
|
|
|
3, |
|
|
|
|
'请填写完整按方处理', |
|
|
|
|
'dispatchCubeCategory' |
|
|
|
|
); |
|
|
|
|
@ -845,49 +1007,47 @@ const handleSubmit = async() => {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 附加费是否按品类计费选择了是才进行处理 |
|
|
|
|
if (SurchargeState.value) { |
|
|
|
|
if (form.value.dispatchIsCategorySubjoin) { |
|
|
|
|
Submit.dispatchSubjoinCategory = AdditionalcategoriesList.value |
|
|
|
|
.map(res => res.Warehousecategory) |
|
|
|
|
.join(','); //附加费品类 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log(Submit, '要提交的数据'); |
|
|
|
|
if(props.templateData.code){ |
|
|
|
|
if (props.templateData.code || $route.query.id) { |
|
|
|
|
console.log('走编辑接口'); |
|
|
|
|
// 编辑接口 |
|
|
|
|
let data={ |
|
|
|
|
let data = { |
|
|
|
|
id: props.templateData.code, //模板ID |
|
|
|
|
checkType:'4', |
|
|
|
|
...Submit, |
|
|
|
|
} |
|
|
|
|
$_putpriceTemplate(data).then(res=>{ |
|
|
|
|
console.log(res,'提交成功后返回值'); |
|
|
|
|
checkType: 4, //服务类型 |
|
|
|
|
}; |
|
|
|
|
$_putpriceTemplate(data).then(res => { |
|
|
|
|
console.log(res, '提交成功后返回值'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
// 新增接口 |
|
|
|
|
let data={ |
|
|
|
|
...Submit |
|
|
|
|
} |
|
|
|
|
console.log('走新增接口'); |
|
|
|
|
$_priceTemplate(data).then(res=>{ |
|
|
|
|
|
|
|
|
|
console.log(res,'提交成功后返回值'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
emit('request-data',res.data.data);//把获取到的数据传递给父页面 |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
let data = { |
|
|
|
|
...Submit, |
|
|
|
|
}; |
|
|
|
|
console.log('走新增接口'); |
|
|
|
|
$_priceTemplate(data).then(res => { |
|
|
|
|
console.log(res, '提交成功后返回值'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
emit('request-data', res.data.data); //把获取到的数据传递给父页面 |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}; |
|
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
@ -935,13 +1095,13 @@ const handleSubmit = async() => {
|
|
|
|
|
.el_Storage { |
|
|
|
|
margin-bottom: 30px; |
|
|
|
|
.el_Cselect { |
|
|
|
|
margin-left: 10px; |
|
|
|
|
} |
|
|
|
|
.el_table_span { |
|
|
|
|
font-size: 16px; |
|
|
|
|
font-weight: 500; |
|
|
|
|
display: inline-block; |
|
|
|
|
width: 160px; |
|
|
|
|
margin-bottom: 10px; |
|
|
|
|
} |
|
|
|
|
.Storage-cont { |
|
|
|
|
/* 禁止双击选中文本 */ |
|
|
|
|
@ -950,23 +1110,55 @@ const handleSubmit = async() => {
|
|
|
|
|
-ms-user-select: none; /* IE 10+/Edge */ |
|
|
|
|
user-select: none; /* Standard syntax */ |
|
|
|
|
display: flex; |
|
|
|
|
flex-direction: column; |
|
|
|
|
width: 382px; |
|
|
|
|
.el_Storagecategory { |
|
|
|
|
border: 1px solid #ccc; |
|
|
|
|
.el_table_span { |
|
|
|
|
display: flex; |
|
|
|
|
width: 100%; |
|
|
|
|
background-color: #ebeef5; |
|
|
|
|
padding: 4px; |
|
|
|
|
padding: 0 4px; |
|
|
|
|
border-bottom: 1px solid #ccc; |
|
|
|
|
box-sizing: border-box; |
|
|
|
|
} |
|
|
|
|
.el_table_border { |
|
|
|
|
height: 30px; |
|
|
|
|
margin-bottom: 0; |
|
|
|
|
align-items: center; |
|
|
|
|
} |
|
|
|
|
.el_table_id { |
|
|
|
|
width: 62px; |
|
|
|
|
width: 55px; |
|
|
|
|
font-weight: 600; |
|
|
|
|
color: #606266; |
|
|
|
|
border-right: 1px solid #ccc; |
|
|
|
|
margin-right: 4px; |
|
|
|
|
font-weight: 500; |
|
|
|
|
height: 100%; |
|
|
|
|
display: flex; |
|
|
|
|
align-items: center; |
|
|
|
|
} |
|
|
|
|
.el_table_title { |
|
|
|
|
font-weight: 600; |
|
|
|
|
color: #606266; |
|
|
|
|
font-weight: 500; |
|
|
|
|
border-right: 1px solid #ccc; |
|
|
|
|
display: flex; |
|
|
|
|
width: 207px; |
|
|
|
|
height: 100%; |
|
|
|
|
align-items: center; |
|
|
|
|
} |
|
|
|
|
.el_table_operation { |
|
|
|
|
color: #606266; |
|
|
|
|
width: 134px; |
|
|
|
|
display: flex; |
|
|
|
|
font-weight: 500; |
|
|
|
|
justify-content: flex-start; |
|
|
|
|
height: 100%; |
|
|
|
|
align-items: center; |
|
|
|
|
span { |
|
|
|
|
padding-left: 3px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_table_td { |
|
|
|
|
display: flex; |
|
|
|
|
@ -975,40 +1167,39 @@ const handleSubmit = async() => {
|
|
|
|
|
border-bottom: 1px solid #ccc; |
|
|
|
|
position: relative; |
|
|
|
|
.el_table_operation { |
|
|
|
|
width: 70px; |
|
|
|
|
height: 100%; |
|
|
|
|
display: flex; |
|
|
|
|
align-items: center; |
|
|
|
|
justify-content: space-between; |
|
|
|
|
position: absolute; |
|
|
|
|
right: -80px; |
|
|
|
|
right: 0px; |
|
|
|
|
border-left: 1px solid #ccc; |
|
|
|
|
padding: 0 3px; |
|
|
|
|
width: 110px; |
|
|
|
|
.el_table_operation_span_a, |
|
|
|
|
.el_table_operation_span_b { |
|
|
|
|
font-size: 20px; |
|
|
|
|
font-weight: bold; |
|
|
|
|
width: 40%; |
|
|
|
|
border: 2px solid #f00; |
|
|
|
|
font-size: 14px; |
|
|
|
|
color: #f00; |
|
|
|
|
height: 70%; |
|
|
|
|
border-radius: 6px; |
|
|
|
|
display: block; |
|
|
|
|
line-height: 23px; |
|
|
|
|
text-align: center; |
|
|
|
|
cursor: pointer; |
|
|
|
|
display: flex; |
|
|
|
|
align-items: center; |
|
|
|
|
} |
|
|
|
|
.el_table_operation_span_b { |
|
|
|
|
border: 2px solid #0d83b7; |
|
|
|
|
color: #0d83b7; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.el_table_operation_span_a:hover { |
|
|
|
|
background-color: #f00; |
|
|
|
|
color: #ccc; |
|
|
|
|
} |
|
|
|
|
.el_table_operation_span_b:hover { |
|
|
|
|
background-color: #0d83b7; |
|
|
|
|
color: #ccc; |
|
|
|
|
} |
|
|
|
|
// .el_table_operation_span_a:hover { |
|
|
|
|
// background-color: #f00; |
|
|
|
|
// color: #ccc; |
|
|
|
|
// } |
|
|
|
|
// .el_table_operation_span_b:hover { |
|
|
|
|
// background-color: #0d83b7; |
|
|
|
|
// color: #ccc; |
|
|
|
|
// } |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_table_idNumber { |
|
|
|
|
@ -1039,10 +1230,15 @@ const handleSubmit = async() => {
|
|
|
|
|
width: 100%; |
|
|
|
|
max-height: 500px; |
|
|
|
|
box-sizing: border-box; |
|
|
|
|
border: 1px solid #ccc; |
|
|
|
|
padding: 4px; |
|
|
|
|
border-radius: 4px; |
|
|
|
|
display: flex; |
|
|
|
|
overflow-y: scroll; |
|
|
|
|
.el_margin { |
|
|
|
|
margin-left: 20px; |
|
|
|
|
} |
|
|
|
|
.el_margin:first-child { |
|
|
|
|
margin-left: 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_Surchargebilling { |
|
|
|
|
@ -1068,4 +1264,35 @@ const handleSubmit = async() => {
|
|
|
|
|
margin-left: 70px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_flex { |
|
|
|
|
display: flex; |
|
|
|
|
flex-direction: column; |
|
|
|
|
align-items: flex-start; |
|
|
|
|
.el_Cselect { |
|
|
|
|
margin-left: 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_row_f1 { |
|
|
|
|
display: flex; |
|
|
|
|
} |
|
|
|
|
.el_fx { |
|
|
|
|
background-color: #f6f6f6; |
|
|
|
|
padding: 0 6px; |
|
|
|
|
border-radius: 4px; |
|
|
|
|
} |
|
|
|
|
.el_fj{ |
|
|
|
|
display: flex; |
|
|
|
|
.el_Storage{ |
|
|
|
|
width: 280px; |
|
|
|
|
display: flex; |
|
|
|
|
flex-direction: column; |
|
|
|
|
width:400px; |
|
|
|
|
margin-right: 2%; |
|
|
|
|
.el_Cselect{ |
|
|
|
|
background-color:#f6f6f6; |
|
|
|
|
width:100%; |
|
|
|
|
padding: 0 4px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
