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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 11 months ago
parent
d00331104d 7c21a82d3e
commit
ac5b499b86
11 changed files with 2317 additions and 1839 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. 6
      src/components/pric/tablePric.vue
  2. 1228
      src/views/Pricesystem/Price/PriceDelivery.vue
  3. 448
      src/views/Pricesystem/Price/PriceWarehousing.vue
  4. 15
      src/views/Pricesystem/PricesyHome.vue
  5. 11
      src/views/distribution/checkInventoryTask/createTask.vue
  6. 4
      src/views/distribution/reservation/reservation.vue
  7. 4
      src/views/distribution/stockup/distributionStockupMarket.vue
  8. 165
      src/views/financialsector/FinanceHome.vue
  9. 1192
      src/views/financialsector/Financialse/FinancialDelivery.vue
  10. 1059
      src/views/financialsector/Financialse/FinancialWarehousing.vue
  11. 24
      src/views/warehouse/parcelList/distributionParcelList.vue

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

@ -15,6 +15,7 @@
:min="0"
:max="999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
@ -31,6 +32,7 @@
:loading=scope.row.loading
loading-text='正在查询中...'
@focus="categoriesSearchfocus(column, scope.row)"
:disabled=column.show
>
<el-option
v-for="item in scope.row.options"
@ -79,3 +81,7 @@ const props = defineProps({
},
});
</script>
<style scoped lang='scss'>
</style>

1228
src/views/Pricesystem/Price/PriceDelivery.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -1,179 +1,141 @@
<template>
<el-form label-position="top" label-width="400" :model="form" class="el_form">
<div class="content">
<div class="el_row_1">
<div class="el_flex_row">
<el-form-item label="计算类型">
<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-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-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" v-if="Surchargecd">
<div class="el_sever_title">
<span> 附加费用</span>
</div>
<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"
<div v-loading="loading" element-loading-text="正在加载中...">
<el-form label-position="top" label-width="400" :model="form" class="el_form">
<div class="content">
<div class="el_row_1">
<div class="el_flex_row">
<el-form-item label="计算类型">
<el-select
class="el_Cselect"
v-model="form.warehousePricingType"
filterable
clearable
disabled
placeholder="选择计费类型"
style="width: 100%"
>
<el-input-number
v-model="form.operatePrice"
:precision="2"
:min="0"
:max="10"
:controls="false"
placeholder="请输入价格"
<el-option
v-for="item in Storagebillingtype"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-form-item>
<el-form-item
label="仓储管理费"
style="margin-top: 10px"
v-if="request.warehouseIsManageFee"
</el-select>
</el-form-item>
<el-form-item label="计算模式">
<el-select
class="el_Cselect"
v-model="form.warehousePricingMode"
filterable
clearable
disabled
placeholder="选择仓储计费模式"
style="width: 100%"
>
<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-option
v-for="item in Warehousebillingmode"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-form-item>
</div>
</el-select>
</el-form-item>
</div>
<div class="el_flex_row">
<el-form-item label="计算基准">
<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>
<!-- 品类计费单价 -->
<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>
</div>
<!-- 下半部分布局 -->
<div class="el_flex">
<!-- 按件计费 -->
<!-- <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" />
</el-form-item>
<el-form-item label="按件计费品类单价">
<SurchargeTable
:SurchargeData="form.piecebillingData"
:Surcharge="form.piecebillingPL"
/>
</el-form-item>
</div> -->
<!-- <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" />
</el-form-item>
<el-form-item label="按件计费品类单价">
<SurchargeTable
:SurchargeData="form.piecebillingData"
:Surcharge="form.piecebillingPL"
/>
</el-form-item>
</div> -->
<!-- 下半部分布局 -->
<div class="el_flex">
<div class="el_row">
<span class="Subtitle">{{ tabform.title }}</span>
<el-form-item :label="tabform.table">
<SurchargeTable :SurchargeData="form.publicData" :Surcharge="form.publicTable" />
</el-form-item>
</div>
</div>
<!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 3">
<span class="Subtitle">按重量计费(kg)</span>
<el-form-item label="统一计费单价" class="el_lable_title">
<SurchargeTable
:SurchargeData="form.BillingbyweightPLData"
:Surcharge="form.Billingbyweight"
/>
</el-form-item>
<div class="el_row_2" v-if="Surchargecd">
<div class="el_sever_title">
<span> 附加费用</span>
</div>
<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="9999999"
:controls="false"
:value-on-clear="0"
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="9999999"
:controls="false"
:value-on-clear="0"
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="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
</div>
</div>
</div>
</div>
<el-form-item label="按重量(KG)计费品类单价">
<SurchargeTable
:SurchargeData="form.piecebillingData"
:Surcharge="form.BillingbyweightPL"
/>
</el-form-item>
</div> -->
<div class="el_row">
<span class="Subtitle">{{ tabform.title }}</span>
<el-form-item :label="tabform.table" class="el_lable_title">
<SurchargeTable :SurchargeData="form.publicData" :Surcharge="form.publicTable" />
<!-- 品类计费单价 -->
<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>
</div>
</div>
</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>
</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>
</template>
@ -182,7 +144,7 @@ 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 { ElMessage, ElMessageBox } from 'element-plus';
import { putBasicdataPrice } from '@/api/Pricesystem/index';
import { useRoute } from 'vue-router';
const $route = useRoute(); //获取地址栏参数
@ -205,8 +167,8 @@ const Warehousebillingmode = ref([]);
const CalculationBasis = ref([]);
const request = ref({});
const Surchargepricingunit = ref([]);
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType)
async function updateDictionary(targetArray, dictionaryType) {
await getDictionaryBiz(dictionaryType)
.then(res => {
console.log(res, '字典');
if (res.data.code == 200) {
@ -224,7 +186,8 @@ function updateDictionary(targetArray, dictionaryType) {
.catch(() => {})
.finally(() => {});
}
const loading = ref(true);
const formCopy = ref({}); //拷贝数据
const form = ref({
operatePrice: 0, //操作/装卸费
warehouseManagementPrice: 0, //仓储管理费
@ -232,26 +195,33 @@ const form = ref({
// 附加费
Surcharge: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
{
label: '产品品类',
prop: 'categoryId',
type: 'select',
width: '150',
disabled: true,
show: true,
},
{
label: '仓储操作/装卸费',
prop: 'operatePrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
{
label: '仓储管理费',
prop: 'warehouseManagementPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
{
label: '仓储分货费',
prop: 'warehouseSortPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
],
@ -259,33 +229,40 @@ const form = ref({
// 按吨计费
publicTable: [
{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
{ label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
{
label: '产品品类',
prop: 'categoryId',
type: 'select',
width: '150',
disabled: true,
show: true,
},
{
label: '30天内',
prop: 'withinThirtyPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
{
label: '30天-60天',
prop: 'betweenThirtySixtyPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
{
label: '60天外',
prop: 'beyondSixtyPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
{
label: '上限',
prop: 'maximumPrice',
type: 'number',
width: '180',
width: 'auto',
disabled: true,
},
],
@ -293,14 +270,14 @@ const form = ref({
publicData: [],
});
const onLoad = async () => {
updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
await Promise.all([
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; //计算基准
@ -328,13 +305,13 @@ const onLoad = async () => {
});
});
}
}else{
} 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
let data = requestInfo.value.additionalCategory[0];
console.log(data, 'data数据');
form.value.operatePrice = data.operatePrice || 0;
form.value.warehouseManagementPrice = data.warehouseManagementPrice || 0;
form.value.warehouseSortPrice = data.warehouseSortPrice || 0;
}
form.value.publicData = []; //清空数据
// 仓储回显
@ -416,6 +393,46 @@ const onLoad = async () => {
handleFormUpdate(isByCategory, '(元/t)', '按吨计费(t)');
break;
}
// 附加费是否有操作装/装卸费
if (!request.value.warehouseIsOperateFee) {
form.value.Surcharge.find(res => res.prop === 'operatePrice').disabled = false;
} else {
form.value.Surcharge.find(res => res.prop === 'operatePrice').disabled = true;
}
// 附加费是否有仓储管理费
if (!request.value.warehouseIsManageFee) {
form.value.Surcharge.find(res => res.prop === 'warehouseManagementPrice').disabled = false;
} else {
form.value.Surcharge.find(res => res.prop === 'warehouseManagementPrice').disabled = true;
}
// 附加费是否有仓储分货费
if (!request.value.warehouseIsSortFee) {
form.value.Surcharge.find(res => res.prop === 'warehouseSortPrice').disabled = false;
} else {
form.value.Surcharge.find(res => res.prop === 'warehouseSortPrice').disabled = true;
}
// {
// label: '仓储操作/装卸费',
// prop: 'operatePrice',
// type: 'number',
// width: 'auto',
// disabled: true,
// },
// {
// label: '仓储管理费',
// prop: 'warehouseManagementPrice',
// type: 'number',
// width: 'auto',
// disabled: true,
// },
// {
// label: '仓储分货费',
// prop: 'warehouseSortPrice',
// type: 'number',
// width: 'auto',
// disabled: true,
// },
// if(request.value.warehouseSubjoinFeeUnit==4){
// form.value.publicTable.forEach(res=>{
@ -467,45 +484,46 @@ const onLoad = async () => {
// }
// }
}
console.log(request.value, '初始化页面');
};
const price = async () => {
// 价格处理
if (Object.keys(requestInfo.value).length > 0) {
if (requestInfo.value.catergory && 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;
data.betweenThirtySixtyPrice = res.betweenThirtySixtyPrice || 0;
data.beyondSixtyPrice = res.beyondSixtyPrice || 0;
data.maximumPrice = res.maximumPrice || 0;
data.withinThirtyPrice = res.withinThirtyPrice || 0;
}
});
}
// 附加费（还差状态）
// 附加费
if (requestInfo.value.additionalCategory && 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;//仓储分货费
data.operatePrice = res.operatePrice || 0; //操作/装卸费
data.managementFee = res.managementFee || 0;
data.warehouseManagementPrice = res.warehouseManagementPrice || 0; // 仓储管理费
data.warehouseSortPrice = res.warehouseSortPrice || 0; //仓储分货费
}
});
}
}
}
let setTime = setTimeout(async () => {
formCopy.value = await deepClone(form.value);
loading.value = false;
clearTimeout(setTime);
}, 500);
console.log(request.value, '初始化页面');
};
// 页面初始化
const pageonload = async () => {
request.value = await deepClone(props.templateData.request);
requestInfo.value = await deepClone(props.templateData.requestInfo.warehouse);
onLoad(); //页面渲染
price(); //处理价格
};
pageonload();
const Surchargecd = computed(() => {
@ -526,7 +544,24 @@ const Surchargecd = computed(() => {
return true;
}
});
// 重置表单
const resetFormData = () => {
ElMessageBox.confirm('是否重置数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
loading.value = true;
form.value = deepClone(formCopy.value);
setTimeout(() => {
loading.value = false;
ElMessage({
message: '重置成功',
type: 'success',
});
}, 300);
});
};
// 保存数据
const handleSubmit = () => {
let data = {
@ -584,7 +619,6 @@ const handleSubmit = () => {
// 数据处理
if (!request.value.warehouseIsCategorySubjoin) {
// 不存在填写统一单价
// data.warehouse['additionalCategory'].push({
// operatePrice: form.value.operatePrice, //操作/装卸费
@ -593,7 +627,7 @@ const handleSubmit = () => {
// name: 'fj',
// });
let mox = data.warehouse['additionalCategory'].find(res => res.name == 'fj');
delete mox.name
delete mox.name;
if (!request.value.warehouseIsManageFee) {
//删除管理费
delete mox.warehouseManagementPrice;

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

@ -18,10 +18,10 @@
:templateData="templateInfo"
/></span>
<span v-if="item.label == '仓储'"
><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
><FinancialWarehousing ref="financialWarehousing" @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '配送'"
><FinancialDelivery @request-data="provideData" :templateData="templateInfo"
><FinancialDelivery ref="financialDelivery" @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '安装'">安装</span>
</el-tab-pane>
@ -70,6 +70,9 @@ const financialBill = ref();
const financialTrunkLine = ref();
const financialDelivery=ref()
const financialWarehousing=ref()
// 字典公共函数
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType)
@ -170,8 +173,12 @@ const onLoad = async () => {
await nextTick();
setTimeout(() => {
console.log('financialBill :>> ', financialBill);
financialBill.value[0].initDictionaryBiz();
financialTrunkLine.value[0].initDictionaryBiz();
if( financialBill.value && financialBill.value.length){
financialBill.value[0].initDictionaryBiz();
}
if(financialTrunkLine.value && financialTrunkLine.value.length){
financialTrunkLine.value[0].initDictionaryBiz();
}
}, 1000);
});
} catch (error) {

11
src/views/distribution/checkInventoryTask/createTask.vue
Unescape View File

@ -1125,6 +1125,17 @@ const InventoryDetails = ref([
search: false,
head: true,
},
{
prop: 'newTrayName',
label: '移动托盘名称',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
search: false,
head: true,
},
{
prop: 'isChange',
label: '是否数量变更',

4
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -280,7 +280,7 @@
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="备货区域:">
<!-- <el-form-item label="备货区域:">
<el-select v-model="info.stockupArea" clearable placeholder="请选择备货区编号">
<el-option
v-for="item in goodsAreaIdData"
@ -290,7 +290,7 @@
>
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<span class="dialog-footer">

4
src/views/distribution/stockup/distributionStockupMarket.vue
Unescape View File

@ -149,7 +149,7 @@
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="备货区域" :label-width="formLabelWidth">
<!-- <el-form-item label="备货区域" :label-width="formLabelWidth">
<el-select
v-model="form.goodsAreaId"
clearable
@ -164,7 +164,7 @@
>
</el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item
label="出库时间"
prop="outboundDate"

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

@ -42,12 +42,13 @@
:loading="ServiceTypeLoading"
>
<el-option
style="padding: 0"
v-for="item in ServiceList"
:key="item.value"
:label="item.label"
:value="item.value"
>
<el-checkbox v-model="item.check" @change="() => isChecked(item, true,true)">
<el-checkbox v-model="item.check" @change="() => isChecked(item, true, true)">
{{ item.label }}
</el-checkbox>
</el-option>
@ -83,8 +84,12 @@
<script setup>
import { ref, defineAsyncComponent, getCurrentInstance } from 'vue';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { $_basicdataBrande, $_InfopriceTemplate ,$_tempDelpriceTemplate} from '@/api/financialsector/index'; //价格模板
import { ElMessage,ElMessageBox } from 'element-plus';
import {
$_basicdataBrande,
$_InfopriceTemplate,
$_tempDelpriceTemplate,
} from '@/api/financialsector/index'; //价格模板
import { ElMessage, ElMessageBox } from 'element-plus';
const $route = useRoute(); //获取地址栏参数
const pageLoading = ref(true); //页面加载效果
@ -143,7 +148,7 @@ function updateDictionary(targetArray, dictionaryType) {
async function executeCheckedResults(results) {
for (const res of results) {
await new Promise(resolve => setTimeout(resolve, 500));
await isChecked(res,false,false);
await isChecked(res, false, false);
await provideData();
}
pageLoading.value = false;
@ -187,83 +192,74 @@ const onLoad = async () => {
};
onLoad();
// 点击菜单
const isChecked = (val, isChecked = false,msg=false) => {
console.log(msg,'当前msg');
const isChecked = (val, isChecked = false, msg = false) => {
console.log(msg, '当前msg');
console.log(val, 'val');
if(msg){
if (msg) {
val.state = !val.state;
Tabmenu.value = val.label;
if(!val.check){
form.value.ServiceType.push(val.value)
console.log( form.value.ServiceType,' form.value.ServiceType');
val.check = true;
val.state = true;
ElMessageBox.confirm(
'关闭当前模板会重置数据！是否关闭？',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
val.check = false;
val.state = false;
let indexToRemove = form.value.ServiceType.findIndex(item => item ==val.value);
if (indexToRemove !== -1) {
form.value.ServiceType.splice(indexToRemove, 1);
}
if (form.value.ServiceType.length) {
Tabmenu.value = ServiceList.value.find(res => res.state).label;
}
if($route.query.id || templateInfo.value.code){
let data={
checkType:val.value,
templateId:$route.query.id,
}
$_tempDelpriceTemplate(data).then(res=>{
console.log(res,'删除成功返回值');
if(res.data.code ==200){
ElMessage({
type: 'success',
message: res.data.msg,
})
}
})
}else{
ElMessage({
type: 'success',
message: '操作成功',
})
}
})
.catch(() => {
val.state = true;
if (!val.check) {
form.value.ServiceType.push(val.value);
console.log(form.value.ServiceType, ' form.value.ServiceType');
val.check = true;
})
}
}else{
console.log(val, 'val');
//菜单隐藏/显示
val.state = !val.state;
if ($route.query.id && !isChecked) {
val.check = !val.check;
}
// 激活菜单设置为已经存在的
//设置激活菜单
Tabmenu.value = val.label;
// 如果当前菜单被关闭则显示最新菜单
if (!val.state && form.value.ServiceType.length) {
Tabmenu.value = ServiceList.value.find(res => res.state).label;
val.state = true;
ElMessageBox.confirm('关闭当前模板会重置数据！是否关闭？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
val.check = false;
val.state = false;
let indexToRemove = form.value.ServiceType.findIndex(item => item == val.value);
if (indexToRemove !== -1) {
form.value.ServiceType.splice(indexToRemove, 1);
}
if (form.value.ServiceType.length) {
Tabmenu.value = ServiceList.value.find(res => res.state).label;
}
if ($route.query.id || templateInfo.value.code) {
let data = {
checkType: val.value,
templateId: $route.query.id,
};
$_tempDelpriceTemplate(data).then(res => {
console.log(res, '删除成功返回值');
if (res.data.code == 200) {
ElMessage({
type: 'success',
message: res.data.msg,
});
}
});
} else {
ElMessage({
type: 'success',
message: '操作成功',
});
}
})
.catch(() => {
val.state = true;
val.check = true;
});
}
} else {
console.log(val, 'val');
//菜单隐藏/显示
val.state = !val.state;
if ($route.query.id && !isChecked) {
val.check = !val.check;
}
// 激活菜单设置为已经存在的
//设置激活菜单
Tabmenu.value = val.label;
// 如果当前菜单被关闭则显示最新菜单
if (!val.state && form.value.ServiceType.length) {
Tabmenu.value = ServiceList.value.find(res => res.state).label;
}
}
};
};
// 点击移除
const removeTag = value => {
ServiceList.value.find(res => res.value == value).check = false;
@ -272,7 +268,7 @@ const removeTag = value => {
if (form.value.ServiceType.length) {
Tabmenu.value = ServiceList.value.find(res => res.state).label;
}
}
};
// 给子页面传递数据
const provideData = data => {
console.log(data, '来自子页面的数据');
@ -328,6 +324,7 @@ const handleChange = () => {
.name {
font-size: 16px;
}
}
}
@ -338,10 +335,11 @@ const handleChange = () => {
.el-checkbox__label {
margin-left: 20px;
}
.el-select-dropdown__item {
padding: 0 !important;
}
}
.el-select-dropdown__item {
padding: 0;
}
.el-select-dropdown__item::after {
content: '';
display: none;
@ -350,13 +348,4 @@ const handleChange = () => {
margin-top: 6px;
height: 100%;
}
:deep(.el-scrollbar__view){
padding: 0 10px !important;
}
.el-scrollbar__view{
.el-select-dropdown__item {
padding:0 10px !important;
}
}
</style>

1192
src/views/financialsector/Financialse/FinancialDelivery.vue
View File

File diff suppressed because it is too large Load Diff

1059
src/views/financialsector/Financialse/FinancialWarehousing.vue
View File

File diff suppressed because it is too large Load Diff

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