From 74bda83b3d3e4d9393bafe1586ab9a403c476b2d Mon Sep 17 00:00:00 2001 From: zhangds Date: Tue, 20 Feb 2024 15:51:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0key=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8C=85=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UseExchangeAddEdit/index.jsx | 3 + src/pages/plan/key/UseKeyAddEdit.jsx | 98 +++++++++++++++++++-- src/pages/plan/list/list.js | 1 + 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/src/components/UseExchangeAddEdit/index.jsx b/src/components/UseExchangeAddEdit/index.jsx index aeae656c..2f1ee553 100644 --- a/src/components/UseExchangeAddEdit/index.jsx +++ b/src/components/UseExchangeAddEdit/index.jsx @@ -578,6 +578,9 @@ const UseExchangeAddEdit = forwardRef((props, ref) => { return (
+ {/*

+ 2222{props.isSettlement} {JSON.stringify(props.settlementData)} +

*/}
diff --git a/src/pages/plan/key/UseKeyAddEdit.jsx b/src/pages/plan/key/UseKeyAddEdit.jsx index 67d25dbf..1ccb1c14 100644 --- a/src/pages/plan/key/UseKeyAddEdit.jsx +++ b/src/pages/plan/key/UseKeyAddEdit.jsx @@ -216,7 +216,10 @@ const UseKeyAddEdit = () => { copyKeyCodeId: "", reseller_id: "", white_visible: false, - keyCodeId: "" + keyCodeId: "", + settlement_type: 0, + isSettlement: 0, + settlementData: null }) const keyFormEl = useRef(null) const bindObjEl = useRef(null) @@ -232,7 +235,9 @@ const UseKeyAddEdit = () => { stock: "", merge_stock: 1, mobile_excel: "", - mobile_repeat: [] + mobile_repeat: [], + key_official_price: "", + key_cost_price: "" }) //#endRegion data ***************************/ @@ -260,6 +265,17 @@ const UseKeyAddEdit = () => { } const init = () => { + /**包码TODO: 包码结算方式 0不是*/ + let plan_list_settlement_type = sessionStorage.getItem("plan_list_settlement_type") + if (plan_list_settlement_type) { + let settlement_type = Number(plan_list_settlement_type) + setState({ + isSettlement: settlement_type > 0 ? 1 : 0, + settlementData: settlement_type > 0 ? { key: settlement_type } : null, + settlement_type + }) + } + /* TODO: KeyPcType UseKeyAddEdit 1编辑 2复制 3新增 */ let planItem = sessionStorage.getItem("plan_item") @@ -432,7 +448,9 @@ const UseKeyAddEdit = () => { stock: data.stock, merge_stock: data.merge_stock, mobile_excel: data.mobile_excel, - mobile_repeat: data.mobile_repeat + mobile_repeat: data.mobile_repeat, + key_official_price: data.key_official_price, + key_cost_price: data.key_cost_price }) let newData = [] @@ -621,6 +639,12 @@ const UseKeyAddEdit = () => { let validator = addEditExchangeEl.current.submit() if (validator) { let param = addEditExchangeEl.current.getModel() + + if (state.isSettlement === 1 && param.product.legal.length > 1) { + Notify.error("包码只能创建一个商品") + return + } + let tempData = state.distdata // 优惠券编辑 if (state.rowIndex > -1) { @@ -807,9 +831,11 @@ const UseKeyAddEdit = () => { receive_email: state.reseller.contact_email[0], payment_direction: state.payment_direction[state.payType - 1] } - // 参数 是否是优惠券还是兑换码 + // 参数 是否是优惠券还是兑换码 keyType 1兑换码 2优惠券 if (state.keyType === 1) { create_param.code_batch = data + create_param.key_official_price = model.key_official_price + create_param.key_cost_price = model.key_cost_price } else { create_param.coupon = data } @@ -837,7 +863,7 @@ const UseKeyAddEdit = () => { receive_email: state.reseller.contact_email[0], payment_direction: state.payment_direction[state.payType - 1] } - // 参数 是否是优惠券还是兑换码 + // 参数 是否是优惠券还是兑换码 keyType 1兑换码 2优惠券 if (state.keyType === 1) { edit_param.code_batch = data } else { @@ -975,10 +1001,10 @@ const UseKeyAddEdit = () => { 串码 - + 链接 - + 二维码 @@ -987,6 +1013,56 @@ const UseKeyAddEdit = () => { + {state.isSettlement === 1 ? ( + + { + setModel({ + key_cost_price: e + }) + }} + onClearItem={(e) => { + setModel({ + key_cost_price: "" + }) + }} + value={model.key_cost_price} + placeholder={"请输入"} + labelWidth={"0px"} + maxLength={12} + height={"36px"} + disabled={state.KeyPcType === "1"} + width={"520px"} + alignment={"left"} + /> + + ) : null} + + {state.isSettlement === 1 ? ( + + { + setModel({ + key_official_price: e + }) + }} + onClearItem={(e) => { + setModel({ + key_official_price: "" + }) + }} + value={model.key_official_price} + placeholder={"请输入"} + labelWidth={"0px"} + disabled={state.KeyPcType === "1"} + maxLength={12} + height={"36px"} + width={"520px"} + alignment={"left"} + /> + + ) : null} + {state.KeyPcType === "1" ? null : (
@@ -1068,6 +1144,12 @@ const UseKeyAddEdit = () => { {state.keyType === 1 ? (