From 9e29eb57bc8d311d9addde03bdc2f681085e4852 Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Thu, 14 Dec 2023 17:37:47 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E5=81=9C=E8=BD=A6?=
 =?UTF-8?q?=E5=8D=A1=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParkingCard/ParkingCardMgm/loadable.jsx        |  2 +-
 .../ParkingCard/ParkingCardOrder/loadable.jsx      | 35 ++++++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
index 2969c4d..6fd4adc 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
@@ -602,7 +602,7 @@ function ParkingCardMgm(props) {
             message.error('请选择适用范围')
         } else if (checkData.sale_start == '' && checkData.sale_end == '') {
             message.error('请选择销售日期')
-        } else if (checkData.card_num === '') {
+        } else if (checkData.card_num === '' && getvalueNum == 2 ) {
             message.error('请选择停车卡数量')
         } else if (checkData.channel == '') {
             message.error('请选择销售渠道')
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
index 66b4128..a8c2545 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
@@ -742,12 +742,43 @@ function ParkingCardOrder() {
                                             </span>
                                              :
                                              <div className="yisa-search">
-                                                <Input
+                                                {/* <Input
                                                    //  placeholder="请输入内容"
                                                     value={updataOrder.plate_type}
                                                     style={{ width: 250, marginLeft: 10 }}
                                                     maxLength={30}
                                                     onChange={(e) => setUpdataOrder({plate_type:e.target.value})}
+                                                /> */}
+                                                <Select
+                                                    style={{ width: 250, marginLeft: 10 }}
+                                                    value={updataOrder.plate_type}
+                                                    options={[
+                                                        {
+                                                            value: '0',
+                                                            label: "蓝"
+                                                        },
+                                                        {
+                                                            value: '1',
+                                                            label: '黄'
+                                                        },
+                                                        {
+                                                            value: '2',
+                                                            label: '绿'
+                                                        },
+                                                        {
+                                                            value: '3',
+                                                            label: "黄绿"
+                                                        },
+                                                        {
+                                                            value: '4',
+                                                            label: '黑'
+                                                        },
+                                                        {
+                                                            value: '5',
+                                                            label: '黑'
+                                                        }
+                                                    ]}
+                                                    onChange={(e) => {setUpdataOrder({plate_type:e})}}
                                                 />
                                              </div>
                                         }
@@ -780,7 +811,7 @@ function ParkingCardOrder() {
                                         {listItem?.name || '---'}
                                     </Descriptions.Item>
                                     <Descriptions.Item  style={{ margin: '20px' }} label="商户名称" span={3}>
-                                        {listItem?.operator || '---'}
+                                        {listItem?.operator_name || '---'}
                                     </Descriptions.Item>
                                     <Descriptions.Item style={{ margin: '20px' }} label="适用范围" span={3}>
                                          {listItem?.scope || '---'}