From 6f635d7a6d579c03d7a9c4ace37902c7a765ac20 Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Tue, 12 Dec 2023 15:18:12 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E5=81=9C=E8=BD=A6=E5=8D=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParkingCard/ParkingCardMgm/loadable.jsx        | 82 +++++++++++-----------
 .../ParkingCard/ParkingCardOrder/loadable.jsx      | 38 +++-------
 .../ParkingCard/ParkingCardStat/loadable.jsx       |  6 +-
 .../OperationCenter/ParkingCardMgm/index.js        |  4 +-
 4 files changed, 58 insertions(+), 72 deletions(-)

diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
index 5b91b6c..21f6d96 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
@@ -25,7 +25,7 @@ function ParkingCardMgm(props) {
     })
     const parameter = {
         name: '',//商品名称
-        channel_id: '',//销售渠道
+        channel: '',//销售渠道
         status: 0,//销售状态
         operator_id: '',//商户名称
         pn: 1,
@@ -46,7 +46,7 @@ function ParkingCardMgm(props) {
     }
     //销售渠道
     const handleSaleChannel = (v) => {
-        setFormData({ ...formData, channel_id: v })
+        setFormData({ ...formData, channel: v })
     }
     //销售状态
     const handleSaleType = (v) => {
@@ -99,6 +99,11 @@ function ParkingCardMgm(props) {
             title: '序号',
             dataIndex: 'id',
             key: 'id',
+            render:(_,record,index) => {
+                return (
+                    <span>{index + 1}</span>
+                )
+            }
         },
         {
             title: '商品名称',
@@ -140,13 +145,13 @@ function ParkingCardMgm(props) {
         },
         {
             title: '销售渠道',
-            dataIndex: 'channel',
-            key: 'channel',
+            dataIndex: 'channel_name',
+            key: 'channel_name',
         },
         {
             title: '商品状态',
-            dataIndex: 'status',
-            key: 'status',
+            dataIndex: 'status_name',
+            key: 'status_name',
         },
         {
             title: '创建人',
@@ -166,7 +171,7 @@ function ParkingCardMgm(props) {
                         <div className="operateBtn">
                             <div onClick={() => { CheckBtn(record) }}>查看</div>
                             {
-                                record.status_id === 1 ?
+                                record.status == 1 ?  
                                     <>
                                         <div onClick={() => { translateBtn(record) }}>修改</div>
                                         {/* <div onClick={() => { translateBtn(record) }}>上架</div> */}
@@ -176,7 +181,7 @@ function ParkingCardMgm(props) {
                                     </> : ''
                             }
                             {
-                                record.status_id === 3 || record.status_id === 4 ?
+                                record.status == 3 || record.status == 4 ?
                                     <>
                                         {/* <div onClick={() => { translateBtn(record) }}>下架</div> */}
                                         <Popconfirm placement="left" title="下架的停车卡将不可购买，已购买的会继续生效，确认下架？" onConfirm={() => { $deleteConfirm(record?.id, "下架") }} okText="确定" cancelText="取消">
@@ -379,26 +384,25 @@ function ParkingCardMgm(props) {
         setGetScope("")
     }
     let param = {
-        operator: '',
+        name: '',
         effective_start: '',
         effective_end: '',
         days: '',
         effective_days: '',
         operator_id: '',
         scope: '',
-        channel_id: "",
-        uid: '',
+        channel: "",
         sale_start:"",
         sale_end:"",
         card_num:0,
-        remark:"",
+        text:"",
         
     }
     //停车卡名称
     const [checkData, setCheckData] = useState(param)
     const handleParkName = (v) => {
         setCheckData(
-            Object.assign({}, checkData, { operator: v.target.value })
+            Object.assign({}, checkData, { name: v.target.value })
         );
     };
     //生效日期
@@ -460,6 +464,7 @@ function ParkingCardMgm(props) {
     //商户名称
     const handleOperator = (v) => {
         setCheckData({ ...checkData, operator_id: v })
+        getEtcStatus(v)
     }
     //适用范围
     const [getScope, setGetScope] = useState("")
@@ -467,14 +472,14 @@ function ParkingCardMgm(props) {
         setGetScope(v)
         setCheckData({
             ...checkData,
-            scope:v
+            scope:v == "1" ? "" : v
         })
     }
     // 销售渠道
     const handleSales = (v) => {
         setCheckData({
             ...checkData,
-            channel_id:v
+            channel:v
         })
     }
     // 优惠金额
@@ -489,15 +494,15 @@ function ParkingCardMgm(props) {
             return
         }
         
-        setCheckData({...checkData,discount_amount:v,selling_price: checkData.original_price - v})
+        setCheckData({...checkData,discount_amount:v})
     }
     const [getEtcList, setGetEtcList] = useState([])
     const [EtctargetKeys, setEtcTargetKeys] = useState([]);
     const [selectedEtcKeys, setSelectedEtcKeys] = useState([]);
     const getEtcStatus = (id) => {
-        let road_id = id
-        const params = road_id !== null ? { road_id } : {};
-        ajax.getParkList(params).then(
+        // let road_id = id
+        // const params = road_id !== null ? { road_id } : {};
+        ajax.getParkList({id}).then(
             (res) => {
                 if (res.status === 20000) {
                     let _data = [...res.data].map((item) => {
@@ -570,11 +575,11 @@ function ParkingCardMgm(props) {
             setCheckData({...checkData,original_price:''})
             return
         }
-        setCheckData({...checkData,original_price:v,selling_price: v - checkData.discount_amount})
+        setCheckData({...checkData,original_price:v})
     }
 
     const placeSaveBtn = () => {
-        let url = actionType == 1 ? ajax.saveData : ajax.updataGoods
+        let url = actionType == 1 ? ajax.saveCardOrder : ajax.updataGoods
         let data = {
             ...checkData,
         }
@@ -688,8 +693,9 @@ function ParkingCardMgm(props) {
         merchantDataName()
         recipientName()
         getCascaderList()
-        getEtcStatus()
+        // getEtcStatus()
     }, [])
+
     return <>
         <div className="paid-ParkingCardMgm">
             <div className="paid-search">
@@ -718,7 +724,7 @@ function ParkingCardMgm(props) {
                     <Select
                         style={{ width: 270 }}
                         placeholder="请选择"
-                        value={formData.channel_id}
+                        value={formData.channel}
                         options={sysConfig.saleChannel}
                         onChange={handleSaleChannel}
                     />
@@ -793,7 +799,7 @@ function ParkingCardMgm(props) {
                         {cardItem?.name || '---'}
                     </Descriptions.Item>
                     <Descriptions.Item label="商品状态" span={1.5}>
-                        {cardItem?.status || '---'}
+                        {cardItem?.status_name || '---'}
                     </Descriptions.Item>
                     <Descriptions.Item label="生效日期" span={3}>
                          <span>自购买后{cardItem?.days || '---'}天开始生效</span>
@@ -817,25 +823,26 @@ function ParkingCardMgm(props) {
                   labelStyle={{wordBreak:"keep-all"}}
                 >
                     <Descriptions.Item label="销售日期" span={3}>
-                        {cardItem?.name || '---'}
+                        {cardItem?.sale_start || '---'}&ensp;至&ensp;
+                        {cardItem?.sale_end || '---'}
                     </Descriptions.Item>
                     <Descriptions.Item label="停车卡数量" span={2}>
-                        {cardItem?.card_num || '---'}
+                        {cardItem?.card_num || '---'}张
                     </Descriptions.Item>
                     <Descriptions.Item label="销售渠道" span={1.5}>
-                         {cardItem?.channel || '---'}
+                         {cardItem?.channel_name || '---'}
                     </Descriptions.Item>
                     <Descriptions.Item label="原价" span={1}>
-                        {cardItem?.original_price || '---'}
+                        {cardItem?.original_price || '---'}元
                     </Descriptions.Item>
                     <Descriptions.Item label="优惠价格" span={1}>
-                         {cardItem?.discount_amount || '---'}
+                         {cardItem?.discount_amount || '---'}元
                     </Descriptions.Item>
                     <Descriptions.Item label="销售价格" span={1}>
-                         {cardItem?.selling_price || '---'}
+                         {cardItem?.original_price - cardItem?.discount_amount || '---'}元
                     </Descriptions.Item>
                     <Descriptions.Item label="备注" span={1.5}>
-                         {cardItem?.remark || '---'}
+                         {cardItem?.text || '---'}
                     </Descriptions.Item>
                 </Descriptions>
             </div>
@@ -858,7 +865,7 @@ function ParkingCardMgm(props) {
                     <label>停车卡名称</label>
                     <Input
                         placeholder="请输入内容"
-                        value={checkData.operator}
+                        value={checkData.name}
                         style={{ width: 250, marginLeft: 10 }}
                         maxLength={30}
                         onChange={handleParkName}
@@ -873,11 +880,6 @@ function ParkingCardMgm(props) {
                                 <Space direction="vertical" size={12}>
                                     <RangePicker
                                         disabledDate={disabledDate}
-                                        disabledTime={disabledRangeTime}
-                                        // showTime={{
-                                        //     hideDisabledOptions: true,
-                                        //     defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('00:00:00', 'HH:mm:ss')],
-                                        // }}
                                         showTime
                                         onChange={changeTime}
                                         format="YYYY-MM-DD HH:mm:ss"
@@ -1035,7 +1037,7 @@ function ParkingCardMgm(props) {
                                 label: '后台录入'
                             }
                         ]}
-                        value={String(checkData.channel_id)}
+                        value={String(checkData.channel)}
                     />
                 </div>
                 <div className="yisa-search extra-style">
@@ -1076,9 +1078,9 @@ function ParkingCardMgm(props) {
                     <label>备注</label>
                      <TextArea
                         placeholder="输入内容"
-                        value={checkData.remark}
+                        value={checkData.text}
                         style={{ width: 250, marginLeft: 20 }}
-                        onChange={(v)=> setCheckData({...checkData,remark:v.target.value})}
+                        onChange={(v)=> setCheckData({...checkData,text:v.target.value})}
                         />
                 </div>
             </div>
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
index 31e1851..1ef54ba 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
@@ -149,8 +149,8 @@ function ParkingCardOrder() {
         channel:'0',//支付渠道
         equipment:"0",//支付设备
         serial_number:'',//渠道流水号
-        start_time: "",//支付开始时间
-        end_time: "",//支付结束时间
+        start_time: moment(moment().startOf("days")).format("YYYY-MM-DD HH:mm:ss"),//支付开始时间
+        end_time: moment().format("YYYY-MM-DD HH:mm:ss"),//支付结束时间
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     })
@@ -482,56 +482,40 @@ function ParkingCardOrder() {
                             },
                             {
                                 value: '1',
-                                label: '系统自动扣款'
+                                label: '余额'
                             },
                             {
                                 value: '2',
-                                label: '微信公众号'
+                                label: '现金'
                             },
                             {
                                 value: '3',
-                                label: 'MS'
+                                label: '微信'
                             },
                             {
                                 value: '4',
-                                label: "PDA"
+                                label: '支付宝'
                             },
                             {
                                 value: '5',
-                                label: '开放平台支付'
+                                label: "系统录入"
                             },
                             {
                                 value: '6',
-                                label: '扫码抢'
+                                label: '招商银行'
                             },
                             {
                                 value: '7',
-                                label: '微信小程序'
+                                label: '数字人民币'
                             },
                             {
                                 value: '8',
-                                label: '支付宝生活号'
+                                label: '车场自收'
                             },
                             {
                                 value: '9',
-                                label: '支付宝小程序'
-                            },
-                            {
-                                value: '10',
-                                label: '自主缴费机'
-                            },
-                            {
-                                value: '11',
-                                label: '后台录入'
-                            },
-                            {
-                                value: '12',
-                                label: 'H5'
-                            },
-                            {
-                                value: '13',
                                 label: 'ETC'
-                            }
+                            },
                         ]}
                         onChange={e=>{setFormData({channel:e}) }}
                     />
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
index f3e5dd5..477109b 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
@@ -39,8 +39,8 @@ function ParkingCardStat() {
     ]
     // 表单数据
     const [formData, setFormData] = useSetState({
-        start_date:'', // 开始时间
-        end_date:''  // 结束时间
+        start_date:moment(moment().startOf("days")).format("YYYY-MM-DD HH:mm:ss"), // 开始时间
+        end_date:moment().format("YYYY-MM-DD HH:mm:ss")  // 结束时间
     })
     const [dataList, setDataList] = useState([])
     // 加载
@@ -147,7 +147,7 @@ function ParkingCardStat() {
                                     style={{width:270}}
                                     showTime 
                                     allowClear={false}
-                                    format={"YYYY-MM-DD HH:mm:ss"}
+                                    format={"YYYY-MM-DD HH:mm:SS"}
                                     value={formData?.start_date ? moment(formData.start_date) : null}
                                     // disabledDate={(current) => current < moment(formData.start_date)}
                                     onChange={(date, time) => {
diff --git a/src/services/OperationCenter/ParkingCardMgm/index.js b/src/services/OperationCenter/ParkingCardMgm/index.js
index bbfc4ce..6f9c1a4 100644
--- a/src/services/OperationCenter/ParkingCardMgm/index.js
+++ b/src/services/OperationCenter/ParkingCardMgm/index.js
@@ -10,7 +10,7 @@ const getParkcardrList = (params) => {
 const getParkList = (params) => {
     return ajax({
       url: "/api/ope/parkcard/park_list",
-      type: "get",
+      type: "post",
       data: params,
     });
   };
@@ -49,7 +49,7 @@ const getCardOrderList = (params) => {
 // 添加订单保存
 const saveCardOrder = (params) => {
   return ajax({
-    url:'/api/ope/parkcard/order_insert',
+    url:'/api/ope/parkcard/insert',
     type:'post',
     data:params
   })