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

财务

dev-xx
马远东 12 months ago
parent
0f096761aa
commit
3566bd147f
4 changed files with 294 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 441
      src/views/Pricesystem/Price/PriceDelivery.vue
  2. 6
      src/views/Pricesystem/Price/PriceWarehousing.vue
  3. 10
      src/views/distribution/inventory/distrilbutionBillLading.vue
  4. 1
      src/views/financialsector/FinanceHome.vue

441
src/views/Pricesystem/Price/PriceDelivery.vue
Unescape View File

@ -5,40 +5,40 @@
<div class="el_flex_row"> <div class="el_flex_row">
<el-form-item label="配送服务类型"> <el-form-item label="配送服务类型">
<el-select <el-select
class="el_Cselect" class="el_Cselect"
style="width: 100%;" style="width: 100%"
v-model="form.dispatchServiceType" v-model="form.dispatchServiceType"
filterable filterable
placeholder="选择计费类型" placeholder="选择计费类型"
disabled disabled
@change="chargetype" @change="chargetype"
> >
<el-option <el-option
v-for="item in Warehousebillingmode" v-for="item in Warehousebillingmode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="计费模式"> <el-form-item label="计费模式">
<el-select <el-select
v-model="form.dispatchPricingType" v-model="form.dispatchPricingType"
filterable filterable
placeholder="请选择配送计费模式" placeholder="请选择配送计费模式"
:popper-append-to-body="false" :popper-append-to-body="false"
style="width:100%;" style="width: 100%"
disabled disabled
multiple multiple
>
<el-option
v-for="item in ServiceList"
:key="item.value"
:label="item.label"
:value="item.value"
> >
</el-option> <el-option
</el-select> v-for="item in ServiceList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -50,7 +50,7 @@
<div class="el_flex"> <div class="el_flex">
<div class="el_flex_row el_flex_right el_flex_input"> <div class="el_flex_row el_flex_right el_flex_input">
<span class="Subtitle">按件计费 </span> <span class="Subtitle">按件计费 </span>
<div class="el_flex_row_1"> <div class="el_flex_row_1" v-if="billing">
<el-form-item label="统一计费(元/件)"> <el-form-item label="统一计费(元/件)">
<el-input-number <el-input-number
v-model="form.ss" v-model="form.ss"
@ -65,8 +65,8 @@
<el-form-item label="品类计费"> <el-form-item label="品类计费">
<SurchargeTable <SurchargeTable
:SurchargeData="form.perpieceBillingData" :SurchargeData="form.pieceCategoryData"
:Surcharge="form.perpieceBilling" :Surcharge="form.pieceCategory"
/> />
</el-form-item> </el-form-item>
</div> </div>
@ -87,33 +87,30 @@
</div> </div>
<el-form-item label="品类计费"> <el-form-item label="品类计费">
<SurchargeTable <SurchargeTable :SurchargeData="form.cubeCategoryData" :Surcharge="form.cubeCategory" />
:SurchargeData="form.perpieceBillingData"
:Surcharge="form.perpieceBilling"
/>
</el-form-item> </el-form-item>
</div> </div>
<!-- 按重量计费 --> <!-- 按重量计费 -->
<div class="el_flex_row el_flex_right"> <div class="el_flex_row el_flex_right">
<span class="Subtitle">按重量计费</span> <span class="Subtitle">按重量计费</span>
<div>
<el-form-item label="统一计费(元/KG)" style="margin-right: 0"> <el-form-item label="统一计费(元/KG)" style="margin-right: 0">
<el-input-number <el-input-number
v-model="form.ss" style="width: 48%"
:precision="2" v-model="form.ss"
:min="0" :precision="2"
:max="10" :min="0"
:controls="false" :max="10"
placeholder="请输入价格" :controls="false"
/> placeholder="请输入价格"
</el-form-item> />
</div> </el-form-item>
<el-form-item label="品类计费"> <el-form-item label="品类计费">
<SurchargeTable <SurchargeTable
:SurchargeData="form.perpieceBillingData" :SurchargeData="form.weightCategoryData"
:Surcharge="form.perpieceBilling" :Surcharge="form.weightCategory"
/> />
</el-form-item> </el-form-item>
</div> </div>
@ -185,17 +182,17 @@
</div> </div>
</div> </div>
<!-- 整车计费 --> <!-- 整车计费 -->
<el-form-item label="品类计费" style="width: 48%"> <el-form-item label="整车计费" class="Subtitle Wholevehicle" style="width: 48%">
<SurchargeTable :SurchargeData="form.VehiclebillingData" :Surcharge="form.Vehiclebilling"> <SurchargeTable :SurchargeData="form.fullVehicleData" :Surcharge="form.fullVehicle">
<template #default="slotProps"> <template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> <template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn"> <div class="eml_btn">
<span @click="categoriesplus(item.id)" class="el_btn_a"> <span @click="storageplus" class="el_btn_a">
<el-icon style="font-size: 12px; color: #409eff; margin-right: 3px" <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
><CirclePlus /></el-icon ><CirclePlus /></el-icon
>新增 >新增
</span> </span>
<span @click="categoriesduce(item.id)" class="el_btn_b"> <span @click="storagereduce(slotProps.scope.row.index)" class="el_btn_b">
<el-icon style="font-size: 12px; color: #f00; margin-right: 3px" <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
><Delete /></el-icon ><Delete /></el-icon
>删除 >删除
@ -208,7 +205,7 @@
<!-- 附加费用 --> <!-- 附加费用 -->
<div class="el_flex_Surcharge"> <div class="el_flex_Surcharge">
<div class="el_sever_title"> <div class="el_sever_title">
<span>附加费用</span> <span>附加费用</span>
</div> </div>
<span class="Subtitle">统一计费</span> <span class="Subtitle">统一计费</span>
<div class="el_flex"> <div class="el_flex">
@ -277,17 +274,17 @@
</div> </div>
</div> </div>
<!-- 品类计费 --> <!-- 品类计费 -->
<el-form-item label="品类计费" class="el_flex_row"> <el-form-item label="品类计1费" class="el_flex_row">
<SurchargeTable :SurchargeData="form.SurchargeData" :Surcharge="form.Surcharge" /> <SurchargeTable
:SurchargeData="form.aaaData" :Surcharge="form.aaa"
/>
</el-form-item> </el-form-item>
</div> </div>
<!-- 最低等级计费 --> <!-- 最低等级计费 -->
<div> <div>
<div class="el_sever_title"> <div class="el_sever_title">
<span> <span> 最低计费等级 </span>
最低计费等级
</span>
</div> </div>
<div class="el_flex_Minimum"> <div class="el_flex_Minimum">
<template v-for="item in form.Minimumbilling" :key="item.label"> <template v-for="item in form.Minimumbilling" :key="item.label">
@ -329,7 +326,7 @@
</template> </template>
<script setup> <script setup>
import { ref , defineEmits, defineComponent} from 'vue'; import { ref, defineEmits, defineComponent, computed } from 'vue';
import SurchargeTable from '@/components/pric/tablePric.vue'; import SurchargeTable from '@/components/pric/tablePric.vue';
import { putBasicdataPrice } from '@/api/Pricesystem/index'; import { putBasicdataPrice } from '@/api/Pricesystem/index';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
@ -345,40 +342,123 @@ const props = defineProps({
templateData: Object, templateData: Object,
}); });
console.log(props, '来自父页面参数'); console.log(props, '来自父页面参数');
const ServiceList=ref([]) const ServiceList = ref([]);
const requestInfo = ref({}); //价格回显 const requestInfo = ref({}); //价格回显
const request=ref({}) const request = ref({});
const Warehousebillingmode=ref([]);//服务类型 const Warehousebillingmode = ref([]); //服务类型
const pricevehicle = ref([]); //车型
const form = ref({ const form = ref({
// 附加费品类
aaa:[
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{
label: '产品品类(元/件)',
prop: 'categoryId',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '操作/装卸费(元/件)',
prop: 'handlingPrice',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '分货费(元/件)',
prop: 'sortPrice',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '平移费(元/件)',
prop: 'relocationPrice',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '上楼费价格(元/层)',
prop: 'upstairsDeliveryPrice',
type: 'number',
width: 'auto',
disabled: true,
},
],
aaa: [
{
index:1,
handlingPrice:0,
sortPrice:0,
relocationPrice:0,
upstairsDeliveryPrice:0,
}
],
// 按件计费 // 按件计费
perpieceBilling: [ pieceCategory: [
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true }, { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{ label: '产品品类', prop: 'category', type: 'string', width: 'auto', disabled: true }, { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
{ {
label: '单价(元/件)', label: '单价(元/件)',
prop: 'storageFee', prop: 'price',
type: 'number', type: 'number',
width: 'auto', width: 'auto',
disabled: true, disabled: true,
}, },
{ {
label: '遗留件单价(元/件)', label: '遗留件单价(元/件)',
prop: 'managementFeea', prop: 'leaveBehindPrice',
type: 'number', type: 'number',
width: 'auto', width: 'auto',
disabled: true, disabled: true,
}, },
], ],
//按件品类
pieceCategoryData: [],
perpieceBillingData: [ // 按方品类计费
cubeCategory: [
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{ label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
{ label: '单价(元/m³)', prop: 'price', type: 'number', width: 'auto', disabled: true },
{ {
index: 0, label: '遗留单价(元/m³)',
category: '暂无', prop: 'leaveBehindPrice',
storageFee: 0, type: 'number',
managementFee: 0, width: 'auto',
managementFeea: 0, disabled: true,
},
],
// 按件品类
cubeCategoryData: [],
// 按重量品类计费
weightCategory: [
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{ label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
{ label: '单价(元/kg)', prop: 'price', type: 'number', width: 'auto', disabled: true },
{
label: '遗留单价(元/kg)',
prop: 'leaveBehindPrice',
type: 'number',
width: 'auto',
disabled: true,
}, },
], ],
// 按重量品类
weightCategoryData: [],
// 按整车计费
fullVehicle: [
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{ label: '车型', prop: 'vehicleType', type: 'select', width: 'auto', disabled: true },
{ label: '分拣费(元/车)', prop: 'price', type: 'number', width: 'auto', disabled: true },
{ label: '操作', prop: '', type: '', width: 'auto', disabled: true },
],
// 按整车计费
fullVehicleData: [],
// 品类计费 // 品类计费
Billingcategory: [ Billingcategory: [
@ -431,10 +511,6 @@ const form = ref({
prop: 'category', prop: 'category',
type: 'select', type: 'select',
width: 'auto', width: 'auto',
options: [
{ value: 'option1', label: 'Option 1' },
{ value: 'option2', label: 'Option 2' },
],
disabled: true, disabled: true,
}, },
{ {
@ -447,6 +523,8 @@ const form = ref({
{ label: '操作', prop: '', type: '', width: '130', disabled: true }, { label: '操作', prop: '', type: '', width: '130', disabled: true },
], ],
VehiclebillingData: [ VehiclebillingData: [
{ {
index: 1, index: 1,
@ -455,48 +533,7 @@ const form = ref({
managementFee: 0, managementFee: 0,
}, },
], ],
// 附加费用
Surcharge: [
{ label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
{ label: '产品品类(元/件)', prop: 'category', type: 'string', width: '200', disabled: true },
{
label: '操作/装卸费(元/件)',
prop: 'storageFee',
type: 'number',
width: '200',
disabled: true,
},
{
label: '分贷费(元/件)',
prop: 'managementFeea',
type: 'number',
width: '200',
disabled: true,
},
{
label: '平移费(元/件)',
prop: 'managementFeea',
type: 'number',
width: '200',
disabled: true,
},
{
label: '上楼费(元/层)',
prop: 'managementFeea',
type: 'number',
width: '200',
disabled: true,
},
],
SurchargeData: [
{
index: 1,
category: '暂无',
storageFee: 0,
managementFee: 0,
managementFeea: 0,
},
],
// 最低计费等级 // 最低计费等级
Minimumbilling: [ Minimumbilling: [
{ {
@ -578,26 +615,115 @@ function updateDictionary(targetArray, dictionaryType) {
.catch(() => {}) .catch(() => {})
.finally(() => {}); .finally(() => {});
} }
const onLoad= async()=>{
await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
if(props.templateData.request){
console.log(props.templateData.request,'props.templateData.request');
request.value =await deepClone(props.templateData.request)
form.value.dispatchServiceType= request.value.dispatchServiceType;//配送服务类型
form.value.dispatchPricingType = request.value.dispatchPricingType // 移除对象
? request.value.dispatchPricingType.split(',').map(Number) function removeItemById(array, id) {
: []; //服务类型 const index = array.findIndex(item => item.index === id);
if (index !== -1) {
array.splice(index, 1);
array.forEach((item, index) => {
item.index = index + 1;
});
} }
} }
onLoad() function addItemAfterId(array) {
console.log(array);
const newItem = {
index: array.length + 1, // 新对象的 ID 为当前数组长度加 1
plus: false, // 是否显示加号
reduce: true, // 是否显示减号
vehicleType: '', // 车型
loading: false,
price: 0, //价格
options: pricevehicle.value, //选择框列表
};
array.push(newItem);
}
// 仓储减
const storagereduce = id => {
removeItemById(form.value.fullVehicleData, id); //传入配置项和对应的ID
};
// 仓储加
const storageplus = data => {
addItemAfterId(form.value.fullVehicleData);
};
const onLoad = async () => {
await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
await updateDictionary(pricevehicle.value, 'price_vehicle_type'); //车型
// 回显
if (props.templateData.request) {
console.log(props.templateData.request, 'props.templateData.request');
request.value = await deepClone(props.templateData.request);
form.value.dispatchServiceType = request.value.dispatchServiceType; //配送服务类型
form.value.dispatchPricingType = request.value.dispatchPricingType
? request.value.dispatchPricingType.split(',').map(Number)
: []; //服务类型
addItemAfterId(form.value.fullVehicleData); //整车计费(缺少判断)
// 缺少判断
// 按件品类计费
if (form.value.dispatchPricingType.includes(1)) {
request.value.dispatchPieceCategorys.forEach((item, index) => {
form.value.pieceCategoryData.push({
index: index + 1,
categoryId: item.id, //品类
price: 0, //价格
leaveBehindPrice: 0, //遗留单价
options: [{ label: item.name, value: item.id }],
});
});
}
// 按方计费
if (form.value.dispatchPricingType.includes(3)) {
request.value.dispatchCubeCategorys.forEach((item, index) => {
form.value.cubeCategoryData.push({
index: index + 1,
categoryId: item.id, //品类
price: 0, //价格
leaveBehindPrice: 0, //遗留单价
options: [{ label: item.name, value: item.id }],
});
});
}
// 按重量
if (form.value.dispatchPricingType.includes(3)) {
request.value.dispatchWeightCategorys.forEach((item, index) => {
form.value.weightCategoryData.push({
index: index + 1,
categoryId: item.id, //品类
price: 0, //价格
leaveBehindPrice: 0, //遗留单价
options: [{ label: item.name, value: item.id }],
});
});
}
// 附加费品类
// request.value.dispatchAdditionalCategorys.forEach((item,index)=>{
// form.value.additionalCategoryData.push()
// })
}
};
onLoad();
const btn = () => { const btn = () => {
console.log(form.value); console.log(form.value);
}; };
const view = val => { const view = val => {
console.log(val); console.log(val);
}; };
const billing = computed(() => {
if (!request.value.value) {
return true;
} else {
return false;
}
});
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@ -675,17 +801,14 @@ const view = val => {
.el_row { .el_row {
width: 48%; width: 48%;
} }
:deep(.el_flex_row_1){ :deep(.el_flex_row_1) {
.el-form-item__content {
.el-form-item__content{
width: 48% !important; width: 48% !important;
.el-input-number { .el-input-number {
width: 100%; width: 100%;
}
} }
}
} }
} }
.el_flex_row { .el_flex_row {
width: 48%; width: 48%;
@ -712,29 +835,33 @@ const view = val => {
} }
} }
} }
.el_sever_title{ .el_sever_title {
span{ span {
padding-left: 10px; padding-left: 10px;
color: #d58833; color: #d58833;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
position: relative; position: relative;
} }
span::before{ span::before {
content: ''; content: '';
width: 4px; width: 4px;
height: 70%; height: 70%;
background-color: #d58833; background-color: #d58833;
position: absolute; position: absolute;
left: 0px; left: 0px;
top:4px; top: 4px;
} }
} }
.Subtitle{ .Subtitle {
display: block; display: block;
margin-top: 10px; margin-top: 10px;
color: #d58833; color: #d58833;
} }
:deep(.Wholevehicle) {
.el-form-item__label {
color: #d58833;
font-size: 18px;
}
}
</style> </style>

6
src/views/Pricesystem/Price/PriceWarehousing.vue
Unescape View File

@ -185,8 +185,6 @@ import { deepClone } from '@/utils/util';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { putBasicdataPrice } from '@/api/Pricesystem/index'; import { putBasicdataPrice } from '@/api/Pricesystem/index';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { valid } from 'mockjs';
import page from '@/router/page';
const $route = useRoute(); //获取地址栏参数 const $route = useRoute(); //获取地址栏参数
const emit = defineEmits(['request-data']); const emit = defineEmits(['request-data']);
defineComponent({ defineComponent({
@ -476,7 +474,7 @@ const onLoad = async () => {
const price = async () => { const price = async () => {
if (Object.keys(requestInfo.value).length > 0) { if (Object.keys(requestInfo.value).length > 0) {
if (requestInfo.value.catergory.length) { if (requestInfo.value.catergory && requestInfo.value.catergory.length) {
// 仓储 // 仓储
requestInfo.value.catergory.forEach(res => { requestInfo.value.catergory.forEach(res => {
let data = form.value.publicData.find(temp => temp.categoryId == res.categoryId); let data = form.value.publicData.find(temp => temp.categoryId == res.categoryId);
@ -489,7 +487,7 @@ const price = async () => {
}); });
} }
// 附加费（还差状态） // 附加费（还差状态）
if (requestInfo.value.additionalCategory.length) { if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
requestInfo.value.additionalCategory.forEach(res => { requestInfo.value.additionalCategory.forEach(res => {
let data = form.value.SurchargeData.find(temp => temp.categoryId == res.categoryId); let data = form.value.SurchargeData.find(temp => temp.categoryId == res.categoryId);
if (data) { if (data) {

10
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -2293,11 +2293,11 @@ export default {
}, },
//确定 //确定
callFordelivery(inde) { callFordelivery(inde) {
// if (!this.selectionList.length) { if (!this.selectionList.length) {
// console.log(this.selectionListStock, '23'); console.log(this.selectionListStock, '23');
// this.$message.warning('至少选择一条数据！'); this.$message.warning('至少选择一条数据！');
// return; return;
// } }
let isa = false; let isa = false;
this.selectionList.some(i => { this.selectionList.some(i => {
if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) { if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) {

1
src/views/financialsector/FinanceHome.vue
Unescape View File

@ -358,4 +358,5 @@ const handleChange = () => {
padding:0 10px !important; padding:0 10px !important;
} }
} }
</style> </style>

Write Preview
Loading…
Cancel
Save