修复表格缓存问题

src/views/Pricesystem/ListOfPriceSystems.vue

@@ -161,7 +161,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, deepClone } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 const $router = useRouter(); //跳转
@@ -205,7 +205,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],

src/views/aftersales/WorkorderTimeout.vue

@@ -88,7 +88,7 @@
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/aftersales/WorkorderTimeout.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty } from '@/utils/util';
+import { processRowProperty, deepClone } from '@/utils/util';
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -127,7 +127,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [{}],
@@ -208,12 +208,9 @@ const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   test(details.query);
-    
 };
 // 实例函数
-const test=(val)=>{
-
-}
+const test = val => {};
 /** 表格表头时间选择 */
 const timesc = (index, row) => {
   console.log(index, row);

src/views/aftersales/aftersalesWorkOrder.vue

@@ -205,7 +205,12 @@
               </div>
             </el-row>
             <!-- 申诉列表展示 -->
-            <el-tabs type="border-card" v-if="TabPermissions == 6" @tab-change="AppealTab" v-model="arbitrationTemp">
+            <el-tabs
+              type="border-card"
+              v-if="TabPermissions == 6"
+              @tab-change="AppealTab"
+              v-model="arbitrationTemp"
+            >
               <el-tab-pane :name="0" label="仲裁中"></el-tab-pane>
               <el-tab-pane :name="1" label="申诉列表"></el-tab-pane>
             </el-tabs>
@@ -382,7 +387,7 @@
             <!-- 分页模块 -->
             <el-row class="el-fy">
               <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-                <div>勾选数量:{{details.selectionList.length}}</div>
+                <div>勾选数量:{{ details.selectionList.length }}</div>
                 <el-pagination
                   align="right"
                   background
@@ -1074,7 +1079,7 @@ import {
 } from '@/option/aftersales/vueTvemp.js';
 import { processRowProperty, isNumber, computeNumber } from '@/utils/util';
 import { useRouter } from 'vue-router';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, deepClone } from '@/utils/util';
 import dayjs from 'dayjs';
 const $router = useRouter();
 const $useStore = useStore();
@@ -1210,14 +1215,11 @@ const screenHeight = ref(0); // 屏幕高度
 const eightyPercentHeight = ref(0); // 80% 高度
 const list = ref([]);
 const options = ref([]);
-const arbitration = ref(
-  {
+const arbitration = ref({
   a: 0,
   b: 1,
-  },
- 
-);
-const arbitrationTemp=ref(0);//仲裁中当点击的那个菜单
+});
+const arbitrationTemp = ref(0); //仲裁中当点击的那个菜单
 const CustomerData = ref([]); //客服指派表格查询
 const repulse = ref(false);
 const dialogBatchcompletion = ref(false); //批量完结弹窗
@@ -1302,12 +1304,12 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
   // 处理记录
-  recordList,
+  recordList: deepClone(recordList),
   // 处理记录数据
   recorddata: [],
   /** 页面loading */
@@ -2520,29 +2522,6 @@ const inputsc = async (index, row) => {
   await DataRendering(TabPermissions.value, details.query, true);
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
   return;
-  console.log('没有执行');
-  if (TabPermissions.value == '4') {
-    // 理赔金额未出
-    settlementclaim(details.query);
-    return;
-  }
-
-  if (AppealStatusT.value && TabPermissions.value == '6') {
-    // 申诉列表
-    appealFn(details.query);
-    return;
-  }
-  if (TabPermissions.value == '8') {
-    // 待回复
-    ProcessingPartyFun(details.query);
-    return;
-  }
-  if (TabPermissions.value == '7') {
-    TimeoutHandling(details.query); //超时未处理
-    return;
-  }
-
-  IndexTable(details.query); //首页初始化信息
 
   // =======
 
@@ -2576,20 +2555,6 @@ const inputsc = async (index, row) => {
 const searchChange = () => {
   DataRendering(TabPermissions.value, details.query, true);
   return;
-
-  if (ClaimStatus.value) {
-    // 表示这是理赔查询
-    settlementclaim();
-    details.search = false; //关闭搜索
-    return;
-  }
-
-  details.search = false; //关闭搜索
-  if (!ProcessingPartyState.value) {
-    IndexTable(details.query); //首页初始化信息
-  } else {
-    ProcessingPartyFun(details.query); //处理方信息
-  }
 };
 
 const emptyvalues = data => {
@@ -2637,15 +2602,6 @@ const timesc = async (index, row) => {
   await DataRendering(TabPermissions.value, details.query, true);
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
   return;
-
-  console.log(index, row);
-  if (!!index) {
-    index = dayjs(index).format('YYYY-MM-DD');
-  }
-  details.query[row.prop] = index;
-  if (!index) {
-    delete details.query[row.prop];
-  }
 };
 
 /** 表格表头输入框搜索 */
@@ -2664,30 +2620,6 @@ const selectsc = async (index, row) => {
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
 
   return;
-
-  if (TimeoutStatus.value) {
-    // 超时列表
-    TimeoutHandling(details.query);
-    return;
-  }
-
-  if (AppealStatus.value) {
-    // 申诉列表
-    appealFn(details.query);
-    return;
-  }
-
-  if (ClaimStatus.value) {
-    // 这是理赔搜索
-    settlementclaim(details.query);
-    return;
-  }
-
-  if (!ProcessingPartyState.value) {
-    IndexTable(details.query); //首页初始化信息
-  } else {
-    ProcessingPartyFun(details.query); //处理方信息
-  }
 };
 
 // 反字典公共请求
@@ -2716,30 +2648,6 @@ const currentChange = async val => {
   await DataRendering(TabPermissions.value, details.query, true);
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
   return;
-  // 超时
-  if (TimeoutStatus.value) {
-    TimeoutHandling(details.query);
-    return;
-  }
-
-  if (AppealStatus.value) {
-    // 申诉列表
-    appealFn(details.query);
-    return;
-  }
-
-  if (ClaimStatus.value) {
-    // 这是理赔
-    settlementclaim(details.query);
-    return;
-  }
-
-  if (!ProcessingPartyState.value) {
-    //表示当前不是处理方
-    IndexTable(details.query);
-  } else {
-    ProcessingPartyFun(details.query);
-  }
 };
 // 每页多少条
 const sizeChange = async val => {
@@ -2748,29 +2656,6 @@ const sizeChange = async val => {
   await DataRendering(TabPermissions.value, details.query, true);
   TabList.value.find(res => res.name == TabPermissions.value).request = false;
   return;
-  // 超时
-  if (TimeoutStatus.value) {
-    TimeoutHandling(details.query);
-    return;
-  }
-  if (AppealStatus.value) {
-    // 申诉列表
-    appealFn(details.query);
-    return;
-  }
-
-  if (ClaimStatus.value) {
-    // 这是理赔
-    settlementclaim(details.query);
-    return;
-  }
-
-  if (!ProcessingPartyState.value) {
-    //表示当前不是处理方
-    IndexTable(details.query);
-  } else {
-    ProcessingPartyFun(details.query);
-  }
 };
 const changeProcessingResults = val => {
   // 首先删除取消的项目
@@ -2939,13 +2824,12 @@ const appealFn = val => {
 
 // 申诉列表
 const AppealTab = val => {
-
   console.log(val, '仲裁中当前列表');
-  console.log(arbitration.value,'菜单');
-  arbitrationTemp.value=val
+  console.log(arbitration.value, '菜单');
+  arbitrationTemp.value = val;
 
   if (val == 0) {
-    arbitrationTemp.value=0
+    arbitrationTemp.value = 0;
     AppealStatusT.value = false; //申诉列表关闭
     Tableheaderswitching(columnList); //切换表头
     console.log('处理完毕');
@@ -2958,8 +2842,7 @@ const AppealTab = val => {
     };
     IndexTable(data, true);
   } else {
-
-    arbitrationTemp.value=1
+    arbitrationTemp.value = 1;
     AppealListFn(); //申诉列表函数
   }
 
@@ -2970,7 +2853,7 @@ const AppealTab = val => {
 // 申诉列表公共函数
 function AppealListFn(val) {
   AppealStatusT.value = true; //申诉列表开启
-  console.log(AppealStatusT.value,'AppealStatusT.value');
+  console.log(AppealStatusT.value, 'AppealStatusT.value');
   data.workOrderStatus = '';
   console.log(data.workOrderStatus, '当前搜索状态');
   Tableheaderswitching(AppealList); //切换表头
@@ -3165,7 +3048,6 @@ const DataRendering = (val, input, Refresh) => {
 
     IndexTable(data, Refresh);
   } else if (val == 6 && AppealStatusT.value) {
-  
     // 申诉列表
     Tableheaderswitching(AppealList); //切换表头
     console.log('申诉列表');
@@ -3173,8 +3055,8 @@ const DataRendering = (val, input, Refresh) => {
     details.query.workOrderStatus = null;
     AppealListFn(data, Refresh); //申诉列表函数
   } else if (val == 6) {
-    console.log(arbitrationTemp.value,'arbitrationTemp.value');
-    console.log(AppealStatusT.value,'AppealStatusT.value');
+    console.log(arbitrationTemp.value, 'arbitrationTemp.value');
+    console.log(AppealStatusT.value, 'AppealStatusT.value');
     // 完结
     ProcessingPartyState.value = false; //关闭处理方
     data.workOrderStatus = 80;
@@ -3235,107 +3117,6 @@ const tabChenge = async (val, input, Refresh = false) => {
   DataRendering(TabPermissions.value, input, Refresh);
 
   return;
-  if (val == 0) {
-    ProcessingPartyState.value = false; //关闭处理方
-    ArbitrationStatus.value = true; //可以以申请仲裁
-    if (UserPermissions.value == '仓库客服') {
-      //全部
-      data.workOrderStatus = 1000;
-      details.query.workOrderStatus = 1000;
-      Tableheaderswitching(columnList);
-      IndexTable(data);
-    } else {
-      details.query.workOrderStatus = null;
-      Tableheaderswitching(columnList);
-      IndexTable();
-    }
-  } else if (val == 1) {
-    // 处理中
-    if (UserPermissions.value == '仓库客服') {
-      data.workOrderStatus = 20;
-      details.query.workOrderStatus = 20;
-    } else {
-      data.workOrderStatus = 40;
-      details.query.workOrderStatus = 40;
-    }
-    ProcessingPartyState.value = false; //关闭处理方
-    ArbitrationStatus.value = true; //可以申请仲裁
-    Tableheaderswitching(columnList);
-    IndexTable(data);
-  } else if (val == 2) {
-    //处理完毕
-    data.workOrderStatus = 30;
-    details.query.workOrderStatus = 30;
-    ProcessingPartyState.value = false; //关闭处理方
-    ArbitrationStatus.value = false; //不可以申请仲裁
-    Tableheaderswitching(columnList);
-    IndexTable(data);
-  } else if (val == 3) {
-    // 待处理
-    ProcessingPartyState.value = true; //开启处理方
-    if (UserPermissions.value != '仓库客服') {
-      data.workOrderStatus = 500;
-      details.query.workOrderStatus = 500;
-    } else {
-      data.workOrderStatus = 10;
-      details.query.workOrderStatus = 10;
-    }
-    ArbitrationStatus.value = true; //可以申请仲裁
-    Tableheaderswitching(columnList);
-    IndexTable(data);
-  } else if (val == 4) {
-    // 理赔金额未出
-    ProcessingPartyState.value = false; //关闭处理方
-    details.query.workOrderStatus = null;
-    ArbitrationStatus.value = false; //不可以申请仲裁
-    Tableheaderswitching(Claimsfield); //切换表格
-    settlementclaim(data);
-  } else if (val == 5) {
-    // 仲裁中
-    ProcessingPartyState.value = false; //关闭处理方
-    data.workOrderStatus = 70;
-    details.query.workOrderStatus = 70;
-    ArbitrationStatus.value = false; //不可以申请仲裁
-    Tableheaderswitching(columnList); //表头切换
-    IndexTable(data);
-  } else if (val == 6 && AppealStatusT.value) {
-    console.log('申诉列表');
-    data.workOrderStatus = null;
-    details.query.workOrderStatus = null;
-    AppealListFn(data); //申诉列表函数
-  } else if (val == 6) {
-    // 完结
-    ProcessingPartyState.value = false; //关闭处理方
-    data.workOrderStatus = 80;
-    details.query.workOrderStatus = 80;
-    ArbitrationStatus.value = false; //不可以申请仲裁
-    Tableheaderswitching(columnList); //表头切换
-    IndexTable(data);
-    var bodyContent = document.querySelectorAll('.maboxhi');
-    const _height = getWinHight();
-    // 设置列表的高度
-    bodyContent.forEach(val => {
-      val.style.height = _height - val.getBoundingClientRect().top - (65 + 20) + 'px';
-    });
-  } else if (val == 7) {
-    // 超时未处理
-    ProcessingPartyState.value = false; //关闭处理方
-    data.workOrderStatus = null;
-    details.query.workOrderStatus = null;
-    ArbitrationStatus.value = false; //不可以申请仲裁
-    Tableheaderswitching(timeoutList); //表头切换
-    TimeoutHandling(); //调用超时未出理
-  } else if (val == 8) {
-    // 待回复按钮
-    if (UserPermissions.value == '仓库客服') {
-      // 不是仓库客服看不见待回复按钮
-      data.workOrderStatus = null;
-      details.query.workOrderStatus = null;
-      Tableheaderswitching(columnList);
-      ProcessingPartyFun(data);
-    }
-  }
-  console.log('执行完毕');
 };
 /**
  * 设置列表 -- 固定函数
@@ -3443,11 +3224,6 @@ const reply = val => {
     },
   });
   return;
-  console.log(val, 'ID++++++++');
-  console.log(val.row);
-  dialogcustomerService.value = true; //开启回复弹窗
-  ListRow.value = val.row; //存储当前行点击数据
-  FKList();
 };
 // 处理方数据
 const ProcessingParty = () => {
@@ -4722,7 +4498,6 @@ const AssignSubmission = () => {
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-
 }
 .el-times {
   :deep(.el-input__wrapper) {

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -792,9 +792,13 @@
                     <el-timeline-item timestamp="2018/4/12" placement="top">
                       <el-card>
                         <div>
-                      <span>操作人</span>  <h4>Update Github template</h4> </div>
-                      <div>   <span>操作事件</span>  <p>Tom committed 2018/4/12 20:46</p></div>
-                   
+                          <span>操作人</span>
+                          <h4>Update Github template</h4>
+                        </div>
+                        <div>
+                          <span>操作事件</span>
+                          <p>Tom committed 2018/4/12 20:46</p>
+                        </div>
                       </el-card>
                     </el-timeline-item>
                     <el-timeline-item timestamp="2018/4/3" placement="top">
@@ -909,7 +913,7 @@ import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
 import { getToken } from '@/utils/auth';
 import { useRoute, useRouter } from 'vue-router';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { computeNumber, isNumber, AddressClosed } from '@/utils/util';
+import { computeNumber, isNumber, AddressClosed, deepClone } from '@/utils/util';
 import { useStore } from 'vuex';
 // 获取vuex仓库
 const $store = useStore();
@@ -1051,12 +1055,12 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
   // 处理记录
-  recordList,
+  recordList: deepClone(recordList),
   // 处理记录数据
   recorddata: [],
   /** 页面loading */

src/views/basicdata/ConfigureBillingAndWarehousing/list.vue

@@ -204,7 +204,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce ,deepClone} from '@/utils/util';
 import { columnList } from '@/option/basicdata/ConfigureBillingAndWarehousing';
 import {
   postPageList,
@@ -268,7 +268,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/basicdata/TripartiteMaterial/list.vue

@@ -220,7 +220,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { columnList } from '@/option/basicdata/TripartiteMaterial';
 import {
   postPageList,
@@ -284,7 +284,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -142,7 +142,7 @@ import { columnList } from '@/option/basicdata/basicdataDriverArtery1';
 import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -153,7 +153,7 @@ export default {
     return {
       search: false,
       query: {},
-      columnList,
+      columnList: deepClone(columnList),
       data: [],
       drawerShow: false,
       page: {

src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue

@@ -591,7 +591,7 @@ import {
   $_getMyWarehouseList,
   $_Postupdate,
 } from '@/api/basicdata/basicdataWarehouse';
-import { processRowProperty } from '@/utils/util';
+import { processRowProperty, deepClone } from '@/utils/util';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
@@ -611,7 +611,7 @@ const dialogTitle = ref('新增');
 const handleRemove = file => {
   console.log(file);
 };
-const ruleFormRef = ref()
+const ruleFormRef = ref();
 const handlePictureCardPreview = file => {
   dialogImageUrl.value = file.url;
   dialogVisible.value = true;
@@ -621,10 +621,8 @@ const handleDownload = file => {
   console.log(file);
 };
 const rules = reactive({
-  name: [
-    { required: true, message: '仓库名称', trigger: 'change' },
-  ],
-})
+  name: [{ required: true, message: '仓库名称', trigger: 'change' }],
+});
 const Topquery = ref({}); //顶部搜索参数
 const newlyaddload = ref(false); //新增弹窗
 const AssessmentDepartment = ref([]); //考核部门
@@ -802,7 +800,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   query: {},
   /** 列表数据 */
   data: [],
@@ -992,7 +990,9 @@ const onLoad = val => {
             }
             if (item.grade) {
               // 仓库等级
-              item.grade = gradeList.value.find(res => res.dictKey === String(item.grade) || res.dictValue === String(item.grade)).dictValue;
+              item.grade = gradeList.value.find(
+                res => res.dictKey === String(item.grade) || res.dictValue === String(item.grade)
+              ).dictValue;
             }
           });
         } else {
@@ -1132,79 +1132,10 @@ const DeleteInformation = val => {
 };
 // 新增数据确定
 const newlyaddSubmit = () => {
-  ruleFormRef.value.validate(valid=>{
-    console.log(valid,'当前校验');
-  })
-  return
-  console.log(ruleFormRef);
-  if(ruleFormRef.value.validate){
-    console.log('通过校验');
-  }else{
-    console.log('未通过校验');
-
-  }
-  return
-  console.log(Addform.value);
-  Addform.value.warehouseAddress = Addform.value.address[2]; //仓库地址
-  Addform.value.longitude = Addform.value.address[0]; //精度
-  Addform.value.latitude = Addform.value.address[1]; //维度
-  console.log(AssessmentDepartment.value, '部门');
-  Addform.value.departmentName = department.value.label; //部门名称
-  Addform.value.startDate = dayjs(Addform.value.daterange[0]).format('YYYY-MM-DD'); //开始时间
-  Addform.value.endDate = dayjs(Addform.value.daterange[1]).format('YYYY-MM-DD'); //结束时间
-  if (Addform.value.paymentCodeUrlS) {
-    if (Addform.value.paymentCodeUrlS.length) {
-      Addform.value.paymentCodeUrl = Addform.value.paymentCodeUrlS[0].response.data.link; //收款码
-    }
-  }
-  Addform.value.administrativeAreas = Addform.value.administrativeAreas.join(',');
-  Addform.value.provinceCode = Addform.value.addressInfo[0]; //  仓库地区一级
-  Addform.value.cityCode = Addform.value.addressInfo[0]; //  仓库地区二级
-  Addform.value.code = Addform.value.addressInfo[0]; //  仓库地区三级
-  console.log(Addform.value);
-  let data = {
-    ...Addform.value,
-  };
-  console.log(data, '准备提交的参数');
-  if (dialogTitle.value == '新增') {
-    TCloading.value = true;
-    $_addsave(data)
-      .then(res => {
-        console.log(res, '新增之后返回值');
-        if (res.data.code == 200) {
-          newlyaddload.value = false; //关闭新增弹窗
-          Addform.value = {};
-          ElMessage({
-            message: res.data.msg,
-            type: 'success',
+  ruleFormRef.value.validate(valid => {
+    console.log(valid, '当前校验');
   });
-          onLoad();
-        }
-      })
-      .catch(() => {})
-      .finally(() => {
-        TCloading.value = false;
-      });
-  } else {
-    TCloading.value = true;
-    $_Postupdate(data)
-      .then(res => {
-        console.log(res, '编辑之后的值');
-        if (res.data.code == 200) {
-          newlyaddload.value = false; //关闭新增弹窗
-          Addform.value = {};
-          ElMessage({
-            message: res.data.msg,
-            type: 'success',
-          });
-          onLoad();
-        }
-      })
-      .catch(() => {})
-      .finally(() => {
-        TCloading.value = false;
-      });
-  }
+  return;
 };
 
 // 编辑信息

src/views/distribution/artery/AddVehicleStowage.vue

@@ -671,11 +671,11 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 订单池表头 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 调度池表头 */
-  newColumnList,
+  newColumnList: deepClone(newColumnList),
   /** 节点信息列表表头 */
-  nodeInfoColumnList,
+  nodeInfoColumnList: deepClone(nodeInfoColumnList),
   /** 列表数据 */
   data: [],
   /** 节点信息数据 */

src/views/distribution/artery/TripartiteTransfer.vue

@@ -481,9 +481,9 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 装车明细表头信息 */
-  detailsColumnList,
+  detailsColumnList: deepClone(detailsColumnList),
   /** 修改的列表信息 */
   editColumnList: [],
   /** 列表数据 */

src/views/distribution/artery/TripartiteTransferDetails.vue

@@ -316,7 +316,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, computeNumber, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
 import {
   postloadFindLoadInitData,
@@ -388,9 +388,9 @@ const details = reactive<any>({
   /** 修改的列表信息 */
   editColumnList: [],
   /** 运单池 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 调度池 */
-  newColumnList,
+  newColumnList: deepClone(newColumnList),
   /** 列表数据 */
   oldData: [],
   /** 渲染数据 */

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -520,7 +520,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/distribution/artery/VehicleStowage.vue

@@ -435,7 +435,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { columnList, packageColumnList } from '@/option/distribution/VehicleStowage';
 import {
   postloadCarsPageList,
@@ -504,7 +504,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */
@@ -548,7 +548,7 @@ const details = reactive<any>({
     /** 装载清单 */
     listOfLoadedWagonsPopUp: false,
   },
-  packageColumnList,
+  packageColumnList: deepClone(packageColumnList),
   /** 配置装车目的地数据 */
   packageData: [],
   /** 配置装车目的地数据 -- 渲染数据 */

src/views/distribution/artery/VehicleStowageDetails.vue

@@ -414,7 +414,7 @@ import {
 import { postRemoveCarsLoadScan } from '@/api/distribution/truckLoadingDetails';
 import { useRouter, useRoute } from 'vue-router';
 import { useStore } from 'vuex';
-import { ElMessage, ElMessageBox, ElSpace } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 /** 被合并的列 */
 const mergeColumn = [];
@@ -485,9 +485,9 @@ const details = reactive<any>({
   /** 修改的列表信息 */
   editColumnList: [],
   /** 运单池 */
-  detailsColumnList,
+  detailsColumnList: deepClone(detailsColumnList),
   /** 节点列表 */
-  nodeInfoColumnList,
+  nodeInfoColumnList: deepClone(nodeInfoColumnList),
   nodeInfoData: [],
   /** 列表数据 */
   oldData: [],

src/views/distribution/artery/abnormalList.vue

@@ -164,7 +164,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/distribution/abnormalList';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -212,7 +212,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [{}],
   /** 页面loading */

src/views/distribution/artery/addTripartiteTransfer.vue

@@ -432,7 +432,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, computeNumber, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
 import {
   postloadFindLoadInitData,
@@ -507,9 +507,9 @@ const details = reactive<any>({
   /** 修改的列表信息 */
   editColumnList: [],
   /** 运单池 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 调度池 */
-  newColumnList,
+  newColumnList: deepClone(newColumnList),
   /** 列表数据 */
   newData: [],
   newRenderData: [],

src/views/distribution/artery/directGoMarketDetails.vue

@@ -310,8 +310,8 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 装车明细表头信息 */
-  columnList,
-  detailsColumnList,
+  columnList: deepClone(columnList),
+  detailsColumnList: deepClone(detailsColumnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/distribution/artery/handleLoadingDestination.vue

@@ -90,7 +90,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { packageColumnList } from '@/option/distribution/VehicleStowage';
 import {
   postDetermineHasNoFinalNode,
@@ -153,7 +153,7 @@ const details = reactive<any>({
       },
     },
   ],
-  packageColumnList,
+  packageColumnList: deepClone(packageColumnList),
   /** 复选框选中数据 */
   selectionList: [],
   /** 后续节点数据 */

src/views/distribution/artery/truckLoadingDetails.vue

@@ -216,7 +216,7 @@ import {
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, getHtmls, debounce, setNodeHeight } from '@/utils/util';
+import { downloadXls, getHtmls, debounce, setNodeHeight, deepClone } from '@/utils/util';
 import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
 import { useRouter, useRoute } from 'vue-router';
 import print from '@/utils/print';
@@ -259,7 +259,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 装车明细表头信息 */
-  detailsColumnList,
+  detailsColumnList: deepClone(detailsColumnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/distribution/artery/zeroAdditionalRecording.vue

@@ -261,7 +261,7 @@ import {
   postDeleteZeroSuppleById,
   postFindNextNodeList,
 } from '@/api/distribution/zeroAdditionalRecording';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
 import { ElMessage } from 'element-plus';
 import { useRoute, useRouter } from 'vue-router';
@@ -318,8 +318,8 @@ const details = reactive<any>({
   stockupDate: [],
   /** 列表 */
   columnList: [],
-  oldColumnList,
-  newColumnList,
+  oldColumnList: deepClone(oldColumnList),
+  newColumnList: deepClone(newColumnList),
   /** 订单池数据 */
   oldData: [],
   /** 调度池数据 */

src/views/distribution/inventory/BookingNote.vue

@@ -16,7 +16,7 @@
                 <div class="flex-c-c">
                   <el-icon color="#172e60"><Van /></el-icon>
                   车次号:
-                  <span class="red">{{ query.trainNumber }}</span>
+                  <span class="red">{{ query.customerTrain }}</span>
                 </div>
               </div>
               <div class="mt10">

src/views/distribution/inventory/CreateOrder.vue

@@ -7,7 +7,7 @@
         :inline="true"
         :rules="details.rules"
         :model="query"
-        class="el-fr-d"
+        class="table_form"
         label-width="100px"
       >
         <!-- 顶部 -->
@@ -940,6 +940,59 @@
         <!-- <el-button type="primary" icon="Printer" @click="handlePrint">打 印</el-button> -->
       </div>
     </el-dialog>
+
+    <!-- 改单原因 -->
+    <el-dialog
+      title="修改信息"
+      :center="true"
+      :align-center="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      :visible.sync="details.popUpShow.causeVisited"
+      width="50%"
+      v-model="details.popUpShow.causeVisited"
+    >
+      <el-form :model="details.causeForm" label-width="120px">
+        <el-form-item label="修改原因：" style="margin-right: 0">
+          <el-select
+            v-model="details.causeForm.pickupPricingType"
+            clearable
+            multiple
+            placeholder="请选择修改原因"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in details.priceMethodType"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="备注：" style="margin-right: 0">
+          <el-input type="textarea" placeholder="请输入描述" />
+        </el-form-item>
+      </el-form>
+
+      <tablecmt
+        style="height: 40vh"
+        ref="tableNode"
+        :columnList="details.changeColumnList"
+        :tableData="details.changeData"
+        :loading="loadingObj.list"
+      >
+        <template #default="slotProps"> </template>
+      </tablecmt>
+
+      <div class="flex-c-c mt20">
+        <el-button icon="CircleClose" @click="() => (details.popUpShow.causeVisited = false)"
+          >取 消</el-button
+        >
+        <el-button type="primary" icon="CircleCheck" @click="handleRepetition">确 认</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -974,7 +1027,7 @@ import {
   debounce,
   getObjType,
 } from '@/utils/util';
-import { columnList, packageListColumnList } from '@/option/waybill/TemporaryStorageList';
+import { columnList } from '@/option/waybill/TemporaryStorageList';
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
 import { getLazyTreeAll } from '@/api/base/region';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -1008,6 +1061,8 @@ const $route = useRoute();
 // 获取vuex
 let $store = useStore();
 
+const tableNode = ref();
+
 console.log('$store :>> ', $store);
 
 const details = reactive<any>({
@@ -1481,7 +1536,7 @@ const details = reactive<any>({
     ],
   },
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   haveDataData: [],
   notHaveDataData: [],
@@ -1516,6 +1571,8 @@ const details = reactive<any>({
     columnListVisited: false,
     /** 是否继续开单 */
     titleVisited: false,
+    /** 改单原因 */
+    causeVisited: false,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -1540,6 +1597,45 @@ const details = reactive<any>({
     /** 装卸费 */
     // { name: '仓库存储费', key: 'storageFee' },
   ],
+  /** 提交类型 */
+  submitType: 'haveData' as 'haveData' | 'notHaveData',
+  /** 修改原因 */
+  causeForm: {},
+  /** 修改列表 */
+  changeColumnList: [
+    {
+      prop: 'itemName',
+      label: '修改项',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'oldValue',
+      label: '修改前',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'newValue',
+      label: '修改后',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: false,
+    },
+  ],
+  /** 修改数据 */
+  changeData: [],
 });
 
 const info = ref<any>({});
@@ -1728,6 +1824,8 @@ const initPageInfo = async (idsArr = []) => {
 
       details.query = { ...data, ...data.warehouseWaybill };
       delete details.query.warehouseWaybill;
+      console.log('details.query :>> ', details.query);
+      details.query.openOrderUserName = details.query.agent;
       details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
       details.query.openOrderDate = data.warehouseWaybill.createTime;
       details.query.orderCode = data.warehouseWaybill.orderNo;
@@ -1992,6 +2090,7 @@ const handleChoose = () => {
     const ids = details.selectionList.map(val => val.id);
     // 请求页面数据
     initPageInfo(ids);
+    details.submitType = details.orderStatus;
     details.popUpShow.columnListVisited = false;
     details.popUpShow.titleVisited = false;
   } catch (error) {
@@ -2351,7 +2450,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         details.submitData = submitData;
 
         // 有数据开单
-        if (details.orderStatus === 'haveData') res = await postOpenOrderOpenWaybill(submitData);
+        if (details.submitType === 'haveData') res = await postOpenOrderOpenWaybill(submitData);
         else {
           submitData.waybillType = 2;
 
@@ -2401,28 +2500,35 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         const response = await postUpdateWaybillVerify(submitData);
         if (response.data.code !== 200) return;
 
-        if (!response.data.data) return ElMessage.warning('没有更改的数据');
+        if (!response.data.data || response.data.data.length === 0)
+          return ElMessage.warning('没有更改的数据');
 
-        ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', {
-          dangerouslyUseHTMLString: true,
-          confirmButtonText: '确认',
-          callback: async (action: Action) => {
-            try {
-              details.loadingObj.submitLoadingBtn = true;
+        details.changeData = response.data.data;
+        details.popUpShow.causeVisited = true;
+        await nextTick();
 
-              const res = await postUpdateWaybill(submitData);
-              const { code, msg } = res.data;
-              if (code !== 200) return;
-              if (msg) ElMessage.success(msg);
+        setNodeHeight(tableNode.value.$el, '40vh');
 
-              back();
-            } catch (error) {
-              console.log('error :>> ', error);
-            } finally {
-              details.loadingObj.submitLoadingBtn = false;
-            }
-          },
-        });
+        // ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', {
+        //   dangerouslyUseHTMLString: true,
+        //   confirmButtonText: '确认',
+        //   callback: async (action: Action) => {
+        //     try {
+        //       details.loadingObj.submitLoadingBtn = true;
+
+        //       const res = await postUpdateWaybill(submitData);
+        //       const { code, msg } = res.data;
+        //       if (code !== 200) return;
+        //       if (msg) ElMessage.success(msg);
+
+        //       back();
+        //     } catch (error) {
+        //       console.log('error :>> ', error);
+        //     } finally {
+        //       details.loadingObj.submitLoadingBtn = false;
+        //     }
+        //   },
+        // });
       }
       const { code, msg } = res.data;
       if (code !== 200) return;
@@ -2602,6 +2708,7 @@ const handleChooseGoods = (item, val) => {
 details.deepQuery = deepClone(details.query);
 
 details.orderStatus = $route.query.orderStatus;
+details.submitType = $route.query.orderStatus;
 
 initPageInfo();
 
@@ -2622,14 +2729,20 @@ initPageInfo();
 
 <style scoped lang="scss">
 $borderColor: #172e60;
-:deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
+.table_form {
+  :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
     height: 100% !important;
-}
+  }
 
-:deep(.el-input__wrapper) {
+  :deep(.el-input__wrapper) {
     box-shadow: none;
     border-bottom: 1px solid $borderColor;
     border-radius: 0;
+  }
+}
+:deep(.table_form .el-form-item) {
+  flex: 1 !important;
+  margin: 0 !important;
 }
 
 .border-left {
@@ -2750,11 +2863,6 @@ $borderColor: #172e60;
   width: 100%;
 }
 
-:deep(.el-form-item) {
-  flex: 1;
-  margin: 0;
-}
-
 :deep(.el-radio) {
   margin: 0;
 }

src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue

@@ -424,12 +424,11 @@ import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
 import { ElMessage } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
-import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util';
 import func from '@/utils/func';
 import { computed, ref, reactive, onMounted, nextTick, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStore } from 'vuex';
-import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util';
 
 // 实例化router
 const $router = useRouter();
@@ -447,7 +446,7 @@ const newFormNode = ref<FormInstance>();
 const selectNodeRef = ref();
 
 const details = reactive({
-  columnNewList,
+  columnNewList: deepClone(columnNewList),
   newColumnNewList: deepClone(columnNewList),
   /** 列表配置抽屉 */
   drawerShow: false,

src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@@ -281,13 +281,19 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
-import { downloadXls, setNodeHeight, debounce, handleClearTableQuery } from '@/utils/util';
+import {
+  downloadXls,
+  setNodeHeight,
+  debounce,
+  handleClearTableQuery,
+  deepClone,
+} from '@/utils/util';
 
 export default {
   data() {
     return {
-      columnList,
-      columnDetailList,
+      columnList: deepClone(columnList),
+      columnDetailList: deepClone(columnDetailList),
       /** 列表配置抽屉 */
       drawerShow: false,
       height: 0,

src/views/distribution/inventory/delivery/orderLogs.vue

@@ -116,7 +116,7 @@ import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/distribution/orderLogs';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -164,7 +164,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [{}],
   /** 页面loading */

src/views/financialsector/CustomerBaseprice.vue

@@ -94,7 +94,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue
 import { columnList } from '@/option/financialsector/index.js';
 import { $_getpriceTemplate, $_deletelpriceTemplate } from '@/api/financialsector/index'; //价格模板
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { processRowProperty, setNodeHeight, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
@@ -141,7 +141,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -328,7 +328,7 @@ const Deletetemplate = () => {
     .then(() => {
       details.loadingObj.list = true;
       let data = {
-        ids:details.selectionList.map(res => res.id).join(','),
+        ids: details.selectionList.map(res => res.id).join(','),
       };
       $_deletelpriceTemplate(data).then(res => {
         if (res.data.code == 200) {
@@ -349,15 +349,15 @@ const Deletetemplate = () => {
 };
 
 // 修改模板
-const Modifytemplate=(row)=>{
+const Modifytemplate = row => {
   console.log(row);
   $router.push({
-        query:{
-            id:row.id
+    query: {
+      id: row.id,
     },
     path: '/financialsector/FinanceHome',
-    })
-}
+  });
+};
 </script>
 
 <style scoped lang="scss">

src/views/reportforms/DeliveryCustomers.vue

@@ -1,5 +1,3 @@
-
-
 <template>
   <basic-container>
     <!-- 首页表格 -->
@@ -86,7 +84,8 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" @click="exportReport">
-                    <el-icon><Download /></el-icon>导出报表</el-button>
+              <el-icon><Download /></el-icon>导出报表</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -148,24 +147,24 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/DeliveryCustomers.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty,setNodeHeight } from '@/utils/util';	
-  import {$_getcustomer,$_exportCustomer,$_getMyWarehouseList} from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util'; 
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const TopQuery=ref({});//顶部搜索
-  const warehouseList = ref([]); //仓库列表
-  // const DeliveryTypeList =ref([])
-  const queryCarn=ref({});//查询顶部
-  // const DeliverygenericList =ref([])
-  const DeliveryTypeList = ref([
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/DeliveryCustomers.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { $_getcustomer, $_exportCustomer, $_getMyWarehouseList } from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls, deepClone } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const TopQuery = ref({}); //顶部搜索
+const warehouseList = ref([]); //仓库列表
+// const DeliveryTypeList =ref([])
+const queryCarn = ref({}); //查询顶部
+// const DeliverygenericList =ref([])
+const DeliveryTypeList = ref([
   {
     label: '商配',
     value: '商配',
@@ -188,7 +187,7 @@ const DeliverygenericList = ref([
     value: '三方配送',
   },
 ]); //配送类型
-  const details = reactive({
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -226,7 +225,7 @@ const DeliverygenericList = ref([
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -264,9 +263,9 @@ const DeliverygenericList = ref([
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -280,13 +279,13 @@ const DeliverygenericList = ref([
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -297,20 +296,19 @@ const DeliverygenericList = ref([
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain()
-      
-  };
-  // 实例函数
-  const Toptiem = val => {
+};
+// 实例函数
+const Toptiem = val => {
   if (!val) {
     delete TopQuery.value.ks;
     delete TopQuery.value.end;
@@ -318,8 +316,8 @@ const DeliverygenericList = ref([
   console.log(val, '顶部时间触发');
   console.log(TopQuery.value, '顶部时间触发');
 };
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -329,104 +327,104 @@ const DeliverygenericList = ref([
     delete details.query[row.prop];
   }
   // getrain()
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
   // getrain()
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
+};
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.time) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-  }else{
-    delete  queryCarn.value.startTaskTime
-    delete  queryCarn.value.endTaskTime
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 车辆处理
-  if(TopQuery.value.vehicleNameRange){
-    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange
-  }else{
+  if (TopQuery.value.vehicleNameRange) {
+    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange;
+  } else {
     delete queryCarn.value.vehicleNameRange;
   }
   // 司机处理
-  if(TopQuery.value.driverNameRange){
-    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange
-  }else{
+  if (TopQuery.value.driverNameRange) {
+    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange;
+  } else {
     delete queryCarn.value.driverNameRange;
   }
 
   // 客户处理
-  if(TopQuery.value.consigneeRange){
-    queryCarn.value.consigneeRange = TopQuery.value.consigneeRange
-  }else{
+  if (TopQuery.value.consigneeRange) {
+    queryCarn.value.consigneeRange = TopQuery.value.consigneeRange;
+  } else {
     delete queryCarn.value.consigneeRange;
   }
 
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
 
 // 清空
-const searchReset=()=>{
+const searchReset = () => {
   TopQuery.value = {};
-  TopQuery.value.warehouseNameRange=[]
+  TopQuery.value.warehouseNameRange = [];
   queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
+  details.page.total = 0;
+  details.data = [];
   // getrain(queryCarn.value)
-}
-  // 每页多少条
-  const sizeChange = val => {
+};
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
-     getrain(queryCarn.value)
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+  getrain(queryCarn.value);
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
-    getrain(queryCarn.value)
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+  getrain(queryCarn.value);
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
-    getrain()
-  };
-  // 顶部搜索
-  const searchHide = () => {
+  getrain();
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -436,8 +434,8 @@ const searchReset=()=>{
       });
     });
   });
-  }
-  // 页面初始化方法
+}
+// 页面初始化方法
 // 页面初始化方法
 const onLoad = () => {
   warehouseList.value = [];
@@ -463,77 +461,78 @@ const onLoad = () => {
       });
   });
 };
-  onLoad();
-  // 获取数据
-const getrain=(val)=>{
-    let data={
-        current:details.page.currentPage,
-        size:details.page.pageSize,
-        ... details.query,
-        ...val
-    }
-    details.loadingObj.list=true
-    $_getcustomer(data).then(res=>{
-        console.log(res,'当前参数');
-        details.page.total  =  res.data.data.total
-        details.data = res.data.data.records
-  
-    }).catch(()=>{
-        
-    }).finally(()=>{
-        details.loadingObj.list=false
+onLoad();
+// 获取数据
+const getrain = val => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...val,
+  };
+  details.loadingObj.list = true;
+  $_getcustomer(data)
+    .then(res => {
+      console.log(res, '当前参数');
+      details.page.total = res.data.data.total;
+      details.data = res.data.data.records;
     })
-}
+    .catch(() => {})
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
+};
 // getrain()
 // 导出
-const exportReport=()=>{
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
   })
-    .then(()=>{
-      let data={
-        ... details.query
-      }
-      $_exportCustomer(data).then(res=>{
+    .then(() => {
+      let data = {
+        ...details.query,
+      };
+      $_exportCustomer(data)
+        .then(res => {
           downloadXls(res.data, `配送客户报表数据.xlsx`);
-      }).catch(()=>{
-
-}).finally(()=>{
-  details.loadingObj.list=false
-})
-
-    }).catch(()=>{})
-}
-  </script>
+        })
+        .catch(() => {})
+        .finally(() => {
+          details.loadingObj.list = false;
+        });
+    })
+    .catch(() => {});
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  :deep(.el-fr-d) {
+}
+:deep(.el-fr-d) {
   width: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -564,5 +563,4 @@ const exportReport=()=>{
     justify-content: flex-end;
   }
 }
-  </style>
-  
+</style>

src/views/reportforms/DeliveryDetails.vue

@@ -165,13 +165,13 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue
 import { columnList } from '@/option/reportforms/DeliveryDetails.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-import { $_getdetails, $_exportDetails,$_getMyWarehouseList } from '@/api/reportforms/index.js';
+import { $_getdetails, $_exportDetails, $_getMyWarehouseList } from '@/api/reportforms/index.js';
 import { ElMessageBox } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
-const queryCarn=ref({});//查询顶部
-const TopQuery=ref({});//查询顶部
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -197,12 +197,10 @@ const DeliverygenericList = ref([
   },
 ]); //配送类型
 
-
 // 签收状态
 
-const Signingstatus=ref(
-  [
-{
+const Signingstatus = ref([
+  {
     label: '已签收',
     value: '已签收',
   },
@@ -211,8 +209,7 @@ const Signingstatus=ref(
     label: '未签收',
     value: '未签收',
   },
-]
-)
+]);
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -251,7 +248,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnLists),
 
   /** 列表数据 */
   data: [],
@@ -362,65 +359,65 @@ const selectionChange = list => {
   details.selectionList = list;
 };
 // 清空
-const searchReset=()=>{
+const searchReset = () => {
   TopQuery.value = {};
-  TopQuery.value.warehouseNameRange=[]
+  TopQuery.value.warehouseNameRange = [];
   queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
+  details.page.total = 0;
+  details.data = [];
   // getrain();
-}
+};
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.time) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-  }else{
-    delete  queryCarn.value.startTaskTime
-    delete  queryCarn.value.endTaskTime
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 车辆处理
-  if(TopQuery.value.vehicleNameRange){
-    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange
-  }else{
+  if (TopQuery.value.vehicleNameRange) {
+    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange;
+  } else {
     delete queryCarn.value.vehicleNameRange;
   }
   // 司机处理
-  if(TopQuery.value.driverNameRange){
-    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange
-  }else{
+  if (TopQuery.value.driverNameRange) {
+    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange;
+  } else {
     delete queryCarn.value.driverNameRange;
   }
 
   // 客户处理
-  if(TopQuery.value.consigneeRange){
-    queryCarn.value.consigneeRange = TopQuery.value.consigneeRange
-  }else{
+  if (TopQuery.value.consigneeRange) {
+    queryCarn.value.consigneeRange = TopQuery.value.consigneeRange;
+  } else {
     delete queryCarn.value.consigneeRange;
   }
   // 运单收货人
-  if(TopQuery.value.consigneeNameRange){
-    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
-  }else{
+  if (TopQuery.value.consigneeNameRange) {
+    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange;
+  } else {
     delete queryCarn.value.consigneeNameRange;
   }
   // 运单收货人
-  if(TopQuery.value.consigneeNameRange){
-    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+  if (TopQuery.value.consigneeNameRange) {
+    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange;
   }
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
 // 每页多少条
@@ -490,7 +487,7 @@ const onLoad = () => {
 };
 onLoad();
 // 获取数据
-const getrain = (val) => {
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,

src/views/reportforms/DeliveryTrainNumber.vue

@@ -29,7 +29,6 @@
                 filterable
                 placeholder="多选仓库搜索"
                 style="width: 240px"
-                
               >
                 <el-option
                   v-for="item in warehouseList"
@@ -167,11 +166,11 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import { $_getrain, $_exportTrain, $_getMyWarehouseList } from '@/api/reportforms/index.js';
 import { ElMessageBox } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls,deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const warehouseList = ref([]); //仓库列表
-const queryCarn=ref({});//查询顶部
+const queryCarn = ref({}); //查询顶部
 const DeliveryTypeList = ref([
   {
     label: '商配',
@@ -235,7 +234,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -351,46 +350,45 @@ const searchChange = () => {
   if (TopQuery.value.time) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-  }else{
-    delete  queryCarn.value.startTaskTime
-    delete  queryCarn.value.endTaskTime
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 车辆处理
-  if(TopQuery.value.vehicleNameRange){
-    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange
-  }else{
+  if (TopQuery.value.vehicleNameRange) {
+    queryCarn.value.vehicleNameRange = TopQuery.value.vehicleNameRange;
+  } else {
     delete queryCarn.value.vehicleNameRange;
   }
   // 司机处理
-  if(TopQuery.value.driverNameRange){
-    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange
-  }else{
+  if (TopQuery.value.driverNameRange) {
+    queryCarn.value.driverNameRange = TopQuery.value.driverNameRange;
+  } else {
     delete queryCarn.value.driverNameRange;
   }
 
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
 //顶部清空搜索
-const searchReset=()=>{
-  TopQuery.value={}
-  TopQuery.value.warehouseNameRange=[]
-  queryCarn.value={}
+const searchReset = () => {
+  TopQuery.value = {};
+  TopQuery.value.warehouseNameRange = [];
+  queryCarn.value = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-  details.query={},
-  details.page.total = 0;
+  (details.query = {}), (details.page.total = 0);
   details.data = [];
   // getrain(queryCarn.value)
-}
+};
 const Toptiem = val => {
   if (!val) {
     delete TopQuery.value.startTaskTime;
@@ -465,7 +463,7 @@ const onLoad = () => {
 };
 onLoad();
 // 获取数据
-const getrain = (val) => {
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,

src/views/reportforms/Inventory.vue

@@ -156,39 +156,44 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/Inventory.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_exportInventory ,$_getInventory,$_getMyWarehouseList} from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const queryCarn=ref({});//查询顶部
-  const TopQuery=ref({})
-  const warehouseList = ref([]); //仓库列表
-  const DeliveryType=ref([{
-  label:'商配',
-  value:'商配'
-},
-{
-  label:'市配',
-  value:'市配'
-},
-{
-  label:'自提',
-  value:'自提'
-},
-{
-  label:'三方中专',
-  value:'三方中专'
-},
-]);//配送类型
-  const details = reactive({
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/Inventory.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import {
+  $_exportInventory,
+  $_getInventory,
+  $_getMyWarehouseList,
+} from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls,deepClone } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({});
+const warehouseList = ref([]); //仓库列表
+const DeliveryType = ref([
+  {
+    label: '商配',
+    value: '商配',
+  },
+  {
+    label: '市配',
+    value: '市配',
+  },
+  {
+    label: '自提',
+    value: '自提',
+  },
+  {
+    label: '三方中专',
+    value: '三方中专',
+  },
+]); //配送类型
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -226,7 +231,7 @@
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -264,9 +269,9 @@
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -280,13 +285,13 @@
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -297,20 +302,20 @@
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain();
-  };
+};
 
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -320,114 +325,114 @@
     delete details.query[row.prop];
   }
   // getrain();
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
-  // 网页顶部搜索按钮
+};
+// 网页顶部搜索按钮
 // 网页顶部搜索按钮
 const searchChange = () => {
-  console.log(TopQuery.value,'TopQuery.value');
+  console.log(TopQuery.value, 'TopQuery.value');
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 商场名称
-  if(TopQuery.value.marketNameRange){
-    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange
-  }else{
+  if (TopQuery.value.marketNameRange) {
+    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange;
+  } else {
     delete queryCarn.value.marketNameRange;
   }
   // 物料编码
-  if(TopQuery.value.cargoNumberRange){
-    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange
-  }else{
+  if (TopQuery.value.cargoNumberRange) {
+    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange;
+  } else {
     delete queryCarn.value.cargoNumberRange;
   }
   // 物料名称
-  if(TopQuery.value.descriptionGoodsRange){
-    queryCarn.value.descriptionGoodsRange = TopQuery.value.descriptionGoodsRange
-  }else{
+  if (TopQuery.value.descriptionGoodsRange) {
+    queryCarn.value.descriptionGoodsRange = TopQuery.value.descriptionGoodsRange;
+  } else {
     delete queryCarn.value.descriptionGoodsRange;
   }
 
   // 收货单位
-  if(TopQuery.value.consigneeUnitRange){
-    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
-  }else{
+  if (TopQuery.value.consigneeUnitRange) {
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange;
+  } else {
     delete queryCarn.value.consigneeUnitRange;
   }
   // 订单自编号
-  if(TopQuery.value.orderCodeRange){
-    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange
-  }else{
+  if (TopQuery.value.orderCodeRange) {
+    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange;
+  } else {
     delete queryCarn.value.orderCodeRange;
   }
 
   // 客户处理
-  if(TopQuery.value.examineUserRange){
-    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange
-  }else{
+  if (TopQuery.value.examineUserRange) {
+    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange;
+  } else {
     delete queryCarn.value.examineUserRange;
   }
 
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
-  // 每页多少条
-  const sizeChange = val => {
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
   getrain(queryCarn.value);
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
   getrain(queryCarn.value);
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
   getrain();
-  };
-  // 清空
-  const searchReset=()=>{
-    TopQuery.value={};
-    TopQuery.value.warehouseNameRange=[]
-    queryCarn.value={};
+};
+// 清空
+const searchReset = () => {
+  TopQuery.value = {};
+  TopQuery.value.warehouseNameRange = [];
+  queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
-  }
-  // 顶部搜索
-  const searchHide = () => {
+  details.page.total = 0;
+  details.data = [];
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -437,13 +442,13 @@ const searchChange = () => {
       });
     });
   });
-  }
-  // 页面初始化方法
-  const onLoad = () => {
+}
+// 页面初始化方法
+const onLoad = () => {
   warehouseList.value = [];
   columnList.find(res => res.label == '仓库').checkarr = [];
   columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
-  columnList.find(res => res.label == '类型').checkarr=[]
+  columnList.find(res => res.label == '类型').checkarr = [];
   columnList.find(res => res.label == '类型').checkarr = DeliveryType.value;
   console.log(columnList, 'columnList');
   // 获取仓库
@@ -459,9 +464,9 @@ const searchChange = () => {
       });
   });
 };
-  onLoad();
-  // 获取数据
-  const getrain = (val) => {
+onLoad();
+// 获取数据
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
@@ -479,11 +484,11 @@ const searchChange = () => {
     .finally(() => {
       details.loadingObj.list = false;
     });
-  };
-  // getrain();
+};
+// getrain();
 
-  // 导出
-  const exportReport = () => {
+// 导出
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -498,41 +503,38 @@ const searchChange = () => {
         .then(res => {
           downloadXls(res.data, `库存品明细报表数据.xlsx`);
         })
-          .catch(() => {
-  
-          })
+        .catch(() => {})
         .finally(() => {
           details.loadingObj.list = false;
-          })
+        });
     })
     .catch(() => {});
-  };
-  </script>
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  </style>
-  
+}
+</style>

src/views/reportforms/InventoryOutbound.vue

@@ -168,39 +168,40 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/InventoryOutbound.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_getreport ,$_exportOutStocks,$_getMyWarehouseList} from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const queryCarn=ref({});//查询顶部
-  const TopQuery=ref({})
-  const warehouseList = ref([]); //仓库列表
-  const DeliveryType=ref([{
-  label:'商配',
-  value:'商配'
-},
-{
-  label:'市配',
-  value:'市配'
-},
-{
-  label:'自提',
-  value:'自提'
-},
-{
-  label:'三方中专',
-  value:'三方中专'
-},
-]);//配送类型
-  const details = reactive({
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/InventoryOutbound.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight,deepClone } from '@/utils/util';
+import { $_getreport, $_exportOutStocks, $_getMyWarehouseList } from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({});
+const warehouseList = ref([]); //仓库列表
+const DeliveryType = ref([
+  {
+    label: '商配',
+    value: '商配',
+  },
+  {
+    label: '市配',
+    value: '市配',
+  },
+  {
+    label: '自提',
+    value: '自提',
+  },
+  {
+    label: '三方中专',
+    value: '三方中专',
+  },
+]); //配送类型
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -238,7 +239,7 @@
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -276,9 +277,9 @@
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -292,13 +293,13 @@
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -309,20 +310,20 @@
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain();
-  };
+};
 
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -332,123 +333,123 @@
     delete details.query[row.prop];
   }
   // getrain();
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
   // getrain()
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
-  // 清空
-  const searchReset=()=>{
-    TopQuery.value={}
-  TopQuery.value.warehouseNameRange=[]
-  queryCarn.value={}
+};
+// 清空
+const searchReset = () => {
+  TopQuery.value = {};
+  TopQuery.value.warehouseNameRange = [];
+  queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
+  details.page.total = 0;
+  details.data = [];
   // getrain(queryCarn.value)
-  }
-  // 网页顶部搜索按钮
-  const searchChange = () => {
-  console.log(TopQuery.value,'TopQuery.value');
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
   if (TopQuery.value.time) {
     queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-  }else{
-    delete  queryCarn.value.startTaskTime
-    delete  queryCarn.value.endTaskTime
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 商场名称
-  if(TopQuery.value.marketNameRange){
-    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange
-  }else{
+  if (TopQuery.value.marketNameRange) {
+    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange;
+  } else {
     delete queryCarn.value.marketNameRange;
   }
   // 物料编码
-  if(TopQuery.value.cargoNumberRange){
-    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange
-  }else{
+  if (TopQuery.value.cargoNumberRange) {
+    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange;
+  } else {
     delete queryCarn.value.cargoNumberRange;
   }
   // 物料名称
-  if(TopQuery.value.materialNameRange){
-    queryCarn.value.materialNameRange = TopQuery.value.materialNameRange
-  }else{
+  if (TopQuery.value.materialNameRange) {
+    queryCarn.value.materialNameRange = TopQuery.value.materialNameRange;
+  } else {
     delete queryCarn.value.materialNameRange;
   }
 
   // 收货单位
-  if(TopQuery.value.consigneeUnitRange){
-    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
-  }else{
+  if (TopQuery.value.consigneeUnitRange) {
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange;
+  } else {
     delete queryCarn.value.consigneeUnitRange;
   }
   // 订单自编号
-  if(TopQuery.value.orderCodeRange){
-    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange
-  }else{
+  if (TopQuery.value.orderCodeRange) {
+    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange;
+  } else {
     delete queryCarn.value.orderCodeRange;
   }
 
   // 客户处理
-  if(TopQuery.value.examineUserRange){
-    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange
-  }else{
+  if (TopQuery.value.examineUserRange) {
+    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange;
+  } else {
     delete queryCarn.value.examineUserRange;
   }
 
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
-  // 每页多少条
-  const sizeChange = val => {
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
   getrain(queryCarn.value);
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
   getrain(queryCarn.value);
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
   getrain();
-  };
-  // 顶部搜索
-  const searchHide = () => {
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -458,9 +459,9 @@
       });
     });
   });
-  }
-  // 页面初始化方法
-  const onLoad = () => {
+}
+// 页面初始化方法
+const onLoad = () => {
   warehouseList.value = [];
   columnList.find(res => res.label == '仓库').checkarr = [];
   columnList.find(res => res.label == '出库类型').checkarr = [];
@@ -480,9 +481,9 @@
       });
   });
 };
-  onLoad();
-  // 获取数据
-  const getrain = (val) => {
+onLoad();
+// 获取数据
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
@@ -500,11 +501,11 @@
     .finally(() => {
       details.loadingObj.list = false;
     });
-  };
-  // getrain();
+};
+// getrain();
 
-  // 导出
-  const exportReport = () => {
+// 导出
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -519,41 +520,38 @@
         .then(res => {
           downloadXls(res.data, `库存出库明细报表数据.xlsx`);
         })
-          .catch(() => {
-  
-          })
+        .catch(() => {})
         .finally(() => {
           details.loadingObj.list = false;
-          })
+        });
     })
     .catch(() => {});
-  };
-  </script>
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  </style>
-  
+}
+</style>

src/views/reportforms/InventoryReceipt.vue

@@ -178,7 +178,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import { $_exportInStocks, $_getinStocks, $_getMyWarehouseList } from '@/api/reportforms/index.js';
 import { ElMessageBox } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
@@ -239,7 +239,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList:deepClone(columnList),
 
   /** 列表数据 */
   data: [],

src/views/reportforms/Selfpickupreport.vue

@@ -146,22 +146,26 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/Selfpickupreport.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_getSelfpickup,$_exportSelfpickup,$_getMyWarehouseList } from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const queryCarn=ref({});//查询顶部
-  const TopQuery=ref({})
-  const warehouseList = ref([]); //仓库列表
-  const details = reactive({
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/Selfpickupreport.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import {
+  $_getSelfpickup,
+  $_exportSelfpickup,
+  $_getMyWarehouseList,
+} from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls, deepClone } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({});
+const warehouseList = ref([]); //仓库列表
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -199,7 +203,7 @@
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -237,9 +241,9 @@
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -253,13 +257,13 @@
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -270,20 +274,20 @@
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain();
-  };
+};
 
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -293,104 +297,104 @@
     delete details.query[row.prop];
   }
   // getrain();
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
   // getrain();
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
-  // 清空
-  const searchReset=()=>{
+};
+// 清空
+const searchReset = () => {
   TopQuery.value = {};
-    TopQuery.value.warehouseNameRange=[]
+  TopQuery.value.warehouseNameRange = [];
   queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
+  details.page.total = 0;
+  details.data = [];
   // getrain();
-  }
+};
 // 网页顶部搜索按钮
 const searchChange = () => {
-  console.log(TopQuery.value,'TopQuery.value');
+  console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
   if (TopQuery.value.time) {
     queryCarn.value.startScanTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endScanTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-  }else{  
-    delete  queryCarn.value.startScanTime
-    delete  queryCarn.value.endScanTime
+  } else {
+    delete queryCarn.value.startScanTime;
+    delete queryCarn.value.endScanTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
-  }else{
+  } else {
     delete queryCarn.value.warehouseNameRange;
   }
   // 收货单位
-  if(TopQuery.value.consigneeUnitRange){
-    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
-  }else{
+  if (TopQuery.value.consigneeUnitRange) {
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange;
+  } else {
     delete queryCarn.value.consigneeUnitRange;
   }
   // 订单自编号
-  if(TopQuery.value.orderCodeRange){
-    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange
-  }else{
+  if (TopQuery.value.orderCodeRange) {
+    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange;
+  } else {
     delete queryCarn.value.orderCodeRange;
   }
 
   // 客户处理
-  if(TopQuery.value.examineUserRange){
-    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange
-  }else{
+  if (TopQuery.value.examineUserRange) {
+    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange;
+  } else {
     delete queryCarn.value.examineUserRange;
   }
 
   console.log(queryCarn.value, '顶部搜索触发');
-  getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
 };
-  // 每页多少条
-  const sizeChange = val => {
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
   getrain(queryCarn.value);
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
   getrain(queryCarn.value);
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
   getrain();
-  };
-  // 顶部搜索
-  const searchHide = () => {
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -400,9 +404,9 @@ const searchChange = () => {
       });
     });
   });
-  }
-  // 页面初始化方法
-  const onLoad = () => {
+}
+// 页面初始化方法
+const onLoad = () => {
   warehouseList.value = [];
   columnList.find(res => res.label == '仓库').checkarr = [];
   columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
@@ -421,9 +425,9 @@ const searchChange = () => {
       });
   });
 };
-  onLoad();
-  // 获取数据
-  const getrain = (val) => {
+onLoad();
+// 获取数据
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
@@ -441,11 +445,11 @@ const searchChange = () => {
     .finally(() => {
       details.loadingObj.list = false;
     });
-  };
-  // getrain();
+};
+// getrain();
 
-  // 导出
-  const exportReport = () => {
+// 导出
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -460,41 +464,38 @@ const searchChange = () => {
         .then(res => {
           downloadXls(res.data, `自提明细报表数据.xlsx`);
         })
-          .catch(() => {
-  
-          })
+        .catch(() => {})
         .finally(() => {
           details.loadingObj.list = false;
-          })
+        });
     })
     .catch(() => {});
-  };
-  </script>
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  </style>
-  
+}
+</style>

src/views/reportforms/Selfpickuptask.vue

@@ -157,22 +157,26 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/Selfpickuptask.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_getMyWarehouseList,$_exportStockOrder, $_getstockOrder  } from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const queryCarn=ref({});//查询顶部
-  const TopQuery=ref({});//查询顶部
-  const warehouseList = ref([]); //仓库列表
-  const DeliveryTypeList = ref([
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/Selfpickuptask.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight, deepClone } from '@/utils/util';
+import {
+  $_getMyWarehouseList,
+  $_exportStockOrder,
+  $_getstockOrder,
+} from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({}); //查询顶部
+const warehouseList = ref([]); //仓库列表
+const DeliveryTypeList = ref([
   {
     label: '商配',
     value: '商配',
@@ -182,9 +186,9 @@
     label: '市配',
     value: '市配',
   },
-  ]); //配送类型
-  // 配送种类
-  const DeliverygenericList = ref([
+]); //配送类型
+// 配送种类
+const DeliverygenericList = ref([
   {
     label: '自主配送',
     value: '自主配送',
@@ -194,8 +198,8 @@
     label: '三方配送',
     value: '三方配送',
   },
-  ]); //配送类型
-  const details = reactive({
+]); //配送类型
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -233,7 +237,7 @@
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -271,9 +275,9 @@
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -287,13 +291,13 @@
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -304,20 +308,20 @@
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain();
-  };
+};
 
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -327,112 +331,112 @@
     delete details.query[row.prop];
   }
   // getrain();
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
   // getrain();
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
-  // 清空
-  const searchReset=()=>{
+};
+// 清空
+const searchReset = () => {
   TopQuery.value = {};
-    TopQuery.value.warehouseRange=[]
+  TopQuery.value.warehouseRange = [];
   queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
+  details.page.total = 0;
+  details.data = [];
   // getrain();
-  }
-  // 网页顶部搜索按钮
-  const searchChange = () => {
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
   // 日期处理
   if (TopQuery.value.time) {
     queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
-    }else{
-      delete  queryCarn.value.startCreatedTime
-      delete  queryCarn.value.endCreatedTime
+  } else {
+    delete queryCarn.value.startCreatedTime;
+    delete queryCarn.value.endCreatedTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseRange.length) {
     queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
-    }else{
+  } else {
     delete queryCarn.value.warehouseRange;
   }
   // 收货单位
-    if(TopQuery.value.consigneeUnitRange){
-      queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
-    }else{
+  if (TopQuery.value.consigneeUnitRange) {
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange;
+  } else {
     delete queryCarn.value.consigneeUnitRange;
   }
   // 收货人
-    if(TopQuery.value.consigneeUserRange){
-      queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange
-    }else{
+  if (TopQuery.value.consigneeUserRange) {
+    queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange;
+  } else {
     delete queryCarn.value.consigneeUserRange;
   }
 
   // 提货人
-    if(TopQuery.value.billUserRange){
-      queryCarn.value.billUserRange = TopQuery.value.billUserRange
-    }else{
+  if (TopQuery.value.billUserRange) {
+    queryCarn.value.billUserRange = TopQuery.value.billUserRange;
+  } else {
     delete queryCarn.value.billUserRange;
   }
   // 运单收货人
-    if(TopQuery.value.consigneeNameRange){
-      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
-    }else{
+  if (TopQuery.value.consigneeNameRange) {
+    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange;
+  } else {
     delete queryCarn.value.consigneeNameRange;
   }
   // 运单收货人
-    if(TopQuery.value.consigneeNameRange){
-      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+  if (TopQuery.value.consigneeNameRange) {
+    queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange;
   }
   console.log(queryCarn.value, '顶部搜索触发');
-    getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
-  };
-  // 每页多少条
-  const sizeChange = val => {
+};
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
   getrain(queryCarn.value);
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
   getrain(queryCarn.value);
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
   getrain();
-  };
-  // 顶部搜索
-  const searchHide = () => {
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -442,9 +446,9 @@
       });
     });
   });
-  }
-  // 页面初始化方法
-  const onLoad = () => {
+}
+// 页面初始化方法
+const onLoad = () => {
   warehouseList.value = [];
   columnList.find(res => res.label == '仓库').checkarr = [];
   columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
@@ -462,10 +466,10 @@
         });
       });
   });
-  };
-  onLoad();
-  // 获取数据
-  const getrain = (val) => {
+};
+onLoad();
+// 获取数据
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
@@ -484,10 +488,10 @@
     .finally(() => {
       details.loadingObj.list = false;
     });
-  };
-  // getrain();
-  // 导出
-  const exportReport = () => {
+};
+// getrain();
+// 导出
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -507,35 +511,35 @@
         });
     })
     .catch(() => {});
-  };
-  </script>
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  :deep(.el-fr-d) {
+}
+:deep(.el-fr-d) {
   width: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -556,8 +560,8 @@
       }
     }
   }
-  }
-  :deep(.el-btn) {
+}
+:deep(.el-btn) {
   margin-right: 0;
   display: flex;
   width: 100%;
@@ -565,6 +569,5 @@
   .el-form-item__content {
     justify-content: flex-end;
   }
-  }
-  </style>
-  
+}
+</style>

src/views/reportforms/Stockordertable.vue

@@ -22,7 +22,6 @@
               />
             </el-form-item>
 
-
             <el-form-item label="仓库">
               <el-select
                 multiple
@@ -67,7 +66,6 @@
                 placeholder="多个	运单号请用逗号隔开"
               />
             </el-form-item>
-  
           </div>
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -145,22 +143,27 @@
     :drawerShow="drawerShow"
     :columnList="details.columnList"
   ></edittablehead>
-  </template>
+</template>
 
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/reportforms/Stockordertable.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_getMyWarehouseList,$_getasks,$_exportTasks ,$_getstockOrder } from '@/api/reportforms/index.js';
-  import { ElMessageBox } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import dayjs from 'dayjs';
-  const queryCarn=ref({});//查询顶部
-  const TopQuery=ref({});//查询顶部
-  const warehouseList = ref([]); //仓库列表
-  const DeliveryTypeList = ref([
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/reportforms/Stockordertable.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import {
+  $_getMyWarehouseList,
+  $_getasks,
+  $_exportTasks,
+  $_getstockOrder,
+} from '@/api/reportforms/index.js';
+import { ElMessageBox } from 'element-plus';
+import { downloadXls, deepClone } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+const queryCarn = ref({}); //查询顶部
+const TopQuery = ref({}); //查询顶部
+const warehouseList = ref([]); //仓库列表
+const DeliveryTypeList = ref([
   {
     label: '商配',
     value: '商配',
@@ -170,9 +173,9 @@
     label: '市配',
     value: '市配',
   },
-  ]); //配送类型
-  // 配送种类
-  const DeliverygenericList = ref([
+]); //配送类型
+// 配送种类
+const DeliverygenericList = ref([
   {
     label: '自主配送',
     value: '自主配送',
@@ -182,8 +185,8 @@
     label: '三方配送',
     value: '三方配送',
   },
-  ]); //配送类型
-  const details = reactive({
+]); //配送类型
+const details = reactive({
   /** 是否开启搜索 */
   search: false,
   /** 表格搜索条件 */
@@ -221,7 +224,7 @@
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-    columnList,
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -259,9 +262,9 @@
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  });
+});
 
-  const {
+const {
   search,
   query,
   shortcuts,
@@ -275,13 +278,13 @@
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
-  } = toRefs(details);
-  /**
+} = toRefs(details);
+/**
  * 设置列表 -- 固定函数
  * 弹窗的勾选回调，用于更改头部数组
  * 固定搭配，只需要更换   columnList
  *  */
-  const setnewcolum = (newarr, headarr, type) => {
+const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
@@ -292,20 +295,20 @@
     details.columnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
-  };
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
   details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   // getrain();
-  };
+};
 
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
   console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
@@ -315,52 +318,58 @@
     delete details.query[row.prop];
   }
   // getrain();
-  };
+};
 
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
   processRowProperty(index, row, details);
   // getrain();
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
-  };
-  // 清空
-  const searchReset=()=>{
-    TopQuery.value={};
-    TopQuery.value.warehouseNameRange=[]
-    queryCarn.value={};
+};
+// 清空
+const searchReset = () => {
+  TopQuery.value = {};
+  TopQuery.value.warehouseNameRange = [];
+  queryCarn.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
   });
-    details.page.total  =  0
-    details.data = []
-  }
-  // 网页顶部搜索按钮
-  const searchChange = () => {
+  details.page.total = 0;
+  details.data = [];
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
   // 日期处理
   // 处理开始和结束日期
-queryCarn.value.startWarehouseEntryTime = TopQuery.value.time ? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss') : undefined;
-queryCarn.value.endWarehouseEntryTime = TopQuery.value.time ? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss') : undefined;
+  queryCarn.value.startWarehouseEntryTime = TopQuery.value.time
+    ? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss')
+    : undefined;
+  queryCarn.value.endWarehouseEntryTime = TopQuery.value.time
+    ? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss')
+    : undefined;
 
-// 处理仓库范围
-queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.length ? TopQuery.value.warehouseRange.join(',') : undefined;
+  // 处理仓库范围
+  queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.length
+    ? TopQuery.value.warehouseRange.join(',')
+    : undefined;
 
-// 处理商场名称
-queryCarn.value.mallNameRange = TopQuery.value.mallNameRange || undefined;
+  // 处理商场名称
+  queryCarn.value.mallNameRange = TopQuery.value.mallNameRange || undefined;
 
-// 处理运单号
-queryCarn.value.billUserRange = TopQuery.value.billUserRange || undefined;
+  // 处理运单号
+  queryCarn.value.billUserRange = TopQuery.value.billUserRange || undefined;
 
-// 处理收货人
-queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || undefined;
+  // 处理收货人
+  queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || undefined;
   // // 运单收货人
   // if(TopQuery.value.consigneeNameRange){
   //   queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
@@ -372,37 +381,37 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
   //   queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
   // }
   console.log(queryCarn.value, '顶部搜索触发');
-    getrain(queryCarn.value)
+  getrain(queryCarn.value);
   // details.search = false; //关闭搜索
-  };
-  // 每页多少条
-  const sizeChange = val => {
+};
+// 每页多少条
+const sizeChange = val => {
   details.page.pageSize = val;
   getrain(queryCarn.value);
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
   details.page.currentPage = val;
   getrain(queryCarn.value);
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
+};
+// 刷新按钮
+const searchChangeS = () => {
   // details.columnList.forEach(item => {
   //   item.values = '';
   // });
   details.search = false; //关闭搜索
   getrain(queryCarn.value);
-  };
-  // 顶部搜索
-  const searchHide = () => {
+};
+// 顶部搜索
+const searchHide = () => {
   console.log(details);
   details.search = !details.search;
 
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     console.log(res, '字典');
     res.data.data.forEach(item => {
@@ -412,9 +421,9 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
       });
     });
   });
-  }
-  // 页面初始化方法
-  const onLoad = () => {
+}
+// 页面初始化方法
+const onLoad = () => {
   warehouseList.value = [];
   columnList.find(res => res.label == '仓库').checkarr = [];
   columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
@@ -432,10 +441,10 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
         });
       });
   });
-  };
-  onLoad();
-  // 获取数据
-  const getrain = (val) => {
+};
+onLoad();
+// 获取数据
+const getrain = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
@@ -454,10 +463,10 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
     .finally(() => {
       details.loadingObj.list = false;
     });
-  };
-  // getrain();
-  // 导出
-  const exportReport = () => {
+};
+// getrain();
+// 导出
+const exportReport = () => {
   ElMessageBox.confirm('是否导出报表?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -477,35 +486,35 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
         });
     })
     .catch(() => {});
-  };
-  </script>
+};
+</script>
 
-  <style scoped lang="scss">
-  .ElBtnClass button {
+<style scoped lang="scss">
+.ElBtnClass button {
   border: none;
   padding: 0;
   background-color: transparent;
-  }
-  :deep(.el-card) {
+}
+:deep(.el-card) {
   height: 100%;
-  }
-  :deep(.el-card__body) {
+}
+:deep(.el-card__body) {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  .el-fy {
+}
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
-  }
-  .avue-crud {
+}
+.avue-crud {
   height: 100%;
   display: flex;
   flex-direction: column;
-  }
-  :deep(.el-fr-d) {
+}
+:deep(.el-fr-d) {
   width: 100%;
   display: flex;
   flex-wrap: wrap;
@@ -526,8 +535,8 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
       }
     }
   }
-  }
-  :deep(.el-btn) {
+}
+:deep(.el-btn) {
   margin-right: 0;
   display: flex;
   width: 100%;
@@ -535,6 +544,5 @@ queryCarn.value.consigneePersonRange = TopQuery.value.consigneePersonRange || un
   .el-form-item__content {
     justify-content: flex-end;
   }
-  }
-  </style>
-  
+}
+</style>

src/views/supervise/IndicatorList.vue

@@ -414,7 +414,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { ref, reactive, computed, onMounted } from 'vue';
 import { IndicatorColumnList } from '@/option/supervise/supervise.js';
 import functions from '@/utils/functions.js';
-import { setNodeHeight } from '@/utils/util';
+import { setNodeHeight, deepClone } from '@/utils/util';
 import { downloadXls } from '@/utils/util';
 import {
   $_Getclassify,

src/views/supervise/classify.vue

@@ -24,10 +24,20 @@
               <el-icon><Plus /></el-icon>新 增</el-button
             >
 
-            <el-button type="primary" @click="BatchDelete" icon="Delete" v-if="PermissionButton.classify_delete">
+            <el-button
+              type="primary"
+              @click="BatchDelete"
+              icon="Delete"
+              v-if="PermissionButton.classify_delete"
+            >
               批量删除</el-button
             >
-            <el-button class="el_view" type="primary" @click="BatchDelete"  v-if="PermissionButton.classify_view">
+            <el-button
+              class="el_view"
+              type="primary"
+              @click="BatchDelete"
+              v-if="PermissionButton.classify_view"
+            >
               查看</el-button
             >
           </div>
@@ -136,6 +146,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { ref, reactive, computed, onMounted, watch } from 'vue';
 import { classificationColumnList } from '@/option/supervise/supervise.js';
 import functions from '@/utils/functions.js';
+import { deepClone } from '@/utils/util.js';
 import {
   $_Getclassify,
   $_newlyadded,
@@ -148,7 +159,7 @@ const current = ref(1); //当前页
 const total = ref(0); //总页数
 const drawerShow = ref(false); //列表配置显示
 const pageSize = ref(30);
-const currentPage=ref(1)
+const currentPage = ref(1);
 const lassificationform = ref({}); //分类表单
 const title = ref(true); //标题
 const EditID = ref(true); //编辑需要的ID
@@ -159,22 +170,21 @@ const selectionList = ref([]); //选中数据
 const $useStore = useStore();
 const accessControl = $useStore.getters.permission;
 
-
 const PermissionButton = computed(() => {
   return {
     classify_add: accessControl.classify_add, //新增
-    classify_delete:accessControl.classify_delete, //删除
-    classify_view:accessControl.classify_view, //查看
+    classify_delete: accessControl.classify_delete, //删除
+    classify_view: accessControl.classify_view, //查看
   };
 });
-console.log(accessControl,'角色权限');
+console.log(accessControl, '角色权限');
 const onLoad = () => {
   let data = {
     current: current.value,
     size: pageSize.value,
     isPid: 1,
   };
-  columnList.value=classificationColumnList
+  columnList.value = deepClone(classificationColumnList);
   loadingclassification.value = true; //开启加载效果
   $_Getclassify(data)
     .then(res => {
@@ -231,7 +241,6 @@ const ClassificationDditing = val => {
   lassificationform.value.name = data.name; //分类名称
   lassificationform.value.description = data.description; //分类描述
   lassificationform.value.remark = data.remark; //分类备注
-
 };
 
 // 分类新增按钮
@@ -345,11 +354,11 @@ const selectionChange = list => {
   console.log(selectionList.value, '已经选中的数据');
 };
 // 表格禁止勾选
-function ProhibitSelection(val,index){
-    if(val.isEdit=='0'){
-      return false
-    }else{
-      return true
+function ProhibitSelection(val, index) {
+  if (val.isEdit == '0') {
+    return false;
+  } else {
+    return true;
   }
 }
 </script>
@@ -386,7 +395,7 @@ function ProhibitSelection(val,index){
 .maboxhi {
   height: 700px !important;
 }
-.el_view{
+.el_view {
   display: none;
 }
 </style>

src/views/system/dict.vue

@@ -109,6 +109,7 @@ import {
 } from '@/api/system/dict';
 import { optionParent, optionChild } from '@/option/system/dict';
 import { mapGetters } from 'vuex';
+import { deepClone } from '@/utils/util.js';
 
 export default {
   data() {
@@ -136,8 +137,8 @@ export default {
       },
       dataParent: [],
       dataChild: [],
-      optionParent: optionParent,
-      optionChild: optionChild,
+      optionParent: deepClone(optionParent),
+      optionChild: deepClone(optionChild),
     };
   },
   computed: {
@@ -449,19 +450,19 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
-:deep(.avue-form__row){
-  max-width:300px!important;
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  max-width: 300px !important;
 }
-:deep(.no-print){
-  .el-button{
-     margin-right:0
+:deep(.no-print) {
+  .el-button {
+    margin-right: 0;
   }
 }
-:deep(.no-print){
-  margin-left:auto;
+:deep(.no-print) {
+  margin-left: auto;
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
 }
 </style>

src/views/system/dictbiz.vue

@@ -109,6 +109,7 @@ import {
 } from '@/api/system/dictbiz';
 import { optionParent, optionChild } from '@/option/system/dictbiz';
 import { mapGetters } from 'vuex';
+import { deepClone } from '@/utils/util.js';
 
 export default {
   data() {
@@ -136,8 +137,8 @@ export default {
       },
       dataParent: [],
       dataChild: [],
-      optionParent: optionParent,
-      optionChild: optionChild,
+      optionParent: deepClone(optionParent),
+      optionChild: deepClone(optionChild),
     };
   },
   computed: {
@@ -448,26 +449,26 @@ export default {
   },
 };
 </script>
-<style scoped lang='scss'>
-:deep(.no-print){
-   margin-left:auto;
+<style scoped lang="scss">
+:deep(.no-print) {
+  margin-left: auto;
 }
-:deep(.avue-form__group--flex){
+:deep(.avue-form__group--flex) {
   justify-content: flex-start;
 }
-:deep(.avue-form__row){
-  margin-left:10px;
-  max-width:300px!important;
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 300px !important;
 }
-:deep(.avue-form__row){
-  margin-left:0
+:deep(.avue-form__row) {
+  margin-left: 0;
 }
-:deep(.no-print){
-  .el-button{
-     margin-right:0
+:deep(.no-print) {
+  .el-button {
+    margin-right: 0;
   }
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
 }
 </style>

src/views/util/demo/dict.vue

@@ -120,6 +120,7 @@ import {
 } from '@/api/system/dict';
 import { optionParent, optionChild } from '@/option/system/dict';
 import { mapGetters } from 'vuex';
+import { deepClone } from '@/utils/util.js';
 
 export default {
   data() {
@@ -146,8 +147,8 @@ export default {
       },
       dataParent: [],
       dataChild: [],
-      optionParent: optionParent,
-      optionChild: optionChild,
+      optionParent: deepClone(optionParent),
+      optionChild: deepClone(optionChild),
     };
   },
   computed: {

src/views/util/demo/dictbiz.vue

@@ -120,6 +120,7 @@ import {
 } from '@/api/system/dictbiz';
 import { optionParent, optionChild } from '@/option/system/dictbiz';
 import { mapGetters } from 'vuex';
+import { deepClone } from '@/utils/util.js';
 
 export default {
   data() {
@@ -146,8 +147,8 @@ export default {
       },
       dataParent: [],
       dataChild: [],
-      optionParent: optionParent,
-      optionChild: optionChild,
+      optionParent: deepClone(optionParent),
+      optionChild: deepClone(optionChild),
     };
   },
   computed: {

src/views/waybill/ChangeOrder.vue

@@ -196,7 +196,7 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getopenOrderAdvancePageList } from '@/api/waybill/ChangeOrder';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList, viewColumnList } from '@/option/waybill/ChangeOrder';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
@@ -243,11 +243,11 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [{}],
   /** 查看列表表头 */
-  viewColumnList,
+  viewColumnList: deepClone(viewColumnList),
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */

src/views/waybill/ComparativeStatement.vue

@@ -75,7 +75,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight } from '@/utils/util';
+import { downloadXls, setNodeHeight, deepClone } from '@/utils/util';
 import {
   columnList,
   detailsColumnList,
@@ -89,12 +89,11 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 const $router = useRouter();
 
 const details = reactive<any>({
-
   /** 列表 */
-  columnList,
-  detailsColumnList,
-  warehouseNodeColumnList,
-  truckLoadingColumnList,
+  columnList: deepClone(columnList),
+  detailsColumnList: deepClone(detailsColumnList),
+  warehouseNodeColumnList: deepClone(warehouseNodeColumnList),
+  truckLoadingColumnList: deepClone(truckLoadingColumnList),
   /** 列表数据 */
   data: [{}],
   /** 页面loading */
@@ -110,9 +109,6 @@ const details = reactive<any>({
     pageSize: 30,
     total: 0,
   },
-
-
-
 });
 
 const { data, loadingObj } = toRefs(details);

src/views/waybill/CreateZeroOrder.vue

@@ -881,8 +881,7 @@ import {
   postFindCategoryInfo,
   postFindArrPrice,
 } from '@/api/distribution/CreateOrder.js';
-import { isNumber, getObjType } from '@/utils/util.js';
-import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util';
+import { isNumber, getObjType, deepClone } from '@/utils/util.js';
 
 // 获取vue实例
 const instance = getCurrentInstance();

src/views/waybill/EditCustomerInfo.vue

@@ -71,6 +71,7 @@ import {
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 import { ElMessage } from 'element-plus';
+import { deepClone } from '@/utils/util';
 
 const $store = useStore();
 const $router = useRouter();
@@ -95,7 +96,7 @@ for (let key in form.value) {
 
 const details = reactive<any>({
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   data: [],
   /** 页面loading */

src/views/waybill/FreezeOrder.vue

@@ -144,6 +144,7 @@ import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
 import { columnList, packageListColumnList } from '@/option/waybill/FreezeOrder';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
+import { deepClone } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 
 // 获取路由实例
@@ -187,14 +188,14 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   haveDataData: [],
   notHaveDataData: [],
   /** 包明细表头 */
-  packageListColumnList,
+  packageListColumnList: deepClone(packageListColumnList),
   /** 包明细数据 */
-  packageListData: [{}],
+  packageListData: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */

src/views/waybill/ReceiptManagement.vue

@@ -120,6 +120,7 @@ import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle
 import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
 import { columnList } from '@/option/waybill/ReceiptManagement';
 import { useRouter } from 'vue-router';
+import { deepClone } from '@/utils/util';
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
 
@@ -164,7 +165,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 包明细表头 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 包明细数据 */
   data: [{}],
   /** 页面loading */

src/views/waybill/TemporaryStorageList.vue

@@ -479,7 +479,7 @@ import {
 } from '@/api/waybill/TemporaryStorageList';
 import { getLazyTreeAll } from '@/api/base/region';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/waybill/TemporaryStorageList';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
@@ -496,7 +496,7 @@ const $store = useStore();
 
 // 表单实例
 const ruleFormRef = ref<FormInstance>();
-
+columnList;
 /** 表格实例 */
 const tableNodeRef = ref();
 
@@ -538,7 +538,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 列表数据 */
   haveDataData: [],
   notHaveDataData: [],

src/views/waybill/WarehousingByTrainNumber.vue

@@ -103,7 +103,7 @@ import {
   postFindIncomingOrderList,
   postIncomingBatchOrder,
 } from '@/api/distribution/WarehousingByTrainNumber';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/waybill/WarehousingByTrainNumber';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
@@ -156,7 +156,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 包明细表头 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 包明细数据 */
   data: [],
   /** 页面loading */

src/views/waybill/WaybillOrderList.vue

@@ -280,14 +280,13 @@ import {
   postSaveWaybillReturn,
 } from '@/api/waybill/WaybillOrderList.js';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/waybill/WaybillOrderList';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
 import { ElMessage } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import type { UploadProps, UploadUserFile } from 'element-plus';
-import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util';
 
 const $store = useStore();
 

src/views/waybill/ZeroTagList.vue

@@ -131,7 +131,7 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import { columnList } from '@/option/waybill/ZeroTagList';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
@@ -178,7 +178,7 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 包明细表头 */
-  columnList,
+  columnList: deepClone(columnList),
   /** 包明细数据 */
   data: [{}],
   /** 页面loading */

src/views/waybill/orderDetails.vue

@@ -118,6 +118,7 @@ import {
   getHtmls,
   handleClearTableQuery,
   debounce,
+  deepClone,
 } from '@/utils/util';
 import { packageListColumnList } from '@/option/waybill/orderDetails';
 import { useRouter, useRoute } from 'vue-router';
@@ -173,7 +174,7 @@ const details = reactive<any>({
   data: [],
   renderData: [],
   /** 包明细表头 */
-  packageListColumnList,
+  packageListColumnList: deepClone(packageListColumnList),
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */

src/views/waybill/orderPackageList.vue

@@ -365,7 +365,7 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
 import {
   packageListColumnList,
   packageDetailColumnList,
@@ -416,17 +416,17 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 包明细表头 */
-  packageListColumnList,
+  packageListColumnList: deepClone(packageListColumnList),
   /** 包明细数据 */
-  packageListData: [{}],
+  packageListData: [],
   /** 包内产品表头 */
-  packageDetailColumnList,
+  packageDetailColumnList: deepClone(packageDetailColumnList),
   /** 包内产品数据 */
-  packageDetailData: [{}],
+  packageDetailData: [],
   /** 流转节点表头 */
-  flowNodeColumnList,
+  flowNodeColumnList: deepClone(flowNodeColumnList),
   /** 流转节点数据 */
-  flowNodeData: [{}],
+  flowNodeData: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -619,8 +619,6 @@ const handleShowPackageOrderList = ({ row }) => {
   });
 };
 
-
-
 /** 修改客户信息 */
 const editClientInfo = () => {
   if (details.selectionList.length !== 0) {

src/views/waybill/orderPackageListDetails.vue

@@ -280,7 +280,7 @@ import {
   postDeleteAdvanceDetail,
   postFinaPackageTrackLogList,
 } from '@/api/waybill/orderPackageListDetails';
-import { downloadXls, setNodeHeight, getHtmls, debounce } from '@/utils/util';
+import { downloadXls, setNodeHeight, getHtmls, debounce, deepClone } from '@/utils/util';
 import {
   packageListColumnList,
   packageDetailColumnList,
@@ -334,18 +334,18 @@ const details = reactive<any>({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 包明细表头 */
-  packageListColumnList,
+  packageListColumnList: deepClone(packageListColumnList),
   /** 包明细数据 */
   packageListData: [],
   packageListRenderData: [],
   /** 包内产品表头 */
-  packageDetailColumnList,
+  packageDetailColumnList: deepClone(packageDetailColumnList),
   /** 包内产品数据 */
   packageDetailData: [],
   /** 流转节点表头 */
-  flowNodeColumnList,
+  flowNodeColumnList: deepClone(flowNodeColumnList),
   /** 流转节点数据 */
-  flowNodeData: [{}],
+  flowNodeData: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */