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

财务

pre-production
马远东 12 months ago
parent
69138aa8ab
commit
7c21a82d3e
2 changed files with 255 additions and 61 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. 292
      src/views/financialsector/Financialse/FinancialDelivery.vue
  2. 24
      src/views/warehouse/parcelList/distributionParcelList.vue

292
src/views/financialsector/Financialse/FinancialDelivery.vue
Unescape View File

@ -85,8 +85,172 @@
>
<!-- 商配/市配内容 -->
<div class="el_Commercial_ercial">
<!-- 按件计费 -->
<template v-for="Item in Commercialcial" :key="Item.title">
<div v-if="Item.state" class="tabBox">
<div
class="el_Storagecategory"
v-loading="Item.Storageloading"
element-loading-text="Loading..."
>
<table class="styled-table">
<thead>
<tr>
<th style="width: 30px; text-align: center">序号</th>
<th>产品品类</th>
<th style="width: 104px">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="item in Item.sequence" :key="item.id">
<td style="text-align: center">{{ item.id }}</td>
<td>
<el-select
class="el_Cselect"
v-model="item.Warehousecategory"
filterable
remote
clearable
reserve-keyword
placeholder="请选择品类"
style="width: 100%"
remote-show-suffix
:remote-method="categoriesearch"
@focus="categoriesSearchfocus(item)"
>
<el-option
v-for="option in item.Additionalcategories"
:key="option.value"
:label="option.label"
:value="option.value"
/>
</el-select>
</td>
<td style="line-height: 16px">
<span
class="el_btn_a"
@click="storageplus(Item, item.id)"
v-if="item.plus"
>
<el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
><CirclePlus /></el-icon
>新增
</span>
<span
class="el_btn_b"
@click="storagereduce(Item, item.id)"
v-if="item.reduce"
>
<el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
><Delete /></el-icon
>删除
</span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</template>
<!-- 按件 -->
<el-form-item label="按件计费">
<SurchargeTable
:SurchargeData="form.dispatchPieceCategoryData"
:Surcharge="dispatchPieceCategory"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
<span
@click="categoriesplus"
class="el_btn_a"
v-if="slotProps.scope.row.plus"
>
<el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
>新增
</span>
<span
@click="categoriesduce(slotProps.scope.row.index)"
class="el_btn_b"
v-if="slotProps.scope.row.reduce"
>
<el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
</span>
</div>
</template>
</template>
</SurchargeTable>
</el-form-item>
<el-form-item label="按重量计费">
<SurchargeTable
:SurchargeData="form.dispatchWeightCategoryData"
:Surcharge="dispatchWeightCategory"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
<span
@click="categoriesplus"
class="el_btn_a"
v-if="slotProps.scope.row.plus"
>
<el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
>新增
</span>
<span
@click="categoriesduce(slotProps.scope.row.index)"
class="el_btn_b"
v-if="slotProps.scope.row.reduce"
>
<el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
</span>
</div>
</template>
</template>
</SurchargeTable>
</el-form-item>
<el-form-item label="按方计费">
<SurchargeTable
:SurchargeData="form.dispatchCubeCategoryData"
:Surcharge="dispatchCubeCategory"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="eml_btn">
<span
@click="categoriesplus"
class="el_btn_a"
v-if="slotProps.scope.row.plus"
>
<el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
>新增
</span>
<span
@click="categoriesduce(slotProps.scope.row.index)"
class="el_btn_b"
v-if="slotProps.scope.row.reduce"
>
<el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
</span>
</div>
</template>
</template>
</SurchargeTable>
</el-form-item>
</div>
</el-tab-pane>
</el-tabs>
@ -305,6 +469,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { deepClone } from '@/utils/util';
import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
import { $_priceTemplate, $_putpriceTemplate } from '@/api/financialsector/index'; //价格模板
import SurchargeTable from '@/components/pric/tablePric.vue';
const $route = useRoute(); //获取地址栏参数
const emit = defineEmits(['request-data']);
defineComponent({
@ -334,7 +499,48 @@ const form = ref({
dispatchMinCostType: 1, //最低计费类型
dispatchIsUpwardJudgment: 0, //是否向上判断
WarehousebillingmodeTitle: '', //标题
dispatchPieceCategoryData: [], //按件品类
dispatchWeightCategoryData: [], //按重量
dispatchCubeCategoryData: [], //按方品类
});
// 按件品类
const dispatchPieceCategory = ref([
//按件品类
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '产品品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{ label: '操作', prop: '', type: '', width: '80', disabled: true },
]);
// 按重量
const dispatchWeightCategory = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '产品品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{ label: '操作', prop: '', type: '', width: '80', disabled: true },
]);
// 按方品类
const dispatchCubeCategory = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '产品品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{ label: '操作', prop: '', type: '', width: '80', disabled: true },
]);
const SelectOpin = ref(null); //当前点击的品类搜索框
// 是否向上判断
const Upwardjudgment = ref([]);
@ -403,16 +609,7 @@ const chargetype = val => {
//案件计费
const Storageloading = ref(false);
// 附加费品类
const Additionalcategories = ref([
{
label: '衣柜',
value: '1',
},
{
label: '橱柜',
value: '2',
},
]);
const Additionalcategories = ref([]);
const Timedelive = () => {
Deliveryloading.value = true;
@ -731,7 +928,6 @@ const resetFormData = () => {
// 页面初始化必要请求
const onLoad = async () => {
await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
await updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
await updateDictionary(Billingmethod.value, 'min_cost_way'); //是否区分品类
@ -761,77 +957,76 @@ const onLoad = async () => {
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 {
dataItem.state = false;
}
});
// 按件计费回显
// // 显示那些表格
// 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 {
// dataItem.state = false;
// }
// });
if (request.value.dispatchPieceCategory) {
console.log(Commercialcial.value, 'Commercialcial.value===>');
let piece = Commercialcial.value.find(res => res.id == 1);
console.log(piece, 'piece===>???');
piece.sequence = [];
form.value.dispatchPieceCategoryData = [];
request.value.dispatchPieceCategorys.forEach((res, index) => {
console.log(piece, '按件显示');
piece.sequence.push({
Additionalcategories: [
console.log(form.value, ' form.value.dispatchPieceCategoryData');
form.value.dispatchPieceCategoryData.push({
index: index + 1,
Warehousecategory: res.id,
options: [
{
label: res.name,
value: res.id,
},
],
StateName: 'storage',
Warehousecategory: res.id,
id: index + 1,
plus: true,
reduce: !index ? false : true,
reduce: false,
StateName: 'storage', //仓储标识
loading: false,
});
});
}
// 按重量
if (request.value.dispatchWeightCategory) {
let piece = Commercialcial.value.find(res => res.id == 2);
piece.sequence = [];
form.value.dispatchWeightCategoryData=[]
request.value.dispatchWeightCategorys.forEach((res, index) => {
console.log(piece, '按件显示');
piece.sequence.push({
Additionalcategories: [
form.value.dispatchWeightCategoryData.push({
index: index + 1,
Warehousecategory: res.id,
options: [
{
label: res.name,
value: res.id,
},
],
StateName: 'storage',
Warehousecategory: res.id,
id: index + 1,
plus: true,
reduce: !index ? false : true,
reduce: false,
StateName: 'storage', //仓储标识
loading: false,
});
});
}
// 按方
if (request.value.dispatchCubeCategory) {
let piece = Commercialcial.value.find(res => res.id == 3);
piece.sequence = [];
form.value.dispatchCubeCategoryData=[]
request.value.dispatchCubeCategorys.forEach((res, index) => {
console.log(piece, '按件显示');
piece.sequence.push({
Additionalcategories: [
form.value.dispatchCubeCategoryData.push({
index: index + 1,
Warehousecategory: res.id,
options: [
{
label: res.name,
value: res.id,
},
],
StateName: 'storage',
Warehousecategory: res.id,
id: index + 1,
plus: true,
reduce: !index ? false : true,
reduce: false,
StateName: 'storage', //仓储标识
loading: false,
});
});
}
@ -858,7 +1053,6 @@ const onLoad = async () => {
});
}
}
console.log('执行2');
pageLoading.value = false;
};
onLoad();

24
src/views/warehouse/parcelList/distributionParcelList.vue
Unescape View File

@ -320,17 +320,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'pickupBatch',
label: '提货批次',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'pickupBatch',
// label: '提货批次',
// type: 2,
// values: '',
// width: '140',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'scanTime',
label: '装车时间',
@ -465,7 +465,7 @@ export default {
// },
{
prop: 'reservationCode',
label: '预约单编号',
label: '任务号',
type: 2,
values: '',
width: '140',

Write Preview
Loading…
Cancel
Save