From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/api/data.js | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index 5936ae6..1909a6e 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -2,6 +2,14 @@
const purchaseStatus = [
{ id: 1, name: "寰呯‘璁�" },
{ id: 2, name: "寰呭叆搴�" },
+ { id: 3, name: "宸插叆搴�" },
+ { id: 4, name: "宸插畬鎴�" },
+ { id: 5, name: "宸插彇娑�" }
+]
+// 鏀惰揣鐘舵��
+const receiveStatus = [
+ { id: 1, name: "寰呯‘璁�" },
+ { id: 2, name: "寰呭叆搴�" },
{ id: 3, name: "灏辩华" },
{ id: 4, name: "宸插畬鎴�" },
{ id: 5, name: "宸插彇娑�" }
@@ -44,5 +52,7 @@
return qualityStatus
} else if (type == "returnedStatus") {
return returnedStatus
+ } else if (type == "receiveStatus") {
+ return receiveStatus
}
}
--
Gitblit v1.8.0