Sfoglia il codice sorgente

修改待审批订单跳转

hurx 2 settimane fa
parent
commit
b862f9ecba

+ 8 - 1
src/views/order/orderAudit/index.vue

@@ -147,7 +147,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { Search, Document, User, ArrowRight, Picture, ArrowUp, ArrowDown } from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { PageTitle, StatusTabs } from '@/components';
@@ -158,6 +158,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { complaints_suggestion_type } = toRefs<any>(proxy?.useDict('complaints_suggestion_type'));
 
 const router = useRouter();
+const route = useRoute();
 
 const activeMainTab = ref('myAudit');
 const activeStatusTab = ref('all');
@@ -368,6 +369,12 @@ const handleStatusTabChange = () => {
 };
 
 onMounted(() => {
+  // 接收路由参数orderNo并赋值给keyword
+  const orderNo = route.query.orderNo as string;
+  if (orderNo) {
+    queryParams.keyword = orderNo;
+  }
+
   loadDeptTree();
   loadOrderList();
   loadCheckOrderIds();

+ 11 - 3
src/views/order/orderManage/index.vue

@@ -139,9 +139,13 @@
                   @click="order.statusText === '待支付' && handlePayment(order)"
                   >{{ order.statusText }}</span
                 >
-                <span v-if="order.auditStatus" :class="['audit-status', getAuditStatusClass(order.auditStatus), 'clickable-audit']">{{
-                  order.auditStatus == '0' ? '待审批' : order.auditStatus == '1' ? '' : '审批驳回'
-                }}</span>
+                <span
+                  v-if="order.auditStatus"
+                  :class="['audit-status', getAuditStatusClass(order.auditStatus), 'clickable-audit']"
+                  @click="order.auditStatus == '0' && handleAudit(order)"
+                >
+                  {{ order.auditStatus == '0' ? '待审批' : order.auditStatus == '1' ? '' : '审批驳回' }}</span
+                >
               </div>
               <div class="action-buttons">
                 <el-button type="primary" v-if="order.statusText == '发货完成'" link @click="handleConfirmReceipt(order)">确认收货</el-button>
@@ -629,6 +633,10 @@ const handlePayment = (order: any) => {
   onPath('/payc?id=' + order.orderId);
 };
 
+const handleAudit = (order: any) => {
+  router.push(`/order/orderAudit?orderNo=${order.orderNo}`);
+};
+
 const handleConfirmReceipt = async (order: any) => {
   try {
     const res = await batchConfirmation([order.id]);