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

新增提货价格

dev-xx
qb 12 months ago
parent
fb8f465af4
commit
a87f40a3b2
3 changed files with 501 additions and 165 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. 601
      src/views/Pricesystem/Price/PriceBill.vue
  2. 0
      src/views/basicdata/TripartiteMaterial/add.vue
  3. 65
      src/views/distribution/artery/VehicleStowageDetails.vue

601
src/views/Pricesystem/Price/PriceBill.vue
Unescape View File

@ -27,23 +27,217 @@
<!-- 整车计费 -->
<el-divider content-position="left">整车计费</el-divider>
<el-form
v-for="(value, index) in details.form.VehicleBillingDetal"
:key="value"
label-width="130px"
inline
:model="value"
ref="VehicleBillingFormRef"
>
<!-- 计价方式 -->
<table class="table" border style="border-collapse: collapse">
<thead class="header">
<tr align="center">
<th class="index">序号</th>
<th width="200px">车型</th>
<th width="200px">整车计费 ( 元/车 )</th>
<th width="100px">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(value, index) in details.form.VehicleBillingDetal" :key="value">
<td class="index">{{ index }}</td>
<td>
<el-select
class="w100"
v-model="value.pickupPricingType"
clearable
placeholder="请选择车型"
@change="handleChangePrcieMethod"
>
<el-option
v-for="item in details.priceMethodType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</td>
<td>
<el-input-number
class="w100"
v-model="value.pickupPricing"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</td>
<td>
<el-button
v-if="index === 0"
@click="() => handlePlusVehicle(value, index)"
class="addButton"
icon="Edit"
>新 增</el-button
>
<el-button
v-else
@click="() => handleReduceVehicle(value, index)"
class="removeButton"
icon="CircleClose"
>移 除</el-button
>
</td>
</tr>
</tbody>
</table>
<!-- 品类计费 -->
<!-- <template v-if="details.form.pickupIsByCategory === '1'"> -->
<el-divider content-position="left">品类管理</el-divider>
<div class="billTemplateDetail_container">
<template v-for="value in details.form.billTemplateDetail" :key="value.title">
<template v-if="details.form.pickupPricingType.includes(value.code)">
<!-- 附加费品类最低计费 -->
<div>
<div class="title">{{ value.title }}</div>
<el-input-number
v-model="value.pickupMinCostType"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</div>
<!-- 附加费品类 -->
<div>
<div class="title">{{ value.title }}</div>
<table class="table" border>
<thead class="header">
<tr>
<th class="index">序号</th>
<th width="200px">产品品类</th>
<th width="200px">按件计费(元/件)</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in value.categories">
<td class="index">{{ index }}</td>
<!-- 品类名称 -->
<td>{{ item.goodsName }}</td>
<!-- 费用 -->
<td>
<el-input-number
class="w100"
v-model="item.pickupMinCostType"
style="width: 100%"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</td>
</tr>
</tbody>
</table>
</div>
</template>
</template>
</div>
<!-- </template> -->
<!-- 最低计费 -->
<el-divider content-position="left">最低计费</el-divider>
<el-form label-width="130px" inline>
<el-form-item
label="车型"
prop="pickupPricingType"
:rules="[{ required: true, message: '请选择车型', trigger: ['blur', 'change'] }]"
label="最低计费价格"
prop="pickupMinCostType"
:rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
>
<el-select
v-model="value.pickupPricingType"
<el-input-number
v-model="details.form.pickupMinCostType"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</el-form-item>
<el-form-item
label="加算价格"
prop="AddOnPrice"
:rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
>
<el-input-number
v-model="details.form.AddOnPrice"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</el-form-item>
</el-form>
<div class="flex-c-sb">
<el-divider content-position="left">提货路径</el-divider>
<el-button icon="CirclePlus" class="ml10" type="primary" @click="handleAdd">
新 增
</el-button>
</div>
<table class="table w100" border style="border-collapse: collapse">
<thead class="header">
<tr align="center">
<th width="25%">始发地</th>
<th width="25%">目的地</th>
<th width="25%">发货单位</th>
<th width="25%">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(value, index) in details.form.VehicleBillingDetal" :key="value">
<td></td>
<td></td>
<td></td>
<td>
<el-text @click="() => handlePlusVehicle(index)"
><el-icon>
<CirclePlus />
</el-icon>
编 辑</el-text
>
<el-text class="remove" @click="() => handlePlusVehicle(index)">
<el-icon>
<Delete />
</el-icon>
删 除</el-text
>
</td>
</tr>
</tbody>
</table>
<!-- 操作按钮 -->
<div class="flex-c-c">
<el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
<el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
</div>
</div>
<el-dialog
title="新增提货路径"
:visible.sync="details.popUpShow.addVsitied"
width="70%"
v-model="details.popUpShow.addVsitied"
>
<el-form inline label-width="130px">
<el-form-item label="始发地">
<el-select
class="w100"
v-model="details.form.pickupPricingType"
clearable
placeholder="请选择车型"
@change="handleChangePrcieMethod"
@ -57,94 +251,161 @@
</el-select>
</el-form-item>
<el-form-item
label="整车计费(元/车)"
prop="pickupPricing"
:rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
>
<el-input-number
v-model="value.pickupPricing"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
<el-form-item label="目的地">
<el-select
class="w100"
v-model="details.form.pickupPricingType"
clearable
placeholder="请选择车型"
@change="handleChangePrcieMethod"
>
<el-option
v-for="item in details.priceMethodType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
<el-form-item>
<div class="button_container">
<div class="el_table_operation">
<!-- 新增 -->
<span
v-if="value.plus"
@click="handlePlusVehicle(value, index)"
class="el_table_operation_span_b"
>+
</span>
<!-- 删除 -->
<span
v-if="value.reduce"
@click="handleReduceVehicle(value, index)"
class="el_table_operation_span_a"
>-
</span>
</div>
</div>
<el-form-item label="模糊查询发货单位">
<el-select
class="w100"
v-model="details.form.pickupPricingType"
clearable
placeholder="请选择车型"
@change="handleChangePrcieMethod"
>
<el-option
v-for="item in details.priceMethodType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
</el-form>
<!-- 整车计费 -->
<el-divider content-position="left">整车计费</el-divider>
<table class="table" border style="border-collapse: collapse">
<thead class="header">
<tr align="center">
<th class="index">序号</th>
<th width="200px">车型</th>
<th width="200px">整车计费 ( 元/车 )</th>
<th width="100px">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(value, index) in details.form.VehicleBillingDetal" :key="value">
<td class="index">{{ index }}</td>
<td>
<el-select
class="w100"
v-model="value.pickupPricingType"
clearable
placeholder="请选择车型"
@change="handleChangePrcieMethod"
>
<el-option
v-for="item in details.priceMethodType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</td>
<td>
<el-input-number
class="w100"
v-model="value.pickupPricing"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</td>
<td>
<el-button
v-if="index === 0"
@click="() => handlePlusVehicle(index)"
class="addButton"
icon="Edit"
>新 增</el-button
>
<el-button
v-else
@click="() => handleReduceVehicle(index)"
class="removeButton"
icon="CircleClose"
>移 除</el-button
>
</td>
</tr>
</tbody>
</table>
<!-- 品类计费 -->
<!-- <template v-if="details.form.pickupIsByCategory === '1'"> -->
<el-divider content-position="left">品类管理</el-divider>
<template v-for="value in details.form.billTemplateDetail" :key="value.title">
<template v-if="details.form.pickupPricingType.includes(value.code)">
<!-- 附加费品类 -->
<el-form-item label-width="130px" :label="value.title">
<el-input-number
v-model="value.pickupMinCostType"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</el-form-item>
<!-- 附加费品类 -->
<el-form-item label-width="130px" :label="value.title">
<table class="table" border>
<thead>
<tr>
<th>序号</th>
<th style="width: 45%">产品品类</th>
<th style="width: 45%">按件计费(元/件)</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in value.categories">
<td>{{ index }}</td>
<!-- 品类名称 -->
<td>{{ item.goodsName }}</td>
<!-- 费用 -->
<td>
<el-input-number
v-model="item.pickupMinCostType"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</td>
</tr>
</tbody>
</table>
</el-form-item>
<div class="billTemplateDetail_container">
<template v-for="value in details.form.billTemplateDetail" :key="value.title">
<template v-if="details.form.pickupPricingType.includes(value.code)">
<!-- 附加费品类最低计费 -->
<div>
<div class="title">{{ value.title }}</div>
<el-input-number
v-model="value.pickupMinCostType"
style="width: 13vw"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</div>
<!-- 附加费品类 -->
<div>
<div class="title">{{ value.title }}</div>
<table class="table" border>
<thead class="header">
<tr>
<th class="index">序号</th>
<th width="200px">产品品类</th>
<th width="200px">按件计费(元/件)</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in value.categories">
<td class="index">{{ index }}</td>
<!-- 品类名称 -->
<td>{{ item.goodsName }}</td>
<!-- 费用 -->
<td>
<el-input-number
class="w100"
v-model="item.pickupMinCostType"
style="width: 100%"
:controls="false"
:precision="2"
:value-on-clear="0"
:min="0"
/>
</td>
</tr>
</tbody>
</table>
</div>
</template>
</template>
</template>
</div>
<!-- </template> -->
<!-- 最低计费 -->
@ -181,12 +442,11 @@
</el-form-item>
</el-form>
<!-- 操作按钮 -->
<div class="flex-c-c">
<el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
<el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="details.popUpShow.addVsitied = false">关 闭</el-button>
<el-button type="primary" @click="handleSubmit">提 交</el-button>
</span>
</el-dialog>
</template>
<script setup lang="ts">
@ -237,10 +497,6 @@ interface VehicleBilling {
pickupPricingType: string;
/** 车型计费(元/车) */
pickupPricing: number;
/** 显示新增 */
plus: boolean;
/** 显示删除 */
reduce: boolean;
}
/** 页面数据 */
@ -277,16 +533,12 @@ const details = reactive({
pickupPricingType: '',
/** 车型计费(元/车) */
pickupPricing: 0,
plus: true,
reduce: false,
},
{
/** 车型 */
pickupPricingType: '',
/** 车型计费(元/车) */
pickupPricing: 0,
plus: true,
reduce: true,
},
] as VehicleBilling[],
},
@ -296,6 +548,9 @@ const details = reactive({
loadingObj: {
pageLoading: false,
},
popUpShow: {
addVsitied: false,
},
});
const validatePrice = (rule: any, value: any, callback: any) => {
@ -410,24 +665,22 @@ const initFormData = () => {
};
/** 新增车辆 */
const handlePlusVehicle = async (value: any, index: number) => {
const handlePlusVehicle = async (index: number) => {
details.form.VehicleBillingDetal.splice(index + 1, 0, {
/** 车型 */
pickupPricingType: '',
/** 车型计费(元/车) */
pickupPricing: 0,
plus: true,
reduce: true,
});
await nextTick();
// await nextTick();
instance.ctx.$refs[value.title + (index + 1)][0].focus();
console.log('instance :>> ', instance.ctx);
// instance.ctx.$refs[value.title + (index + 1)][0].focus();
// console.log('instance :>> ', instance.ctx);
};
/** 删除车辆 */
const handleReduceVehicle = (value: any, index: number) => {
const handleReduceVehicle = (index: number) => {
if (index === 0) return;
details.form.VehicleBillingDetal.splice(index, 1);
};
@ -470,6 +723,11 @@ const remoteMethod = async (value, item) => {
}
};
/** 新增提货路径 */
const handleAdd = () => {
details.popUpShow.addVsitied = true;
};
/** 重置数据 */
const resetFormData = () => {
ElMessageBox.confirm('是否重置数据?', '提示', {
@ -586,50 +844,95 @@ const handleSubmit = async () => {
position: relative;
}
.el_table_operation {
width: 70px;
height: 100%;
display: flex;
align-items: center;
justify-content: space-between;
position: absolute;
right: -80px;
.el_table_operation_span_a,
.el_table_operation_span_b {
font-size: 20px;
font-weight: bold;
width: 40%;
border: 2px solid #f00;
color: #f00;
height: 70%;
border-radius: 6px;
display: block;
line-height: 23px;
text-align: center;
cursor: pointer;
.title {
font-size: 1rem;
font-weight: bold;
color: var(--el-color-primary);
margin-bottom: 10px;
}
.table {
text-align: center;
border-color: #e8e8e8;
font-size: 12px;
line-height: 17px;
font-weight: bold;
td,
th {
padding: 5px 10px;
box-sizing: border-box;
}
.el_table_operation_span_b {
border: 2px solid #0d83b7;
color: #0d83b7;
th.index {
width: fit-content;
padding: 0 20px;
}
.el_table_operation_span_a:hover {
background-color: #f00;
color: #ccc;
td.index {
font-size: 14px;
}
.el_table_operation_span_b:hover {
background-color: #0d83b7;
color: #ccc;
th {
height: 32px;
}
:deep(.el-input__wrapper) {
box-shadow: none;
.header {
background: #f5f8fa;
}
}
.table {
width: 40vw;
text-align: center;
border-color: var(--el-color-danger);
:deep(.el-divider__text.is-left) {
font-size: 1.04167vw;
font-weight: bold;
color: #d3832a;
}
// 新增按钮
.addButton {
background: #0086f1;
border-color: #0086f1;
color: #fff !important;
&:hover {
background: #79bbff;
border-color: #79bbff;
}
}
// 移除按钮
.removeButton {
background: #f85b52;
border-color: #f85b52;
color: #fff !important;
&:hover {
background: #f89898;
border-color: #f89898;
}
}
.w100 {
width: 100% !important;
}
:deep(.el-text) {
color: #d3832a !important;
font-weight: normal;
cursor: pointer;
margin-right: 15px;
&.remove {
color: #f85b52 !important;
}
}
.billTemplateDetail_container {
display: flex;
flex-wrap: wrap;
& > div {
margin-right: 20px;
}
}
</style>

0
src/views/basicdata/TripartiteMaterial/add.vue
Unescape View File

65
src/views/distribution/artery/VehicleStowageDetails.vue
Unescape View File

@ -78,7 +78,7 @@
</el-form-item>
<el-form-item label="车牌号/类型">
<el-input readonly placeholder="车牌号/类型" />
<el-input readonly v-model="form.carNumber" placeholder="车牌号/类型" />
</el-form-item>
<el-form-item label="主驾司机/电话">
@ -86,7 +86,11 @@
</el-form-item>
<el-form-item label="副驾司机/电话">
<el-input readonly v-model="form.carrierOrderCode" placeholder="副驾司机/电话" />
<el-input
readonly
v-model="form.assistantNameAndMobile"
placeholder="副驾司机/电话"
/>
</el-form-item>
<el-form-item label="主驾电话">
@ -171,19 +175,35 @@
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 表格 -->
<tablecmt
ref="oldColumnListNode"
:columnList="details.detailsColumnList"
:tableData="details.renderData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@selectCheck="selectsc"
@selection="selectionChange"
:arraySpanMethod="row => arraySpanMethod(row)"
>
</tablecmt>
<div class="flex">
<el-tabs
v-model="details.type"
tab-position="left"
style="height: 100%; width: fit-content; flex: none"
class="demo-tabs"
>
<el-tab-pane label="实际数据" name="real"></el-tab-pane>
<el-tab-pane label="计划数据" name="plan"></el-tab-pane>
</el-tabs>
<div class="overflow">
<!-- 表格 -->
<tablecmt
class="w100"
ref="oldColumnListNode"
:columnList="details.detailsColumnList"
:tableData="details.type === 'real' ? details.renderData : details.planData"
:loading="loadingObj.oldListLoading"
@inputTxt="inputsc"
@timeCheck="timesc"
@selectCheck="selectsc"
@selection="selectionChange"
:arraySpanMethod="row => arraySpanMethod(row)"
>
</tablecmt>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="日 志 跟 踪" name="tab2">
@ -394,7 +414,7 @@ import {
import { postRemoveCarsLoadScan } from '@/api/distribution/truckLoadingDetails';
import { useRouter, useRoute } from 'vue-router';
import { useStore } from 'vuex';
import { ElMessage, ElMessageBox } from 'element-plus';
import { ElMessage, ElMessageBox, ElSpace } from 'element-plus';
/** 被合并的列 */
const mergeColumn = [];
@ -471,6 +491,8 @@ const details = reactive<any>({
nodeInfoData: [],
/** 列表数据 */
oldData: [],
planData: [],
type: 'real' as 'real' | 'plan',
renderData: [],
/** 页面loading */
loadingObj: {
@ -664,6 +686,8 @@ const initOriginWarehouseOrder = async (params = {}) => {
details.nodeInfoData = data.carsLoadLineList;
details.oldData = [];
details.planData = [];
data.carsLoadWaybillInfoList.forEach(val => {
details.oldData.push(
...val.carsLoadOrderInfoList.map((item, index) => {
@ -679,6 +703,8 @@ const initOriginWarehouseOrder = async (params = {}) => {
return item;
})
);
details.planData = [...details.planData, ...(val.carsLoadOrderInfoListPlan || [])];
});
inputsc('', { prop: 'aaa' });
@ -881,6 +907,9 @@ const setnewcolum = (newarr, headarr, type) => {
/** 合并行 */
const arraySpanMethod = (row: any) => {
console.log('123 :>> ', 123);
if (details.type === 'plan') return;
const { column } = row;
if (mergeColumn.indexOf(column.property) !== -1) {
if (row.row.mergeColumnIndex !== 0) return [row.row.mergeColumnIndex, 1];
@ -1124,4 +1153,8 @@ watch(
.carriageContractList_img {
border-radius: 5px;
}
.overflow {
overflow: hidden;
}
</style>

Write Preview
Loading…
Cancel
Save