feat: 合并dev分支代码

src/views/DestinationDelivery/src/components/CreateNewBooking/src/CreateNewbooking.vue

@@ -575,7 +575,7 @@ const handleClickAddress = () => {
 
 //选择日期
 const changeDatePicker = (val: any) => {
-  if (val === null) {
+  if (val === null || !specialDates.value.length) {
     isRecommendDate.value = false
     recommendateWarning.value = ''
     isConsistent.value = false
@@ -969,7 +969,6 @@ onMounted(() => {
           <a-date-picker
             v-model:value="DateValue"
             :disabled="isNotClickAddress"
-            @change="changeDatePicker"
             :showToday="false"
             style="width: 240px"
             :format="userStore.dateFormat"

src/views/DestinationDelivery/src/components/TableView/src/TableView.vue

@@ -438,7 +438,7 @@ defineExpose({
           v-if="
             isEmployeeRole &&
             row.status === 'Pending Approval' &&
-            row.kln_pic.includes(userStore.userInfo.employee_email)
+            row.kln_pic.includes(userStore.userInfo.employee_email.toUpperCase())
           "
           style="height: 24px; width: 24px"
         >
@@ -449,7 +449,7 @@ defineExpose({
           v-if="
             isEmployeeRole &&
             row.status === 'Pending Approval' &&
-            row.kln_pic.includes(userStore.userInfo.employee_email)
+            row.kln_pic.includes(userStore.userInfo.employee_email.toUpperCase())
           "
           @click="handleTips('reject', row)"
           class="action-btn el-button--blue"