服务类型
@@ -55,6 +77,7 @@
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index f7f08fd5..3346feea 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -5,7 +5,7 @@
仓储计费类型
仓储计费模式
计算基准
-
+
{{
item.label
}}
@@ -52,7 +52,11 @@
是否区分品类
-
+
{{
item.label
}}
@@ -60,7 +64,7 @@
-
+
仓储品类配置
@@ -78,12 +82,18 @@
{{ item.id }}
+
附加费计价单位
是否有管理费
-
+
{{
item.label
}}
@@ -145,7 +155,7 @@
是否有操作/装卸费
-
+
{{
item.label
}}
@@ -155,7 +165,7 @@
是否有分拣费用
-
+
{{
item.label
}}
@@ -164,26 +174,21 @@
- 附加费用是否统一计费
- 附加费是否按品类计费
+
+
-
-
+ {{
+ item.label
+ }}
+
-
+
附加费品类配置
@@ -201,11 +206,16 @@
{{ item.id }}
import { ref } from 'vue';
-import { defineProps , defineEmits} from 'vue';
+import { defineProps, defineEmits } from 'vue';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import {$_priceTemplate} from '@/api/financialsector/index'; //价格模板
+import { $_priceTemplate, $_basicdataBrande } from '@/api/financialsector/index'; //价格模板
import { defineComponent } from 'vue';
+import { ElMessage } from 'element-plus';
+import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
+const SelectOpin = ref(null); //当前点击的品类搜索框
+// 获取点击的品类(附加品类配置)
+const categoriesDisplay = ref(false); //是否区分品类（显示/隐藏）
+const SurchargeDisplay = ref(false); //附加费是否按品类计费(显示/隐藏)
+const categoriesSearchfocus = item => {
+ console.log(item, 'item');
+ SelectOpin.value = item; //获取当前点击的是那个品类输入框
+};
+// 附加品类的搜索
+const categoriesearch = goodsName => {
+ console.log(goodsName, '当前搜索参数');
+ if (!goodsName) {
+ return;
+ }
+ let data = {
+ goodsName: goodsName,
+ };
+ let selectionList = null;
+ // StateName:'storage',//仓储标识
+ // StateName:'additional',//附加费标识
+ if (SelectOpin.value.StateName == 'storage') {
+ selectionList = StoragecategoryList.value.find(res => res.id == SelectOpin.value.id); //当前是那个选择框
+ } else {
+ selectionList = AdditionalcategoriesList.value.find(res => res.id == SelectOpin.value.id); //当前是那个选择框
+ }
+ console.log(selectionList, 'selectionList');
+ postFindCategoryInfo(data).then(res => {
+ console.log(res, '附加费品类计费');
+ if (res.data.code == 200) {
+ if (res.data.data.length) {
+ selectionList.Additionalcategories = []; //如果有新的参数就清空之前的
+ res.data.data.forEach(item => {
+ selectionList.Additionalcategories.push({
+ label: item.goodsName,
+ value: item.goodsId,
+ });
+ });
+ }
+ }
+ });
+};
+
const emit = defineEmits(['request-data']);
defineComponent({
- emits: ['request-data']
+ emits: ['request-data'],
});
// 接收参数
const props = defineProps({
@@ -257,11 +311,12 @@ console.log(props, '来自父页面参数');
const Storageloading = ref(false); //仓储品类加载
const goriesloading = ref(false); //仓储品类加载
const form = ref({
- CalculationBasis: '1', // 计算基准
- Distinguishcategories: '0', //是否区分品类
- Managementfees: '0', //是否有管理费
- Operatingunloading: '0', //是否有操作/装卸费
- Sortingfee: '0', //是否有分拣费
+ warehouseCalculationBasis: '1', // 计算基准
+ warehouseIsByCategory: '0', //是否区分品类
+ warehouseIsManageFee: '0', //是否有管理费
+ warehouseIsOperateFee: '0', //是否有操作/装卸费
+ warehouseIsSortFee: '0', //是否有分拣费
+ warehouseIsCategorySubjoin: '0', //附加费用是否按品类计费
}); //表单
// 仓储计费类型
const Storagebillingtype = ref([]);
@@ -288,16 +343,9 @@ const StoragecategoryList = ref([
id: 1,
plus: true,
reduce: false,
- Additionalcategories: [
- {
- label: '衣柜',
- value: '1',
- },
- {
- label: '橱柜',
- value: '2',
- },
- ],
+ StateName: 'storage', //仓储标识
+ warehousePieceCategory: '', //输入的值
+ Additionalcategories: [],
},
]);
// 附加费品类配置
@@ -306,16 +354,9 @@ const AdditionalcategoriesList = ref([
id: 1,
plus: true,
reduce: false,
- Additionalcategories: [
- {
- label: '衣柜',
- value: '1',
- },
- {
- label: '橱柜',
- value: '2',
- },
- ],
+ StateName: 'additional', //附加费标识
+ warehousePieceCategory: '', //输入的值
+ Additionalcategories: [],
},
]);
// 附加费品类
@@ -330,8 +371,7 @@ const Additionalcategories = ref([
},
]);
// 附加计费单位
-const Surchargepricingunit = ref([
-]);
+const Surchargepricingunit = ref([]);
// 是否有管理费
const Managementfees = ref([]);
// 是否有操作/装卸费
@@ -356,16 +396,18 @@ function removeItemById(array, id) {
clearTimeout(timerId); // 在回调函数内部清除定时器
}, 300);
}
-
+// StateName:'storage',//仓储标识
+// StateName:'additional',//附加费标识
// 添加对象
-function addItemAfterId(array, id, data) {
+function addItemAfterId(array, id, StateName) {
console.log(array);
const newItem = {
id: array.length + 1, // 新对象的 ID 为当前数组长度加 1
plus: true, //是否显示加号
reduce: true, //是否显示减号
- WarehousecategoryInput: '', //选择框值
- Additionalcategories: [...data], //选择框列表,防止后期需要改动列表值
+ StateName, //标识
+ warehousePieceCategory: '', //选择框值
+ Additionalcategories: [], //选择框列表,防止后期需要改动列表值
};
const index = array.findIndex(item => item.id === id);
if (index !== -1) {
@@ -388,15 +430,17 @@ const storagereduce = id => {
Storageloading.value = true; //开启加载效果
removeItemById(StoragecategoryList.value, id); //传入配置项和对应的ID
};
+// StateName:'storage',//仓储标识
+// StateName:'additional',//附加费标识
// 仓储加
const storageplus = id => {
Storageloading.value = true;
- addItemAfterId(StoragecategoryList.value, id, Warehousecategory.value);
+ addItemAfterId(StoragecategoryList.value, id, 'storage');
};
// 附加品类加
const categoriesplus = id => {
goriesloading.value = true;
- addItemAfterId(AdditionalcategoriesList.value, id, Additionalcategories.value);
+ addItemAfterId(AdditionalcategoriesList.value, id, 'additional');
};
// 附加品类减
const categoriesduce = id => {
@@ -404,46 +448,154 @@ const categoriesduce = id => {
removeItemById(AdditionalcategoriesList.value, id);
};
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: item.dictKey,
- label: item.dictValue,
- id: item.id,
- });
+ 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: item.dictKey,
+ label: item.dictValue,
+ id: item.id,
+ });
+ });
+ }
+ }
+ if (dictionaryType == 'price_yes_no') {
+ Managementfees.value = { ...Distinguishcategories.value }; //是否有管理费
+ Operatingunloading.value = { ...Distinguishcategories.value }; //是否有操作/装卸费
+ Sortingfee.value = { ...Distinguishcategories.value }; //是否有分拣费用
+ Additionalfeebilling.value = { ...Distinguishcategories.value }; //附加费用是否统一计费
+ }
+ })
+ .catch(() => {})
+ .finally(() => {});
+}
+// 页面初始化必要请求
+const onLoad = () => {
+ updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
+ updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
+ updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
+ updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
+ updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
+};
+onLoad();
+// 新增
+const Submit = async () => {
+ emit('request-data','123')
+ return
+ await emit('request-data'); //通知父页面传递数据
+ console.log(props, 'props');
+ if (!props.templateData.TemplateName) {
+ ElMessage({
+ message: '请输入模板名称',
+ type: 'warning',
});
- }
+ return;
+ } else {
+ form.value.name = props.templateData.TemplateName; //模板名称
+ }
+ if (!props.templateData.brand) {
+ ElMessage({
+ message: '请选择品牌',
+ type: 'warning',
+ });
+ return;
+ } else {
+ form.value.brandId = props.templateData.brand; //品牌ID
}
- if(dictionaryType == 'price_yes_no'){
- Managementfees.value ={...Distinguishcategories.value};//是否有管理费
- Operatingunloading.value ={...Distinguishcategories.value};//是否有操作/装卸费
- Sortingfee.value ={...Distinguishcategories.value};//是否有分拣费用
- Additionalfeebilling.value ={...Distinguishcategories.value};//附加费用是否统一计费
+ form.value.serviceType = '3'; //服务类型（仓储固定参数）
+ // 如果勾选了区分品类判断是否填写了仓储品类配置
+ if (categoriesDisplay.value) {
+ let storage = StoragecategoryList.value.find(res => !res.warehousePieceCategory); //查看仓储品类配置是否完全没有填写
+ if (storage) {
+ // 如果勾选了,并且查到了有没有填写的就提示必须填写
+ ElMessage({
+ message: '请填写仓储品类配置',
+ type: 'warning',
+ });
+ return;
+ } else {
+ console.log(StoragecategoryList.value, 'StoragecategoryList.value');
+ // 如果都填写了进行数据处理
+ form.value.warehousePieceCategory = StoragecategoryList.value
+ .map(res => res.warehousePieceCategory)
+ .join(',');
+ }
}
-}).catch(()=>{
-}).finally(()=>{
-});
-}
-// 页面初始化必要请求
-const onLoad=()=>{
- updateDictionary(Storagebillingtype.value,'warehouse_pricing_type');//仓储计费类型
- updateDictionary(Warehousebillingmode.value,'warehouse_pricing_mode');//仓储计费模式
- updateDictionary(CalculationBasis.value,'warehouse_calculation_basis');//计算基准
- updateDictionary(Distinguishcategories.value,'price_yes_no');//是否区分品类
- updateDictionary(Surchargepricingunit.value,'warehouse_pricing_unit');//附加费计价单位
-
-}
-onLoad()
-// 新增
-const Submit=()=>{
- console.log(form.value,'表单');
- emit('request-data');//通知父页面传递数据
- console.log(props);//读取父页面传递的参数
-}
+ // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
+ if (SurchargeDisplay.value) {
+ let Surcharge = AdditionalcategoriesList.value.find(res => !res.warehousePieceCategory); //查看附加费品类配置是否完全没有填写
+ if (Surcharge) {
+ // 如果勾选了,并且查到了有没有填写的就提示必须填写
+ ElMessage({
+ message: '请填写附加品类配置',
+ type: 'warning',
+ });
+ return;
+ } else {
+ // 如果都填写了进行数据处理
+ form.value.warehouseSubjoinCategory = AdditionalcategoriesList.value
+ .map(res => res.warehousePieceCategory)
+ .join(',');
+ }
+ }
+
+ console.log(form.value, '要提交的参数');
+ let data = {
+ ...form.value,
+ };
+ $_priceTemplate(data).then(res => {
+ console.log(res, '提交成功之后返回值');
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ $emit('data-to-parent',res.data.data);
+ }
+ // res.data.data 返回的参数
+ });
+};
+// 是否区分品类事件
+const categoriesDisplayChange = val => {
+ console.log(val);
+ if (val == 1) {
+ categoriesDisplay.value = true;
+ StoragecategoryList.value = [
+ {
+ id: 1,
+ plus: true,
+ reduce: false,
+ StateName: 'storage', //仓储标识
+ warehousePieceCategory: '', //输入的值
+ Additionalcategories: [],
+ },
+ ];
+ } else {
+ categoriesDisplay.value = false;
+ }
+};
+// 附加费是否按品类计费
+const AdditionalDisplayChange = val => {
+ if (val == 1) {
+ SurchargeDisplay.value = true;
+ AdditionalcategoriesList.value = [
+ {
+ id: 1,
+ plus: true,
+ reduce: false,
+ StateName: 'additional', //附加费标识
+ warehousePieceCategory: '', //输入的值
+ Additionalcategories: [],
+ },
+ ];
+ } else {
+ SurchargeDisplay.value = false;
+ }
+};
diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
index 23ff5db1..cd6d2364 100644
--- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
+++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
@@ -32,6 +32,20 @@
/>
+
+
+
+
+
搜 索
@@ -313,6 +327,17 @@ const searchChange = () => {
delete queryCarn.value.signingTimeStart;
delete queryCarn.value.signingTimeEnd;
}
+
+ // 签收扫描时间
+ if (TopQuery.value.scanSingnTime) {
+ queryCarn.value.scanSigningTimeStart = dayjs(TopQuery.value.scanSingnTime[0]).format(
+ 'YYYY-MM-DD HH:mm:ss'
+ ); //开始日期
+ queryCarn.value.scanSigningTimeEnd = dayjs(TopQuery.value.scanSingnTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+ } else {
+ delete queryCarn.value.scanSigningTimeStart;
+ delete queryCarn.value.scanSigningTimeEnd;
+ }
getrain();
};