HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu

This commit is contained in:
许红梅 2022-05-18 15:16:56 +08:00
parent 0a50e472cf 28bac3845c
commit 53deeeda51
9 changed files with 888 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/exchangecode/edit/edit.js
View File

@ -573,6 +573,7 @@ export default class exchangedit extends React.Component {
this.setState({ codeInfo: model2 })
}
//渲染范围列表数据以及数据转换
async productSubmit() {
let visible = ''
if (this.state.addIsType === 'addProduct') {
@ -615,7 +616,7 @@ export default class exchangedit extends React.Component {
data = JSON.parse(sessionStorage.getItem('knockGoldData'))
temp = _.map(data, (item) => {
let index = this.state.tempdata.findIndex((o) => {
return o.product_id === item.id
return o.product_id === item.uuid
})
if (index > -1) {
@ -625,7 +626,7 @@ export default class exchangedit extends React.Component {
/* 转换商品结构 */
// temp
return {
product_id: item.id,
product_id: item.uuid,
product_name: item.batch_goods_name, //名字
cost_price: '',
contract_price: item.contract_price, //单价
@ -689,6 +690,7 @@ export default class exchangedit extends React.Component {
}
}
/* 修改商品名称 */
onNameChange(e, row) {
let rowIndex = this.state.tempdata.findIndex((o) => {
return o.product_id == row.product_id
@ -696,6 +698,8 @@ export default class exchangedit extends React.Component {
this.state.tempdata[rowIndex].product_name = e.target.value
this.setState({ tempdata: this.state.tempdata })
}
/* 修改库存总数 */
onQuantityChange(e, row) {
this.setState({ tempdata: this.state.tempdata })
let value = e.target.value
@ -713,6 +717,8 @@ export default class exchangedit extends React.Component {
value - this.state.tempdata[rowIndex].usage
this.setState({ tempdata: this.state.tempdata })
}
/* 修改合同价 */
onPriceChange(e, row) {
let str = e.target.value
let value = str
@ -851,6 +857,7 @@ export default class exchangedit extends React.Component {
})
}
/* 商品范围列表编辑 */
productEditShow(rowData) {
console.log('direct_reseller_id ==>', this.state.direct_reseller_id)
console.log('rowData 12==>', rowData)
@ -865,7 +872,7 @@ export default class exchangedit extends React.Component {
if (rowData.type === 'knockGold') {
const temp = JSON.parse(sessionStorage.getItem('knockGoldData'))
const editData = temp.filter(
(item) => item.id === rowData.product_id
(item) => item.uuid === rowData.product_id
)
this.setState({

893
src/pages/order/list/list.js
View File

File diff suppressed because it is too large Load Diff

1
src/pages/plan/add/step2.less
View File

@ -1,7 +1,6 @@
.draw2 {
.zent-card-body {
border: none;
padding: 0 !important;
}
.borderNone {

28
src/pages/plan/knockGold/Dialog.jsx
View File

@ -29,14 +29,18 @@ export default ({ data, onChangeMoney }) => {
预估当前剩余余额为<span className='green'> 60000.21</span>元
</p>
<Form ref={ref} model={stateData} rules={rules.addNew}>
<FormItem id='addNew' prop='addNew' labelname='使用说明'>
<FormItem
id='addNew'
prop='addNew'
labelname='加款'
labelwidth='60px'>
<Ipt
className='addNew'
onChange={(value) => {
setStateData({ stateData: value })
setStateData({ addNew: value })
}}
onClearItem={() => {
setStateData({ stateData: '' })
setStateData({ addNew: '' })
}}
kind='number'
value={stateData.addNew}
@ -46,25 +50,17 @@ export default ({ data, onChangeMoney }) => {
height={'36px'}
unit='元'
countShow={false}
width={'200px'}
width={'260px'}
alignment={'left'}
/>
</FormItem>
<FormItem
id='addNew'
prop='addNew'
labelname='加款'
labelwidth='60px'>
<FormItem id='addNew1' labelname='加款' labelwidth='60px'>
<Ipt
className='addNew'
onChange={(value) => {
setStateData({ stateData: value })
}}
onClearItem={() => {
setStateData({ stateData: '' })
}}
onChange={(value) => {}}
onClearItem={() => {}}
kind='number'
value={stateData.addNew}
value={''}
placeholder={''}
labelWidth={'0px'}
maxLength={16}

190
src/pages/plan/knockGold/index.jsx
View File

@ -6,6 +6,7 @@ import Form from '../../../components/form/main'
import FormItem from '../../../components/form-item/main'
import rules from './rules'
import moment from 'moment'
import { uuid } from './utils'
import {
Select,
Button,
@ -18,9 +19,10 @@ import {
Card,
Dialog,
Notify,
Input
Input,
Tag
} from 'zent'
import _ from 'lodash'
import _, { isArray } from 'lodash'
import AddNewDialog from './Dialog'
import MobileComponent from './mobileCmponent'
export default class adduserinfo extends React.Component {
@ -29,7 +31,7 @@ export default class adduserinfo extends React.Component {
this.state = {
model: {
//数据模型不可少
id: '888',
uuid: '',
channel: '1', // 渠道
entry_time: '', // 生效时间
expire_time: '', // 过期时间
@ -48,7 +50,7 @@ export default class adduserinfo extends React.Component {
time_limit: '', // '时间限制配置',
instruction: '', //'使用说明',
early_per: [], //'预警百分比',
early_notifier: '', //'预警通知人',
early_notifier: [], //'预警通知人',
create_time: '', // '创建时间',
creator: '', // '创建人,
addNew: '', //加款
@ -66,12 +68,35 @@ export default class adduserinfo extends React.Component {
loadshow: false,
productpic: [],
copyEarly_per: '', //预警百分比输入框
visible: false //加框弹窗
visible: false, //加框弹窗
warningInput: '', //预警输入框
//预警人数据
userSelectList: [
{
key: '1',
text: 'Option 1',
closable: true
},
{
key: '2',
text: 'Option 2',
closable: true
},
{
key: '3',
text: 'Option 3',
disabled: true
},
{
key: '4',
text: `君不见，黄河之水天上来，奔流到海不复回`,
closable: false
}
]
}
}
componentWillMount() {
console.log(this.props.data)
if (this.props.data) {
let model = this.state.model
for (let key in this.props.data) {
@ -115,8 +140,8 @@ export default class adduserinfo extends React.Component {
// }
}
/* x时间控件禁用 */
onDisabledRange = (date, type) => {
console.log(type)
let disabled = false
if (type == 'end') {
disabled = moment(date.getTime()).add(1, 'days') <= new Date().getTime()
@ -127,6 +152,7 @@ export default class adduserinfo extends React.Component {
return disabled
}
/* 提交 */
async submit() {
if (
this.refs.form.validator() &&
@ -141,7 +167,7 @@ export default class adduserinfo extends React.Component {
temp = JSON.parse(sessionStorage.getItem('knockGoldData'))
let index = temp.findIndex((item) => {
return item.id === this.props.data.id
return item.uuid === this.props.data.uuid
})
for (let key in this.state.model) {
@ -174,7 +200,9 @@ export default class adduserinfo extends React.Component {
temp = JSON.parse(sessionStorage.getItem('knockGoldData'))
}
let data = temp ? temp : []
data.push(this.state.model)
const models = this.state.model
models.uuid = uuid(6, 16)
data.push(models)
sessionStorage.setItem('knockGoldData', JSON.stringify(data))
return true
}
@ -213,19 +241,40 @@ export default class adduserinfo extends React.Component {
//方形单选框事件
/* 方框单选事件 */
onTypeChange(e, type) {
onTypeChange(e, key) {
let model2 = this.state.model
model2[type] = e.target.value
model2[key] = e.target.value
this.setState({ model: model2 })
}
//输入框输入事件
onInputChange(value, type) {
onInputChange(value, key) {
let model2 = this.state.model
model2[type] = value
model2[key] = value
this.setState({ model: model2 })
}
//tag关闭
closeCallback(item) {
const newData = this.state.model.early_notifier.filter(
(items) => items.key !== item.key
)
this.onInputChange(newData, 'early_notifier') /* 调用公用setState */
/* 当预警人为0 清除输入框 */
if (newData.length < 1) this.setState({ warningInput: '' })
}
/* 预警人去重 */
deWeightThree(data) {
let map = new Map()
for (let item of data) {
if (!map.has(item.key)) {
map.set(item.key, item)
}
}
return [...map.values()]
}
render() {
return (
<div id='addKnockGold'>
@ -234,7 +283,7 @@ export default class adduserinfo extends React.Component {
<Form model={this.state.model} rules={rules.basic} ref='form'>
<FormItem labelname='渠道' prop='channel' id='type'>
<RadioGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
onChange={(e) => {
this.onTypeChange(e, 'channel')
}}
@ -254,7 +303,7 @@ export default class adduserinfo extends React.Component {
onClearItem={() => {
this.onInputChange('', 'batch_number')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.batch_number}
placeholder={'请输入'}
labelWidth={'0px'}
@ -276,7 +325,7 @@ export default class adduserinfo extends React.Component {
this.onInputChange('', 'batch_goods_name')
}}
value={this.state.model.batch_goods_name}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
placeholder={'请输入'}
labelWidth={'0px'}
maxLength={30}
@ -301,7 +350,7 @@ export default class adduserinfo extends React.Component {
labelWidth={'0px'}
maxLength={7}
height={'36px'}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
kind='number'
width={'520px'}
unit='元'
@ -318,7 +367,7 @@ export default class adduserinfo extends React.Component {
this.onInputChange('', 'money')
}}
value={this.state.model.money}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
placeholder={'请输入'}
unit='元'
countShow={false}
@ -356,11 +405,11 @@ export default class adduserinfo extends React.Component {
placeholder={'请输入'}
labelWidth={'0px'}
unit='元'
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
countShow={false}
maxLength={16}
height={'36px'}
width={'200px'}
width={'231px'}
alignment={'left'}
kind='number'
/>
@ -376,11 +425,11 @@ export default class adduserinfo extends React.Component {
placeholder={'请输入'}
labelWidth={'0px'}
unit='元'
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
countShow={false}
maxLength={16}
height={'36px'}
width={'200px'}
width={'231px'}
alignment={'left'}
kind='number'
/>
@ -396,7 +445,7 @@ export default class adduserinfo extends React.Component {
value={this.state.model.all_budget}
placeholder={'请输入'}
kind='number'
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
labelWidth={'0px'}
maxLength={16}
height={'36px'}
@ -418,7 +467,7 @@ export default class adduserinfo extends React.Component {
onClearItem={() => {
this.onInputChange('', 'day_budget')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.day_budget}
placeholder={'请输入'}
labelWidth={'0px'}
@ -442,7 +491,7 @@ export default class adduserinfo extends React.Component {
onClearItem={() => {
this.onInputChange('', 'receive_number')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.receive_number}
placeholder={'请输入'}
labelWidth={'0px'}
@ -455,7 +504,7 @@ export default class adduserinfo extends React.Component {
kind='number'
/>
<RadioGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
onChange={(e) => {
this.onTypeChange(e, 'receive_type')
}}
@ -468,7 +517,7 @@ export default class adduserinfo extends React.Component {
</FormItem>
<FormItem id='card_type' labelname='卡种' prop='card_type'>
<CheckboxGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.card_type}
onChange={(value) => {
this.onInputChange(value, 'card_type')
@ -482,7 +531,7 @@ export default class adduserinfo extends React.Component {
labelname='是否开启自然人限制'
prop='natural_limit'>
<RadioGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
onChange={(e) => {
this.onTypeChange(e, 'natural_limit')
}}
@ -496,7 +545,7 @@ export default class adduserinfo extends React.Component {
labelname='是否开启防刷拦截'
prop='brush_limit'>
<RadioGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
onChange={(e) => {
this.onTypeChange(e, 'brush_limit')
}}
@ -518,10 +567,11 @@ export default class adduserinfo extends React.Component {
defaultTime: [moment().format('HH:mm:ss'), '23:59:59']
}}
format='YYYY-MM-DD HH:mm:ss'
disabled={[
this.state.model.id ? false : true,
this.state.model.id ? false : true
]}
// disabled={[
// this.props?.data?.id ? true : false,
// this.props?.data?.id ? true : false
// ]}
width={245}
value={this.state.model.entry_time}
onChange={(value) => {
this.onInputChange(value, 'entry_time')
@ -538,10 +588,10 @@ export default class adduserinfo extends React.Component {
defaultTime: [moment().format('HH:mm:ss'), '23:59:59']
}}
format='YYYY-MM-DD HH:mm:ss'
disabled={[
this.state.model.id ? false : true,
this.state.model.id ? false : true
]}
// disabled={[
// this.props?.data?.id ? true : false,
// this.props?.data?.id ? true : false
// ]}
value={this.state.model.timer}
onChange={(value) => {
this.onInputChange(value, 'timer')
@ -552,7 +602,7 @@ export default class adduserinfo extends React.Component {
onChange={(e) => {
this.onTypeChange(e, 'timer_type')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.timer_type}>
<RadioButton value={'1'}>不设置</RadioButton>
<RadioButton value={'2'}>每天</RadioButton>
@ -564,7 +614,7 @@ export default class adduserinfo extends React.Component {
onChange={(e) => {
this.onTypeChange(e, 'timer_type')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.timer_type}>
<RadioButton value={'1'}>不设置</RadioButton>
<RadioButton value={'2'}>每天</RadioButton>
@ -580,7 +630,7 @@ export default class adduserinfo extends React.Component {
<RadioGroup
value={this.state.model.usable_time}
isValueEqual={this.isValueEqual}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
onChange={({ target }) => {
this.onInputChange(target.value, 'usable_time')
}}>
@ -592,7 +642,7 @@ export default class adduserinfo extends React.Component {
clearable
options={[]}
placeholder='选择一项'
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
/>
</div>
<Ipt
@ -602,7 +652,7 @@ export default class adduserinfo extends React.Component {
onClearItem={() => {
this.onInputChange('', 'product_name')
}}
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.product_name}
placeholder={'请输入'}
labelWidth={'0px'}
@ -611,13 +661,13 @@ export default class adduserinfo extends React.Component {
height={'36px'}
unit='天'
countShow={false}
width={'230px'}
width={'292px'}
alignment={'left'}
/>
</div>
<div className='boxTime'>
<RadioGroup
disabled={this.state.model.id ? false : true}
// disabled={this.props?.data?.id ? true : false}
value={this.state.model.usable_time}
onChange={({ target }) => {
this.onInputChange(target.value, 'usable_time')
@ -631,10 +681,11 @@ export default class adduserinfo extends React.Component {
defaultTime: [moment().format('HH:mm:ss'), '23:59:59']
}}
format='YYYY-MM-DD HH:mm:ss'
disabled={[
this.state.model.id ? false : true,
this.state.model.id ? false : true
]}
// disabled={[
// this.props?.data?.id ? true : false,
// this.props?.data?.id ? true : false
// ]}
width={195}
value={this.state.model.fixed_time}
onChange={(value) => {
this.onInputChange(value, 'fixed_time')
@ -695,23 +746,44 @@ export default class adduserinfo extends React.Component {
height={'36px'}
unit='%'
countShow={false}
width={'120px'}
width={'190px'}
alignment={'left'}
/>
</FormItem>
<FormItem
id='early_notifier'
labelname='预警通知人'
// prop='early_notifier'
>
<FormItem id='early_notifier' labelname='预警通知人'>
<div className='bt_se'>
<Select
multiple
options={[]}
placeholder='选择一项'
clearable
creatable
options={this.state.userSelectList}
placeholder='选择一项'
size={'xl'}
value={this.state.warningInput}
onChange={(value) => {
const model = this.state.model
/* 防止清除select时报错 is key undefine */
if (value) {
model.early_notifier.push(value)
model.early_notifier = this.deWeightThree(
model.early_notifier
)
}
this.setState({ warningInput: value, model: model })
}}
/>
<div className='userSelect'></div>
</div>
<div className='userSelect'>
<ol>
{isArray(this.state.model.early_notifier) &&
this.state.model.early_notifier?.map((item) => (
<Tag
closable={item.closable}
onClose={() => this.closeCallback(item)}
key={item.key}>
{item.text}
</Tag>
))}
</ol>
</div>
</FormItem>
</Form>
<Dialog

73
src/pages/plan/knockGold/index.less
View File

@ -9,7 +9,9 @@
right: 90px !important;
-ms-overflow-style: none;
overflow: -moz-scrollbars-none;
background: rgba(218, 218, 218, 0.1);
background: #fff;
border: 1px solid #e4e4e4;
border-radius: 5px;
padding: 15px 0;
box-sizing: border-box;
font-size: 16px;
@ -72,6 +74,12 @@
font-size: 30px;
}
.TextBlock {
.zent-placeholder-text-row:nth-child(6) {
margin-top: 1.7em !important;
}
}
.coupon-right>p {
margin: 0;
font-size: 12px;
@ -239,14 +247,50 @@
}
}
.userSelect {
width: 520px;
height: 200px;
border: 1px solid #e4e4e4;
margin-top: 20px;
.bt_se {
display: flex;
button {
margin-left: 10px;
}
}
.dialog_p {
.userSelect {
width: 520px;
min-height: 150px;
border: 1px solid #e4e4e4;
margin-top: 20px;
ol {
padding: 10px 5px;
.zent-tag {
margin-right: 7px;
margin-bottom: 10px;
padding: 7px;
background-color: #e6efff;
border: #145bd4;
color: #145bd4;
}
}
}
#addNew {
display: flex;
align-items: center;
margin-left: 0;
.form-compontent {
padding: 0;
}
}
}
.dialog_p {
p {
font-size: 16px;
margin-bottom: 10px;
@ -263,17 +307,16 @@
.blue {
color: blue;
}
}
#addNew {
display: flex;
align-items: center;
margin-left: 0;
.form-compontent {
padding: 0;
}
.form-Item {
margin: 20px 0;
}
#addNew1 {
display: none;
}
}

23
src/pages/plan/knockGold/mobileCmponent.jsx
View File

@ -1,5 +1,6 @@
import { filter } from 'lodash'
import { Placeholder } from 'zent'
import './index.less'
const widths = [24, 100, 100, 100, 80, 24, 100, 100, 100, 80, 100, 100, 100, 80]
export default ({ data }) => {
return (
<div id='reduceKnockGold' className='mobile'>
@ -19,19 +20,19 @@ export default ({ data }) => {
{data.channel === '1' ? '支付宝' : '微信'}
{data.batch_goods_name ? data.batch_goods_name : 'xxx'}
</p>
<p className='validity'>
有效期:
{data.entry_time ? data.entry_time[0] : 'xxxx-xx-xx xx:xx:xx'}至
{data.entry_time ? data.entry_time[1] : 'xxxx-xx-xx xx:xx:xx'}
</p>
<p>
{data.card_type.length > 0
{data?.card_type.length > 0
? data.card_type.map(
(item) => (item === '1' ? '借记卡' : '信用卡') + ' '
)
: 'xxx xxx xxx'}{' '}
可用
</p>
<p className='validity'>
有效期:
{data?.entry_time ? data.entry_time[0] : 'xxxx-xx-xx xx:xx:xx'}至
{data?.entry_time ? data.entry_time[1] : 'xxxx-xx-xx xx:xx:xx'}
</p>
</div>
</div>
<div className='receiveBtn'>立即领取</div>
@ -59,7 +60,13 @@ export default ({ data }) => {
</div>
</>
) : (
<div className='blank'>使用说明</div>
<Placeholder.TextBlock
className='TextBlock'
animate
widths={widths}
rows={14}
dashed={false}
/>
)}
</div>
</div>

9
src/pages/plan/knockGold/rules.js
View File

@ -71,7 +71,14 @@ export default {
early_notifier: [{ type: 'required', message: '请选择预警通知人' }] //'预警通知人',
},
addNew: {
addNew: [{ type: 'required', message: '请输入加款金额' }]
addNew: [
{ type: 'required', message: '请输入加款金额' },
{
type: 'regExp',
message: '最多保留2位小数',
reg: '^[0-9]+(.[0-9]{1,2})?$'
}
]
}
// quantity: [
// { type: 'required', message: '请输入商品库存' },

31
src/pages/plan/knockGold/utils.js Normal file
View File

@ -0,0 +1,31 @@
/* uuid生成器 */
export function uuid(len, radix) {
var chars =
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
var uuid = [],
i
radix = radix || chars.length
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
} else {
// rfc4122, version 4 form
var r
// rfc4122 requires these characters
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
uuid[14] = '4'
// Fill in random data. At i==19 set the high bits of clock sequence as
// per rfc4122, sec. 4.1.5
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | (Math.random() * 16)
uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
}
}
}
return uuid.join('')
}