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 | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index a885f6b..1909a6e 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -1,26 +1,58 @@
// 閲囪喘鐘舵��
-const purchaseStatus=[
+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: "宸插彇娑�" }
+]
+// 璐ㄦ鍗曠姸鎬�
+const qualityStatus = [
{
- name:'宸蹭笅鍗�',
- id:1,
+ name: "寰呰川妫�",
+ id: 1
},
{
- name:'鍒拌揣璐ㄦ',
- id:2,
+ name: "宸插畬鎴�",
+ id: 2
+ }
+]
+// 閫�璐у崟鐘舵��
+const returnedStatus = [
+ {
+ name: "寰呭彂璐�",
+ id: 1
},
{
- name:'宸插叆搴�',
- id:3,
+ name: "寰呯鏀�",
+ id: 2
},
{
- name:'宸插畬鎴�',
- id:4,
+ name: "寰呭彂璐�",
+ id: 3
},
+ {
+ name: "宸插畬鎴�",
+ id: 4
+ }
]
-
-export const getDataByType = type => {
- if(type =='purchaseStatus'){
- return purchaseStatus;
+export const getDataByType = (type) => {
+ if (type == "purchaseStatus") {
+ return purchaseStatus
+ } else if (type == "qualityStatus") {
+ return qualityStatus
+ } else if (type == "returnedStatus") {
+ return returnedStatus
+ } else if (type == "receiveStatus") {
+ return receiveStatus
}
}
--
Gitblit v1.8.0