Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

8 小时以前 7b2b3bb85db79bafe2132f4708688cfe8c7c1c95

Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro

 src/api/viewIndex.js

@@ -349,7 +349,7 @@

export const productionOrderProgress = (params = {}) => {
  const safePageNum = Math.max(1, Number(params.pageNum || 1));
  const safeTab = ["all", "inProgress", "completed", "paused"].includes(params.tab)
  const safeTab = ["all", "inProgress", "completed", "end"].includes(params.tab)
    ? params.tab
    : "all";
  return request({

 src/views/index.vue

@@ -117,7 +117,7 @@
              <el-radio-button :value="'waiting'">待开始({{ orderProgressMeta.waitingCount }})</el-radio-button>
              <el-radio-button :value="'inProgress'">进行中({{ orderProgressMeta.inProgressCount }})</el-radio-button>
              <el-radio-button :value="'completed'">已完成({{ orderProgressMeta.completedCount }})</el-radio-button>
              <el-radio-button :value="'paused'">已暂停({{ orderProgressMeta.pausedCount }})</el-radio-button>
              <el-radio-button :value="'end'">已结束({{ orderProgressMeta.endCount }})</el-radio-button>
            </el-radio-group>
          </div>
          <div class="order-table-wrap">
@@ -477,7 +477,7 @@
  waitingCount: 0,
  inProgressCount: 0,
  completedCount: 0,
  pausedCount: 0,
  endCount: 0,
});

const todayPlanList = ref([]);
@@ -852,12 +852,12 @@

const productionOrders = ref([]);

const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "paused"];
const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "end"];
const orderFilterAliasMap = {
  1: "waiting",
  2: "inProgress",
  3: "completed",
  4: "paused",
  5: "end",
};
const orderFilter = ref("all");
const filteredOrders = computed(() => productionOrders.value);
@@ -1157,7 +1157,7 @@
    1: "待开始",
    2: "进行中",
    3: "已完成",
    4: "已暂停",
    5: "已结束",
  };
  return mapping[status] || "未知";
};
@@ -1264,7 +1264,7 @@
      waitingCount: resolveProgressCount(data.waitingCount, statusValue, "waiting", total),
      inProgressCount: resolveProgressCount(data.inProgressCount, statusValue, "inProgress", total),
      completedCount: resolveProgressCount(data.completedCount, statusValue, "completed", total),
      pausedCount: resolveProgressCount(data.pausedCount, statusValue, "paused", total),
      endCount: resolveProgressCount(data.endCount, statusValue, "end", total),
    };
    productionOrders.value = (data.records || []).map(mapOrderProgressRecord);
  } catch {
@@ -1278,7 +1278,7 @@
      waitingCount: 0,
      inProgressCount: 0,
      completedCount: 0,
      pausedCount: 0,
      endCount: 0,
    };
    productionOrders.value = [];
  }