java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复默认联系人

dev-xx
马远东 7 months ago
parent
ab8a8694bb
commit
a3aeeeaae2
7 changed files with 516 additions and 234 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/option/storagecost/Categorypricingunit.js
  2. 3
      src/views/basicdata/brand/basicStoreContact.vue
  3. 55
      src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
  4. 6
      src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
  5. 314
      src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
  6. 150
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  7. 104
      src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue

118
src/option/storagecost/Categorypricingunit.js
Unescape View File

@ -1,70 +1,50 @@
export const columnList = [
{
prop: 'checkbox',
label: '复选框',
type: 0,
width: 35,
fixed: true,
},
{
prop: 'xh',
label: '序号',
type: 12,
values: '',
width: 35,
fixed: true,
},
{
prop: 'a1',
label: '成本结算品类',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'a2',
label: '维护状态 ',
type: 3,
values: '',
width: '150',
checkarr: [
{
label: '已维护',
value: '已维护',
},
{
label: '未维护',
value: '未维护',
},
],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'a3',
label: '计价单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '操作',
type: 6,
values: '',
width: '80',
checkarr: [],
fixed: 'right',
sortable: false,
},
];
{
prop: 'checkbox',
label: '复选框',
type: 0,
width: 35,
fixed: true,
},
{
prop: 'xh',
label: '序号',
type: 12,
values: '',
width: 35,
fixed: true,
},
{
prop: 'a1',
label: '成本结算品类',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'a3',
label: '计价单位',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '操作',
type: 6,
values: '',
width: '80',
checkarr: [],
fixed: 'right',
sortable: false,
},
];

3
src/views/basicdata/brand/basicStoreContact.vue
Unescape View File

@ -275,6 +275,9 @@ export default {
if (!this.form.id) {
this.form.shopId = this.$route.query.id; //门店ID
this.form.partitionType = this.$route.query.type; //区别类型
if(!this.data.length){
this.form.defaultType=true
}
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);

55
src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
Unescape View File

@ -0,0 +1,55 @@
<template>
<div class="content">
<el-form :model="form" label-width="auto">
<el-form-item label="仓库">
<el-select v-model="form.value" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="form.name" placeholder="请输入模板名称"/>
</el-form-item>
</el-form>
</div>
</template>
<script setup>
import { ref } from 'vue';
const form = ref({});
const options = ref([
{
value: '按件',
label: '按件',
},
{
value: '按方',
label: '按方',
},
{
value: '按重量',
label: '按重量',
},
{
value: '按吨',
label: '按吨',
},
]);
</script>
<style scoped lang="scss">
.content {
width: 20%;
margin: 0 auto;
.el-form {
:deep(.el-select) {
width: 100%;
}
}
}
</style>

6
src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
Unescape View File

@ -15,16 +15,16 @@
</el-row>
<!-- 控件模块 -->
<!-- <el-row>
<el-row>
<div class="avue-crud__header">
<div class="avue-crud__left"></div>
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="Search" @click="searchHide" circle></el-button>
<!-- <el-button icon="Search" @click="searchHide" circle></el-button> -->
</div>
</div>
</el-row> -->
</el-row>
<!-- 首页表格 -->
<el-row>

314
src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
Unescape View File

@ -0,0 +1,314 @@
<template>
<div style="padding: 0 10px">
<!-- 配置计价规则 -->
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="商配" name="0"></el-tab-pane>
<el-tab-pane label="市配" name="1"></el-tab-pane>
</el-tabs>
<el-form :model="formLoad" class="el_pricing">
<el-form-item label="是否有附加费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否公里数计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="公里计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里</el-radio>
<el-radio value="0" size="large">点位公里</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否补贴起步公里数计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="补贴公里计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否超区公里计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="超区公里数计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="超区点位计费模式">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">统一计费</el-radio>
<el-radio value="0" size="large">区域计费</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否点位补贴计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否保底费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否补贴油费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="补贴油费计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否附加费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
</template>
<script setup>
import { ref } from 'vue';
const formLoad = ref({});
const activeName=ref('0')
const handleClick=()=>{
console.log(activeName.value)
}
</script>
<style scoped lang="scss">
.form {
width: 30%;
.top {
margin-bottom: 10px;
display: flex;
align-items: center;
}
.el_add {
display: flex;
align-items: center;
color: #656565;
cursor: pointer;
}
.title {
color: #6f6f6f;
margin-right: 20px;
}
}
.eml_btn {
display: flex;
justify-content: space-around;
align-items: center;
.el_btn_a {
display: flex;
align-items: center;
margin: 0 3px;
cursor: pointer;
}
}
.el_pricing {
display: flex;
flex-wrap: wrap;
:deep(.el-form-item) {
display: flex;
flex-direction: column;
width: 30%;
.el-form-item__content {
background-color: #f6f6f6;
padding: 0 10px;
.el-radio-group {
flex-wrap: nowrap;
}
}
}
}
.el_content {
display: flex;
flex-wrap: wrap;
}
.el_category {
width: 43%;
margin-right: 6%;
margin-bottom: 2%;
.title {
padding: 0 10px;
position: relative;
margin-bottom: 10px;
display: block;
}
.title::after {
content: '';
width: 4px;
height: 100%;
background-color: #172e60;
position: absolute;
left: 0;
left: 0;
}
}
.asurcharge {
.el_asurcharge {
display: flex;
flex-direction: column;
.title {
padding: 0 10px;
position: relative;
}
.title::after {
content: '';
width: 4px;
height: 100%;
background-color: #172e60;
position: absolute;
left: 0;
left: 0;
}
.el-radio-group {
margin-top: 10px;
width: 16%;
background-color: #f6f6f6;
padding: 0 8px;
}
}
}
.asurcharge_box {
width: 100%;
}
.el_Kilometers {
display: flex;
justify-content: space-between;
.el_Kilometers_box {
display: flex;
width: 32%;
flex-direction: column;
margin-right: 10px;
.el-input-number {
width: 100%;
}
.title {
position: relative;
padding: 0 10px;
display: block;
margin-bottom: 10px;
}
.title::after {
content: '';
position: absolute;
left: 0;
top: 0;
width: 4px;
height: 100%;
background-color: #172e60;
}
}
}
.el_Oversizedbilling {
.title {
position: relative;
padding: 0 10px;
display: block;
margin-top: 20px;
margin-bottom: 10px;
}
.title::after {
content: '';
position: absolute;
left: 0;
top: 0;
width: 4px;
height: 100%;
background-color: #172e60;
}
.el_text_del {
color: #ff5722;
cursor: pointer;
}
.el_text_add {
margin-left: 10px;
color: #0045c4;
cursor: pointer;
}
}
.el_Super {
display: flex;
justify-content: space-between;
.el_Super_box {
width: 18%;
display: flex;
flex-direction: column;
.el-input-number {
width: 100%;
}
.title {
position: relative;
padding: 0 10px;
display: block;
margin-top: 20px;
margin-bottom: 10px;
}
.title::after {
content: '';
position: absolute;
left: 0;
top: 0;
width: 4px;
height: 100%;
background-color: #172e60;
}
}
}
.SuperAdd {
display: flex;
}
</style>

150
src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
Unescape View File

@ -5,16 +5,6 @@
<el-tab-pane label="市配" name="Municipaldistribution"></el-tab-pane>
</el-tabs>
<div class="form">
<div>
<span
>计价规则：<el-button type="primary" plain @click="form.dialogConfigure = true"
>配置</el-button
></span
>
</div>
<div class="top">
<span class="title">车型配置</span>
</div>
<SurchargeTable
:SurchargeData="form.dispatchSubjoinCategoryData"
:Surcharge="dispatchSubjoinCategory"
@ -40,124 +30,6 @@
</div>
</div>
<!-- 配置计价规则 -->
<el-dialog v-model="form.dialogConfigure" title="配置计价规则" width="70%">
<el-form :model="formLoad" class="el_pricing">
<el-form-item label="是否有附加费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否公里数计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="公里计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里</el-radio>
<el-radio value="0" size="large">点位公里</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否补贴起步公里数计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="补贴公里计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否超区公里计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="超区公里数计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="超区点位计费模式">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">统一计费</el-radio>
<el-radio value="0" size="large">区域计费</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否点位补贴计费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否保底费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否补贴油费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="补贴油费计算规则">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">总公里数</el-radio>
<el-radio value="0" size="large">点位公里数</el-radio>
<el-radio value="0" size="large">最远点位公里数</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否计算返程">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否附加费">
<el-radio-group v-model="formLoad.a" class="ml-4">
<el-radio value="1" size="large">是</el-radio>
<el-radio value="0" size="large">否</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogConfigure = false">关闭</el-button>
<el-button type="primary" @click="dialogConfigureFn">确定</el-button>
</div>
</template>
</el-dialog>
<!-- 配置计价规则 -->
<el-dialog v-model="form.dialogPricingrules" title="编辑" width="70%">
<div class="el_content">
@ -355,7 +227,7 @@ import SurchargeTable from '@/components/pric/tablePric.vue';
import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse';
const activeName = ref('Commercialdistribution');
const SelectData=ref({});//当前点击品类
const SelectData = ref({}); //当前点击品类
// 配置计价规则
const formLoad = ref({});
const form = ref({
@ -673,12 +545,12 @@ const dispatchSubjoinCategory = ref([
]);
const handleRowFocus = value => {
SelectData.value = value;
console.log(SelectData.value,'当前点击的品类');
console.log(SelectData.value, '当前点击的品类');
};
// 品类搜索
const search = (value,row) => {
console.log(value,'value');
console.log(row,'row');
const search = (value, row) => {
console.log(value, 'value');
console.log(row, 'row');
};
const handleClick = () => {};
const categoriesduceSurcharge = row => {
@ -716,13 +588,11 @@ const Pricingrules = () => {
console.log(form.value);
};
// 新增超区区域计费
const Oversizedbillingadd=()=>{
}
const Oversizedbillingadd = () => {};
// 删除超区区域计费
const Oversizedbillingdel=(row)=>{
console.log(row,'删除超区费');
}
const Oversizedbillingdel = row => {
console.log(row, '删除超区费');
};
</script>
<style scoped lang="scss">
@ -873,7 +743,7 @@ console.log(row,'删除超区费');
color: #ff5722;
cursor: pointer;
}
.el_text_add{
.el_text_add {
margin-left: 10px;
color: #0045c4;
cursor: pointer;

104
src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
Unescape View File

@ -1,12 +1,9 @@
<template>
<div class="el_tabes">
<!-- <div class="el_tabes">
<span>模板名称</span
><el-input v-model="input" style="width: 240px" placeholder="模板名称" disabled />
<hr />
<el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
<!-- <el-tab-pane label="品类映射表" name="Categorymapping">
<WarehouseTemplate></WarehouseTemplate>
</el-tab-pane> -->
<el-tab-pane label="品类计价单位" name="Categorypricingunit">
<Categorypricingunit></Categorypricingunit>
</el-tab-pane>
@ -14,39 +11,102 @@
<Deliverymaintenancecosts></Deliverymaintenancecosts>
</el-tab-pane>
</el-tabs>
</div> -->
<div class="el_steps">
<el-steps :active="active" finish-status="success" simple>
<el-step title="基础配置" @click="active = 1" />
<el-step title="品牌品类计价单位" @click="active = 2" />
<el-step title="配送成本计价模板" @click="active = 3" />
<el-step title="车型计费配置" @click="active = 4" />
</el-steps>
<div class="el_tabes">
<Basicconfiguration v-if="active == 1"></Basicconfiguration>
<Categorypricingunit v-if="active == 2"></Categorypricingunit>
<DeliveryCostPricingTemplate v-if="active == 3"></DeliveryCostPricingTemplate>
<Deliverymaintenancecosts v-if="active == 4"></Deliverymaintenancecosts>
<div class="footer">
<el-button type="primary" @click="nextstep"
>下一步<el-icon><ArrowRightBold /></el-icon
></el-button>
<el-button type="primary"
><el-icon><Promotion /></el-icon>提交</el-button
>
</div>
</div>
</div>
</template>
<script setup>
import { ref ,defineAsyncComponent} from 'vue'
import { ref, defineAsyncComponent } from 'vue';
import { ElMessage } from 'element-plus';
const active = ref(1);
//品类映射表
const WarehouseTemplate = defineAsyncComponent(() =>
import('@/views/cost/Deliverycostmanagement/WarehouseTemplate.vue')
// const WarehouseTemplate = defineAsyncComponent(() =>
// import('@/views/cost/Deliverycostmanagement/WarehouseTemplate.vue')
// );
// 1.基础配置
const Basicconfiguration = defineAsyncComponent(() =>
import('@/views/cost/Deliverycostmanagement/Basicconfiguration.vue')
);
// 品类计价单位
// 2.品类计价单位
const Categorypricingunit = defineAsyncComponent(() =>
import('@/views/cost/Deliverycostmanagement/Categorypricingunit.vue')
import('@/views/cost/Deliverycostmanagement/Categorypricingunit.vue')
);
// 3.配送成本计价模板
const DeliveryCostPricingTemplate = defineAsyncComponent(() =>
import('@/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue')
);
// 配送成本维护
// 4.配送成本维护
const Deliverymaintenancecosts = defineAsyncComponent(() =>
import('@/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue')
);
const activeName = ref('Categorypricingunit')
const input = ref('')
const input = ref('');
const handleClick = (tab, event) => {
console.log(tab, event)
}
console.log(tab, event);
};
// 下一步
const nextstep = () => {
if (active.value == 4) {
ElMessage({
message: '已经最后一步了',
type: 'warning',
});
return;
}
active.value++;
};
</script>
<style scoped lang="scss">
:deep(.el_tabes){
.el-tabs__item.is-active{
border-bottom-color: #172e60 !important;
background-color: #172e60 !important;
color: #ccc;
}
:deep(.el_tabes) {
margin-top: 10px;
}
// .el_steps {
// height: 100%;
// .el_tabes {
// height: 100%;
// }
// }
.footer {
position: fixed;
bottom: 10px;
left: 4%;
width: 100%;
display: flex;
justify-content: center;
.el-button {
width: 120px;
height: 40px;
font-size: 16px;
}
}
:deep(.basic-container){
.el-card{
box-shadow:none;
}
}
</style>

Write Preview
Loading…
Cancel
Save