+
@@ -263,12 +263,56 @@ const isChecked = async (val, isChecked = false, msg = false) => {
};
// 点击移除
const removeTag = value => {
- ServiceList.value.find(res => res.value == value).check = false;
- ServiceList.value.find(res => res.value == value).state = false;
- // 激活菜单设置为已经存在的
- if (form.value.ServiceType.length) {
- Tabmenu.value = ServiceList.value.find(res => res.state).label;
- }
+ form.value.ServiceType.push(value);//先加回去
+ console.log(value,'value');
+ ElMessageBox.confirm('关闭当前模板会重置数据！是否关闭？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async () => {
+ let indexToRemove = await form.value.ServiceType.findIndex(item => item == 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:value,
+ templateId: $route.query.id,
+ };
+ $_tempDelpriceTemplate(data).then(res => {
+ console.log(res, '删除成功返回值');
+ if (res.data.code == 200) {
+ ElMessage({
+ type: 'success',
+ message: res.data.msg,
+ });
+ // 激活菜单设置为已经存在的
+ if (form.value.ServiceType.length) {
+ Tabmenu.value = ServiceList.value.find(res => res.state).label;
+ }
+ }
+ });
+ } else {
+
+ ElMessage({
+ type: 'success',
+ message: '操作成功',
+ });
+ }
+ ServiceList.value.find(res => res.value == value).check = false;
+ ServiceList.value.find(res => res.value == value).state = false;
+ })
+
+
+
+
+
+
+
};
// 给子页面传递数据
const provideData = data => {
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index af7f99c0..7b326c80 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -92,6 +92,7 @@
:Surcharge="dispatchPieceCategory"
@focus="handleRowFocus"
@search="search"
+ @change="selectChange"
>
@@ -123,6 +124,7 @@
:Surcharge="dispatchWeightCategory"
@focus="handleRowFocus"
@search="search"
+ @change="selectChange"
>
@@ -153,6 +155,7 @@
:Surcharge="dispatchCubeCategory"
@focus="handleRowFocus"
@search="search"
+ @change="selectChange"
>
@@ -480,7 +483,7 @@ const AdditionalcategoriesList = ref([
id: 1,
plus: true,
reduce: false,
- StateName: 'additional', //附加费标识
+ StateName: 'Commercialcial', //附加费标识
Warehousecategory: '', //选择框值
Additionalcategories: [],
},
@@ -529,7 +532,7 @@ const Timedelive = () => {
let timerId = setTimeout(() => {
Deliveryloading.value = false;
clearTimeout(timerId); // 在回调函数内部清除定时器
- }, 300);
+ }, 200);
};
// 是否面配置楼层
@@ -547,72 +550,80 @@ const MinimumChange = val => {
console.log(val);
if (val) {
form.value.dispatchMinCostMode = 1;
+ form.value.dispatchMinCostType=1
form.value.dispatchIsUpwardJudgment = 0;
} else {
form.value.dispatchMinCostMode = 0;
form.value.dispatchIsUpwardJudgment = 0; //向上判断
+ form.value.dispatchMinCostType=null
}
};
// 根据当前选择的服务类型来选择是否显示框框
-const CommercialcialDisplay = () => {
- ServiceList.value.forEach(res => {
- if (form.value.dispatchPricingType.includes(res.value)) {
- if (res.value == 1) {
- form.value.dispatchPieceCategoryState = true; //按件是否显示
- form.value.dispatchPieceCategoryData = [
- {
- index: 1,
- Warehousecategory: '',
- options: [],
- plus: true,
- reduce: false,
- StateName: 'storage', //仓储标识
- loading: false,
- },
- ];
- } else if (res.value == 2) {
- form.value.dispatchWeightCategoryState = true; //按重量是否显示
- form.value.dispatchWeightCategoryData = [
- {
- index: 1,
- Warehousecategory: '',
- options: [],
- plus: true,
- reduce: false,
- StateName: 'storage', //仓储标识
- loading: false,
- },
- ];
- } else if (res.value == 3) {
- form.value.dispatchCubeCategoryState = true; //按方是否显示
- form.value.dispatchCubeCategoryData = [
- {
- index: 1,
- Warehousecategory: '',
- options: [],
- plus: true,
- reduce: false,
- StateName: 'storage', //仓储标识
- loading: false,
- },
- ];
- }
- res.check = true;
+
+const CommercialcialDisplay = id => {
+ let data = ServiceList.value.find(res => res.value == id);
+ console.log(ServiceList.value, 'ServiceList.value');
+ if (data.value == 1) {
+ form.value.dispatchPieceCategoryState = true; //按件是否显示
+ form.value.dispatchPieceCategoryData = [
+ {
+ index: 1,
+ Warehousecategory: '',
+ options: [],
+ plus: true,
+ reduce: false,
+ StateName: 'storage', //仓储标识
+ loading: false,
+ },
+ ];
+
+ if (data.check) {
+ form.value.dispatchPieceCategoryState = true; //按件是否显示
} else {
- res.check = false;
- if (res.value == 1) {
- form.value.dispatchPieceCategoryState = false; //按件是否显示
- } else if (res.value == 2) {
- form.value.dispatchWeightCategoryState = false; //按重量是否显示
- } else if (res.value == 3) {
- form.value.dispatchCubeCategoryState = false; //按方是否显示
- }
+ form.value.dispatchPieceCategoryState = false; //按件是否显示
}
- });
+ } else if (data.value == 2) {
+ form.value.dispatchWeightCategoryData = [
+ {
+ index: 1,
+ Warehousecategory: '',
+ options: [],
+ plus: true,
+ reduce: false,
+ StateName: 'storage', //仓储标识
+ loading: false,
+ },
+ ];
+ if (data.check) {
+ form.value.dispatchWeightCategoryState = true; //按件是否显示
+ } else {
+ form.value.dispatchWeightCategoryState = false; //按件是否显示
+ }
+ } else if (data.value == 3) {
+ form.value.dispatchCubeCategoryData = [
+ {
+ index: 1,
+ Warehousecategory: '',
+ options: [],
+ plus: true,
+ reduce: false,
+ StateName: 'storage', //仓储标识
+ loading: false,
+ },
+ ];
+
+ if (data.check) {
+ form.value.dispatchCubeCategoryState = true; //按件是否显示
+ } else {
+ form.value.dispatchCubeCategoryState = false; //按件是否显示
+ }
+ }
};
+
// 点击菜单
-const isChecked = value => {
+const isChecked = item => {
+ console.log(item.value, '点击菜单value');
if (!form.value.WarehousebillingmodeTitle) {
ElMessage({
message: '请先选择仓储计费类型',
@@ -620,17 +631,22 @@ const isChecked = value => {
});
form.value.dispatchPricingType = []; //清空选择
- value.check = false; //取消当前勾选
+ item.check = false; //取消当前勾选
return;
}
- CommercialcialDisplay(); // 根据当前选择的服务类型来选择是否显示框框
+ CommercialcialDisplay(item.value); // 根据当前选择的服务类型来选择是否显示框框
Timedelive(); //加载效果
};
// 点击移除
const removeTag = value => {
+ console.log(value, '点击移除value');
Deliveryloading.value = true;
// 根据当前选择的服务类型来选择是否显示框框
- CommercialcialDisplay(); // 根据当前选择的服务类型来选择是否显示框框
+
+ let data = ServiceList.value.find(res => res.value == value);
+ data.check = false;
+ data.state = false;
+ CommercialcialDisplay(value); // 根据当前选择的服务类型来选择是否显示框框
Timedelive(); //加载效果
};
@@ -665,7 +681,7 @@ const storagereduce = id => {
};
// 仓储加
const storageplus = () => {
- addItemAfterId(form.value.dispatchPieceCategoryData, 'Commercialcial');
+ addItemAfterId(form.value.dispatchPieceCategoryData, 'storage');
};
// 按重量减
@@ -674,7 +690,7 @@ const categoriesduceweight = id => {
};
// 按重量加
const categoriesplusweight = () => {
- addItemAfterId(form.value.dispatchWeightCategoryData, 'Commercialcial');
+ addItemAfterId(form.value.dispatchWeightCategoryData, 'storage');
};
// 按方计费减
@@ -683,7 +699,7 @@ const categoriesducesquare = id => {
};
// 按方计费加
const categoriesplussquare = () => {
- addItemAfterId(form.value.dispatchCubeCategoryData, 'Commercialcial');
+ addItemAfterId(form.value.dispatchCubeCategoryData, 'storage');
};
// 附加费减
const categoriesduceSurcharge = id => {
@@ -761,10 +777,16 @@ async function updateDictionary(targetArray, dictionaryType) {
...data,
});
});
- console.log(Commercialcial.value, 'Commercialcial.value===>>>>????');
+
CommercialcialCopy.value = deepClone(Commercialcial.value);
+ // 配送服务类型标题
+
+ console.log(form.value.dispatchServiceType,'服务类型aa');
+
+
+
}
- console.log(form.value, '服务类型');
+
// 是否类型
if (dictionaryType == 'price_yes_no') {
Leftoverparts.value = { ...Distinguishcategories.value }; //是否有遗留件
@@ -800,11 +822,29 @@ const search = val => {
console.log(res, '附加费品类计费');
if (res.data.code == 200) {
if (res.data.data.length) {
+ let concatdata = null;
+ let data = null;
SelectData.value.options = []; //如果有新的参数就清空之前的
+ console.log(SelectData.value.StateName, 'SelectData.value.StateName');
res.data.data.forEach(item => {
+ if (SelectData.value.StateName == 'storage') {
+ //仓储
+ concatdata = form.value.dispatchCubeCategoryData.concat(
+ form.value.dispatchWeightCategoryData,
+ form.value.dispatchPieceCategoryData
+ );
+ data = concatdata.find(res => res.Warehousecategory == item.goodsId);
+ } else if (SelectData.value.StateName == 'Commercialcial') {
+ //附加费
+ data = form.value.dispatchSubjoinCategoryData.find(
+ res => res.Warehousecategory == item.goodsId
+ );
+ console.log(data, '213123');
+ }
SelectData.value.options.push({
label: item.goodsName,
value: item.goodsId,
+ disabled: data ? true : false,
});
});
}
@@ -817,6 +857,49 @@ const search = val => {
}
};
+function updateOptions(allDropdowns) {
+ // 拉平所有的下拉框组到一个单一数组中
+ let dropdowns = [].concat(...allDropdowns);
+
+ // 遍历每个下拉框
+ dropdowns.forEach((dropdown, index, self) => {
+ // 取出当前下拉框选中的值
+ let selectedValue = dropdown.Warehousecategory;
+
+ // 更新其他下拉框的options状态
+ self.forEach(otherDropdown => {
+ if (dropdown !== otherDropdown) { // 确保不是自身
+ otherDropdown.options.forEach(option => {
+ // 如果选项值和当前下拉框选中值相同，则禁用该选项
+ if (option.value === selectedValue) {
+ option.disabled = true;
+ } else {
+ // 如果其他逻辑导致应保持禁用，可以在这里加上，下面的语句是检查是否已在别处被选中
+ let isSelectedSomewhereElse = self.some(d => d !== otherDropdown && d.Warehousecategory === option.value);
+ option.disabled = isSelectedSomewhereElse;
+ }
+ });
+ }
+ });
+ });
+}
+
+
+
+// 构造一个包括所有下拉列表的数组
+
+// 选择框值发生改变
+const selectChange = data => {
+// console.log(data, 'data');
+// console.log(form.value.dispatchCubeCategoryData,'dispatchCubeCategoryData111');
+// console.log(form.value.dispatchWeightCategoryData,'dispatchWeightCategoryData222');
+// console.log(form.value.dispatchPieceCategoryData,'dispatchPieceCategoryData333');
+
+let allDropdowns = [form.value.dispatchCubeCategoryData, form.value.dispatchWeightCategoryData, form.value.dispatchPieceCategoryData];
+// 更新选项
+updateOptions(allDropdowns);
+
+};
const categoriesSearchfocus = item => {
console.log(item, 'item');
SelectOpin.value = item; //获取当前点击的是那个品类输入框
@@ -824,16 +907,17 @@ const categoriesSearchfocus = item => {
// 附加费是否按品类计费
const SurchargeChange = val => {
if (val) {
- AdditionalcategoriesList.value = [
- {
- id: 1,
- plus: true,
- reduce: false,
- StateName: 'additional', //附加费标识
- Warehousecategory: '', //选择框值
- Additionalcategories: [],
- },
- ];
+ form.value.dispatchSubjoinCategoryData = [
+ {
+ index: 1,
+ Warehousecategory: '',
+ options: [],
+ plus: true,
+ reduce: false,
+ StateName: 'Commercialcial',
+ loading: false,
+ },
+ ];
}
};
// 附加品类的搜索
@@ -935,10 +1019,6 @@ const onLoad = async () => {
}
});
- // 配送服务类型标题
- form.value.WarehousebillingmodeTitle = Warehousebillingmode.value.find(
- res => res.value == form.value.dispatchServiceType
- ).label;
StateDelivery.value = true; //显示表格
form.value.dispatchPieceCategoryData = [];
if (request.value.dispatchPieceCategory) {
@@ -1052,7 +1132,7 @@ const onLoad = async () => {
],
plus: true,
reduce: false,
- StateName: 'additional',
+ StateName: 'Commercialcial',
loading: false,
});
});
@@ -1064,16 +1144,18 @@ const onLoad = async () => {
options: [],
plus: true,
reduce: false,
- StateName: 'additional',
+ StateName: 'Commercialcial',
loading: false,
},
];
- console.log(
- form.value.dispatchSubjoinCategoryData,
- ' console.log( form.value.dispatchSubjoinCategoryData);'
- );
+
}
}
+ if (form.value.dispatchServiceType) {
+ form.value.WarehousebillingmodeTitle = Warehousebillingmode.value.find(
+ res => res.value == form.value.dispatchServiceType
+ ).label;
+ }
}
formedit.value = await deepClone(form.value);
pageLoading.value = false;
@@ -1501,6 +1583,7 @@ const handleSubmit = async () => {
display: flex;
align-items: center;
justify-content: center;
+ cursor: pointer;
}
}
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 81332ab1..f2181e79 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -78,6 +78,7 @@
:Surcharge="Storagecategory"
@focus="handleRowFocus"
@search="search"
+ @change="selectChange"
>
@@ -193,6 +194,7 @@
:Surcharge="Additionalcategories"
@focus="handleRowFocus"
@search="search"
+ @change="wxselectChange"
>
@@ -238,6 +240,7 @@ import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
import { deepClone } from '@/utils/util';
import { useRoute } from 'vue-router';
import SurchargeTable from '@/components/pric/tablePric.vue';
+import { disable } from '@/api/basicdata/basicdataGoodsShelfView';
const pageLoading = ref(true); //页面加载
const ruleFormRef = ref();
const SelectData = ref({});
@@ -317,10 +320,25 @@ const search = val => {
if (res.data.code == 200) {
if (res.data.data.length) {
SelectData.value.options = []; //如果有新的参数就清空之前的
+ console.log(SelectData.value, 'SelectData.value');
res.data.data.forEach(item => {
+ let data = null;
+
+ if (SelectData.value.StateName == 'storage') {
+ // 附加费品类
+ data = form.value.StoragecategoryData.find(
+ res => res.warehousePieceCategory == item.goodsId
+ );
+ } else if (SelectData.value.StateName == 'additional') {
+ // 仓储品类配置
+ data = form.value.AdditionalcategoriesData.find(
+ res => res.warehousePieceCategory == item.goodsId
+ );
+ }
SelectData.value.options.push({
label: item.goodsName,
value: item.goodsId,
+ disabled: data ? true : false,
});
});
}
@@ -332,7 +350,51 @@ const search = val => {
});
}
};
+function updateOptions(allDropdowns) {
+ // 拉平所有的下拉框组到一个单一数组中
+ let dropdowns = [].concat(...allDropdowns);
+
+ // 遍历每个下拉框
+ dropdowns.forEach((dropdown, index, self) => {
+ // 取出当前下拉框选中的值
+ let selectedValue = dropdown.Warehousecategory;
+
+ // 更新其他下拉框的options状态
+ self.forEach(otherDropdown => {
+ if (dropdown !== otherDropdown) { // 确保不是自身
+ otherDropdown.options.forEach(option => {
+ // 如果选项值和当前下拉框选中值相同，则禁用该选项
+ if (option.value === selectedValue) {
+ option.disabled = true;
+ } else {
+ // 如果其他逻辑导致应保持禁用，可以在这里加上，下面的语句是检查是否已在别处被选中
+ let isSelectedSomewhereElse = self.some(d => d !== otherDropdown && d.Warehousecategory === option.value);
+ option.disabled = isSelectedSomewhereElse;
+ }
+ });
+ }
+ });
+ });
+}
+
+
+// 选择框值发生改变
+const selectChange = data => {
+// console.log(data, 'data');
+// console.log(form.value.dispatchCubeCategoryData,'dispatchCubeCategoryData111');
+// console.log(form.value.dispatchWeightCategoryData,'dispatchWeightCategoryData222');
+// console.log(form.value.dispatchPieceCategoryData,'dispatchPieceCategoryData333');
+let allDropdowns = [form.value.StoragecategoryData];
+// 更新选项
+updateOptions(allDropdowns);
+
+};
+const wxselectChange=()=>{
+let allDropdowns = [form.value.AdditionalcategoriesData];
+// 更新选项
+updateOptions(allDropdowns);
+}
const formCopy = ref({}); //拷贝对象
const SelectOpin = ref(null); //当前点击的品类搜索框
const $route = useRoute(); //获取地址栏参数
@@ -845,6 +907,7 @@ const AdditionalDisplayChange = val => {
font-size: 14px;
display: flex;
align-items: center;
+ cursor: pointer;
.el-icon {
font-size: 14px;
}