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

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

dev-xx
qb 12 months ago
parent
eab4f657ad 0f096761aa
commit
5c23531c03
8 changed files with 655 additions and 187 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. 10
      src/api/distribution/distributionStockArticle.js
  2. 2
      src/components/pric/tablePric.vue
  3. 91
      src/views/Pricesystem/Price/PriceDelivery.vue
  4. 662
      src/views/Pricesystem/Price/PriceWarehousing.vue
  5. 16
      src/views/Pricesystem/PricesyHome.vue
  6. 10
      src/views/distribution/inventory/distrilbutionBillLading.vue
  7. 6
      src/views/financialsector/Financialse/FinancialWarehousing.vue
  8. 45
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

10
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -364,3 +364,13 @@ export const postShowOrderCode = params => {
params,
});
};
export const $_signforDistributionStockArticleList = params => {
return request({
url: '/api/logpm-distribution/distributionStockArticle/export-signforDistributionStockArticleList',
method: 'get',
params,
responseType: 'blob',
});
};

2
src/components/pric/tablePric.vue
Unescape View File

@ -13,7 +13,7 @@
v-model="scope.row[column.prop]"
:precision="2"
:min="0"
:max="10"
:max="999999"
:controls="false"
placeholder="请输入价格"
/>

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

@ -4,10 +4,41 @@
<div class="el_row_1">
<div class="el_flex_row">
<el-form-item label="配送服务类型">
<el-input v-model="form.name" disabled placeholder="自动带出无法更改" />
<el-select
class="el_Cselect"
style="width: 100%;"
v-model="form.dispatchServiceType"
filterable
placeholder="选择计费类型"
disabled
@change="chargetype"
>
<el-option
v-for="item in Warehousebillingmode"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="计费模式">
<el-input v-model="form.region" disabled placeholder="自动带出无法更改" />
<el-select
v-model="form.dispatchPricingType"
filterable
placeholder="请选择配送计费模式"
:popper-append-to-body="false"
style="width:100%;"
disabled
multiple
>
<el-option
v-for="item in ServiceList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div>
</div>
@ -298,8 +329,26 @@
</template>
<script setup>
import { ref } from 'vue';
import { ref , defineEmits, defineComponent} from 'vue';
import SurchargeTable from '@/components/pric/tablePric.vue';
import { putBasicdataPrice } from '@/api/Pricesystem/index';
import { useRoute } from 'vue-router';
import { deepClone } from '@/utils/util';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
const $route = useRoute(); //获取地址栏参数
const emit = defineEmits(['request-data']);
defineComponent({
emits: ['request-data'],
});
// 接收参数
const props = defineProps({
templateData: Object,
});
console.log(props, '来自父页面参数');
const ServiceList=ref([])
const requestInfo = ref({}); //价格回显
const request=ref({})
const Warehousebillingmode=ref([]);//服务类型
const form = ref({
// 按件计费
perpieceBilling: [
@ -494,7 +543,7 @@ const form = ref({
disabled: true,
},
{
label: '遗留件最低计费方数',
label: '遗留件最低计费重量',
input: 0,
disabled: true,
},
@ -510,7 +559,39 @@ const form = ref({
},
],
});
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType)
.then(res => {
console.log(res, '字典');
if (res.data.code == 200) {
if (res.data.data.length) {
res.data.data.forEach(item => {
targetArray.push({
value: Number(item.dictKey),
label: item.dictValue,
id: item.id,
});
});
}
}
})
.catch(() => {})
.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)
: []; //服务类型
}
}
onLoad()
const btn = () => {
console.log(form.value);
};

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

@ -4,63 +4,114 @@
<div class="el_row_1">
<div class="el_flex_row">
<el-form-item label="计算类型">
<el-input v-model="form.name" disabled placeholder="自动带出无法更改" />
<el-select
class="el_Cselect"
v-model="form.warehousePricingType"
filterable
clearable
disabled
placeholder="选择计费类型"
style="width: 100%"
>
<el-option
v-for="item in Storagebillingtype"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="计算模式">
<el-input v-model="form.region" disabled placeholder="自动带出无法更改" />
<el-select
class="el_Cselect"
v-model="form.warehousePricingMode"
filterable
clearable
disabled
placeholder="选择仓储计费模式"
style="width: 100%"
>
<el-option
v-for="item in Warehousebillingmode"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</div>
<div class="el_flex_row">
<el-form-item label="计算基准">
<el-input v-model="form.type" disabled placeholder="自动带出无法更改" />
<el-radio-group
v-model="form.warehouseCalculationBasis"
class="el_Cselect"
style="width: 100%; background-color: #f5f7fa; padding: 0 4px"
disabled
>
<el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
item.label
}}</el-radio>
</el-radio-group>
</el-form-item>
</div>
</div>
<div class="el_row_2">
<div class="el_row_2" v-if="Surchargecd">
<div class="el_sever_title">
<span> 附加费用</span>
</div>
<span class="Subtitle">统一计费单价</span>
<div class="el_row_2_1">
<div class="el_flex_row">
<el-form-item label="仓储操作/装卸费" class="el_lable_title">
<el-input-number
v-model="form.a"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
<el-form-item label="仓储管理费" style="margin-top: 10px">
<el-input-number
v-model="form.a"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
</div>
<div class="el_flex_row" style="margin-top: 10px">
<el-form-item label="仓储分货费">
<el-input-number
v-model="form.a"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
<div v-if="!request.warehouseIsCategorySubjoin">
<span class="Subtitle">统一计费单价</span>
<div class="el_row_2_1">
<div class="el_flex_row">
<el-form-item
label="仓储操作/装卸费"
class="el_lable_title"
v-if="request.warehouseIsOperateFee"
>
<el-input-number
v-model="form.operatePrice"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
<el-form-item
label="仓储管理费"
style="margin-top: 10px"
v-if="request.warehouseIsManageFee"
>
<el-input-number
v-model="form.warehouseManagementPrice"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
</div>
<div class="el_flex_row" style="margin-top: 10px" v-if="request.warehouseIsSortFee">
<el-form-item label="仓储分货费">
<el-input-number
v-model="form.warehouseSortPrice"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
/>
</el-form-item>
</div>
</div>
</div>
</div>
<!-- 品类计费单价 -->
<div class="el_row" style="width: 50%">
<div class="el_row" style="width: 50%" v-if="request.warehouseIsCategorySubjoin">
<el-form-item label="品类计费单价">
<SurchargeTable :SurchargeData="form.SurchargeData" :Surcharge="form.Surcharge" />
</el-form-item>
@ -68,7 +119,7 @@
<!-- 下半部分布局 -->
<div class="el_flex">
<!-- 按件计费 -->
<div class="el_row">
<!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 1">
<span class="Subtitle">按件计费</span>
<el-form-item label="统一计费单价" class="el_lable_title">
<SurchargeTable :SurchargeData="form.piecebillingData" :Surcharge="form.piecebilling" />
@ -79,9 +130,9 @@
:Surcharge="form.piecebillingPL"
/>
</el-form-item>
</div>
</div> -->
<div class="el_row">
<!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 2">
<span class="Subtitle">按方计费</span>
<el-form-item label="统一计费单价" class="el_lable_title">
<SurchargeTable :SurchargeData="form.piecebillingData" :Surcharge="form.piecebilling" />
@ -92,9 +143,9 @@
:Surcharge="form.piecebillingPL"
/>
</el-form-item>
</div>
</div> -->
<div class="el_row">
<!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 3">
<span class="Subtitle">按重量计费(kg)</span>
<el-form-item label="统一计费单价" class="el_lable_title">
<SurchargeTable
@ -109,17 +160,11 @@
:Surcharge="form.BillingbyweightPL"
/>
</el-form-item>
</div>
</div> -->
<div class="el_row">
<span class="Subtitle">按吨计费(t)</span>
<el-form-item label="统一计费单价" class="el_lable_title">
<SurchargeTable :SurchargeData="form.piecebillingData" :Surcharge="form.piecebilling" />
</el-form-item>
<el-form-item label="按件计费品类单价">
<SurchargeTable
:SurchargeData="form.piecebillingData"
:Surcharge="form.piecebillingPL"
/>
<span class="Subtitle">{{ tabform.title }}</span>
<el-form-item :label="tabform.table" class="el_lable_title">
<SurchargeTable :SurchargeData="form.publicData" :Surcharge="form.publicTable" />
</el-form-item>
</div>
</div>
@ -133,157 +178,449 @@
</template>
<script setup>
import { ref } from 'vue';
import { ref, defineEmits, defineComponent, computed } from 'vue';
import SurchargeTable from '@/components/pric/tablePric.vue';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { deepClone } from '@/utils/util';
import { ElMessage } from 'element-plus';
import { putBasicdataPrice } from '@/api/Pricesystem/index';
import { useRoute } from 'vue-router';
import { valid } from 'mockjs';
import page from '@/router/page';
const $route = useRoute(); //获取地址栏参数
const emit = defineEmits(['request-data']);
defineComponent({
emits: ['request-data'],
});
// 接收参数
const props = defineProps({
templateData: Object,
});
console.log(props, '来自父页面参数');
const tabform = ref({
table: '',
title: '',
});
const requestInfo = ref({}); //价格回显
const Storagebillingtype = ref([]);
const Warehousebillingmode = ref([]);
const CalculationBasis = ref([]);
const request = ref({});
const Surchargepricingunit = ref([]);
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType)
.then(res => {
console.log(res, '字典');
if (res.data.code == 200) {
if (res.data.data.length) {
res.data.data.forEach(item => {
targetArray.push({
value: Number(item.dictKey),
label: item.dictValue,
id: item.id,
});
});
}
}
})
.catch(() => {})
.finally(() => {});
}
const form = ref({
operatePrice: 0, //操作/装卸费
warehouseManagementPrice: 0, //仓储管理费
warehouseSortPrice: 0, //仓储分货费
// 附加费
Surcharge: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'category', type: 'string', width: '150', disabled: true },
{ label: '仓储操作/装卸费', prop: 'storageFee', type: 'number', width: '180', disabled: true },
{ label: '仓储管理费', prop: 'managementFeea', type: 'number', width: '180', disabled: true },
{ label: '仓储分货费', prop: 'managementFeec', type: 'number', width: '180', disabled: true },
],
SurchargeData: [
{ label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
{
index: 1,
category: '暂无',
storageFee: 0,
managementFee: 0,
managementFeea: 0,
managementFeec: 0,
},
],
// 按件计费
piecebilling: [
{ label: '30天内(元/件)', prop: 'category', type: 'number', width: '150', disabled: true },
{
label: '30天-60天(元/件)/装卸费',
prop: 'storageFee',
label: '仓储操作/装卸费',
prop: 'operatePrice',
type: 'number',
width: '180',
disabled: true,
},
{
label: '60天外(元/件)',
prop: 'managementFeea',
label: '仓储管理费',
prop: 'warehouseManagementPrice',
type: 'number',
width: '180',
disabled: true,
},
{ label: '上限(元/件)', prop: 'managementFeec', type: 'number', width: '180', disabled: true },
],
piecebillingData: [
{
index: 1,
category: 0,
storageFee: 0,
managementFee: 0,
managementFeea: 0,
managementFeec: 0,
},
],
// 按件计费品类单价
piecebillingPL: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'category', type: 'string', width: '150', disabled: true },
{ label: '30天内(元/件)', prop: 'category', type: 'number', width: '150', disabled: true },
{
label: '30天-60天(元/件)/装卸费',
prop: 'storageFee',
label: '仓储分货费',
prop: 'warehouseSortPrice',
type: 'number',
width: '180',
disabled: true,
},
{
label: '60天外(元/件)',
prop: 'managementFeea',
type: 'number',
width: '180',
disabled: true,
},
{ label: '上限(元/件)', prop: 'managementFeec', type: 'number', width: '180', disabled: true },
],
piecebillingPLData: [
{
index: 1,
category: '暂无 ',
storageFee: 0,
managementFee: 0,
managementFeea: 0,
managementFeec: 0,
},
],
// 按重量计费
Billingbyweight: [
{ label: '30天内(元/件)', prop: 'category', type: 'number', width: '150', disabled: true },
SurchargeData: [],
// 按吨计费
publicTable: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
{
label: '30天-60天(元/件)/装卸费',
prop: 'storageFee',
label: '30天内',
prop: 'withinThirtyPrice',
type: 'number',
width: '180',
disabled: true,
},
{
label: '60天外(元/件)',
prop: 'managementFeea',
label: '30天-60天',
prop: 'betweenThirtySixtyPrice',
type: 'number',
width: '180',
disabled: true,
},
{ label: '上限(元/件)', prop: 'managementFeec', type: 'number', width: '180', disabled: true },
],
BillingbyweightData: [
{
index: 1,
category: 0,
storageFee: 0,
managementFee: 0,
managementFeea: 0,
managementFeec: 0,
},
],
// 按重量(kg)计费品类单价
BillingbyweightPL: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'category', type: 'string', width: '150', disabled: true },
{ label: '30天内(元/件)', prop: 'category', type: 'number', width: '150', disabled: true },
{
label: '30天-60天(元/件)/装卸费',
prop: 'storageFee',
label: '60天外',
prop: 'beyondSixtyPrice',
type: 'number',
width: '180',
disabled: true,
},
{
label: '60天外(元/件)',
prop: 'managementFeea',
label: '上限',
prop: 'maximumPrice',
type: 'number',
width: '180',
disabled: true,
},
{ label: '上限(元/件)', prop: 'managementFeec', type: 'number', width: '180', disabled: true },
],
BillingbyweightPLData: [
{
index: 1,
category: '暂无 ',
storageFee: 0,
managementFee: 0,
managementFeea: 0,
managementFeec: 0,
},
],
publicData: [],
});
const onLoad = async () => {
updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
// updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
// 价格回显
if (props.templateData.request) {
form.value.warehousePricingType = request.value.warehousePricingType; //计算类型
form.value.warehousePricingMode = request.value.warehousePricingMode; //计费模式
form.value.warehouseCalculationBasis = request.value.warehouseCalculationBasis; //计算基准
// 附加费产品品类回显
if (request.value.warehouseIsCategorySubjoin) {
console.log('有附加品类');
if (
request.value.warehouseSubjoinCategorys &&
request.value.warehouseSubjoinCategorys.length
) {
request.value.warehouseSubjoinCategorys.forEach((res, index) => {
form.value.SurchargeData.push({
index: index + 1,
categoryId: res.id,
options: [
{
label: res.name,
value: res.id,
},
],
operatePrice: 0,
managementFee: 0,
warehouseManagementPrice: 0,
warehouseSortPrice: 0,
});
});
}
}else{
console.log('没有附加品类');
let data= requestInfo.value.additionalCategory[0]
console.log(data,'data数据');
form.value.operatePrice=data.operatePrice
form.value.warehouseManagementPrice=data.warehouseManagementPrice
form.value.warehouseSortPrice=data.warehouseSortPrice
}
form.value.publicData = []; //清空数据
// 仓储回显
function updateLabelsWithUnit(unit, labelsMap) {
form.value.publicTable.forEach(res => {
if (labelsMap[res.label]) {
res.label = labelsMap[res.label] + unit;
}
});
}
function handleFormUpdate(disableIndexAndCategory, unitLabel, tableTitle, perPiece = false) {
const unitMapping = {
按件计费: `${unitLabel}/件`,
'按重量计费(t)': `${unitLabel}/KG`,
'按吨计费(t)': `${unitLabel}/t`,
};
const unit = unitMapping[tableTitle] || unitLabel;
updateLabelsWithUnit(unit, {
'30天内': '30天内',
'30天-60天': '30天-60天',
'60天外': '60天外',
上限: '上限',
});
tabform.value.title = tableTitle;
tabform.value.table = perPiece ? '按件计费品类单价' : '统一计费单价';
form.value.publicTable.find(res => res.prop === 'index').disabled = disableIndexAndCategory;
form.value.publicTable.find(res => res.prop === 'categoryId').disabled =
disableIndexAndCategory;
if (request.value.warehouseIsByCategory) {
request.value.warehousePieceCategorys.forEach((res, index) => {
form.value.publicData.push(createPublicDataEntry(index, res.id, res.name));
});
} else {
form.value.publicData = [createEmptyPublicDataEntry()];
}
}
function createPublicDataEntry(index, categoryId, categoryName) {
return {
index: index + 1,
categoryId: categoryId,
withinThirtyPrice: 0,
betweenThirtySixtyPrice: 0,
beyondSixtyPrice: 0,
maximumPrice: 0,
options: [{ label: categoryName, value: categoryId }],
};
}
function createEmptyPublicDataEntry() {
return {
withinThirtyPrice: 0,
betweenThirtySixtyPrice: 0,
beyondSixtyPrice: 0,
maximumPrice: 0,
};
}
const unitType = request.value.warehousePricingType;
console.log(unitType, ' console.log(unitType);===>');
const isByCategory = request.value.warehouseIsByCategory;
switch (unitType) {
case 1:
handleFormUpdate(isByCategory, '(元/件)', '按件计费');
break;
case 2:
handleFormUpdate(isByCategory, '(元/m³)', '按件计费');
break;
case 3:
handleFormUpdate(isByCategory, '(元/KG)', '按重量计费(t)');
break;
case 4:
handleFormUpdate(isByCategory, '(元/t)', '按吨计费(t)');
break;
}
// if(request.value.warehouseSubjoinFeeUnit==4){
// form.value.publicTable.forEach(res=>{
// if( res.label=='30天内'){
// res.label='30天内(元/t)';
// }else if(res.label=='30天-60天'){
// res.label='30天-60天(元/t)';
// }else if(res.label=='60天外'){
// res.label='60天外(元/t)';
// }else if(res.label=='上限'){
// res.label='上限(元/t)';
// }
// })
// // 按吨
// tabform.value.title='按吨计费(t)';
// if(request.value.warehouseIsByCategory){
// tabform.value.table='按吨(t)计费品类单价';
// form.value.publicTable.find(res=>res.prop=='index').disabled=true;
// form.value.publicTable.find(res=>res.prop=='categoryId').disabled=true;
// request.value.warehousePieceCategorys.forEach((res,index)=>{
// form.value.publicData.push({
// index: index+1,
// categoryId:res.id, //品类ID
// withinThirtyPrice: 0, //30天内
// betweenThirtySixtyPrice: 0, //30天-60天
// beyondSixtyPrice: 0, // 60天外
// maximumPrice: 0, // 上限
// options:[
// {
// label:res.name,
// value:res.id,
// }
// ]
// })
// })
// }else{
// tabform.value.table='统一计费单价';
// form.value.publicTable.find(res=>res.prop=='index').disabled=false;
// form.value.publicTable.find(res=>res.prop=='categoryId').disabled=false;
// form.value.publicData=[
// {
// withinThirtyPrice: 0, //30天内
// betweenThirtySixtyPrice: 0, //30天-60天
// beyondSixtyPrice: 0, // 60天外
// maximumPrice: 0, // 上限
// }
// ]
// }
// }
}
const btn = () => {
console.log(form.value);
console.log(request.value, '初始化页面');
};
const price = async () => {
if (Object.keys(requestInfo.value).length > 0) {
if (requestInfo.value.catergory.length) {
// 仓储
requestInfo.value.catergory.forEach(res => {
let data = form.value.publicData.find(temp => temp.categoryId == res.categoryId);
if (data) {
data.betweenThirtySixtyPrice = res.betweenThirtySixtyPrice;
data.beyondSixtyPrice = res.beyondSixtyPrice;
data.maximumPrice = res.maximumPrice;
data.withinThirtyPrice = res.withinThirtyPrice;
}
});
}
// 附加费（还差状态）
if (requestInfo.value.additionalCategory.length) {
requestInfo.value.additionalCategory.forEach(res => {
let data = form.value.SurchargeData.find(temp => temp.categoryId == res.categoryId);
if (data) {
data.operatePrice = res.operatePrice;//操作/装卸费
data.managementFee = res.managementFee;
data.warehouseManagementPrice = res.warehouseManagementPrice;// 仓储管理费
data.warehouseSortPrice = res.warehouseSortPrice;//仓储分货费
}
});
}
}
};
const pageonload = async () => {
request.value = await deepClone(props.templateData.request);
requestInfo.value = await deepClone(props.templateData.requestInfo.warehouse);
onLoad(); //页面渲染
price(); //处理价格
};
pageonload();
const Surchargecd = computed(() => {
const {
warehouseIsCategorySubjoin,
warehouseIsOperateFee,
warehouseIsManageFee,
warehouseIsSortFee,
} = request.value;
if (
!warehouseIsCategorySubjoin &&
!warehouseIsOperateFee &&
!warehouseIsManageFee &&
!warehouseIsSortFee
) {
return false;
} else {
return true;
}
});
// 保存数据
const handleSubmit = () => {
let data = {
checkType: '3',
id: $route.query.id,
warehouse: {
additionalCategory: [],
catergory: [],
},
};
// 附加费存在
if (request.value.warehouseIsCategorySubjoin) {
form.value.SurchargeData.forEach(res => {
data.warehouse['additionalCategory'].push({
categoryId: res.categoryId, //品类ID
operatePrice: res.operatePrice, //操作/装卸费
warehouseManagementPrice: res.warehouseManagementPrice, //仓储管理费
warehouseSortPrice: res.warehouseSortPrice, //仓储分货费
});
});
} else {
// 不存在填写统一单价
data.warehouse['additionalCategory'].push({
operatePrice: form.value.operatePrice, //操作/装卸费
warehouseManagementPrice: form.value.warehouseManagementPrice, //仓储管理费
warehouseSortPrice: form.value.warehouseSortPrice, //仓储分货费
name: 'fj',
});
}
// 仓储费
if (request.value.warehouseIsByCategory) {
form.value.publicData.forEach(res => {
data.warehouse['catergory'].push({
betweenThirtySixtyPrice: res.betweenThirtySixtyPrice, // 30-60天
beyondSixtyPrice: res.beyondSixtyPrice, // 60天外
categoryId: res.categoryId, // 品类id
maximumPrice: res.maximumPrice, // 上限价格
withinThirtyPrice: res.withinThirtyPrice, // 30天内
});
});
} else {
form.value.publicData.forEach(res => {
data.warehouse['catergory'].push({
betweenThirtySixtyPrice: res.betweenThirtySixtyPrice, // 30-60天
beyondSixtyPrice: res.beyondSixtyPrice, // 60天外
maximumPrice: res.maximumPrice, // 上限价格
withinThirtyPrice: res.withinThirtyPrice, // 30天内
});
});
}
console.log(data, 'data===>');
// 数据处理
if (!request.value.warehouseIsCategorySubjoin) {
// 不存在填写统一单价
// data.warehouse['additionalCategory'].push({
// operatePrice: form.value.operatePrice, //操作/装卸费
// warehouseManagementPrice: form.value.warehouseManagementPrice, //仓储管理费
// warehouseSortPrice: form.value.warehouseSortPrice, //仓储分货费
// name: 'fj',
// });
let mox = data.warehouse['additionalCategory'].find(res => res.name == 'fj');
delete mox.name
if (!request.value.warehouseIsManageFee) {
//删除管理费
delete mox.warehouseManagementPrice;
}
if (!request.value.warehouseIsOperateFee) {
// 删除是否有操作/装卸费
delete mox.operatePrice;
}
if (!request.value.warehouseIsSortFee) {
// 删除分拣费
delete mox.warehouseSortPrice;
}
}
putBasicdataPrice(data)
.then(res => {
console.log(res, '保存成功');
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
}
})
.catch(() => {})
.finally(() => {});
};
</script>
@ -361,6 +698,7 @@ const btn = () => {
justify-content: space-between;
flex-direction: row;
flex-wrap: wrap;
align-items: flex-end;
.el_row {
width: 50%;
}

16
src/views/Pricesystem/PricesyHome.vue
Unescape View File

@ -29,11 +29,10 @@
import { ref, defineAsyncComponent } from 'vue';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { $_basicdataBrande } from '@/api/financialsector/index'; //价格模板
import { $_InfopriceTemplate as getInfo } from '@/api/Pricesystem/index.js';
import { $_InfopriceTemplate as getInfo,getBasicdataPrice } from '@/api/Pricesystem/index.js';
import { $_InfopriceTemplate } from '@/api/financialsector/index.js';
import { useRoute } from 'vue-router';
import { nextTick } from 'vue';
const $route = useRoute();
//仓储模板
@ -101,7 +100,7 @@ const initData = async () => {
const { code, data } = res.data;
if (code !== 200) return;
form.value.requestInfo=data;//发送回显数据
// form.value = data;
} catch (error) {
console.log('error :>> ', error);
@ -112,7 +111,7 @@ const initData = async () => {
const onLoad = async () => {
try {
pageLoading.value = true;
const PromiseAll = [
/** 服务类型 */
updateDictionary(ServiceList.value, 'service_type'),
@ -121,8 +120,8 @@ const onLoad = async () => {
];
await Promise.all(PromiseAll);
initData();
console.log('VehicleTypeList :>> ', VehicleTypeList);
let data = {
@ -136,13 +135,14 @@ const onLoad = async () => {
console.log(res, '获取详情');
form.value.TemplateName = data.name || ''; //模板名称
form.value.ServiceType = data.serviceType.split(',') || []; //服务类型
form.value.request=data
form.value.request = data;
console.log('form.value.ServiceType :>> ', form.value.ServiceType);
const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
await initData();
// 激活菜单设置为已经存在的
executeCheckedResults(result);
await nextTick();
setTimeout(() => {
console.log('financialBill :>> ', financialBill);

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

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

6
src/views/financialsector/Financialse/FinancialWarehousing.vue
Unescape View File

@ -218,7 +218,7 @@
<div class="Storage-cont">
<span class="el_table_span">附加费品类配置</span>
<!-- 表格 -->
<SurchargeTable :SurchargeData="AdditionalcategoriesData" :Surcharge="Additionalcategories" @focus="handleRowFocus" @search='search'>
<SurchargeTable :SurchargeData="AdditionalcategoriesData" :Surcharge="Additionalcategories" @focus="handleRowFocus" @search='search'>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
@ -631,7 +631,7 @@ const onLoad = async () => {
reduce: index ? true : false,
StateName: 'additional', //附加费标识
warehousePieceCategory: res.id,
Additionalcategories: [
options: [
{
label: res.name,
value: res.id,
@ -687,7 +687,7 @@ const Submit = async () => {
}
} else {
if (form.value.warehousePieceCategory) {
delete form.value.warehousePieceCategory;
form.value.warehousePieceCategory='';
}
}
// 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置

45
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
Unescape View File

@ -59,7 +59,7 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" @click="AddInfo"
<el-button type="primary" @click="exportExcel"
><el-icon><Download /></el-icon>导出</el-button
>
</div>
@ -149,9 +149,11 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue
import { columnList } from '@/option/warehouse/distributionStockArticle.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { processRowProperty, setNodeHeight } from '@/utils/util';
import { $_signforList } from '@/api/distribution/distributionStockArticle.js';
import { $_signforList ,$_signforDistributionStockArticleList} from '@/api/distribution/distributionStockArticle.js';
import functions from '@/utils/functions.js';
import { ElMessageBox } from 'element-plus';
import { ElMessageBox, ElMessage} from 'element-plus';
import { downloadXls} from '@/utils/util';
const $router = useRouter(); //跳转
import { useStore } from 'vuex';
import dayjs from 'dayjs';
@ -363,6 +365,43 @@ const searchHide = () => {
const _node = document.querySelector('.tableNode');
setNodeHeight(_node, '', true);
};
// 导出
const exportExcel = () => {
if (!Object.values(queryCarn.value).length || Object.values(details.query).length) {
ElMessage({
message: '请输入查询条件',
type: 'warning',
})
return
}
ElMessageBox.confirm('是否导出数据?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
let data = {
current: details.page.currentPage,
size: details.page.pageSize,
...details.query,
...queryCarn.value,
};
$_signforDistributionStockArticleList(data).then(res => {
downloadXls(res.data, `已签订单.xlsx`);
ElMessage({
message:'导出成功',
type: 'success',
})
});
})
.catch(() => {});
};
// 清空
const searchReset = () => {

Write Preview
Loading…
Cancel
Save