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

预约修复

dev-xx
马远东 8 months ago
parent
c912b7f6e4
commit
7efb8071c0
4 changed files with 400 additions and 17 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. 53
      src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
  2. 287
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  3. 38
      src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
  4. 39
      src/views/distribution/reservation/reservationAddFrom.vue

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

@ -69,6 +69,29 @@
</div>
</el-row>
</div>
<el-dialog v-model="dialogedit" title="编辑" width="40%">
<el-form :model="form" class="elform">
<el-form-item label="成本结算品类">
<el-input v-model.trim="form.name" placeholder="暂无成本结算品类" disabled />
</el-form-item>
<el-form-item label="计价单位">
<el-select v-model="form.value" placeholder="请选择计价单位" style="width: 240px">
<el-option
v-for="item in Pricingunit"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogedit = false">取消</el-button>
<el-button type="primary" @click="dialogVisible = false"> 确定 </el-button>
</div>
</template>
</el-dialog>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
@ -93,6 +116,26 @@ import dayjs from 'dayjs';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
const dialogedit = ref(false); //编辑弹窗
const form = ref({});
const Pricingunit=ref([
{
value: '1',
label: '按件',
},
{
value: '2',
label: '按方',
},
{
value: '3',
label: '按重量',
},
{
value: '4',
label: '按吨',
},
])
const details = reactive({
/** 是否开启搜索 */
search: false,
@ -265,6 +308,7 @@ const onLoad = () => {};
// 编辑
const handleEdit = row => {
console.log(row);
dialogedit.value = true;
};
</script>
@ -293,4 +337,13 @@ const handleEdit = row => {
display: flex;
flex-direction: column;
}
.elform {
display: flex;
flex-wrap: wrap;
:deep(.el-form-item) {
width: 29%;
display: flex;
flex-direction: column;
}
}
</style>

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

@ -27,7 +27,7 @@
<span class="el_btn_a" @click="newlyadded(slotProps)">
<el-icon style="color: #409eff"><CirclePlus /></el-icon>新增
</span>
<span class="el_btn_a">
<span class="el_btn_a" @click="EditRules">
<el-icon style="color: #409eff"><Edit /></el-icon>编辑
</span>
<span @click="categoriesduceSurcharge(slotProps.scope.row.index)" class="el_btn_a">
@ -151,6 +151,111 @@
</div>
</template>
</el-dialog>
<!-- 配置计价规则 -->
<el-dialog v-model="form.dialogPricingrules" title="编辑" width="70%">
<div class="el_content">
<div class="el_category">
<span class="title"> 品类按件计费 </span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
</template>
</SurchargeTable>
</div>
<div class="el_category">
<span class="title">品类按方计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
</template>
</SurchargeTable>
</div>
<div class="el_category">
<span class="title">品类按方计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
</template>
</SurchargeTable>
</div>
<div class="el_category">
<span class="title">品类按方计费</span>
<SurchargeTable
:SurchargeData="form.Categorybyitembilling"
:Surcharge="Categorybyitembilling"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
</template>
</SurchargeTable>
</div>
</div>
<div class="asurcharge">
<div class="el_asurcharge">
<span class="title">是否附加费</span>
<el-radio-group v-model="radio1" class="ml-4">
<el-radio value="0" size="large">否</el-radio>
<el-radio value="1" size="large">是</el-radio>
</el-radio-group>
</div>
<!-- 附加费表格 -->
<div class="el_category asurcharge_box">
<span class="title">品类按方计费</span>
<SurchargeTable
:SurchargeData="form.asurcharge"
:Surcharge="asurcharge"
@focus="handleRowFocus"
@search="search"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
</template>
</SurchargeTable>
</div>
</div>
<div class="el_Kilometers">
<div class="el_Kilometers_box">
<span class="title">公里数单价</span>
<el-input-number v-model="form.num" :min="1" :max="10" />
</div>
<div class="el_Kilometers_box">
<span class="title">公里数单价</span>
<el-input-number v-model="form.num" :min="1" :max="10" />
</div>
<div class="el_Kilometers_box">
<span class="title">公里数单价</span>
<el-input-number v-model="form.num" :min="1" :max="10" />
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="form.dialogVisible = false">取消</el-button>
<el-button type="primary" @click="Pricingrules = false"> 确定 </el-button>
</div>
</template>
</el-dialog>
</template>
<script setup>
import { ref } from 'vue';
@ -159,16 +264,107 @@ const activeName = ref('Commercialdistribution');
// 配置计价规则
const formLoad = ref({});
const form = ref({
dialogPricingrules: false, //配置车型规则
dialogConfigure: false,
dispatchSubjoinCategoryData: [
{
index: 0,
index: 1,
Warehousecategory: '',
options: [],
loading: false,
},
],
// 车型配置
// 品类按件计费
Categorybyitembilling: [
{
index: 1,
Costsettlementcategory: '', //成本结算品类
UnitPrice: '', //单价(元/件)
Setunitprice: '', //套单价(元/套)
options: [],
loading: false,
},
],
asurcharge: [
{
index: 1,
Costsettlementcategory: '', //成本结算品类
UnitPrice: '', //单价(元/件)
a: '', //套单价(元/套)
b: '',
c: '',
options: [],
loading: false,
},
],
});
// 品类按件计费
const Categorybyitembilling = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '成本结算品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '单价(元/件)',
prop: 'UnitPrice',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '套单价(元/套)',
prop: 'Setunitprice',
type: 'number',
width: 'auto',
disabled: true,
},
]);
// 附加费
const asurcharge = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
label: '成本结算品类',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
disabled: true,
},
{
label: '上楼费(元/层/件)',
prop: 'UnitPrice',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '分货费(元/层/件)',
prop: 'a',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '平移费(元/件)',
prop: 'b',
type: 'number',
width: 'auto',
disabled: true,
},
{
label: '卸费(元/件)',
prop: 'c',
type: 'number',
width: 'auto',
disabled: true,
},
]);
// 车型配置
const dispatchSubjoinCategory = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
@ -204,6 +400,9 @@ const categoriesduceSurcharge = row => {
'form.value.dispatchSubjoinCategoryData after deletion and reordering'
);
};
const EditRules = () => {
form.value.dialogPricingrules = true; //开启车型配置规则弹窗
};
const newlyadded = row => {
console.log(row, 'row');
let data = {
@ -214,6 +413,8 @@ const newlyadded = row => {
};
form.value.dispatchSubjoinCategoryData.push(data);
};
// 编辑车型规则
const Pricingrules = () => {};
</script>
<style scoped lang="scss">
@ -262,4 +463,86 @@ const newlyadded = row => {
}
}
}
.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 {
margin-top: 23px;
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;
}
}
}
</style>

38
src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
Unescape View File

@ -78,7 +78,33 @@
</div>
</el-row>
</div>
<el-dialog v-model="dialogedit" title="编辑" width="40%">
<el-form :model="form" class="elform">
<el-form-item label="品牌">
<el-input v-model.trim="form.name" placeholder="暂无品牌" disabled/>
</el-form-item>
<el-form-item label="一级品">
<el-input v-model.trim="form.name" placeholder="暂无一级品" disabled/>
</el-form-item>
<el-form-item label="二级品">
<el-input v-model.trim="form.name" placeholder="暂无二级品" disabled/>
</el-form-item>
<el-form-item label="三级片">
<el-input v-model.trim="form.name" placeholder="暂无三级片" disabled/>
</el-form-item>
<el-form-item label="成本结算品类">
<el-input v-model.trim="form.name" placeholder="请输入成本结算品类" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogedit = false">取消</el-button>
<el-button type="primary" @click="dialogVisible = false"> 确定 </el-button>
</div>
</template>
</el-dialog>
</basic-container>
<!-- 列表配置显示 -->
<edittablehead
@setcolum="setnewcolum"
@ -102,6 +128,8 @@ import dayjs from 'dayjs';
const $router = useRouter(); //跳转
const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
const dialogedit = ref(false); //编辑弹窗
const form=ref({})
const details = reactive({
/** 是否开启搜索 */
search: false,
@ -273,6 +301,7 @@ const onLoad = () => {};
// 编辑
const handleEdit = row => {
dialogedit.value = true;
console.log(row);
};
</script>
@ -302,4 +331,13 @@ const handleEdit = row => {
display: flex;
flex-direction: column;
}
.elform{
display: flex;
flex-wrap: wrap;
:deep(.el-form-item ){
width: 29%;
display: flex;
flex-direction: column;
}
}
</style>

39
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -2648,27 +2648,32 @@ export default {
this.form.stockArticleList
);
if (this.form.inventoryList.length === 0 && this.form.stockArticleList.length === 0) {
this.$message({
type: 'warning',
message: '无效的预约计划!',
});
operation = false;
return;
}
if (!operation) return;
// if (this.form.inventoryList.length === 0 && this.form.stockArticleList.length === 0) {
// this.$message({
// type: 'warning',
// message: '无效的预约计划!',
// });
// operation = false;
// return;
// }
// if (!operation) return;
// this.form.stockArticleList = this.packageList;
console.log('>>>>>>>>', this.form);
if (this.reservationId) {
console.log(this.reservationId,'this.reservationId');
// 判断是否都没有选择包件
console.log(this.form.stockArticleList,'this.form.stockArticleList');
const checkInfoValues = this.form.stockArticleList.every(
item => !item.reservationNum
);
if (checkInfoValues) {
console.log(this.renderInventoryData,'renderInventoryData');
console.log(this.renderOrderData,'renderOrderData');
console.log(checkInfoValues,'checkInfoValues');
if (!this.renderInventoryData.length && !this.renderOrderData.length) {
await ElMessageBox.prompt(
'当前所有订单都没有选择包件是否确认"取消本次计划"?',
'当前计划为空是否"取消本次计划"?',
'请填写取消原因',
{
confirmButtonText: '确认',
@ -2746,6 +2751,10 @@ export default {
});
this.back();
} else {
if (!this.renderInventoryData.length && !this.renderOrderData.length) {
this.$message.warning('无效计划');
return
}
// 开启提交按钮loading
this.loadingObj.submitBtnLoading = true;
this.reservationloading = true; //开启全屏加载
@ -2845,10 +2854,10 @@ export default {
console.log('>>>>>>>>>>>>>>>row', row);
},
removeStockList(row) {
if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
this.$message.warning('如需移除请取消该预约计划!!');
return;
}
// if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
// this.$message.warning('如需移除请取消该预约计划!!');
// return;
// }
this.inventoryData.forEach((item, index) => {
if (item.id === row.id) {
this.inventoryData.splice(index, 1);

Write Preview
Loading…
Cancel
Save