Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/baseinfo/TaskMail/TenantAuditStepModal.vue

@@ -138,7 +138,7 @@
     setModalProps({ loading: false })
   })
 
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增商品信息' : '编辑商品信息'))
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增邮件模板' : '编辑邮件模板'))
 
   async function handleSave(exit) {
     try {

src/views/bookingcabin/CabinManagement/index.vue

@@ -166,7 +166,7 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps, se
           })
           arr.splice(i, 1)
         }
-        if( arr[i].bookingSlotSaleInfoList.length == 1){
+        if (arr[i].bookingSlotSaleInfoList && arr[i].bookingSlotSaleInfoList.length == 1) {
           arr[i].op = arr[i].bookingSlotSaleInfoList[0].op
           arr[i].customername = arr[i].bookingSlotSaleInfoList[0].customername
           arr[i].custservice = arr[i].bookingSlotSaleInfoList[0].custservice
@@ -184,7 +184,7 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps, se
       setProps({
         showIndexColumn: false,
       }),
-        resolve({ data: arr, total: res.count })
+    resolve({ data: arr, total: res.count })
       optionsStore.getOptionsByCode('GetClientPortSelectList')
     })
   },