From 0db48dc0e5ddf1f49f8ed0531a23bcbe197e597a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 9 Jul 2024 18:50:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E9=87=8D?=
=?UTF-8?q?=E5=A4=8D=E5=8C=85=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/option/storagecost/Categorypricingunit.js | 6 +-
.../Categorypricingunit.vue | 584 +++++++++---------
.../Deliverymaintenancecosts.vue | 63 +-
.../WarehouseTemplate.vue | 2 +-
.../turndelivery/deliveryDiscuss.vue | 12 +-
5 files changed, 340 insertions(+), 327 deletions(-)
diff --git a/src/option/storagecost/Categorypricingunit.js b/src/option/storagecost/Categorypricingunit.js
index 3691bf12..ec183bb2 100644
--- a/src/option/storagecost/Categorypricingunit.js
+++ b/src/option/storagecost/Categorypricingunit.js
@@ -3,7 +3,7 @@ export const columnList = [
prop: 'checkbox',
label: '复选框',
type: 0,
- width: 55,
+ width: 35,
fixed: true,
},
{
@@ -11,7 +11,7 @@ export const columnList = [
label: '序号',
type: 12,
values: '',
- width: 55,
+ width: 35,
fixed: true,
},
{
@@ -61,7 +61,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
- width: '200',
+ width: '80',
checkarr: [],
fixed: 'right',
sortable: false,
diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
index 8337368c..fa387f6d 100644
--- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
+++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
@@ -1,306 +1,296 @@
-
-
-
-
-
-
-
-
-
- 搜 索
- 清 空
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = val => {
+ console.log(val);
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+ processRowProperty(index, row, details);
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+ console.log(list);
+ details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+ details.search = false; //关闭搜索
+};
+// 每页多少条
+const sizeChange = val => {
+ page.value.pageSize = val;
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+ page.value.currentPage = val;
+};
+// 刷新按钮
+const searchChangeS = () => {
+ details.search = false; //关闭搜索
+};
+// 顶部搜索
+const searchHide = () => {
+ console.log(details);
+ details.search = !details.search;
+ const _node = document.querySelectorAll('.tableNode');
+ setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+ getDictionaryBiz(dictionaryType).then(res => {
+ console.log(res, '字典');
+ res.data.data.forEach(item => {
+ targetArray.push({
+ value: item.dictKey,
+ label: item.dictValue,
+ });
+ });
+ });
+}
+// 页面初始化
+const onLoad = () => {};
+
+// 编辑
+const handleEdit = row => {
+ console.log(row);
+};
+
+
+
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 0f2d6ff4..559cdd3d 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -5,27 +5,31 @@
@@ -35,7 +39,7 @@ import SurchargeTable from '@/components/pric/tablePric.vue';
const activeName = ref('Commercialdistribution');
const form = ref({
dispatchSubjoinCategoryData: [
- {
+ {
index: 1,
Warehousecategory: '',
options: [],
@@ -46,7 +50,7 @@ const form = ref({
const dispatchSubjoinCategory = ref([
{ label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
{
- label: '产品品类',
+ label: '车型',
prop: 'Warehousecategory',
type: 'select',
width: 'auto',
@@ -67,5 +71,20 @@ const categoriesduceSurcharge = () => {};
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
index e257316e..41a3ef82 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
@@ -253,7 +253,7 @@ const searchChangeS = () => {
const searchHide = () => {
console.log(details);
details.search = !details.search;
- const _node = document.querySelector('.tableNode');
+ const _node = document.querySelectorAll('.tableNode');
setNodeHeight(_node, '', true);
};
// 字典公共函数
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 5603e8d2..e7090a89 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2148,7 +2148,8 @@ const submit = () => {
if (!dataInfo.value[dataId.value].packageListInfo) {
dataInfo.value[dataId.value].packageListInfo = [];
}
- dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
+ // dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
+ dataInfo.value[dataId.value].packageListInfo = dataTmp.value
wrapTemp.value[dataId.value] = dataTmp.value;
console.log('wrapTemp.value[dataId.value] :>> ', wrapTemp.value[dataId.value]);
console.log(wrapTemp.value, '包件订单被缓存');
@@ -2188,7 +2189,8 @@ const submit = () => {
if (!dataInfo.value[dataId.value].packageListInfo) {
dataInfo.value[dataId.value].packageListInfo = [];
}
- dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
+ // dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
+ dataInfo.value[dataId.value].packageListInfo = dataTmp.value
console.log(wrapTemp.value, '包件订单被缓存222');
console.log(dataInfo.value, '处理好的订单');
console.log(Packageow.value, 'Packageow.value');
@@ -2202,8 +2204,11 @@ const submit = () => {
console.log('提交后的临时存储', dataTmp.value);
}
+
// 展示的信息
- dataInfo.value = removeDuplicates(dataInfo.value);
+ dataInfo.value = removeDuplicates(dataInfo.value);
+ console.log( dataInfo.value,' dataInfo.value');
+
// 计算总数
tooSUM();
// 临时存储
@@ -3260,7 +3265,6 @@ const SubmitCommercial = async () => {
handleBack();
} else {
// 新增信息
-
console.log(DataSubmit.value, '准备提交的信息');
const res = await deliveryBusinessTask(DataSubmit.value);
code = res.data.code;