修复新增预约单bug

src/components/tablecmt/tablecmt.vue

@@ -38,8 +38,10 @@
           v-if="column.type != 0"
           flexible
           show-overflow-tooltip
+          class="el_boxsa"
         >
           <template #header>
+            <el-text class="el_placeholder" v-if="column.type == 1">&nbsp</el-text>
             <el-text
               v-if="column.type == 1 || column.type == 0 || column.type == 12 || column.type == 6"
               class="mx-1"
@@ -925,4 +927,10 @@ defineExpose({ handleCheckSelect, handleClearSelect });
   background-color: #ff0000;
   color: #fff !important;
 }
+.el_placeholder{
+  width: 100%;
+  position: absolute;
+  margin-top: -10% !important;
+  z-index: 9999999;
+}
 </style>

src/utils/util.js

@@ -635,7 +635,11 @@ export function debounce(func, delay) {
 
 /** 去除零宽字符 */
 export const removeZeroWidth = str => {
-  return str.replace(/[\u200B-\u200D\uFEFF]/g, '');
+  if(str){
+    return str.replace(/[\u200B-\u200D\uFEFF]/g, '');
+  }else{
+    return str;
+  }
 };
 
 /**判断对象除了指定值为真其余值是否为假**/

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -334,6 +334,7 @@ import dayjs from 'dayjs';
 export default {
   data() {
     return {
+      currentdate:true,
       height: 0,
       // 弹框标题
       title: '',
@@ -1081,13 +1082,7 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-
-      if (getObjType(this.query.taskTimeArr) === 'array') {
-        params.taskTimeStart = this.query.taskTimeArr[0];
-        params.taskTimeEnd = this.query.taskTimeArr[1];
-      }
+    Getcurrentdate(){
 // 获取当前日期
 const currentDate = dayjs();
 // 计算一个月前的日期
@@ -1097,7 +1092,19 @@ const formatDate = (date) => date.format('YYYY-MM-DD');
 this.query.taskTimeArr = []
 this.query.taskTimeArr[0] = formatDate(startDate), // 一个月前的日期
 this.query.taskTimeArr[1] = formatDate(currentDate) // 当前日期
+    },
+ async onLoad(page, params = {}) {
+      this.loading = true;
+
+      if (getObjType(this.query.taskTimeArr) === 'array') {
+        params.taskTimeStart = this.query.taskTimeArr[0];
+        params.taskTimeEnd = this.query.taskTimeArr[1];
+      }
+      if(this.currentdate){
+      await this.Getcurrentdate()
+      }
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        this.currentdate=false
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -3165,27 +3165,27 @@ export default {
       console.log('orderList-------------》', this.orderList);
       if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
       const list = [...this.orderList];
-      let _name = removeZeroWidth(list[0].customerName.trim());
-      let _address = removeZeroWidth(list[0].customerAddress.trim());
-      let _phone = removeZeroWidth(list[0].customerTelephone.trim());
-      if (this.marketName === '') this.marketName = removeZeroWidth(list[0].mallName.trim());
+      let _name = removeZeroWidth(list[0]?.customerName?.trim());
+      let _address = removeZeroWidth(list[0]?.customerAddress?.trim());
+      let _phone = removeZeroWidth(list[0]?.customerTelephone?.trim());
+      if (this.marketName === '') this.marketName = removeZeroWidth(list[0]?.mallName?.trim());
       const _markeName = this.marketName
-        ? removeZeroWidth(list[0].mallName.trim())
+        ? removeZeroWidth(list[0]?.mallName?.trim())
         : this.marketName;
 
       let message = '';
       // 循环查看数据是否符合要求
       for (let i = 0; i < list.length; i++) {
         const item = list[i];
-        if (item.mallName.trim() !== _markeName) {
+        if (item.mallName?.trim() !== _markeName) {
           message = '请选择统一商场!!!';
           break;
         }
 
         if (
-          removeZeroWidth(item.customerName.trim()) !== _name ||
-          removeZeroWidth(item.customerAddress.trim()) !== _address ||
-          removeZeroWidth(item.customerTelephone.trim()) !== _phone
+          removeZeroWidth(item.customerName?.trim()) !== _name ||
+          removeZeroWidth(item.customerAddress?.trim()) !== _address ||
+          removeZeroWidth(item.customerTelephone?.trim()) !== _phone
         ) {
           console.log('i :>> ', i);
           message = '请选择统一顾客订单!!!';