From 49eacb4fa979b8499a5232b399fa1846dd3574ed Mon Sep 17 00:00:00 2001 From: lisf Date: Wed, 6 Dec 2023 18:05:38 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=81=9C=E8=BD=A6=E5=8D=A1=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B4=E4=BD=93=E5=B8=83=E5=B1=80=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingCard/ParkingCardMgm/loadable.jsx | 128 ++++-- .../ParkingCard/ParkingCardOrder/index.scss | 137 ++++++ .../ParkingCard/ParkingCardOrder/loadable.jsx | 477 ++++++++++++++++++++- .../OperationCenter/ParkingCardMgm/index.js | 20 +- 4 files changed, 714 insertions(+), 48 deletions(-) diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx index 477192c..256ca61 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: '',//销售渠道 + channel_id: '',//销售渠道 status: 0,//销售状态 operator_id: '',//商户名称 pn: 1, @@ -46,7 +46,7 @@ function ParkingCardMgm(props) { } //销售渠道 const handleSaleChannel = (v) => { - setFormData({ ...formData, channel: v }) + setFormData({ ...formData, channel_id: v }) } //销售状态 const handleSaleType = (v) => { @@ -73,7 +73,7 @@ function ParkingCardMgm(props) { let url = type == "下架" ? ajax.undercarriageGoods : ajax.putawayGoods; url({ id }).then((res) => { if (res.status === 20000) { - message.success(res.message || `${type}成功`); + message.success(`${type}成功`); getData(); } else { message.error(res.message); @@ -223,20 +223,30 @@ function ParkingCardMgm(props) { uid: '' }) const [getId, setGetId] = useState({}) + // 修改的数据 + const [actionType, setActionType] = useState(1) // 1为添加 2为修改 + const scopeRef = useRef('') const translateBtn = (record) => { - setGetId(record) - setEditVisible(true) - setGetEditData(Object.assign({}, getEditData, { - region_id: record.region_id, - operatorid: record.operatorid, - code: record.code, - name: record.goods_name, - brand_id: record.brand_id, - model_id: record.model_id, - status: record.status, - uid: record.use_name, - })) - } + // setGetId(record) + // setEditVisible(true) + // setGetEditData(Object.assign({}, getEditData, { + // region_id: record.region_id, + // operatorid: record.operatorid, + // code: record.code, + // name: record.goods_name, + // brand_id: record.brand_id, + // model_id: record.model_id, + // status: record.status, + // uid: record.use_name, + // })) + setActionType(2) + setAddVisible(true) + setCheckData({ + ...checkData, + ...record + }) + scopeRef.current = record.scope; + } const editModal = () => { setEditVisible(false) } @@ -351,11 +361,13 @@ function ParkingCardMgm(props) { } //添加 const addData = () => { + setActionType(1) setAddVisible(true) } const addModal = () => { setCheckData(param) setAddVisible(false) + setGetScope("1") } let param = { operator: '', @@ -365,12 +377,13 @@ function ParkingCardMgm(props) { effective_days: '', operator_id: '', scope: '', - channel: 0, + channel_id: 0, uid: '', sale_start:"", sale_end:"", card_num:0, - remark:"" + remark:"", + days_value:1 } //停车卡名称 @@ -381,11 +394,11 @@ function ParkingCardMgm(props) { ); }; //生效日期 - const [value, setValue] = useState(1); + const [value, setValue] = useState(!checkData.days ? 2 : 1); const onChangeTime = (e) => { setCheckData({ ...checkData, - days:'' + days:'', }) setValue(e.target.value); }; @@ -453,7 +466,7 @@ function ParkingCardMgm(props) { const handleSales = (v) => { setCheckData({ ...checkData, - channel:v + channel_id:v }) } // 优惠金额 @@ -500,7 +513,8 @@ function ParkingCardMgm(props) { console.log(nextTargetKeys); let str = nextTargetKeys.toString() setEtcTargetKeys(nextTargetKeys); - setCheckData({ ...checkData, scope: str || "2" }) + setCheckData({ ...checkData, scope: "2,"+str || "2" }) + scopeRef.current = str }; const onSelectEtcChange = (sourceSelectedKeys, targetSelectedKeys) => { setSelectedEtcKeys([...sourceSelectedKeys, ...targetSelectedKeys]); @@ -533,7 +547,7 @@ function ParkingCardMgm(props) { setGetInputNum(v) setCheckData({ ...checkData, card_num: v }) } - const [getvalueNum, setGetvalueNum] = useState(1); + const [getvalueNum, setGetvalueNum] = useState(!checkData.card_num ? 2 : 1); const onChangeValue = (e) => { setGetvalueNum(e.target.value); if (e.target.value === 1) { @@ -555,6 +569,7 @@ function ParkingCardMgm(props) { setCheckData({ ...checkData, uid: v }) } const placeSaveBtn = () => { + let url = actionType == 1 ? ajax.saveData : ajax.updataGoods let data = { ...checkData, } @@ -582,12 +597,12 @@ function ParkingCardMgm(props) { message.error('请输入优惠金额') } else { - ajax.saveData(data).then((res) => { + url(data).then((res) => { if (res.status === 20000) { setAddVisible(false) setCheckData(param) getData(formData) - message.success(res.message) + message.success(actionType == 1 ? "保存成功" : "修改成功" ) } }).catch(err => { console.log(err); @@ -692,7 +707,7 @@ function ParkingCardMgm(props) { { setFormData({ plate: e.target.value }) } } + /> + +
+ + { setFormData({ phone: e.target.value }) } } + /> +
+
+ + { setFormData({ name: e.target.value }) } } + /> +
+
+ + {setFormData({status:e}) }} + /> +
+
+ + {setFormData({equipment:e}) }} + /> +
+
+ + { + setFormData({start_time:dateStrings[0],end_time:dateStrings[1]}) + }} + format="YYYY-MM-DD HH:mm:ss" + value={ + formData.start_time == '' && formData.end_time == '' ? + [] : + [moment(formData.start_time),moment(formData.end_time)] + } + /> +
+
+ + { setFormData({ serial_number: e.target.value }) } } + /> +
+
+
+ + + +
+
+ +
+
+ 共检索到{resultData.total}条结果 + + + `共 ${resultData.total} 条`} + total={resultData.total} + current={lastFormData.pn} + pageSize={lastFormData.page_size} + pageSizeOptions={pageSizeOptions} + onChange={changePn} + onShowSizeChange={changeLength} + /> + + + + + ) } export default ParkingCardOrder; \ No newline at end of file diff --git a/src/services/OperationCenter/ParkingCardMgm/index.js b/src/services/OperationCenter/ParkingCardMgm/index.js index 601c9e5..e5b5946 100644 --- a/src/services/OperationCenter/ParkingCardMgm/index.js +++ b/src/services/OperationCenter/ParkingCardMgm/index.js @@ -30,9 +30,27 @@ const undercarriageGoods = (params) => { data:params }) } +// 修改商品 +const updataGoods = (params) => { + return ajax({ + url:'/api/ope/parkcard/edit', + type:'post', + data:params + }) +} +// 获取卡片订单列表 +const getCardOrderList = (params) => { + return ajax({ + url:'/api/ope/parkcard/order_list', + type:'post', + data:params + }) +} export default { getParkcardrList, getParkList, putawayGoods, - undercarriageGoods + undercarriageGoods, + updataGoods, + getCardOrderList }