Kaynağa Gözat

修改

Co-authored-by: Copilot <copilot@github.com>
hurx 15 saat önce
ebeveyn
işleme
e0e7005b28

+ 2 - 1
src/views/enterprise/purchaseHistory/index.vue

@@ -278,7 +278,7 @@ const fetchOrderList = async () => {
 
     // 添加筛选条件
     if (queryParams.keyword) params.orderNo = queryParams.keyword;
-    if (queryParams.department) params.department = queryParams.department;
+    if (queryParams.department) params.createDept = queryParams.department;
     if (queryParams.status) params.orderStatuses = queryParams.status; // 使用orderStatuses支持多状态查询
     if (queryParams.payType) params.payType = queryParams.payType;
     if (queryParams.dateRange && queryParams.dateRange.length == 2) {
@@ -386,6 +386,7 @@ const handleReset = () => {
   queryParams.dateRange = null;
   queryParams.department = '';
   queryParams.payType = '';
+  queryParams.status = '';
   queryParams.pageNum = 1;
   fetchOrderList();
 };

+ 7 - 1
src/views/order/orderManage/index.vue

@@ -132,7 +132,12 @@
             <div v-else style="width: 200px"></div>
             <div class="status-cell" v-if="itemIndex === 0">
               <div class="status-info">
-                <span class="status-text" :style="{ color: getStatusColor(order.status) }">{{ order.statusText }}</span>
+                <span
+                  class="status-text"
+                  v-if="order.isNeedCheck == 1 || (order.isNeedCheck == 0 && order.auditStatus == '1')"
+                  :style="{ color: getStatusColor(order.status) }"
+                  >{{ order.statusText }}</span
+                >
               </div>
               <div class="status-info">
                 <span class="status-text" v-if="order.auditStatus">
@@ -672,6 +677,7 @@ const handleReset = () => {
   queryParams.dateRange = null;
   queryParams.department = '';
   queryParams.payType = '';
+  queryParams.status = '';
   queryParams.pageNum = 1;
   fetchOrderList();
 };