From e6819b2d13a8842d55a61fb44352c55ae746bf04 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 31 Dec 2024 17:02:27 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=99=9A=E4=B8=8A=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/WaybillAudit.vue            |   7 +
 .../reportformsOption/AllTrunklineConfig.vue  | 184 +++++++++++++-----
 .../reportformsOption/OrderAllConfig.vue      | 179 +++++++++++++----
 3 files changed, 278 insertions(+), 92 deletions(-)

diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue
index 7d255a27..f8863338 100644
--- a/src/views/finance/WaybillAudit.vue
+++ b/src/views/finance/WaybillAudit.vue
@@ -442,6 +442,13 @@ const onLoad = async () => {
 
       !value.payStatus && (value.payStatus = '10');
       !value.settlementStatus && (value.settlementStatus = '10');
+
+      for (let j = 0; j < details.columnList.length; j++) {
+        const item = details.columnList[j];
+
+        if (!item.isshowSummary) continue;
+        value[item.prop] = Number(value[item.prop]);
+      }
     }
 
     details.page.total = data.total;
diff --git a/src/views/reportformsOption/AllTrunklineConfig.vue b/src/views/reportformsOption/AllTrunklineConfig.vue
index f09e68f7..27e045f1 100644
--- a/src/views/reportformsOption/AllTrunklineConfig.vue
+++ b/src/views/reportformsOption/AllTrunklineConfig.vue
@@ -63,13 +63,15 @@
       </div>
 
       <!-- 新增配置 -->
-      <el-dialog title="新增配置" width="780px" v-model="details.popUpShow.add">
+      <el-dialog title="新增配置" width="780px" destroy-on-close v-model="details.popUpShow.add">
         <div class="el-dialog-add">
-          <el-form :inline="true" :model="details.form" label-width="100px">
+          <el-form :inline="true" ref="formRef" :model="details.form" label-width="100px">
             <el-form-item
               v-for="item in details.addFormOption"
               :key="item.prop"
               :label="item.label"
+              :prop="item.prop"
+              :rules="item.rules || []"
             >
               <template v-if="item.type === 'number'">
                 <el-input-number
@@ -87,8 +89,10 @@
                   v-model="details.form[item.prop]"
                   filterable
                   :multiple="item.multiple || false"
-                  :placeholder="`请输入${item.label}`"
+                  placeholder="全部"
                   :disabled="item.disabled"
+                  clearable
+                  @change="() => handleChange(item.prop, item.checkarr)"
                 >
                   <el-option
                     v-for="value in item.checkarr"
@@ -165,6 +169,7 @@ const $store = useStore();
 
 // 组件实例
 const tableNodeRef = ref();
+const formRef = ref();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -242,14 +247,17 @@ const details = reactive<any>({
       type: 'select',
       checkarr: [],
       disabled: false,
+      rules: [],
     },
 
     {
       label: '目的仓',
-      prop: 'destinationWarehouseId',
+      prop: 'destinationWarehouseDTOList',
       type: 'select',
       checkarr: [],
       disabled: false,
+      multiple: true,
+      rules: [],
     },
 
     {
@@ -276,9 +284,9 @@ const details = reactive<any>({
     /** 目的仓 */
     destinationWarehouseName: '',
     /** 目的仓id */
-    destinationWarehouseId: '全部',
+    destinationWarehouseDTOList: [],
     /** 时效(小时) */
-    hoursTime: 0,
+    dayTime: 0,
   },
   form: {} as any,
 });
@@ -329,12 +337,36 @@ const onLoad = async (params = {}) => {
 };
 
 const init = () => {
-  //   const time = new Date().getTime();
+  details.addFormOption[0].rules = [
+    {
+      required: computed(
+        () =>
+          (details.form.destinationWarehouseDTOList &&
+            details.form.destinationWarehouseDTOList.length > 0) ||
+          Boolean(details.form.departureWarehouseName)
+      ),
+      message: '请选择始发仓',
+      trigger: 'change',
+    },
+  ];
 
-  //   details.query.timeArr = [
-  //     dayjs(time - 1000 * 60 * 60 * 24 * 7).format('YYYY-MM-DD'),
-  //     dayjs(time).format('YYYY-MM-DD'),
-  //   ];
+  details.addFormOption[1].rules = [
+    {
+      required: computed(() => {
+        console.log(
+          'details.form.departureWarehouseName :>> ',
+          details.form.departureWarehouseName
+        );
+        return (
+          (details.form.destinationWarehouseDTOList &&
+            details.form.destinationWarehouseDTOList.length > 0) ||
+          Boolean(details.form.departureWarehouseName)
+        );
+      }),
+      message: '请选择目的仓',
+      trigger: 'change',
+    },
+  ];
 
   onLoad();
 };
@@ -448,6 +480,38 @@ const currentChange = pageNum => {
   onLoad();
 };
 
+const departureWarehouseChange = (prop, checkarr) => {
+  details.form.departureWarehouseName = '';
+
+  for (let i = 0; i < checkarr.length; i++) {
+    const value = checkarr[i];
+
+    if (value.dictKey !== details.form[prop]) continue;
+    details.form.departureWarehouseName = value.dictValue;
+    break;
+  }
+};
+
+/** 下拉框值变化时 */
+const handleChange = (prop, checkarr) => {
+  switch (prop) {
+    case 'departureWarehouseId':
+      departureWarehouseChange(prop, checkarr);
+      break;
+
+    default:
+      break;
+  }
+
+  if (
+    (details.form.destinationWarehouseDTOList &&
+      details.form.destinationWarehouseDTOList.length === 0) ||
+    !Boolean(details.form.departureWarehouseName)
+  ) {
+    formRef.value.validate();
+  }
+};
+
 /** 新增 */
 const handleAdd = () => {
   details.form = deepClone(details.initForm);
@@ -457,46 +521,68 @@ const handleAdd = () => {
 
 /** 新增提交 */
 const handleSubmitAdd = async () => {
-  try {
-    details.loadingObj.pageLoading = true;
-
-    const submitData = deepClone(details.form);
-
-    for (let i = 0; i < details.warehouseOption.length; i++) {
-      const value = details.warehouseOption[i];
-
-      if (submitData.departureWarehouseId === value.dictKey) {
-        submitData.departureWarehouseName = value.dictValue;
-      }
-
-      if (submitData.destinationWarehouseId === value.dictKey) {
-        submitData.destinationWarehouseName = value.dictValue;
+  formRef.value.validate(async (valid, fields) => {
+    if (valid) {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = deepClone(details.form);
+
+        for (let i = 0; i < details.warehouseOption.length; i++) {
+          const value = details.warehouseOption[i];
+
+          if (submitData.departureWarehouseId === value.dictKey) {
+            submitData.departureWarehouseName = value.dictValue;
+          }
+
+          if (submitData.destinationWarehouseId === value.dictKey) {
+            submitData.destinationWarehouseName = value.dictValue;
+          }
+        }
+
+        for (let i = 0; i < submitData.destinationWarehouseDTOList.length; i++) {
+          const val = submitData.destinationWarehouseDTOList[i];
+
+          for (let j = 0; j < details.warehouseOption.length; j++) {
+            const item = details.warehouseOption[j];
+
+            if (val !== item.dictKey) continue;
+            // submitData.destinationWarehouseName = item.dictValue;
+            submitData.destinationWarehouseDTOList[i] = {
+              warehouseName: item.dictValue,
+              warehouseId: item.dictKey,
+            };
+            break;
+          }
+        }
+
+        if (submitData.departureWarehouseId === '全部') {
+          submitData.departureWarehouseId = '';
+          submitData.departureWarehouseName = '全部';
+        }
+
+        if (submitData.destinationWarehouseDTOList.length === 0) {
+          submitData.destinationWarehouseDTOList = [{ warehouseName: '全部', warehouseId: '' }];
+          submitData.destinationWarehouseName = '全部';
+        }
+
+        details.popUpShow.add = false;
+        const res = await postAddAllTrunklineConfig(submitData);
+
+        const { code, data, msg } = res.data;
+        if (code !== 200) return;
+
+        ElMessage.success(msg);
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
       }
+    } else {
+      console.log('error submit!', fields);
     }
-
-    if (submitData.departureWarehouseId === '全部') {
-      submitData.departureWarehouseId = '';
-      submitData.departureWarehouseName = '全部';
-    }
-
-    if (submitData.destinationWarehouseId === '全部') {
-      submitData.destinationWarehouseId = '';
-      submitData.destinationWarehouseName = '全部';
-    }
-
-    details.popUpShow.add = false;
-    const res = await postAddAllTrunklineConfig(submitData);
-
-    const { code, data, msg } = res.data;
-    if (code !== 200) return;
-
-    ElMessage.success(msg);
-    onLoad();
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.pageLoading = false;
-  }
+  });
 };
 
 /** 删除提交 */
diff --git a/src/views/reportformsOption/OrderAllConfig.vue b/src/views/reportformsOption/OrderAllConfig.vue
index e9c270f1..e1553a56 100644
--- a/src/views/reportformsOption/OrderAllConfig.vue
+++ b/src/views/reportformsOption/OrderAllConfig.vue
@@ -63,13 +63,15 @@
       </div>
 
       <!-- 新增配置 -->
-      <el-dialog title="新增配置" width="780px" v-model="details.popUpShow.add">
+      <el-dialog title="新增配置" width="780px" destroy-on-close v-model="details.popUpShow.add">
         <div class="el-dialog-add">
-          <el-form :inline="true" :model="details.form" label-width="100px">
+          <el-form :inline="true" ref="formRef" :model="details.form" label-width="100px">
             <el-form-item
               v-for="item in details.addFormOption"
               :key="item.prop"
               :label="item.label"
+              :prop="item.prop"
+              :rules="item.rules || []"
             >
               <template v-if="item.type === 'number'">
                 <el-input-number
@@ -87,8 +89,10 @@
                   v-model="details.form[item.prop]"
                   filterable
                   :multiple="item.multiple || false"
-                  :placeholder="`请输入${item.label}`"
+                  placeholder="全部"
                   :disabled="item.disabled"
+                  clearable
+                  @change="() => handleChange(item.prop, item.checkarr)"
                 >
                   <el-option
                     v-for="value in item.checkarr"
@@ -165,6 +169,7 @@ const $store = useStore();
 
 // 组件实例
 const tableNodeRef = ref();
+const formRef = ref();
 
 const details = reactive<any>({
   /** 是否开启搜索 */
@@ -242,6 +247,7 @@ const details = reactive<any>({
       type: 'select',
       checkarr: [],
       disabled: false,
+      rules: [],
     },
 
     {
@@ -251,6 +257,7 @@ const details = reactive<any>({
       checkarr: [],
       disabled: false,
       multiple: true,
+      rules: [],
     },
 
     {
@@ -277,9 +284,9 @@ const details = reactive<any>({
     /** 目的仓 */
     destinationWarehouseName: '',
     /** 目的仓id */
-    destinationWarehouseDTOList: '全部',
+    destinationWarehouseDTOList: [],
     /** 时效(小时) */
-    hoursTime: 0,
+    dayTime: 0,
   },
   form: {} as any,
 });
@@ -330,6 +337,38 @@ const onLoad = async (params = {}) => {
 };
 
 const init = () => {
+  details.addFormOption[0].rules = [
+    {
+      required: computed(
+        () =>
+          (details.form.destinationWarehouseDTOList &&
+            details.form.destinationWarehouseDTOList.length > 0) ||
+          Boolean(details.form.departureWarehouseName)
+      ),
+      message: '请选择始发仓',
+      trigger: 'change',
+    },
+  ];
+
+  details.addFormOption[1].rules = [
+    {
+      required: computed(() => {
+        console.log(
+          'details.form.departureWarehouseName :>> ',
+          details.form.departureWarehouseName
+        );
+        return (
+          (details.form.destinationWarehouseDTOList &&
+            details.form.destinationWarehouseDTOList.length > 0) ||
+          Boolean(details.form.departureWarehouseName)
+        );
+      }),
+      message: '请选择目的仓',
+      trigger: 'change',
+    },
+  ];
+
+  console.log('details.addFormOption :>> ', details.addFormOption);
   //   const time = new Date().getTime();
 
   //   details.query.timeArr = [
@@ -449,6 +488,38 @@ const currentChange = pageNum => {
   onLoad();
 };
 
+const departureWarehouseChange = (prop, checkarr) => {
+  details.form.departureWarehouseName = '';
+
+  for (let i = 0; i < checkarr.length; i++) {
+    const value = checkarr[i];
+
+    if (value.dictKey !== details.form[prop]) continue;
+    details.form.departureWarehouseName = value.dictValue;
+    break;
+  }
+};
+
+/** 下拉框值变化时 */
+const handleChange = (prop, checkarr) => {
+  switch (prop) {
+    case 'departureWarehouseId':
+      departureWarehouseChange(prop, checkarr);
+      break;
+
+    default:
+      break;
+  }
+
+  if (
+    (details.form.destinationWarehouseDTOList &&
+      details.form.destinationWarehouseDTOList.length === 0) ||
+    !Boolean(details.form.departureWarehouseName)
+  ) {
+    formRef.value.validate();
+  }
+};
+
 /** 新增 */
 const handleAdd = () => {
   details.form = deepClone(details.initForm);
@@ -458,46 +529,68 @@ const handleAdd = () => {
 
 /** 新增提交 */
 const handleSubmitAdd = async () => {
-  try {
-    details.loadingObj.pageLoading = true;
-
-    const submitData = deepClone(details.form);
-
-    for (let i = 0; i < details.warehouseOption.length; i++) {
-      const value = details.warehouseOption[i];
-
-      if (submitData.departureWarehouseId === value.dictKey) {
-        submitData.departureWarehouseName = value.dictValue;
-      }
-
-      if (submitData.destinationWarehouseId === value.dictKey) {
-        submitData.destinationWarehouseName = value.dictValue;
+  formRef.value.validate(async (valid, fields) => {
+    if (valid) {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = deepClone(details.form);
+
+        for (let i = 0; i < details.warehouseOption.length; i++) {
+          const value = details.warehouseOption[i];
+
+          if (submitData.departureWarehouseId === value.dictKey) {
+            submitData.departureWarehouseName = value.dictValue;
+          }
+
+          if (submitData.destinationWarehouseId === value.dictKey) {
+            submitData.destinationWarehouseName = value.dictValue;
+          }
+        }
+
+        for (let i = 0; i < submitData.destinationWarehouseDTOList.length; i++) {
+          const val = submitData.destinationWarehouseDTOList[i];
+
+          for (let j = 0; j < details.warehouseOption.length; j++) {
+            const item = details.warehouseOption[j];
+
+            if (val !== item.dictKey) continue;
+            // submitData.destinationWarehouseName = item.dictValue;
+            submitData.destinationWarehouseDTOList[i] = {
+              warehouseName: item.dictValue,
+              warehouseId: item.dictKey,
+            };
+            break;
+          }
+        }
+
+        if (submitData.departureWarehouseId === '全部') {
+          submitData.departureWarehouseId = '';
+          submitData.departureWarehouseName = '全部';
+        }
+
+        if (submitData.destinationWarehouseDTOList.length === 0) {
+          submitData.destinationWarehouseDTOList = [{ warehouseName: '全部', warehouseId: '' }];
+          submitData.destinationWarehouseName = '全部';
+        }
+
+        details.popUpShow.add = false;
+        const res = await postAddOrderAllConfig(submitData);
+
+        const { code, data, msg } = res.data;
+        if (code !== 200) return;
+
+        ElMessage.success(msg);
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
       }
+    } else {
+      console.log('error submit!', fields);
     }
-
-    if (submitData.departureWarehouseId === '全部') {
-      submitData.departureWarehouseId = '';
-      submitData.departureWarehouseName = '全部';
-    }
-
-    if (submitData.destinationWarehouseId === '全部') {
-      submitData.destinationWarehouseDTOList = [];
-      submitData.destinationWarehouseName = '全部';
-    }
-
-    details.popUpShow.add = false;
-    const res = await postAddOrderAllConfig(submitData);
-
-    const { code, data, msg } = res.data;
-    if (code !== 200) return;
-
-    ElMessage.success(msg);
-    onLoad();
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.pageLoading = false;
-  }
+  });
 };
 
 /** 删除提交 */

From cd93ea7fc9c8d7c77290fab8c8c91c60b3c2cfec Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 2 Jan 2025 10:22:55 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=BD=95=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/CreateOrder.vue | 6 ++++--
 src/views/waybill/CreateZeroOrder.vue            | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 9f151306..86ec8fe7 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2185,8 +2185,10 @@ const onLoad = async (idsArr = []) => {
         details.query.shipperId = data.shipperClientId || '';
         details.query.consigneeId = data.consigneeClientId || '';
 
-        details.query.destination = data.destinationArray || [];
-        details.query.departure = data.departureArray || [];
+        details.query.destination =
+          getObjType(data.destinationArray) === 'array' ? data.destinationArray : [];
+        details.query.departure =
+          getObjType(data.departureArray) === 'array' ? data.departureArray : [];
         details.query.queryDestinationWarehouseName = data.destinationWarehouseName || '';
         // 是否提货
         details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index e2f15e16..92ec3c7f 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -1981,8 +1981,11 @@ const onLoad = async () => {
     details.query.shipperId = data.shipperClientId || '';
     details.query.consigneeId = data.consigneeClientId || '';
 
-    details.query.destination = data.destinationArray || [];
-    details.query.departure = data.departureArray || [];
+    details.query.destination =
+      getObjType(data.destinationArray) === 'array' ? data.destinationArray : [];
+    details.query.departure =
+      getObjType(data.departureArray) === 'array' ? data.departureArray : [];
+
     details.query.queryDestinationWarehouseName = data.destinationWarehouseName || '';
     // 是否提货
     details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;

From 5044518434d8f082361a37f6b02a2573cb2b46ae Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 4 Jan 2025 23:15:33 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reportforms/ConsigneeReport.js        |  6 +-
 .../SalesDepartmentIncomeReport.js            |  6 +-
 src/api/waybill/WaybillOrderList.js           | 11 +++
 src/page/index/top/index.vue                  |  2 +-
 .../distribution/inventory/CreateOrder.vue    |  2 +-
 src/views/finance/WaybillAudit.vue            | 83 ++++++++++++++++++-
 6 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/src/api/reportforms/ConsigneeReport.js b/src/api/reportforms/ConsigneeReport.js
index b0563337..de74043f 100644
--- a/src/api/reportforms/ConsigneeReport.js
+++ b/src/api/reportforms/ConsigneeReport.js
@@ -1,10 +1,10 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/consigineeIncomingPage',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   });
 };
 
diff --git a/src/api/reportforms/SalesDepartmentIncomeReport.js b/src/api/reportforms/SalesDepartmentIncomeReport.js
index a63ed5c2..9ac203b6 100644
--- a/src/api/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/api/reportforms/SalesDepartmentIncomeReport.js
@@ -1,10 +1,10 @@
 import request from '@/axios';
 /** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/deptIncomingPage',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
   });
 };
 
diff --git a/src/api/waybill/WaybillOrderList.js b/src/api/waybill/WaybillOrderList.js
index c270838a..a6ae6473 100644
--- a/src/api/waybill/WaybillOrderList.js
+++ b/src/api/waybill/WaybillOrderList.js
@@ -81,3 +81,14 @@ export const postExport = data => {
     responseType: 'blob',
   });
 };
+
+/**
+ * 修改服务类型
+ */
+export const postUpdateWaybillTypeService = data => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseWaybill/updateWaybillTypeService',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index a8a89852..a7df9afb 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -31,7 +31,7 @@
       </div>
       <!-- 仓库名称  -->
 
-      <div class="top-bar__item" @click="showcl(true)">
+      <div class="top-bar__item" style="text-decoration: underline" @click="showcl(true)">
         <view>{{ dataName || '全部' }}</view>
       </div>
 
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 86ec8fe7..9549aadb 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1144,7 +1144,7 @@
                 filterable
                 remote
                 reserve-keyword
-                placeholder="结算品类"
+                placeholder="收入品类"
                 @change="
                   val => {
                     const _item =
diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue
index f8863338..417a6b91 100644
--- a/src/views/finance/WaybillAudit.vue
+++ b/src/views/finance/WaybillAudit.vue
@@ -139,8 +139,9 @@
             >
               审核
             </el-text>
-            <el-text v-else @click="handleCloseAudit(slotProps.scope)"> 取消审核 </el-text>
-            <el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
+            <el-text v-else @click="() => handleCloseAudit(slotProps.scope)"> 取消审核 </el-text>
+            <el-text @click="() => handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
+            <el-text @click="() => handleServiceType(slotProps.scope)">切换服务类型</el-text>
           </template>
         </template>
       </tablecmt>
@@ -207,7 +208,7 @@
     :show-close="false"
     v-model="details.popUpShow.checkVisted"
   >
-    <div class="title">
+    <div class="title mb20">
       <template v-if="details.isBatch"> 批量审核 </template>
       <template v-else> 运单号：{{ details.form.waybillNo }} </template>
     </div>
@@ -227,6 +228,38 @@
     </div>
   </el-dialog>
 
+  <!-- 切换服务类型 -->
+  <el-dialog
+    title="切换服务类型"
+    width="780px"
+    :show-close="false"
+    v-model="details.popUpShow.changeServiceTypeVisted"
+  >
+    <div class="title mb20">
+      <template v-if="details.isBatch"> 批量审核 </template>
+      <template v-else> 运单号：{{ details.changeServiceTypeInfo.waybillNo }} </template>
+    </div>
+    <el-form label-width="100px">
+      <el-form-item label="服务类型：">
+        <el-select v-model="details.changeServiceTypeInfo.serviceType">
+          <el-option
+            v-for="item in details.serviceOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <div class="flex-c-c mt10">
+      <el-button @click="details.popUpShow.changeServiceTypeVisted = false">关 闭</el-button>
+      <el-button type="primary" icon="Position" @click="handleSubmitChangeServiceType">
+        提 交
+      </el-button>
+    </div>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @closce="showdrawer"
@@ -253,7 +286,11 @@ import {
 } from '@/api/finance/WaybillAudit';
 import { postCheckWaybill, postCancleCheckWaybill } from '@/api/distribution/CreateOrder.js';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
-import { postAbolishWaybill, postSaveWaybillReturn } from '@/api/waybill/WaybillOrderList.js';
+import {
+  postAbolishWaybill,
+  postSaveWaybillReturn,
+  postUpdateWaybillTypeService,
+} from '@/api/waybill/WaybillOrderList.js';
 import {
   downloadXls,
   setNodeHeight,
@@ -368,6 +405,8 @@ const details = reactive<any>({
     view: false,
     /** 审核 */
     checkVisted: false,
+    /** 切换服务类型 */
+    changeServiceTypeVisted: false,
   },
   /** 列表复选框选中的数据 */
   selectionList: [],
@@ -395,6 +434,8 @@ const details = reactive<any>({
   }),
   /** 是否为批量操作 */
   isBatch: false,
+  changeServiceTypeInfo: {},
+  serviceOption: [],
 });
 
 const tableNodeRef = ref();
@@ -827,6 +868,40 @@ const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
   details.dialogImageUrl = uploadFile.url!;
   details.popUpShow.dialogVisible = true;
 };
+
+/** 切换服务类型 */
+const handleServiceType = ({ row }) => {
+  details.popUpShow.changeServiceTypeVisted = true;
+  details.changeServiceTypeInfo = { ...row };
+  for (let i = 0; i < details.columnList.length; i++) {
+    const value = details.columnList[i];
+
+    if (value.label !== '服务类型') continue;
+    details.serviceOption = [...value.checkarr];
+    break;
+  }
+};
+
+const handleSubmitChangeServiceType = async () => {
+  try {
+    if (!details.changeServiceTypeInfo.serviceType) return ElMessage.warning('请选择服务类型');
+    details.popUpShow.changeServiceTypeVisted = false;
+    details.loadingObj.pageLoading = true;
+    const res = await postUpdateWaybillTypeService({
+      id: details.changeServiceTypeInfo.id,
+      serviceType: details.changeServiceTypeInfo.serviceType,
+    });
+
+    const { code, msg } = res.data;
+    if (code !== 200) return;
+    ElMessage.success(msg);
+    onLoad();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
 </script>
 
 <style scoped lang="scss">

From f88835b8f545bcf12a2165748f08af3104cce76b Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 4 Jan 2025 23:16:20 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reportforms/ConsigneeReport.js             | 6 +++---
 src/api/reportforms/SalesDepartmentIncomeReport.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/reportforms/ConsigneeReport.js b/src/api/reportforms/ConsigneeReport.js
index de74043f..7a614685 100644
--- a/src/api/reportforms/ConsigneeReport.js
+++ b/src/api/reportforms/ConsigneeReport.js
@@ -18,11 +18,11 @@ export const postFindbusinessLine = () => {
 };
 
 /** 报表导出 */
-export const postDeptIncomingExport = params => {
+export const postDeptIncomingExport = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/consigineeIncomingExport',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
     responseType: 'blob',
   });
 };
diff --git a/src/api/reportforms/SalesDepartmentIncomeReport.js b/src/api/reportforms/SalesDepartmentIncomeReport.js
index 9ac203b6..6c7cf3be 100644
--- a/src/api/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/api/reportforms/SalesDepartmentIncomeReport.js
@@ -18,11 +18,11 @@ export const postFindbusinessLine = () => {
 };
 
 /** 报表导出 */
-export const postDeptIncomingExport = params => {
+export const postDeptIncomingExport = data => {
   return request({
     url: '/api/logpm-report/reportIncoming/deptIncomingExport',
-    method: 'get',
-    params,
+    method: 'post',
+    data,
     responseType: 'blob',
   });
 };

From fd8986ac8eb1fdbc309d540836358e15ec35a081 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 4 Jan 2025 23:17:18 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/WaybillAudit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue
index 417a6b91..15759846 100644
--- a/src/views/finance/WaybillAudit.vue
+++ b/src/views/finance/WaybillAudit.vue
@@ -141,7 +141,7 @@
             </el-text>
             <el-text v-else @click="() => handleCloseAudit(slotProps.scope)"> 取消审核 </el-text>
             <el-text @click="() => handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
-            <el-text @click="() => handleServiceType(slotProps.scope)">切换服务类型</el-text>
+            <!-- <el-text @click="() => handleServiceType(slotProps.scope)">切换服务类型</el-text> -->
           </template>
         </template>
       </tablecmt>

From bf3c0ae08daffe12b5a94e2650a22bb86be89eda Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 6 Jan 2025 15:59:09 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue          |  20 ++-
 .../distribution/VehicleArrivalManagement.js  |  46 +++---
 src/option/distribution/VehicleStowage.js     |  48 +++---
 src/option/waybill/WaybillOrderList.js        |  52 +++---
 src/views/Pricesystem/ListOfPriceSystems.vue  |   1 +
 .../aftersales/aftersalesWorkOrderTemp.vue    | 148 +++++++++++++++---
 src/views/basicdata/brand/basicClient.vue     |   1 +
 .../BasicdataGoodsAllocationDetails.vue       |   3 +
 .../goodsShelf/basicdataGoodsShelfView.vue    |   9 +-
 .../warehouse/tray/basicdataTrayedt.vue       |   3 +
 .../warehouse/tray/basicdataTrayhistory.vue   |   3 +
 .../Transferwarehousestatistics.vue           |   1 +
 .../distribution/artery/AddVehicleStowage.vue |   4 +
 .../artery/VehicleArrivalManagement.vue       |   6 +-
 .../distribution/artery/VehicleStowage.vue    |   3 +
 .../artery/VehicleStowageDetails.vue          |   2 +
 .../artery/addTripartiteTransfer.vue          |   2 +
 .../distribution/artery/directGoMarket.vue    |   2 +
 .../artery/directGoMarketDetails.vue          |   2 +
 .../artery/zeroAdditionalRecording.vue        |   2 +
 .../checkInventoryTask/createTask.vue         |  22 ++-
 .../distributionDeliveryListedt.vue           |   8 +
 .../distribution/inventory/BookingNote.vue    |   6 +
 .../distribution/inventory/CreateOrder.vue    |   3 +
 .../addArteryDistrilbutionBillLadingList.vue  |   2 +
 .../arteryDistrilbutionBillLadingList.vue     |   1 +
 .../delivery/OrderInTransitDetails.vue        |   3 +
 .../delivery/SeparateTheListInfo.vue          |   1 +
 .../distributionStockArticleDetails.vue       |   2 +
 .../distributionStockListDetails.vue          |   5 +
 .../inventory/distrilbutionBillLading.vue     |   5 +
 .../inventory/distrilbutionBillLadingView.vue |   9 +-
 .../distribution/reservation/reservation.vue  |  27 +++-
 .../reservation/reservationAddFrom copy.vue   |   6 +
 .../reservation/reservationAddFrom.vue        |   5 +
 .../reservation/reservationDetails.vue        |   3 +
 src/views/distribution/signfor/asurcharge.vue |   2 +
 .../signfor/distributionSignfortreat.vue      |   1 +
 .../stockup/distributionStockupDetails.vue    |   5 +
 .../distributionStockupDetailsSelf.vue        |   6 +
 .../turndelivery/deliveryDiscuss.vue          |   2 +
 .../turndelivery/deliveryMarket.vue           |   2 +
 src/views/finance/MerchantDepositSlip.vue     |  49 +++---
 .../finance/ReconciliationDepositSlip.vue     |   6 +-
 src/views/mail/order/add.vue                  |   5 +
 src/views/mail/reservation/list.vue           |   2 +
 src/views/waybill/ChangeOrder.vue             |   7 +-
 src/views/waybill/ComparativeStatement.vue    |   5 +
 src/views/waybill/orderPackageList.vue        |   2 +
 src/views/waybill/orderPackageListDetails.vue |   2 +
 .../orderPackageListDetailsByMarket.vue       |   2 +
 51 files changed, 412 insertions(+), 152 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index e3d07b3e..23d3338b 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -214,11 +214,13 @@
 <script lang="ts" setup>
 import { ref, getCurrentInstance, onMounted, defineExpose, watch } from 'vue';
 import type { PropType } from 'vue';
+import { useRoute } from 'vue-router';
 import { computeNumber } from '@/utils/util.js';
 import { postSaveTableSeting } from '@/api/basic/table';
 
 const { proxy } = getCurrentInstance() as any;
 const selecttable = ref(null);
+const $route = useRoute();
 
 interface TableColumnType {
   /** 表格列的key */
@@ -365,8 +367,8 @@ let props = defineProps({
     required: false,
     default: true,
   },
-  /** 是否保存表头宽度设置 */
-  isSave: {
+  /** 是否不保存表头宽度设置 */
+  isNotSave: {
     type: Boolean as PropType<Boolean>,
     required: false,
     default: false,
@@ -714,12 +716,12 @@ const handleWidthChange = (newWidth, oldWidth, column, event) => {
 
   console.log('props.columnListName :>> ', props.columnListName);
 
-  if (props.isSave) return;
+  if (props.isNotSave) return;
 
-  // postSaveTableSeting({
-  //   tableKey: $route.path + props.columnListName,
-  //   tableSetCongig: JSON.stringify(props.columnList),
-  // });
+  postSaveTableSeting({
+    tableKey: $route.path + props.columnListName,
+    tableSetCongig: JSON.stringify(props.columnList),
+  });
 };
 
 let watchTimer;
@@ -966,4 +968,8 @@ defineExpose({ handleCheckSelect, handleClearSelect });
     }
   }
 }
+
+.el-table .cell {
+  padding: 0 4px !important;
+}
 </style>
diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js
index da8e6c13..0983e1d5 100644
--- a/src/option/distribution/VehicleArrivalManagement.js
+++ b/src/option/distribution/VehicleArrivalManagement.js
@@ -40,7 +40,7 @@ export const columnList = [
     label: '计划装车',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -51,7 +51,7 @@ export const columnList = [
     label: '装车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -62,7 +62,7 @@ export const columnList = [
     label: '在车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -73,7 +73,7 @@ export const columnList = [
     label: '卸车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -84,7 +84,7 @@ export const columnList = [
     label: '满载率',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -104,13 +104,13 @@ export const columnList = [
     label: '是否直发商家',
     type: 6,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '2' },
     ],
     fixed: false,
-    sortable: true,
+    sortable: false,
   },
   // {
   //   prop: 'planVolume',
@@ -127,7 +127,7 @@ export const columnList = [
     label: '车辆状态',
     type: 3,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [
       { label: '未发车', value: 0 },
       { label: '已发车', value: 10 },
@@ -167,7 +167,7 @@ export const columnList = [
     label: '车牌号',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -217,7 +217,7 @@ export const columnList = [
     label: '总费用',
     type: 1,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -228,7 +228,7 @@ export const columnList = [
     label: '现付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -239,7 +239,7 @@ export const columnList = [
     label: '油费',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -250,7 +250,7 @@ export const columnList = [
     label: '路桥费',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -261,7 +261,7 @@ export const columnList = [
     label: '回付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -272,7 +272,7 @@ export const columnList = [
     label: '到付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -283,7 +283,7 @@ export const columnList = [
     label: '整车信息费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -294,7 +294,7 @@ export const columnList = [
     label: '整车保险费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -305,7 +305,7 @@ export const columnList = [
     label: '整车落地费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -316,7 +316,7 @@ export const columnList = [
     label: '发站装车费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -327,7 +327,7 @@ export const columnList = [
     label: '发站其他费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -338,7 +338,7 @@ export const columnList = [
     label: '到站卸车费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -349,7 +349,7 @@ export const columnList = [
     label: '到站其它费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -360,7 +360,7 @@ export const columnList = [
     label: '经办人',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index 1896d0d9..c1fcc0fb 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -40,7 +40,7 @@ export const columnList = [
     label: '计划装车',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -51,7 +51,7 @@ export const columnList = [
     label: '装车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -62,7 +62,7 @@ export const columnList = [
     label: '在车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -73,7 +73,7 @@ export const columnList = [
     label: '卸车件数',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -84,7 +84,7 @@ export const columnList = [
     label: '满载率',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -104,13 +104,13 @@ export const columnList = [
     label: '是否直发商家',
     type: 6,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '2' },
     ],
     fixed: false,
-    sortable: true,
+    sortable: false,
   },
   // {
   //   prop: 'planVolume',
@@ -127,7 +127,7 @@ export const columnList = [
     label: '车辆状态',
     type: 3,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [
       { label: '未发车', value: 0 },
       { label: '已发车', value: 10 },
@@ -157,7 +157,7 @@ export const columnList = [
     label: '主驾司机手机号',
     type: 1,
     values: '',
-    width: '150',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -167,7 +167,7 @@ export const columnList = [
     label: '车牌号',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -217,7 +217,7 @@ export const columnList = [
     label: '总费用',
     type: 1,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -228,7 +228,7 @@ export const columnList = [
     label: '现付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -239,7 +239,7 @@ export const columnList = [
     label: '到付油卡费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -250,7 +250,7 @@ export const columnList = [
     label: '路桥费',
     type: 1,
     values: '',
-    width: '120',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -261,7 +261,7 @@ export const columnList = [
     label: '回付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -272,7 +272,7 @@ export const columnList = [
     label: '到付运输费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -283,7 +283,7 @@ export const columnList = [
     label: '整车信息费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -294,7 +294,7 @@ export const columnList = [
     label: '整车保险费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -305,7 +305,7 @@ export const columnList = [
     label: '整车落地费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -316,7 +316,7 @@ export const columnList = [
     label: '发站装车费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -327,7 +327,7 @@ export const columnList = [
     label: '发站其他费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -338,7 +338,7 @@ export const columnList = [
     label: '到站卸车费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -349,7 +349,7 @@ export const columnList = [
     label: '到站其它费',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -360,7 +360,7 @@ export const columnList = [
     label: '经办人',
     type: 1,
     values: '',
-    width: '130',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index ea7af6bf..d5b92628 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -273,7 +273,7 @@ export const columnList = [
     label: '总数',
     type: 2,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -284,7 +284,7 @@ export const columnList = [
     label: '总重量',
     type: 2,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -295,7 +295,7 @@ export const columnList = [
     label: '总体积',
     type: 2,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -306,7 +306,7 @@ export const columnList = [
     label: '运费',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -317,7 +317,7 @@ export const columnList = [
     label: '送货费',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -328,7 +328,7 @@ export const columnList = [
     label: '提货费',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -350,7 +350,7 @@ export const columnList = [
     label: '仓储费',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -405,7 +405,7 @@ export const columnList = [
     label: '申明价值',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -416,7 +416,7 @@ export const columnList = [
     label: '回扣',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -427,7 +427,7 @@ export const columnList = [
     label: '支付方式',
     type: 3,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [
       { label: '现金', value: 1 },
       { label: '银行卡', value: 2 },
@@ -444,7 +444,7 @@ export const columnList = [
     label: '付款方式',
     type: 3,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [
       { label: '现付', value: 1 },
       { label: '到付', value: 2 },
@@ -460,7 +460,7 @@ export const columnList = [
     label: '现付',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -471,7 +471,7 @@ export const columnList = [
     label: '到付',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -482,7 +482,7 @@ export const columnList = [
     label: '月付',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -493,7 +493,7 @@ export const columnList = [
     label: '回付',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -522,7 +522,7 @@ export const columnList = [
     label: '紧急度',
     type: 3,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [
       { label: '正常', value: 1 },
       { label: '急', value: 2 },
@@ -538,7 +538,7 @@ export const columnList = [
     label: '回单数',
     type: 1,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
@@ -571,7 +571,7 @@ export const columnList = [
     label: '运输方式',
     type: 3,
     values: '',
-    width: '100',
+    width: '90',
     checkarr: [
       { label: '公路快运', value: 1 },
       { label: '海运', value: 2 },
@@ -641,35 +641,35 @@ export const columnList = [
     label: '提货是否整车',
     type: 3,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '0' },
     ],
     fixed: false,
     isshowSummary: false,
-    sortable: true,
+    sortable: false,
   },
   {
     prop: 'trunklineCompleteOrNotName',
     label: '干线是否整车',
     type: 3,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '0' },
     ],
     fixed: false,
     isshowSummary: false,
-    sortable: true,
+    sortable: false,
   },
   {
     prop: 'freezeStatusName',
     label: '是否冻结',
     type: 3,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '0' },
@@ -705,7 +705,7 @@ export const columnList = [
     label: '是否作废',
     type: 3,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [
       { label: '是', value: '1' },
       { label: '否', value: '0' },
@@ -741,7 +741,7 @@ export const columnList = [
     label: '签收数量',
     type: 1,
     values: '',
-    width: '130',
+    width: '90',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -899,7 +899,7 @@ export const columnList = [
     ],
     fixed: false,
     isshowSummary: false,
-    sortable: true,
+    sortable: false,
   },
   {
     prop: 'checkReson',
diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index fabe98ca..9d021271 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -192,6 +192,7 @@
   <!-- 历史版本  -->
   <el-dialog v-model="Historical.popUpShow" title="历史版本">
     <tablecmt
+      isNotSave
       class="Historical"
       :columnList="Historical.columnList"
       :tableData="Historical.data"
diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue
index a67f6af2..99752d7f 100644
--- a/src/views/aftersales/aftersalesWorkOrderTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue
@@ -228,6 +228,7 @@
                 @btnCheck="btnsc"
                 @selectCheck="selectsc"
                 @selection="selectionChange"
+                isNotSave
                 :isShowRefresh="false"
                 :tableRowClassName="
                   (row, index) => {
@@ -780,6 +781,7 @@
                   @selectCheck="selectsc"
                   @selection="selectionChange"
                   :isShowRefresh="false"
+                  isNotSave
                   :tableRowClassName="
                     (row, index) => {
                       if (row.conditions != null && row.conditions == '1') return 'Abnormal';
@@ -812,6 +814,7 @@
                   @btnCheck="btnsc"
                   @selectCheck="selectsc"
                   @selection="selectionChange"
+                  isNotSave
                   :isShowRefresh="false"
                   :tableRowClassName="
                     (row, index) => {
@@ -954,6 +957,7 @@
                 :tableData="customerData"
                 :loading="CustomerLoad"
                 :isShowRefresh="false"
+                isNotSave
                 @inputTxt="inputsc"
                 @timeCheck="timesc"
                 @btnCheck="btnsc"
@@ -1257,16 +1261,106 @@ const AppealeditorState = ref(false); //申诉是否为编辑状态(默认否)
 const AppealStatusT = ref(false); //是否为申诉列表
 const loadingCustomer = ref(false); //客服介入弹窗加载
 const TabList = ref([
-  { name: 0, label: '全部', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50,},
-  { name: 8, label: '待回复', state: false, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 3, label: '待处理(新建)', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 1, label: '处理中', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 4, label: '理赔金额未出', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 5, label: '客服介入', state: true, request: true, DataList: [], total: 0 ,currentPage: 1,pageSize: 50,},
-  { name: 9, label: '待审核', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
-  { name: 6, label: '完结', state: true, request: true, DataList: [], total: 0 ,currentPage: 1,pageSize: 50,},
-  { name: 7, label: '超时未处理', state: true, request: true, DataList: [], total: 0,currentPage: 1,pageSize: 50, },
+  {
+    name: 0,
+    label: '全部',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 8,
+    label: '待回复',
+    state: false,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 3,
+    label: '待处理(新建)',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 1,
+    label: '处理中',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 4,
+    label: '理赔金额未出',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 2,
+    label: '处理完毕',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 5,
+    label: '客服介入',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 9,
+    label: '待审核',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 6,
+    label: '完结',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
+  {
+    name: 7,
+    label: '超时未处理',
+    state: true,
+    request: true,
+    DataList: [],
+    total: 0,
+    currentPage: 1,
+    pageSize: 50,
+  },
 ]); //标签栏
 
 const DeliveryDriver = ref([]);
@@ -1766,9 +1860,9 @@ const Statusprocessing = val => {
 };
 // 页面初始化数据
 const IndexTable = (val, Refresh) => {
-  console.log(page.value,'page.value');
+  console.log(page.value, 'page.value');
   console.log('初始化接口');
-  
+
   console.log(
     !TabList.value.find(res => res.name == TabPermissions.value).request,
     Refresh,
@@ -1819,7 +1913,7 @@ const IndexTable = (val, Refresh) => {
       } else {
         TabList.value.find(res => res.name == '9').state = false;
       }
-    }else{
+    } else {
       TabList.value.find(res => res.name == '9').state = false;
     }
     console.log(UserPermissions.value, '当前角色权限');
@@ -1852,7 +1946,8 @@ const IndexTable = (val, Refresh) => {
           TabList.value.find(res => res.name == TabPermissions.value).DataList =
             res.data.data.records;
           TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
-          TabList.value.find(res => res.name == TabPermissions.value).currentPage = res.data.data.current;
+          TabList.value.find(res => res.name == TabPermissions.value).currentPage =
+            res.data.data.current;
           TabList.value.find(res => res.name == TabPermissions.value).request = false;
           console.log(TabList.value, '当前存储的值');
           details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
@@ -1860,8 +1955,9 @@ const IndexTable = (val, Refresh) => {
           console.log(TabList.value, 'TabList.value===>');
         } else {
           TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
-          TabList.value.find(res => res.name == TabPermissions.value).total =  res.data.data.total;
-          TabList.value.find(res => res.name == TabPermissions.value).currentPage = res.data.data.current;
+          TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
+          TabList.value.find(res => res.name == TabPermissions.value).currentPage =
+            res.data.data.current;
           TabList.value.find(res => res.name == TabPermissions.value).request = true;
           // details.data = res.data.data.records;
           details.data = res.data.data.records;
@@ -2524,8 +2620,8 @@ const DetermineClaims = val => {
         })
         .catch(res => {
           details.loadingObj.list = false; //关闭动画加载
-
-        }).finally(()=>{
+        })
+        .finally(() => {
           pageLoad.value = false;
         });
     })
@@ -2839,8 +2935,8 @@ const currentChange = async val => {
   // page.value.pageSize=  _row.pageSize
   // page.value.currentPage=  _row.currentPage
   TabList.value.find(res => res.name == TabPermissions.value).request = true;
-  let _row=   TabList.value.find(res=>res.name==TabPermissions.value)
-  _row.currentPage = val
+  let _row = TabList.value.find(res => res.name == TabPermissions.value);
+  _row.currentPage = val;
   page.value.currentPage = val;
   await DataRendering(TabPermissions.value, details.query, true);
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
@@ -3316,12 +3412,12 @@ const DataRendering = (val, input, Refresh) => {
 const tabChenge = async (val, input, Refresh = false) => {
   console.log(TabList.value, 'TabList.value');
   console.log(val, 'val');
-  let _row=   TabList.value.find(res=>res.name==val)
-  page.value.pageSize=  _row.pageSize
-  page.value.currentPage=  _row.currentPage
-  page.value.total=  _row.total
-  console.log(_row,'当前点击的菜单');
-  
+  let _row = TabList.value.find(res => res.name == val);
+  page.value.pageSize = _row.pageSize;
+  page.value.currentPage = _row.currentPage;
+  page.value.total = _row.total;
+  console.log(_row, '当前点击的菜单');
+
   TabPermissions.value = val; //记录当前点击的菜单
 
   if (val != 6) {
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 3694a4f7..39d00e43 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -567,6 +567,7 @@
       width="70%"
       :align-center="true"
       v-model="popUpShow.logVisted"
+      isNotSave
     >
       <tablecmt ref="tableLogNode" class="mt10" :columnList="columnLogList" :tableData="logData">
         <template #default="{ scope }"> </template>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
index 756c10f6..61c71fc8 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
@@ -79,6 +79,7 @@
             @timeCheck="timesc"
             @selectCheck="selectsc"
             @selection="selectionChange"
+            isNotSave
           >
             <template #default="slotProps">
               <el-text size="small" text>查看</el-text>
@@ -116,6 +117,7 @@
             @timeCheck="timesc"
             @selectCheck="selectsc"
             @selection="selectionChange"
+            isNotSave
           >
             <template #default="slotProps">
               <el-text size="small" text>查看</el-text>
@@ -153,6 +155,7 @@
             @timeCheck="timesc"
             @selectCheck="selectsc"
             @selection="selectionChange"
+            isNotSave
           >
             <template #default="slotProps">
               <el-text size="small" text>查看</el-text>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 0705ccf4..e01c5264 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -375,6 +375,7 @@
         <div class="tabberbox">
           <tablecmt
             :columnList="columnList"
+            isNotSave
             :tableData="tablistarr"
             :loading="loading"
             @inputTxt="inputsc"
@@ -530,6 +531,7 @@
         <div class="tabberbox">
           <tablecmt
             :columnList="columnList"
+            isNotSave
             :tableData="tablistarr"
             :loading="loading"
             @inputTxt="inputsc"
@@ -911,9 +913,10 @@ async function checkshelves() {
    * goodsAreaId 货区ID
    * goodsShelfId 货架ID
    */
-  console.log(details,'details');
-  
-  let goodsAreaarr =  details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
+  console.log(details, 'details');
+
+  let goodsAreaarr =
+    details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
   let goodsShelfarr = goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele];
   let data = {
     goodsAreaId: goodsAreaarr?.id,
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 7edbc1b0..c9b0b943 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -43,6 +43,7 @@
             :columnList="wrapoptioncolumn"
             :tableData="packdata"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -81,6 +82,7 @@
             :columnList="inventoryoptioncolumn"
             :tableData="inventorydata"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -119,6 +121,7 @@
             :columnList="optioncolumn"
             :tableData="data"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
index d0121833..0647fc58 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
@@ -24,6 +24,7 @@
             :columnList="wrapoptioncolumn"
             :tableData="packdata"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -62,6 +63,7 @@
             :columnList="inventoryoptioncolumn"
             :tableData="inventorydata"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -101,6 +103,7 @@
             :columnList="optioncolumn"
             :tableData="data"
             :loading="loading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue
index f2bfab85..48f3b533 100644
--- a/src/views/cost/storagecost/Transferwarehousestatistics.vue
+++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue
@@ -252,6 +252,7 @@
           <el-tab-pane :label="`${Abnormalsettlement.title}记录`" name="异常记录">
             <tablecmt
               class="tableNodeRef"
+              isNotSave
               :columnList="details.columnListrecord"
               :tableData="details.datarecord"
               :loading="details.loadingObj.listrecord"
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 13330f03..e33be1e6 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -280,6 +280,7 @@
 
         <tablecmt
           class="nodeInfo"
+          isNotSave
           :columnList="details.nodeInfoColumnList"
           :tableData="details.nodeInfoData"
           :loading="loadingObj.stowageLoading"
@@ -436,6 +437,7 @@
                 ref="oldColumnListNode"
                 class="columnList"
                 :columnList="details.columnList"
+                isNotSave
                 :tableData="details.data"
                 @inputTxt="inputsc"
                 @selectCheck="selectsc"
@@ -622,6 +624,7 @@
               <tablecmt
                 class="columnList"
                 ref="newColumnListNode"
+                isNotSave
                 :columnList="item.newColumnList"
                 :tableData="item.renderData"
                 :loading="item.loading"
@@ -737,6 +740,7 @@
 
     <tablecmt
       class="columnList"
+      isNotSave
       :columnList="details.newColumnList"
       :tableData="
         details.problemInfo.activeName === 'real'
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 002e2bb8..c2fbb950 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -444,6 +444,7 @@
 
         <tablecmt
           ref="searchOrderTableNode"
+          isNotSave
           :columnList="details.searchOrderOption.columnList"
           :tableData="details.searchOrderOption.data"
           :loading="details.loadingObj.searchOrder"
@@ -477,6 +478,7 @@
         </div>
         <tablecmt
           ref="abnormalOrderTableNode"
+          isNotSave
           :columnList="details.abnormalOption.columnList"
           :tableData="details.abnormalOption.data"
           :isInitHeigt="false"
@@ -551,6 +553,7 @@
 
       <tablecmt
         class="truckLoadingDetailPopUpTable mt10"
+        isNotSave
         :columnList="details.packageColumnList"
         :tableData="details.packageRenderData"
         :loading="loadingObj.list"
@@ -669,8 +672,7 @@
   <edittablehead
     @closce="showdrawer"
     :drawerShow="drawerShow"
-    :columnList="columnList"
-    v-model="columnList"
+    v-model="details.columnList"
   ></edittablehead>
 </template>
 
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index adee79fc..ac9ef7a0 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -417,6 +417,7 @@
           ref="searchOrderTableNode"
           :columnList="details.searchOrderOption.columnList"
           :tableData="details.searchOrderOption.data"
+          isNotSave
           :loading="details.loadingObj.searchOrder"
         >
           <template #default="slotProps">
@@ -448,6 +449,7 @@
         </div>
         <tablecmt
           ref="abnormalOrderTableNode"
+          isNotSave
           :columnList="details.abnormalOption.columnList"
           :tableData="details.abnormalOption.data"
           :isInitHeigt="false"
@@ -523,6 +525,7 @@
 
       <tablecmt
         class="truckLoadingDetailPopUpTable mt10"
+        isNotSave
         :columnList="details.packageColumnList"
         :tableData="details.packageRenderData"
         :loading="loadingObj.list"
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 1ba4280b..86b51eb8 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -121,6 +121,7 @@
 
           <tablecmt
             class="nodeInfo"
+            isNotSave
             :columnList="details.nodeInfoColumnList"
             :tableData="details.nodeInfoData"
             :loading="loadingObj.stowageLoading"
@@ -404,6 +405,7 @@
     <tablecmt
       class="abnormalTableRef mt10"
       style="height: 60vh"
+      isNotSave
       :columnList="details.abnormalColumn"
       :tableData="details.abnormalData"
       :loading="loadingObj.abnormalLoading"
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 07c9c458..a3beaa1f 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -361,6 +361,7 @@
             :columnList="details.columnList"
             :tableData="details.oldData"
             :loading="loadingObj.oldListLoading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @selectCheck="selectsc"
@@ -422,6 +423,7 @@
             ref="newColumnListNode"
             :columnList="details.newColumnList"
             :tableData="details.newData"
+            isNotSave
             @inputTxt="newInputsc"
             @timeCheck="newTimesc"
             @selectCheck="newSelectsc"
diff --git a/src/views/distribution/artery/directGoMarket.vue b/src/views/distribution/artery/directGoMarket.vue
index 3492bdfb..1bae98df 100644
--- a/src/views/distribution/artery/directGoMarket.vue
+++ b/src/views/distribution/artery/directGoMarket.vue
@@ -31,6 +31,7 @@
             :columnList="details.oldColumnList"
             :tableData="details.oldData"
             :loading="loadingObj.oldListLoading"
+            isNotSave
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -90,6 +91,7 @@
             :columnList="details.newColumnList"
             :tableData="details.newData"
             :loading="loadingObj.newListLoading"
+            isNotSave
             @inputTxt="newInputsc"
             @timeCheck="newTimesc"
             @selectCheck="newSelectsc"
diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue
index 7d7677fe..58c3fdfb 100644
--- a/src/views/distribution/artery/directGoMarketDetails.vue
+++ b/src/views/distribution/artery/directGoMarketDetails.vue
@@ -116,6 +116,7 @@
     <tablecmt
       class="mt10"
       style="height: 60vh"
+      isNotSave
       :columnList="details.detailsColumnList"
       :tableData="details.detailsInfo.data"
       :loading="loadingObj.detailsLoading"
@@ -209,6 +210,7 @@
       class="mt10 zeroTable"
       ref="zeroTableRef"
       style="height: 60vh"
+      isNotSave
       :columnList="details.zeroInfo.columnList"
       :tableData="details.zeroInfo.data"
       :loading="loadingObj.zeroLoading"
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 90a3283a..800ad703 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -61,6 +61,7 @@
             </el-button>
           </div>
           <tablecmt
+            isNotSave
             :columnList="details.oldColumnList"
             :tableData="details.oldData"
             :loading="loadingObj.oldListLoading"
@@ -160,6 +161,7 @@
 
           <!-- 表格 -->
           <tablecmt
+            isNotSave
             :columnList="details.newColumnList"
             :tableData="details.renderData"
             :loading="loadingObj.newListLoading"
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 535c0f75..f7bfa5fe 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -120,8 +120,8 @@
         v-loading="formInventoryloading"
         element-loading-text="正在处理中,此任务可能较耗时请耐心等待..."
       >
-      <el-form-item label="盘点名称">
-        <el-input v-model="formInventory.taskName"  placeholder="请输入盘点名称" />
+        <el-form-item label="盘点名称">
+          <el-input v-model="formInventory.taskName" placeholder="请输入盘点名称" />
         </el-form-item>
         <el-form-item label="商场名称">
           <el-select
@@ -280,6 +280,7 @@
         <el-row>
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="InventorytableNode"
             :columnList="details.columnListInventory"
             :tableData="inventoryData"
@@ -342,6 +343,7 @@
       <el-row>
         <!-- 列表模块 -->
         <tablecmt
+          isNotSave
           class="comparativeableNode"
           :columnList="details.comparativecolumnList"
           :tableData="comparativedata"
@@ -397,7 +399,7 @@ import {
 } from '@/option/distribution/createTask.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { downloadXls, handleClearTableQuery,processRowPropertyName } from '@/utils/util';
+import { downloadXls, handleClearTableQuery, processRowPropertyName } from '@/utils/util';
 import {
   getTaskQuestPage,
   getAllDataWithPackage,
@@ -561,7 +563,11 @@ const showdrawer = _flag => {
 /** 表格表头输入框搜索 */
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-  processRowPropertyName(index, row, Inventorydetailsstatus.value ? details.queryInventory: details.query);
+  processRowPropertyName(
+    index,
+    row,
+    Inventorydetailsstatus.value ? details.queryInventory : details.query
+  );
   Inventorydetailsstatus.value ? InventoriedData() : onLoad();
 };
 /** 表格表头时间选择 */
@@ -579,7 +585,11 @@ const timesc = (index, row) => {
 
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  processRowPropertyName(index, row,Inventorydetailsstatus.value ? details.queryInventory: details.query);
+  processRowPropertyName(
+    index,
+    row,
+    Inventorydetailsstatus.value ? details.queryInventory : details.query
+  );
   Inventorydetailsstatus.value ? InventoriedData() : onLoad();
 };
 /** 表格表头复选框选择 */
@@ -940,7 +950,7 @@ const InventorySubmit = async () => {
       }))
     : [];
   //构建提交数据
-  const data = { startTime, endTime, list,taskName};
+  const data = { startTime, endTime, list, taskName };
   console.log('数据:', data);
   formInventoryloading.value = true;
   postAddtaskQuest(data)
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 96e92cd5..d65b3b9d 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -122,6 +122,7 @@
         <!-- 客户列表 -->
         <template v-if="activeTab === 'tab1'">
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="columnList"
             :tableData="data"
@@ -194,6 +195,7 @@
         <template v-if="activeTab === 'tab2'">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="ordoptioncolumn"
             :tableData="orddata"
@@ -209,6 +211,7 @@
           <!-- 列表模块 -->
           <el-button type="warning" plain @click="ViewQRcodes">批量查看二维码 </el-button>
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="wrapoptioncolumn"
             :tableData="packdata"
@@ -248,6 +251,7 @@
         <template v-if="activeTab === 'tab4'">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="inventoryoptioncolumn"
             :tableData="inventorydata"
@@ -397,6 +401,7 @@
               >批量计划取消</el-button
             >
             <tablecmt
+              isNotSave
               :columnList="wrapoption.column"
               :tableData="wrapdata"
               :loading="loading"
@@ -473,6 +478,7 @@
               >批量计划取消</el-button
             >
             <tablecmt
+              isNotSave
               :columnList="wrapoption.reservationInventoryoptioncolumn"
               :tableData="reservationInventoryPackageData"
               :loading="loading"
@@ -543,6 +549,7 @@
               >批量计划取消</el-button
             > -->
             <tablecmt
+              isNotSave
               :columnList="wrapoption.LessThantruckloadListData"
               :tableData="LessThantruckloadListData"
               :loading="loading"
@@ -838,6 +845,7 @@
       </div>
 
       <tablecmt
+        isNotSave
         :columnList="AbnormalReview"
         :tableData="AbnormalReviewData"
         :loading="AbnormalReviewloading"
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 4abfe95b..abf5a8af 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -1008,6 +1008,7 @@
         <el-tab-pane label="运 单 跟 踪" name="tab2">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="StowageInfo"
             :columnList="details.WaybillTrackingColumnList"
             :tableData="data"
@@ -1019,6 +1020,7 @@
         <el-tab-pane label="财 务 记 录" name="tab3">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="StowageInfo"
             :columnList="details.FinancialRecordColumnList"
             :tableData="data"
@@ -1030,6 +1032,7 @@
         <el-tab-pane label="改 单 记 录" name="tab4">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="StowageInfo"
             :columnList="details.ChangeOrderColumnList"
             :tableData="data"
@@ -1058,6 +1061,7 @@
         <el-tab-pane label="异 动 记 录" name="tab6">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="StowageInfo"
             :columnList="details.TransactionColumnList"
             :tableData="data"
@@ -1069,6 +1073,7 @@
         <el-tab-pane label="运单订单记录" name="tab7">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="StowageInfo"
             :columnList="details.columnList"
             :tableData="data"
@@ -1084,6 +1089,7 @@
         >
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             ref="tableOrderPackgeNodeRef"
             :columnList="details.orderPackageOption.columnList"
             :tableData="details.orderPackageOption.renderData"
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 9549aadb..7932971c 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1175,6 +1175,7 @@
 
             <!-- 表格 -->
             <tablecmt
+              isNotSave
               class="mt10"
               ref="packageTableNode"
               :columnList="details.package.columnList"
@@ -1353,6 +1354,7 @@
           <!-- 表格 -->
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             :columnList="details.columnList"
             :tableData="
               details.orderStatus === 'haveData' ? details.haveDataData : details.notHaveDataData
@@ -1466,6 +1468,7 @@
       </el-form>
 
       <tablecmt
+        isNotSave
         style="height: 40vh"
         ref="tableNode"
         :columnList="details.changeColumnList"
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index 8baae241..c12ca5ac 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -295,6 +295,7 @@
 
           <!-- 表格 -->
           <tablecmt
+            isNotSave
             class="tableNode mt10"
             :columnList="details.columnOldList"
             :tableData="details.addInfo.oldData"
@@ -355,6 +356,7 @@
 
           <!-- 表格 -->
           <tablecmt
+            isNotSave
             class="tableNode mt10"
             :columnList="details.columnNewList"
             :tableData="details.addInfo.newRenderData"
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index 4ea3400b..6e1b431d 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -297,6 +297,7 @@
         </el-button>
         <!-- 列表模块 -->
         <tablecmt
+          isNotSave
           class="mt20"
           :columnList="columnDetailList"
           :tableData="detailsData"
diff --git a/src/views/distribution/inventory/delivery/OrderInTransitDetails.vue b/src/views/distribution/inventory/delivery/OrderInTransitDetails.vue
index 86928f5a..7bdfa2b6 100644
--- a/src/views/distribution/inventory/delivery/OrderInTransitDetails.vue
+++ b/src/views/distribution/inventory/delivery/OrderInTransitDetails.vue
@@ -2,6 +2,7 @@
   <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
       <tablecmt
+        isNotSave
         style="height: initial !important"
         :isInitHeigt="false"
         :columnList="details.customer.columnList"
@@ -11,6 +12,7 @@
       </tablecmt>
 
       <tablecmt
+        isNotSave
         style="height: initial !important; margin: 10px 0"
         :isInitHeigt="false"
         :columnList="details.consignee.columnList"
@@ -42,6 +44,7 @@
 
       <!-- 列表模块 -->
       <tablecmt
+        isNotSave
         style="height: 64vh"
         :isInitHeigt="false"
         :columnList="$route.query.isZero + '' === '1' ? details.zerocolumnList : details.columnList"
diff --git a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
index ecb0a24a..b44c5a4f 100644
--- a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
+++ b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
@@ -94,6 +94,7 @@
     </div>
     <el-dialog v-model="dialogVisible" width="60%" title="详情">
       <tablecmt
+        isNotSave
         class="TCtableNode"
         :columnList="TccolumnList"
         :tableData="Tcdata"
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 145f1c0e..23584d4f 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -128,6 +128,7 @@
         </div>
         <!-- 列表模块 -->
         <tablecmt
+          isNotSave
           ref="tableNode"
           :columnList="columnList"
           :tableData="dataPare"
@@ -210,6 +211,7 @@
         </div>
 
         <tablecmt
+          isNotSave
           ref="tableNode"
           :columnList="zerocolumnList"
           :tableData="datazero"
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index bc7e79f4..cf06516f 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -91,6 +91,7 @@
         >
           <el-tab-pane label="库位库存品" name="library">
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnListarrs.column"
               :tableData="data"
@@ -122,6 +123,7 @@
           </el-tab-pane>
           <el-tab-pane label="备货明细" name="outbound">
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnListarrs.columnDetails"
               :tableData="data1"
@@ -159,6 +161,7 @@
               >导 出</el-button
             >
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnListarrs.columnWarehousing"
               :tableData="data2"
@@ -206,6 +209,7 @@
               >导 出</el-button
             > -->
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnListarrs.columnUnpacking"
               :tableData="data3"
@@ -238,6 +242,7 @@
           </el-tab-pane>
           <el-tab-pane label="冻结明细" name="FreezeDetails">
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnListarrs.FreezeDetails"
               :tableData="data4"
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 7fb8ed4a..9e1d1714 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -117,6 +117,7 @@
                 </div>
               </div>
               <tablecmt
+                isNotSave
                 class="tablesc"
                 :columnList="columnListedit"
                 :tableData="dataList"
@@ -171,6 +172,7 @@
                 >新 增</el-button
               >
               <tablecmt
+                isNotSave
                 class="tablesc"
                 :columnList="columnStock"
                 :tableData="data"
@@ -373,6 +375,7 @@
     <!-- 添加库存品 -->
     <el-dialog v-model="dialogFormVisible" title="添加库存品" style="width: 80%">
       <tablecmt
+        isNotSave
         class="addTable"
         :columnList="option.columnStock"
         :tableData="dataOwn"
@@ -473,6 +476,7 @@
     <!-- 添加订单 -->
     <el-dialog v-model="dialogFormOrderVisible" title="添加订单" style="width: 80%">
       <tablecmt
+        isNotSave
         class="addTable"
         ref="multipleTable"
         :columnList="columnList"
@@ -602,6 +606,7 @@
       style="width: 80%"
     >
       <tablecmt
+        isNotSave
         ref="orderChooseTable"
         class="orderChooseTable"
         :columnList="order.columnOrderList"
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 3f233b92..d8cb16f5 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -87,6 +87,7 @@
           <!-- <el-button type="primary" icon="Position" @click="Orderexport">订单导出</el-button> -->
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             ref="tableNodeOrderRef"
             :columnList="columnListarrs.ordoption"
             :tableData="orddata"
@@ -107,7 +108,7 @@
               @size-change="sizeOrderChange"
               @current-change="currentOrderChange"
               :current-page="ordpage.currentPage"
-              :page-sizes="[30, 50, 80, 120,200]"
+              :page-sizes="[30, 50, 80, 120, 200]"
               :page-size="ordpage.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="ordpage.total"
@@ -129,6 +130,7 @@
           </el-button>
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             ref="tableNodePackageRef"
             :columnList="columnListarrs.wrapoption"
             :tableData="packdata"
@@ -154,7 +156,7 @@
               @size-change="psizeChange"
               @current-change="pcurrentChange"
               :current-page="packpage.currentPage"
-              :page-sizes="[30, 50, 80, 120,200]"
+              :page-sizes="[30, 50, 80, 120, 200]"
               :page-size="packpage.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="packpage.total"
@@ -167,6 +169,7 @@
 
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             ref="tableNodeInventoryRef"
             :columnList="columnListarrs.inventoryoption"
             :tableData="inventorydata"
@@ -193,7 +196,7 @@
               @size-change="sizeInChange"
               @current-change="currentInChange"
               :current-page="inventorypage.currentPage"
-              :page-sizes="[30, 50, 80, 120,200]"
+              :page-sizes="[30, 50, 80, 120, 200]"
               :page-size="inventorypage.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="inventorypage.total"
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 92d30b24..c2205a43 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -71,6 +71,7 @@
           <!-- <template v-if="this.activename === 'nocheck'"> -->
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             ref="unconfirmedList"
             class="tableNode"
             :columnList="columnList"
@@ -200,6 +201,7 @@
               </el-row>
               <!-- 列表模块 -->
               <tablecmt
+                isNotSave
                 class="tableNode"
                 ref="confirmList"
                 :columnList="columnList"
@@ -333,15 +335,29 @@
   </el-dialog>
 
   <el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%">
-    <div v-loading="dialogCancelReservationloading" element-loading-text="Loading..." class="el_gCancelReservation">
+    <div
+      v-loading="dialogCancelReservationloading"
+      element-loading-text="Loading..."
+      class="el_gCancelReservation"
+    >
       <el-form :model="cancel">
         <el-form-item label="原因:">
-          <el-input     :rows="4"   type="textarea" v-model="cancel.message" autocomplete="off"></el-input>
+          <el-input
+            :rows="4"
+            type="textarea"
+            v-model="cancel.message"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCancelReservation = false">关 闭</el-button>
-        <el-button type="primary" @click="cancelReservationConfirm(row)" :disabled="dialogCancelReservationloading">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="cancelReservationConfirm(row)"
+          :disabled="dialogCancelReservationloading"
+          >确 定</el-button
+        >
       </div>
     </div>
   </el-dialog>
@@ -1120,7 +1136,6 @@ export default {
         })
         .catch(err => {
           console.log(err);
-          
         })
         .finally(() => {
           this.dialogCancelReservationloading = false;
@@ -1758,8 +1773,8 @@ export default {
 .avue-crud {
   height: 100%;
 }
-.el_gCancelReservation{
-  .el-form-item{
+.el_gCancelReservation {
+  .el-form-item {
     width: 100%;
     flex-direction: column;
   }
diff --git a/src/views/distribution/reservation/reservationAddFrom copy.vue b/src/views/distribution/reservation/reservationAddFrom copy.vue
index da89c9ba..f36ac306 100644
--- a/src/views/distribution/reservation/reservationAddFrom copy.vue	
+++ b/src/views/distribution/reservation/reservationAddFrom copy.vue	
@@ -128,6 +128,7 @@
         <el-tab-pane label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
+            isNotSave
             class="tablesc"
             :columnList="columnList"
             :tableData="renderOrderData"
@@ -198,6 +199,7 @@
 
               <!-- 表格 -->
               <tablecmt
+                isNotSave
                 class="mt10"
                 style="height: 50vh"
                 :columnList="inventoryInfocolumnList"
@@ -266,6 +268,7 @@
 
               <!-- 表格 -->
               <tablecmt
+                isNotSave
                 class="tablesc mt10"
                 style="height: 50vh"
                 :columnList="stockcolumnList"
@@ -324,6 +327,7 @@
           :model="addvalue"
         >
           <tablecmt
+            isNotSave
             :columnList="stockArtcolumnList"
             :tableData="stockArticleInfo"
             :checkselect="orderSelectList"
@@ -445,6 +449,7 @@
         <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="90%">
           <div v-loading="Inventoryloading" element-loading-text="正在拼命加载中...">
             <tablecmt
+              isNotSave
               :columnList="inventoryInfocolumnList"
               :tableData="inventoryInfo"
               :checkselect="inventorySelectList"
@@ -484,6 +489,7 @@
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
+            isNotSave
             :columnList="columnParcels"
             :tableData="packageData"
             :checkselect="packageDataSec"
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index e0cfa2d2..94f222dc 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -137,6 +137,7 @@
         <el-tab-pane name="orderTab" label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
+            isNotSave
             class="tablesc"
             :columnList="columnList"
             :tableData="renderOrderData"
@@ -186,6 +187,7 @@
         <el-tab-pane name="InventoryTab" label="库存品">
           <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
           <tablecmt
+            isNotSave
             class="tablesc"
             :columnList="stockcolumnList"
             :tableData="renderInventoryData"
@@ -242,6 +244,7 @@
       >
         <el-button type="primary" @click="Batchmodifycustomers">批量修改客户 </el-button>
         <tablecmt
+          isNotSave
           ref="orderTableNode"
           :columnList="stockArtcolumnList"
           :tableData="stockArticleInfo"
@@ -342,6 +345,7 @@
       <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="90%">
         <div v-loading="Inventoryloading" element-loading-text="正在拼命加载中...">
           <tablecmt
+            isNotSave
             ref="inventoryTableNode"
             :columnList="inventoryInfocolumnList"
             :tableData="inventoryInfo"
@@ -393,6 +397,7 @@
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
+            isNotSave
             ref="packageTableNode"
             :columnList="columnParcels"
             :tableData="packageData"
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 5dadab79..68dee37c 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -142,6 +142,7 @@
             </el-button>
 
             <tablecmt
+              isNotSave
               :columnList="stockArticleColumnList"
               :tableData="stockArticleData"
               :loading="loading"
@@ -162,6 +163,7 @@
               >导出
             </el-button>
             <tablecmt
+              isNotSave
               :columnList="packageColumnList"
               :tableData="parcelList"
               :loading="loading"
@@ -186,6 +188,7 @@
               >导出
             </el-button>
             <tablecmt
+              isNotSave
               :columnList="stockListColumnList"
               :tableData="stockList"
               :loading="loading"
diff --git a/src/views/distribution/signfor/asurcharge.vue b/src/views/distribution/signfor/asurcharge.vue
index b0abca5d..8d82cce2 100644
--- a/src/views/distribution/signfor/asurcharge.vue
+++ b/src/views/distribution/signfor/asurcharge.vue
@@ -68,6 +68,7 @@
         <el-row v-if="[1, 3, 4, 5].includes(tabName)">
           <!-- 列表模块 -->
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="details.columnList"
             :tableData="data"
@@ -163,6 +164,7 @@
   <el-dialog v-model="packdialog" :title="Tipstitle" width="70%">
     <!-- 列表模块 -->
     <tablecmt
+      isNotSave
       class="TctableNode"
       :columnList="details.columnListTC"
       :tableData="dataTC"
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 45a64352..7865e187 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -557,6 +557,7 @@
 
   <el-dialog :title="numberTitle" v-model="numberDetailDialogVisible" width="70%">
     <tablecmt
+      isNotSave
       :columnList="numberDetailColumnList"
       :tableData="numberDetailData"
       :loading="loading"
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index bd8e9a42..027e7351 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -11,6 +11,7 @@
         >
           <el-tab-pane label="预约列表" name="reservation">
             <tablecmt
+              isNotSave
               :columnList="columnListarrs.columnReservation"
               :tableData="data3"
               :loading="loading"
@@ -41,6 +42,7 @@
           </el-tab-pane>
           <el-tab-pane label="订单列表" name="library">
             <tablecmt
+              isNotSave
               :columnList="columnListarrs.columnStockOrder"
               :tableData="dataPare"
               :loading="loading"
@@ -77,6 +79,7 @@
               >批量备货</el-button
             >
             <tablecmt
+              isNotSave
               :columnList="columnListarrs.columnStockingBag"
               :tableData="data1"
               :loading="loading"
@@ -134,6 +137,7 @@
             >
 
             <tablecmt
+              isNotSave
               :columnList="columnListarrs.columnInventory"
               :tableData="data2"
               :loading="loading"
@@ -178,6 +182,7 @@
         >
 
         <tablecmt
+          isNotSave
           :columnList="columnListarrs.columnInventoryBatch"
           :tableData="packageCodeList"
           :loading="loading"
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 9f020724..6f01871c 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -74,6 +74,7 @@
         >
           <el-tab-pane label="自提列表" name="reservation">
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnList1"
               :tableData="data3"
@@ -106,6 +107,7 @@
           </el-tab-pane>
           <el-tab-pane label="订单列表" name="library">
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnList2"
               :tableData="dataPare"
@@ -141,6 +143,7 @@
               >备货</el-button
             >
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnList3"
               :tableData="data1"
@@ -186,6 +189,7 @@
           <el-tab-pane label="库存品" name="enter">
             <el-button @click="handleBatchDetail1('2')">批量打印</el-button>
             <tablecmt
+              isNotSave
               class="tableNode"
               :columnList="columnList4"
               :tableData="data2"
@@ -269,6 +273,7 @@
         >
 
         <tablecmt
+          isNotSave
           class="tableNode"
           :columnList="columnInventoryBatch"
           :tableData="packageCodeList"
@@ -369,6 +374,7 @@
     <!-- 库存品查看详情 -->
     <el-dialog v-model="dialogInventory" title="详情" width="60%">
       <tablecmt
+        isNotSave
         class="tableNodeS"
         :columnList="TccolumnInventory"
         :tableData="TccolumnInventoryData"
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 3e6b3219..92b4da04 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -317,6 +317,7 @@
                 <!-- 首页表格顶部结束 -->
                 <div class="el-Cart">
                   <tablecmt
+                    isNotSave
                     class="columnList"
                     style="height: 60vh"
                     ref="newColumnListNode"
@@ -480,6 +481,7 @@
       </div>
       <!-- 顶部结束 -->
       <tablecmt
+        isNotSave
         class="columnList mt10"
         style="height: 60vh"
         ref="columnListNode"
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 89136a5a..7ce67be3 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -193,6 +193,7 @@
         <div class="mt10">
           <!-- 表格 -->
           <tablecmt
+            isNotSave
             ref="tableBox"
             :columnList="columnList"
             :tableData="reservationData"
@@ -310,6 +311,7 @@
   <el-dialog title="预约池" v-model="reservationDialogVisible" width="70%" height="50%">
     <el-row>
       <tablecmt
+        isNotSave
         ref="reservationListBox"
         :columnList="reservationListColumnList"
         :tableData="reservationListData"
diff --git a/src/views/finance/MerchantDepositSlip.vue b/src/views/finance/MerchantDepositSlip.vue
index cbb90278..7a146f33 100644
--- a/src/views/finance/MerchantDepositSlip.vue
+++ b/src/views/finance/MerchantDepositSlip.vue
@@ -10,19 +10,19 @@
           </el-form-item>
           <el-form-item label="收货仓库">
             <el-select
-                v-model="details.query.destinationWarehouseName"
-                filterable
-                clearable
-                placeholder="请选择仓库搜索"
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="item in warehouseList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                />
-              </el-select>
+              v-model="details.query.destinationWarehouseName"
+              filterable
+              clearable
+              placeholder="请选择仓库搜索"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label"
+              />
+            </el-select>
           </el-form-item>
           <!-- <el-form-item label="是否关联售后">
             <el-select
@@ -119,6 +119,7 @@
   <!-- 订单详情 -->
   <el-dialog v-model="details.popUpShow.orderVisted" width="70%" title="订单详情">
     <tablecmt
+      isNotSave
       ref="orderTableNodeRef"
       :columnList="details.orderInfo.columnList"
       :tableData="details.orderInfo.data"
@@ -164,20 +165,20 @@ import { columnList, orderColumnList } from '@/option/finance/MerchantDepositSli
 import { useRouter } from 'vue-router';
 import { deepClone } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import {  $_getMyWarehouseList } from '@/api/reportforms/index.js';
+import { $_getMyWarehouseList } from '@/api/reportforms/index.js';
 // 获取路由实例
 const $router = useRouter();
-const warehouseList=ref([])
+const warehouseList = ref([]);
 $_getMyWarehouseList().then(res => {
-    console.log(res, '仓库列表');
-    if (res.data.data.length)
-      res.data.data.forEach(item => {
-        warehouseList.value.push({
-          value: item.name,
-          label: item.name,
-        });
+  console.log(res, '仓库列表');
+  if (res.data.data.length)
+    res.data.data.forEach(item => {
+      warehouseList.value.push({
+        value: item.name,
+        label: item.name,
       });
-  });
+    });
+});
 const details = reactive<any>({
   /** 是否开启搜索 */
   search: true,
@@ -299,7 +300,7 @@ const processTimeSection = (query, sectionKey, startKey, endKey) => {
 };
 
 const TimeProcessing = query => {
-  console.log(query,'query');
+  console.log(query, 'query');
   processTimeSection(query, 'calculateTimeSection', 'openTimeStart', 'openTimeEnd');
 };
 const initOnLoad = (params = {}) => {
diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue
index 7f425164..35c8e3aa 100644
--- a/src/views/finance/ReconciliationDepositSlip.vue
+++ b/src/views/finance/ReconciliationDepositSlip.vue
@@ -225,7 +225,11 @@
           </div>
         </template>
 
-        <tablecmt :columnList="details.confirmColumnList" :tableData="details.selectionList">
+        <tablecmt
+          isNotSave
+          :columnList="details.confirmColumnList"
+          :tableData="details.selectionList"
+        >
         </tablecmt>
 
         <div class="flex-c-c dialog-footer">
diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue
index 9a07f385..bed68aca 100644
--- a/src/views/mail/order/add.vue
+++ b/src/views/mail/order/add.vue
@@ -128,6 +128,7 @@
         <el-tab-pane label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
+            isNotSave
             :columnList="columnList"
             :tableData="orderData"
             :loading="loading"
@@ -204,6 +205,7 @@
         <el-tab-pane label="库存品">
           <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
           <tablecmt
+            isNotSave
             :columnList="stockcolumnList"
             :tableData="inventoryData"
             :loading="loading"
@@ -276,6 +278,7 @@
           <!--            </el-form-item>-->
           <!--          </el-form>-->
           <tablecmt
+            isNotSave
             class="tableNode"
             :columnList="stockArtcolumnList"
             :tableData="stockArticleInfo"
@@ -421,6 +424,7 @@
           <!--            </el-form-item>-->
           <!--          </el-form>-->
           <tablecmt
+            isNotSave
             class="kcptableNode"
             :columnList="inventoryInfocolumnList"
             :tableData="inventoryInfo"
@@ -458,6 +462,7 @@
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
+            isNotSave
             class="tcpack"
             :columnList="columnParcels"
             :tableData="packageData"
diff --git a/src/views/mail/reservation/list.vue b/src/views/mail/reservation/list.vue
index b058851a..44e797f9 100644
--- a/src/views/mail/reservation/list.vue
+++ b/src/views/mail/reservation/list.vue
@@ -61,6 +61,7 @@
             <template v-if="this.activename === 'nocheck'">
               <!-- 列表模块 -->
               <tablecmt
+                isNotSave
                 :columnList="columnList"
                 :tableData="data"
                 :loading="loading"
@@ -117,6 +118,7 @@
             <template v-if="this.activename === 'yescheck'">
               <!-- 列表模块 -->
               <tablecmt
+                isNotSave
                 :columnList="columnList"
                 :tableData="data"
                 :loading="loading"
diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue
index 97238cf6..7c9e3b30 100644
--- a/src/views/waybill/ChangeOrder.vue
+++ b/src/views/waybill/ChangeOrder.vue
@@ -177,7 +177,12 @@
       <el-table-column v-for="item in details.viewColumnList" prop="address" :label="item.label" />
     </el-table> -->
 
-    <tablecmt :columnList="details.viewColumnList" :tableData="data" :loading="loadingObj.list">
+    <tablecmt
+      isNotSave
+      :columnList="details.viewColumnList"
+      :tableData="data"
+      :loading="loadingObj.list"
+    >
     </tablecmt>
   </el-dialog>
 
diff --git a/src/views/waybill/ComparativeStatement.vue b/src/views/waybill/ComparativeStatement.vue
index c1cbd6c0..1ec50e61 100644
--- a/src/views/waybill/ComparativeStatement.vue
+++ b/src/views/waybill/ComparativeStatement.vue
@@ -7,6 +7,7 @@
       </div>
       <el-divider content-position="left"> 仓库节点 </el-divider>
       <tablecmt
+        isNotSave
         :columnList="details.warehouseNodeColumnList"
         :tableData="data"
         :loading="loadingObj.list"
@@ -21,6 +22,7 @@
       </div>
       <el-divider content-position="left"> 总装车数 <span class="red">(22)</span> </el-divider>
       <tablecmt
+        isNotSave
         :columnList="details.truckLoadingColumnList"
         :tableData="data"
         :loading="loadingObj.list"
@@ -33,6 +35,7 @@
       </el-divider>
       <div class="red">描述：已匹配配载运单指该车次配载的运单和装车零担数据能匹配上</div>
       <tablecmt
+        isNotSave
         :columnList="details.truckLoadingColumnList"
         :tableData="data"
         :loading="loadingObj.list"
@@ -45,6 +48,7 @@
       </el-divider>
       <div class="red">描述：已匹配配载运单指该车次配载的运单和装车包条码能匹配上</div>
       <tablecmt
+        isNotSave
         :columnList="details.truckLoadingColumnList"
         :tableData="data"
         :loading="loadingObj.list"
@@ -59,6 +63,7 @@
         描述：未匹配配载运单指该车次配载的运单和装车包条码尚未匹配上，可能配载的运单和装车的货物有错误
       </div>
       <tablecmt
+        isNotSave
         :columnList="details.truckLoadingColumnList"
         :tableData="data"
         :loading="loadingObj.list"
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 5fb7e237..170e746e 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -178,6 +178,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.packageDetailColumnList"
       :tableData="details.packageDetailData"
       :loading="loadingObj.packageListLoading"
@@ -244,6 +245,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.flowNodeColumnList"
       :tableData="details.flowNodeData"
       :loading="loadingObj.packageListLoading"
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index a9490e1f..b91e6956 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -231,6 +231,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.packageDetailColumnList"
       :tableData="details.packageDetailData"
       :loading="loadingObj.packageListLoading"
@@ -297,6 +298,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.flowNodeColumnList"
       :tableData="details.flowNodeData"
       :loading="loadingObj.packageListLoading"
diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue
index 571ecc7b..ecee07cd 100644
--- a/src/views/waybill/orderPackageListDetailsByMarket.vue
+++ b/src/views/waybill/orderPackageListDetailsByMarket.vue
@@ -207,6 +207,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.packageDetailColumnList"
       :tableData="details.packageDetailData"
       :loading="loadingObj.packageListLoading"
@@ -273,6 +274,7 @@
       </div>
     </template>
     <tablecmt
+      isNotSave
       :columnList="details.flowNodeColumnList"
       :tableData="details.flowNodeData"
       :loading="loadingObj.packageListLoading"

From b0a71b6e14d0fc0105ad2e44874794a034ba34f8 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 6 Jan 2025 16:08:34 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reportforms/PackageAllTrunklineTimePageReport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
index 45c46979..385ac0bd 100644
--- a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
+++ b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue
@@ -24,7 +24,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="运单创建时间">
+          <el-form-item label="工厂推送时间">
             <el-date-picker
               v-model="query.timeArr"
               type="daterange"

From 476913e4075ec9ffa44db29077c367c1b3b52046 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 6 Jan 2025 17:25:13 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=9C=BA=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/signfor/distributionSignfor.vue      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index e0ed85c2..a3d740a5 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -399,6 +399,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'consignee',
           label: '客户名称',