Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

src/views/DestinationDelivery/src/DestinationDelivery.vue

@@ -98,7 +98,12 @@ const handleSearch = () => {
     <div class="header">
       <span>Destination Delivery</span>
       <div class="operator">
-        <el-button style="height: 40px" type="default" @click="handleConfigurations">
+        <el-button
+          style="height: 40px"
+          type="default"
+          @click="handleConfigurations"
+          v-if="tableRef?.isEmployeeRole === true"
+        >
           <span style="margin-right: 4px" class="font_family icon-icon_configurations_b"></span>
           <span style="font-weight: 400">Configurations</span></el-button
         >

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

@@ -400,7 +400,7 @@ defineExpose({
           @click="handleEdit(row)"
           class="action-btn el-button--blue"
           style="height: 24px; width: 24px"
-          v-if="!isEmployeeRole && row.status === 'Pending Approval'"
+          v-if="!isEmployeeRole && (row.status === 'Pending Approval' || row.status === 'Rejected')"
         >
           <span class="font_family icon-icon_edit_b"> </span>
         </el-button>