From 514295fb7608432fe731f0005e63c86cb081642e Mon Sep 17 00:00:00 2001 From: lisf Date: Wed, 13 Dec 2023 10:14:20 +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=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx | 2 +- .../OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx index 5963402..9c9a85e 100644 --- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx @@ -674,7 +674,7 @@ function ParkingCardMgm(props) { code: sessionTabList?.code || formData.code,//物品编号 brand_id: sessionTabList?.brand_id || formData.brand_id,//物品类型 model_id: sessionTabList?.model_id || formData.model_id,//物品型号 - operatorid: sessionTabList?.operatorid || formData?.operatorid,//商户名称 + operatorid: sessionTabList?.operatorid || formData?.operator_id,//商户名称 name: sessionTabList?.name || formData.name,//物品名称 status: sessionTabList?.status || formData.status,//状态 uid: sessionTabList?.uid || formData.uid,//领用人 diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx index 1ef54ba..1ced6ec 100644 --- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx @@ -303,7 +303,8 @@ function ParkingCardOrder() { ...addOrderData, effective_days:undefined, days:undefined, - scope:undefined + scope:undefined, + name:undefined } let phoneReg = new RegExp(/^(?:(?:\+|00)86)?1[3-9]\d{9}$/) @@ -317,7 +318,7 @@ function ParkingCardOrder() { }else if(addOrderData.plate_type == ''){ message.error('请选择车牌颜色') return - }else if(!phoneReg.test(addOrderData.phone)){ + }else if(addOrderData.phone && !phoneReg.test(addOrderData.phone)){ message.error('请输入正确的手机号') return }else if(addOrderData.name == ''){ @@ -346,7 +347,7 @@ function ParkingCardOrder() { effective_days:data.effective_days, days:data.days, scope:data.scope, - card_id:data.card_id + card_id:data.value }) }