Skip to content

J
jinfa-admin
Commit bc4f5696 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

parents b6848bd0 b0b59a1b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 398 additions and 1421 deletions
config/routes/logisticsRoutes.ts
View file @ bc4f5696
......@@ -13,15 +13,15 @@ const router = {
{
path: '/logisticsManager/logisticsList',
name: 'logisticsList',
component: '@/pages/logistics/logisticsResult/orderSearchList',
component: '@/pages/logistics',
},
{
path: '/logisticsManager/logisticsDetail',
name: 'logisticsList',
component: '@/pages/logistics/components/orderSearchDetail',
component: '@/pages/logistics/detail',
hideInMenu: true,
hidePageHeader: true
},
]
}
export default router
\ No newline at end of file
export default router
config/routes/systemManageRoute.ts
View file @ bc4f5696
......@@ -61,6 +61,7 @@ const router = {
path: '/system/platformArg/edit',
name: 'platformArgEdit',
hidePageHeader: true,
hideInMenu: true,
component: '@/pages/systemManage/platformArg/template',
}]
}
......
src/constants/index.ts
View file @ bc4f5696
......@@ -565,6 +565,7 @@ export enum DeliverySideState {
// 采购订单外部显示文案
export const PurchaseOrderOutWorkStateTexts = {
"-1": "取消订单",
0: '完成订单',
1: '提交订单',
2: '确认订单',
3: '确认电子合同',
......@@ -636,6 +637,7 @@ export const SaleOrderInsideWorkStateTexts = {
// 订单流转记录外部状态
export const OrderTransformOutWorkStateTexts = {
"-1": '取消订单',
0: '完成订单',
1: '待确认',
2: '待确认电子合同',
3: '待支付',
......@@ -659,6 +661,7 @@ export const OrderTransformOutWorkStateTexts = {
// 采购订单流转记录内部状态
export const PurchaseOrderTransformInsideWorkStateTexts = {
"-1": '取消订单',
0: '完成订单',
1: '待提交审核',
2: '提交审核通过',
3: '审核通过',
......
src/pages/content/advertisement/schema/index.tsx
View file @ bc4f5696
import EyePreview from '@/components/EyePreview';
import { DownOutlined } from '@ant-design/icons';
import { TimeList } from '@/pages/logistics/statusList';
import { TimeList } from '../../statusList';
import moment from 'moment';
import React from 'react';
import {ADVERTISE_COLUMN_TYPE} from '../../utils/utils';
import {ADVERTISE_COLUMN_TYPE} from '../../utils/utils';
const CustomTimeList = [{label: '全部', value: 0}].concat(TimeList.slice(1));
const columns = [
{title: 'ID', dataIndex: 'id'},
{ title: '标题',
dataIndex: 'title',
{ title: '标题',
dataIndex: 'title',
render: (text: string, record: any) => (
<EyePreview
url={`/content/advertisement/detail?id=${record.id}&preview=1`}
......@@ -20,16 +20,16 @@ const columns = [
)
},
{
title: '栏目', dataIndex: 'columnType',
title: '栏目', dataIndex: 'columnType',
render: (text, record) => {
return (
<div>{ADVERTISE_COLUMN_TYPE[text]}</div>
)
},
},
},
{
title: '发布时间',
dataIndex: 'createTime',
title: '发布时间',
dataIndex: 'createTime',
render: (text) => (
moment(text).format('YYYY-MM-DD HH:mm:ss')
)
......@@ -164,7 +164,7 @@ const advertisementSchema = {
}
}
}
}
}
}
}
}
......@@ -199,4 +199,4 @@ const advertisementSchema = {
}
}
export default advertisementSchema
\ No newline at end of file
export default advertisementSchema
src/pages/content/announcements/schema/index.tsx
View file @ bc4f5696
import EyePreview from '@/components/EyePreview';
import { DownOutlined } from '@ant-design/icons';
import { TimeList } from '@/pages/logistics/statusList';
import { TimeList } from '../../statusList';
import moment from 'moment';
import React from 'react';
import { ANNOUNCE_COLUMN_TYPE, transfer2Options } from '../../utils/utils';
......@@ -16,10 +16,10 @@ const columns = [
return (
<div>{ANNOUNCE_COLUMN_TYPE[text]}</div>
)
}
}
},
{ title: '标题',
dataIndex: 'title',
{ title: '标题',
dataIndex: 'title',
render: (text: string, record: any) => (
<EyePreview
url={`/content/announcements/detail?id=${record.id}&preview=1`}
......@@ -29,8 +29,8 @@ const columns = [
)
},
{
title: '操作时间',
dataIndex: 'createTime',
title: '操作时间',
dataIndex: 'createTime',
render: (text) => (
moment(text).format('YYYY-MM-DD HH:mm:ss')
)
......@@ -175,7 +175,7 @@ const announcementSchema = {
}
}
}
}
}
}
}
}
......@@ -215,4 +215,4 @@ const announcementSchema = {
}
}
export default announcementSchema
\ No newline at end of file
export default announcementSchema
src/pages/content/infomation/schema/index.tsx
View file @ bc4f5696
import EyePreview from '@/components/EyePreview';
import { DownOutlined, DeleteOutlined, UpOutlined } from '@ant-design/icons';
import { timeRange } from '@/utils/index';
import { TimeList } from '@/pages/logistics/statusList';
import { TimeList } from '../../statusList';
import moment from 'moment';
import React from 'react';
......@@ -10,10 +10,10 @@ const CustomTimeList = [{label: '全部', value: 0}].concat(TimeList.slice(1));
const columns = [
{title: 'ID', dataIndex: 'id'},
{
title: '栏目', dataIndex: 'columnName',
title: '栏目', dataIndex: 'columnName',
},
{ title: '标题',
dataIndex: 'title',
{ title: '标题',
dataIndex: 'title',
render: (text: string, record: any) => (
<EyePreview
url={`/content/infomations/detail?id=${record.id}&preview=1`}
......@@ -23,14 +23,14 @@ const columns = [
)
},
{
title: '操作时间',
dataIndex: 'createTime',
title: '操作时间',
dataIndex: 'createTime',
render: (text) => (
moment(text).format('YYYY-MM-DD HH:mm:ss')
)
},
{
title: '状态', dataIndex: 'status',
title: '状态', dataIndex: 'status',
filters: [
{ text: '待上架', value: '1' },
{ text: '已上架', value: '2' },
......@@ -115,7 +115,7 @@ const infomationSchema = {
overlay: "{{menu}}",
children: '更多',
icon: <DownOutlined />
}
}
}
}
},
......@@ -215,7 +215,7 @@ const infomationSchema = {
}
}
}
}
}
}
}
}
......
src/pages/logistics/statusList.ts → src/pages/content/statusList.ts
View file @ bc4f5696
......@@ -3,7 +3,7 @@
* @Date: 2020-08-01 11:06:09
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-01 11:07:49
*/
*/
export const TimeList = [
{
label: '单据时间（全部）', value: 0
......@@ -60,4 +60,4 @@ export const statusList = [
{
text: '不接受物流单', value: 4
}
]
\ No newline at end of file
]
src/pages/logistics/colorTag.ts
View file @ bc4f5696
......@@ -3,7 +3,7 @@
* @Date: 2020-07-30 17:23:48
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 17:24:49
*/
*/
export default {
default: {
padding: '2px 5px',
......@@ -27,5 +27,11 @@ export default {
padding: '2px 5px',
background: 'rgba(255,235,230,1)',
borderRadius: '4px'
},
error: {
color: '#ff0404',
padding: '2px 5px',
background: 'rgba(247,235,235,1)',
borderRadius: '4px'
}
}
\ No newline at end of file
}
src/pages/logistics/components/confirmModal.tsx deleted 100644 → 0
View file @ b6848bd0
import React, { Component, useState, useEffect } from 'react';
import { Modal, Button, Form } from 'antd'
import {
SchemaForm, SchemaMarkupField as Field,
createFormActions,
FormEffectHooks
} from '@formily/antd'
import { Input, Radio, FormMegaLayout } from '@formily/antd-components'
import { PublicApi } from '@/services/api'
import {PATTERN_MAPS} from '@/constants/regExp'
export interface Params {
id: number | string;
dialogVisible: boolean;
onCancel: Function;
onOK?: Function;
dontReceive?: boolean; //默认展示
}
const actions = createFormActions()
const { onFieldChange$ } = FormEffectHooks
const comfirmDialog: React.FC<Params> = (props) => {
console.log(props.dialogVisible)
const handleCancel = () => {
}
const handletOk = (values: any) => {
let value = { ...values }
value.id = props.id
console.log(values)
PublicApi.postLogisticsOrderWaitConfirmConfirm(value).then(res => {
if (res.code === 1000) {
props.onOK()
}
})
}
useEffect(() => {
return () => {
}
}, [])
const useFormEffects = () => {
const { setFieldState } = createFormActions()
onFieldChange$('status').subscribe(({ value }) => {
setFieldState('remark', state => {
if (value == 3) {
state.visible = false
} else {
state.visible = true
}
})
setFieldState('freightPrice', state => {
if (value == 3) {
state.visible = false
} else {
state.visible = true
}
})
})
}
return (
<>
<Modal
title='单据确认'
width={800}
visible={props.dialogVisible}
onOk={() => actions.submit()}
onCancel={() => props.onCancel()}
destroyOnClose
afterClose={() => actions.reset()}
okText='确定'
cancelText='取消'
>
<SchemaForm
labelCol={3}
components={{
Input, Radio: Radio.Group, TextArea: Input.TextArea
}}
actions={actions}
effects={() => useFormEffects()}
onSubmit={(values) => handletOk(values)}
initialValues={{
status: 3
}}
>
<Field
enum={
[
{ label: '接受物流单', value: 3 },
{ label: '不接受物流单', value: 4 }
]}
name='status'
required
x-component="Radio"
/>
{props.dontReceive &&
<>
<Field
title='运费'
name="freightPrice"
x-component="Input"
required
x-component-props={{
placeholder:'运费',
// addonBefore: ' '
}}
x-rules ={{
pattern: PATTERN_MAPS.money,
message:'数字类型，币制为当前站点对应的币制，保留2位小数'
}}
/>
{/* <FormMegaLayout name='remarkOption' label='不接受原因' full required labelCol={2} labelAlign="top"> */}
<Field
title='不接受原因'
name="remark"
x-component="TextArea"
required
x-component-props={{
placeholder: '在此输入你的内容，最多60个汉字'
}}
x-rules ={{
max:60,
// maximum:10,//最大数值
message:'原因最多60个汉字'
}}
/>
</>
}
</SchemaForm>
</Modal>
</>
)
}
comfirmDialog.defaultProps = {
dontReceive: true
}
export default comfirmDialog
\ No newline at end of file
src/pages/logistics/components/orderSearchDetail.tsx deleted 100644 → 0
View file @ b6848bd0
This diff is collapsed.
src/pages/logistics/components/orderSearchList.tsx deleted 100644 → 0
View file @ b6848bd0
This diff is collapsed.
src/pages/logistics/components/sumbitOrderModal.tsx deleted 100644 → 0
View file @ b6848bd0
This diff is collapsed.
src/pages/logistics/detail.tsx 0 → 100644
View file @ bc4f5696
This diff is collapsed.
src/pages/logistics/components/index.less → src/pages/logistics/index.less
View file @ bc4f5696
@import "../../member/components/index.less";
@import "../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
......@@ -115,4 +115,4 @@
}
}
}
}
\ No newline at end of file
}
src/pages/logistics/index.tsx 0 → 100644
View file @ bc4f5696
/* @Author: H_Jiax */
import React, { ReactNode, useRef } from 'react';
import { Card } from 'antd';
import { StandardTable } from 'god';
import { logisticsSearchSchema } from './schema'
import { ColumnType } from 'antd/lib/table/interface';
import { history } from 'umi';
import { PublicApi } from '@/services/api';
import statuStyle from './colorTag';
import moment from 'moment';
import NiceForm from '@/components/NiceForm';
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { createFormActions } from '@formily/antd';
import { EyeOutlined } from '@ant-design/icons';
const formActions = createFormActions();
const OrderSearchList: React.FC<{}> = (props) => {
const ref = useRef<any>({})
const fetchData = (params: any) => {
return new Promise(resolve => {
PublicApi.getLogisticsPlatformOrderPage({...params}).then(res => {
if(res.code === 1000) {
resolve(res.data)
}
})
})
}
const columns: ColumnType<any>[] = [
{
title: '物流单号',
key: 'logisticsOrderNo',
dataIndex: 'logisticsOrderNo',
render: (text: any, reconds: any) =>
<span className="commonPickColor" onClick={() => history.push(`/logisticsManager/logisticsDetail?id=${reconds.id}`)}>{text}&nbsp;<EyeOutlined /></span>
},
{
title: '对应订单号',
key: 'relevanceOrderCode',
dataIndex: 'relevanceOrderCode'
},
{
title: '发货方',
key: 'shipperMemberName',
dataIndex: 'shipperMemberName'
},
{
title: '收货方',
key: 'receiverMemberName',
dataIndex: 'receiverMemberName'
},
{
title: '总箱数',
key: 'totalCarton',
dataIndex: 'totalCarton'
},
{
title: '总重量',
key: 'totalWeight',
dataIndex: 'totalWeight'
},
{
title: '总体积',
key: 'totalVolume',
dataIndex: 'totalVolume'
},
{
title: '单据时间',
key: 'invoicesTime',
dataIndex: 'invoicesTime',
render: (text: any) => <>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</>
},
{
title: '外部状态',
dataIndex: 'status',
key: 'status',
render: (_: any, reconds) => {
let component: ReactNode = null
if (reconds.status == 4) {
component = <span style={statuStyle.success}>接受物流单</span>
} else if (reconds.status == 3) {
component = <span style={statuStyle.error}>不接受物流单</span>
} else if (reconds.status == 2) {
component = <span style={statuStyle.confirm}>待确认</span>
} else if (reconds.status == 1) {
component = <span style={statuStyle.default}>待提交</span>
}
return component
}
}
]
const search = (values: any) => {
ref.current.reload(values)
}
return (
<Card>
<StandardTable
tableProps={{ rowKey: 'id' }}
columns={columns}
currentRef={ref}
fetchTableData={params => fetchData(params)}
controlRender={
<NiceForm
actions={formActions}
onSubmit={values => search(values)}
effects={($, actions) => {
useStateFilterSearchLinkageEffect($, actions, 'logisticsOrderNo', FORM_FILTER_PATH)
}}
schema={logisticsSearchSchema}
>
</NiceForm>
}
/>
</Card>
)
}
export default OrderSearchList
src/pages/logistics/list/addCompany.css deleted 100644 → 0
View file @ b6848bd0
.selectBtn {
padding: 0 !important;
}
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-wrapper .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-wrapper .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .ant-input-group-wrapper .ant-input-group .ant-input-group-addon,
.ant-form-item-control .ant-form-item-control-input .ant-form-item-control-input-content .selectBtn .ant-input-group .ant-input-group-addon {
padding: 0 !important;
}
src/pages/logistics/list/addCompany.less deleted 100644 → 0
View file @ b6848bd0
.selectBtn{
padding: 0 !important;
}
.ant-form-item-control{
.ant-form-item-control-input{
.ant-form-item-control-input-content{
.ant-input-group-wrapper, .selectBtn{
.ant-input-wrapper ,.ant-input-group{
.ant-input-group-addon{
padding: 0 !important;
}
}
}
}
}
}
\ No newline at end of file
src/pages/logistics/list/addCompany.tsx deleted 100644 → 0
View file @ b6848bd0
import * as React from 'react';
import { useState, useRef, useEffect } from 'react';
import { Row, Col, Tooltip, Form, Input, Select, Popconfirm, Button, Card, message, Modal } from 'antd';
import { DeleteOutlined, FormOutlined, PlusCircleOutlined, LoadingOutlined, PlusOutlined, LinkOutlined } from '@ant-design/icons';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { ColumnType } from 'antd/lib/table/interface'
import { StandardTable } from 'god'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle';
import { PublicApi, CustomApi } from '@/services/api'
import { addCompany, updateCompany, getCompanyDetail } from '@/services/logistics/index'
import style from "./addCompany.less"
export interface companyProps {
}
export interface companyState {
}
interface Item {
key: string;
}
const { TextArea } = Input;
const layout = {
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
const data = [
{
key: '1',
Name: '山东万达橡胶集团有限公司',
address: '广东省广州市海珠区新港东路1068号'
}]
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'key',
align: 'center',
key: 'key',
},
{
title: '会员名称',
dataIndex: 'Name',
align: 'center'
},
{
title: '公司地址',
dataIndex: 'address',
align: 'center'
}
]
// 模拟请求
const fetchData = (params: any) => {
return new Promise((resolve, reject) => {
const queryResult = data.find(v => v.key === params.keywords)
setTimeout(() => {
resolve({
code: 200,
message: '',
data: queryResult ? [queryResult] : data
})
}, 1000)
})
}
const { Option } = Select;
const defaultValue = 'lucy'
const company: React.FC<{}> = () => {
//hook只能写在函数组件的顶级作用域
const ref = useRef<any>({})
const [menuForm] = Form.useForm();
const [headerTitle, setHeaderTitle] = useState('新建物流公司')
const [Code, setCode] = useState('')
const [codeDisabled, setCodeDisabled] = useState(false)
const [id, setId] = useState<string>(history.location.query.id || null)
const [companyType, setCompanyType] = useState<number>(null)
const [memberId, setMemberId] = useState<number>(null)
const [visible, setsVisible] = useState(false) //state hook写法
const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
useEffect(() => {
let _title = history.location.query.id == 0 ? '新建' :
history.location.query.isSee ? '查看' : '编辑'
setHeaderTitle(`${_title}物流公司`)
if (id !== '0') {
PublicApi.getLogisticsCompanyGet({ id: id }).then(res => {
const data = res.data
menuForm.setFieldsValue(data)
let type = data.cooperateType === 2 ? 2 : 1
setCompanyType(type)
})
}
return () => {
}
}, [])
const handleSubmitAllSetting = () => {
menuForm.validateFields().then((values: any) => {
if (id) {
PublicApi.postLogisticsCompanyUpdate(values).then(res => {
if (res.code === 1000) {
message.success(res.message)
}
})
} else {
PublicApi.postLogisticsCompanyAdd(values).then(res => {
if (res.code === 1000) {
message.success(res.message)
menuForm.resetFields()
history.goBack()
}
})
}
}).catch(error => {
console.error(error)
})
}
const handleCancel = () => {
history.go(-1)
}
const handleLink = () => {
setsVisible(true)
}
//改变code
const onCodeChange = (e: any) => {
const value = e.target.value
setCode(value)
console.log(value);
}
const onChangeType = (value: any) => {
setCompanyType(value)
if (value == 2) {
setCodeDisabled(true)
} else {
setCodeDisabled(false)
}
}
const handleSelectOk = () => {
console.log('数据', selectRow);
let IDS = selectRow.map(v => v.key)
console.log('数据', IDS.join(','));
setCode(IDS.join(','))
setsVisible(false)
}
const handleSelectCancel = () => {
setsVisible(false)
}
const rowSelection = {
selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectRow(selectedRows);
setSelectedRowKeys(selectedRowKeys);
console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
}
}
const selectBtn = (
<Button style={{ backgroundColor: '#909399', borderColor: '#909399', color: 'white' }} onClick={handleLink}>
<LinkOutlined />选择
</Button>
)
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
backIcon={<ReutrnEle description="返回" />}
title={headerTitle}
>
<Row gutter={[36, 36]}>
<Col span={24}>
<Card>
{
(<Form
form={menuForm}
colon={false}
name="edit_infomation"
layout="horizontal"
labelAlign="left"
{...layout}
>
<Row gutter={24}>
<Col span={18}>
<Form.Item
name='cooperateType'
label='合作类型'
rules={[
{
required: true,
message: '合作类型为必须项!',
},
]}
// initialValue={}
>
<Select placeholder="请选择合作类型" value={companyType} onChange={onChangeType}>
<Option value={1}>平台物流服务商</Option>
<Option value={2}>商户合作物流公司</Option>
</Select>
</Form.Item>
</Col>
<Col span={18}>
{
companyType === 1 ?
<Form.Item
name='memberId'
label='物流公司代码/
平台会员ID'
rules={[
{
required: true,
message: '物流公司代码/平台会员ID为必须项!',
}
]}
>
<Input className="input_addonAfter" disabled maxLength={20} addonAfter={selectBtn} />
</Form.Item>
:
<Form.Item
name='code'
label='物流公司代码/平台会员ID'
rules={[
{
required: true,
message: '物流公司代码/平台会员ID为必须项!',
}
]}
>
<Input maxLength={20} />
</Form.Item>
}
</Col>
<Col span={18}>
<Form.Item
name='name'
label='物流公司名称'
rules={[
{
required: true,
message: '输入物流公司名称!',
},
]}
>
<Input maxLength={40} disabled={companyType === 2 ? false : true} placeholder="输入物流公司名称" />
</Form.Item>
</Col>
<Col span={18}>
<Form.Item
name='remark'
label='备注'
>
<TextArea rows={4} maxLength={60} />
</Form.Item>
</Col>
<Col span={18}>
<Row>
<Col span={6}></Col>
<Col span={18}>
<Button onClick={handleSubmitAllSetting} type="primary" style={{ marginTop: 32, marginBottom: 16, marginRight: 24 }}>
保存
</Button>
<Button onClick={handleCancel} style={{ marginTop: 32, marginBottom: 16 }}>
取消
</Button>
</Col>
</Row>
</Col>
</Row>
</Form>)
}
</Card>
</Col>
</Row>
<Modal
title="选择平台物流服务商"
width='800px'
visible={visible}
onOk={handleSelectOk}
onCancel={handleSelectCancel}
okText="确认"
cancelText="取消"
>
<Row>
<Col span={10}> <Input.Search placeholder="输入关键字进行搜索" /></Col>
<Col span={14}></Col>
</Row>
<StandardTable
columns={columns}
currentRef={ref}
rowSelection={{
type: 'radio',
...rowSelection
}}
fetchTableData={(params: any) => fetchData(params)}
/>
</Modal>
</PageHeaderWrapper>
);
}
export default company;
\ No newline at end of file
src/pages/logistics/list/company.tsx deleted 100644 → 0
View file @ b6848bd0
/*
* @Date: 2020-07-13 15:01:40
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-03 16:52:53
*/
import React, { ReactNode, useRef } from 'react'
import { history } from 'umi'
import { Button, Popconfirm, Card, message } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import {
PlusOutlined,
PlayCircleOutlined,
PauseCircleOutlined,
EyeOutlined
} from '@ant-design/icons'
import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface'
import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController'
import {PublicApi,CustomApi} from '@/services/api'
import { getCompanyList, delCompany,updateCompanyStatus } from '@/services/logistics/index'
const data = [
{
key: '1',
attrName: '采购商',
attrGroup: '采购',
displayType: '单选',
required: '平台物流服务商',
status: 1,
},
{
key: '2',
attrName: '供应商',
attrGroup: '供应',
displayType: '双选',
required: '商户合作物流公司',
status: 0,
},
]
// 模拟请求
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
return new Promise((resolve, reject) => {
PublicApi.getLogisticsCompanyPage({ current: params.page, pageSize: params.rows }).then(res => {
resolve(res.data)
})
})
}
const Company: React.FC<{}> = () => {
const ref = useRef<any>({})
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'id',
align: 'center',
key: 'id',
},
{
title: '物流公司编码/平台会员ID',
align: 'center',
dataIndex: 'memberId',
key: "memberId",
render: (value: any, recond: any) =>
<>{recond.memberId ? recond.memberId : recond.code}</>
},
{
title: '属性名称',
dataIndex: 'name',
align: 'center',
key: 'name',
render: (text: any, record: any) => <span className="commonPickColor" onClick={() => handleSee(record.id)}>{text}&nbsp;<EyeOutlined /></span>
},
{
title: '合作类型',
align: 'center',
dataIndex: 'cooperateType',
key: 'cooperateType',
render: (value: any, recode: any) =>
<>
{value == 1 ? '平台物流服务商' : '商户合作物流公司'}
</>
},
{
title: '状态',
align: 'center',
dataIndex: 'status',
key: 'status',
render: (text: any, record: any) => {
let component: ReactNode = null
component = (
<Button type="link" style={record.status === 1 ? { color: '#00B37A' } : { color: 'red' }}>{record.status === 1 ? '有效' : '无效'}
{record.status === 1 ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
</Button>
)
return component
}
},
{
title: '操作',
dataIndex: 'option',
align: 'center',
render: (text: any, record: any) => {
const status = record.status === 0?'启用':'停用'
const title = `确定要${status}吗?`
return (
<>
<Popconfirm title={title} okText="是" cancelText="否" onConfirm={() => handleChangeStatus(record.id,record.status)}>
<Button type='link'>
{ record.status === 0?'启用':'停用'}
</Button>
</Popconfirm>
{ record.status === 0 ?
<>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/list/addCompany?id=${record.id}`)}>编辑</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete(record.id)}>
<Button type='link'>
删除
</Button>
</Popconfirm>
</>
:''}
</>
)
}
}
];
const search: IFormFilter[] = [
{
type: 'Input',
value: 'keywords',
col: 4,
placeHolder: '输入属性名称'
}
]
const searchBarActions: IButtonFilter[] = [
{
type: 'primary',
text: '新建',
icon: <PlusOutlined />,
handler: () => {
history.push('/memberCenter/logisticsAbility/logistics/list/addCompany')
}
}
]
const handleDelete = (id: any) => {
PublicApi.postLogisticsCompanyDelete({ id: id }).then(res => {
if (res.code === 1000) {
ref.current.reload()
}
})
}
const handleChangeStatus = (id:any,status:any) => {
let _status = status == 0 ? 1: 0
PublicApi.postLogisticsCompanyEnable({id:id,status:_status}).then(res => {
if(res.code === 1000){
console.log(ref)
ref.current.reload()
}
})
}
const handleSee = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/list/addCompany?id=${id}&isSee=true`)
}
const confirm = () => {
console.log('confirm')
}
const cancel = () => {
console.log('cancel')
}
const handleModify = (record: object) => {
// 通过传入的params字符串判断是修改那种类型的数据
console.log('执行状态修改', record)
}
return (
<PageHeaderWrapper>
<Card>
<StandardTable
tableProps={{rowKey:'id'}}
columns={columns}
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
formilyChilds={{
children: (
<>
<Button type="primary" onClick={() => history.push('/memberCenter/logisticsAbility/logistics/list/addCompany?id=0')}>
新建 <PlusOutlined />
</Button>
</>
)
}}
/>
</Card>
</PageHeaderWrapper>
)
}
export default Company
src/pages/logistics/list/components/addressForm.tsx deleted 100644 → 0
View file @ b6848bd0
This diff is collapsed.
src/pages/logistics/list/components/addressList.tsx deleted 100644 → 0
View file @ b6848bd0
/*
* @Author: LeeJiancong
* @Date: 2020-07-14 15:07:34
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-29 20:37:05
*/
import React, { Component, ReactNode, useRef, useState } from 'react'
import { history } from 'umi'
import { Modal, Card, Button, Form, InputNumber, Radio, Popconfirm, Switch, Input } from 'antd';
import {
PlayCircleOutlined,
PauseCircleOutlined,
PlusOutlined,
EyeOutlined,
PlusCircleOutlined
} from '@ant-design/icons';
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface'
import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController'
import { PublicApi } from '@/services/api'
const data = [
{
key: '1',
shipperName: '采购商',
phone: '18819276235',
tel: '02020',
required: '平台物流服务商',
isDefault: 0,
code: 252525,
status: 1,
address: '地址'
},
{
key: '2',
shipperName: '采购商',
phone: '18819276235',
tel: '02020',
required: '平台物流服务商',
isDefault: 0,
code: 252525,
status: 0,
address: '地址32'
},
]
// const fetchData = (param: any) => {
// return new Promise((resolve) => {
// let reqParam = {
// ...param
// }
// getUserInfoList(reqParam).then(res => {
// resolve(res.data)
// })
// })
// }
interface Item {
key: string
}
//父页面传递来的参数
export interface ListProps {
title?: React.ReactNode,
type: string
}
export interface ListType {
checked: boolean //可选
}
interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
editing: boolean;
dataIndex: string;
title: any;
inputType: 'number' | 'text';
record: Item;
index: number;
children: React.ReactNode;
}
const EditableCell: React.FC<EditableCellProps> = ({
editing,
dataIndex,
title,
inputType,
record,
index,
children,
...restProps
}) => {
const inputNode = inputType === 'number' ? <InputNumber /> : <Input />;
return (
<td {...restProps}>
{editing ? (
<Form.Item
name={dataIndex}
style={{ margin: 0 }}
rules={[
{
required: true,
message: `Please Input ${title}!`,
},
]}
>
{inputNode}
</Form.Item>
) : (
children
)}
</td>
);
};
/**
* @description:
* @param {type}
* @return:
*/
const AddressList: React.FC<ListProps> = (props) => {
console.log(props)
const ref = useRef({})
const [form] = Form.useForm();
const [table, setTable] = useState([])
const [editingKey, setEditingKey] = useState('');
const toEdit = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/list/addressForm?type=${props.type}&id=${id}`)
};
const columns: ColumnType<any>[] = [
{
title: props.type == '1' ? '发货人姓名' : '收货人姓名',
dataIndex: props.type == '1' ? 'shipperName' : 'receiverName',
align: 'center',
key: props.type == '1' ? 'shipperName' : 'receiverName',
},
{
title: props.type == '1' ? '发货地址' : '收货地址',
align: 'left',
dataIndex: 'address',
key: 'address',
render: (_: any, record: any) => (
<>
{record.fullAddress}
</>
)
},
{
title: '邮编',
dataIndex: 'postalCode',
align: 'center',
key: 'postalCode'
},
{
title: '手机号码',
align: 'center',
dataIndex: 'phone',
key: 'phone',
},
{
title: '电话号码',
align: 'center',
dataIndex: 'tel',
key: 'tel'
},
{
title: '是否默认',
align: 'center',
dataIndex: 'isDefault',
key: 'isDefault',
render: (_: any, record: any) =>
<Switch size='small' disabled defaultChecked={record.isDefault == 0 ? false : true}
/>,
},
{
title: '操作',
dataIndex: 'option',
align: 'center',
render: (_: any, record: any) => {
return (
<>
<><Button type="link" onClick={() => toEdit(record.id)}>编辑</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelete(record.id)}>
<Button type='link'>删除</Button>
</Popconfirm>
</>
</>
)
}
}
];
// 模拟请求
const fetchData = (params: any) => {
console.log(params);
return new Promise((resolve, reject) => {
if (props.type === '1') {//发货
PublicApi.getLogisticsShipperAddressPage({ current: params.page, pageSize: params.rows }).then(res => {
resolve(res.data)
})
} else {
PublicApi.getLogisticsReceiverAddressPage({ current: params.page, pageSize: params.rows }).then(res => {
resolve(res.data)
})
}
})
}
//生命周期
// useEffect(() => {
// effect
// return () => {
// cleanup
// }
// }, [input])
const onDefaultChange = (id: any, checked: boolean) => {
console.log(id, checked)
columns.forEach((v, index) => {
})
}
const handleDelete = (id:number) => {
if(props.type === '1'){
PublicApi.postLogisticsShipperAddressDelete({id:id}).then(res => {
ref.current.reload()
})
}else{
PublicApi.postLogisticsReceiverAddressDelete({id:id}).then(res => {
ref.current.reload()
})
}
}
const search: IFormFilter[] = [
{
type: 'Input',
value: 'keywords',
col: 4,
placeHolder: '输入属性名称'
}
]
const searchBarActions: IButtonFilter[] = [
{
type: 'primary',
text: '新建',
icon: <PlusOutlined />,
handler: () => {
history.push('/logisticsAbility/logistics/list/addCompany')
}
}
]
const handleSee = (record: any) => {
console.log('see')
}
const confirm = () => {
console.log('confirm')
}
const cancel = () => {
console.log('cancel')
}
const handleModify = (record: object) => {
// 通过传入的params字符串判断是修改那种类型的数据
console.log('执行状态修改', record)
}
return (
<PageHeaderWrapper>
<Card>
<StandardTable
tableProps={{rowKey:'id'}}
columns={columns}
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
rowClassName="editable-row"
formilyChilds={{
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/list/addressForm?type=${props.type}&id=0`)}>新建</Button>
</>
)
}}
/>
</Card>
</PageHeaderWrapper>
)
}
AddressList.defaultProps = {
}
export default AddressList
\ No newline at end of file
src/pages/logistics/list/components/templateForm.tsx deleted 100644 → 0
View file @ b6848bd0
This diff is collapsed.
src/pages/logistics/list/deliveryAddress.tsx deleted 100644 → 0
View file @ b6848bd0
import React, { useState } from 'react';
import AddressList from './components/addressList'
const List = () => {
return (
<AddressList title='发货地址管理' type='1'/>
)
}
export default List
\ No newline at end of file
src/pages/logistics/list/receivingAddress.tsx deleted 100644 → 0
View file @ b6848bd0
import React, { useState } from 'react';
import AddressList from './components/addressList'
const List = () => {
return (
<AddressList title='收货地址管理' type='2'/>
)
}
export default List
\ No newline at end of file
src/pages/logistics/list/template.tsx deleted 100644 → 0
View file @ b6848bd0
/*
* @Author: LeeJiancong
* @Date: 2020-07-14 15:07:34
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-03 11:19:53
*/
import React, { Component, ReactNode, useRef, useState } from 'react'
import { history } from 'umi'
import { Modal, Card, Button, Form, InputNumber, Radio, Popconfirm, Switch, Input } from 'antd';
import {
PlayCircleOutlined,
PauseCircleOutlined,
PlusOutlined,
EyeOutlined,
PlusCircleOutlined
} from '@ant-design/icons';
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface'
import { IFormFilter, IButtonFilter } from 'god/dist/src/standard-table/TableController'
import { PublicApi} from '@/services/api'
const data = [
{
key: '1',
name: '采购商',
pricingMode: '计价方式',
transportMode: '运费方式',
explain: '运费说明',
code: 252525,
status: 1
},
{
key: '2',
name: '采购商',
pricingMode: '计价方式',
transportMode: '运费方式',
explain: '运费说明',
code: 252525,
status: 2
}
]
// 模拟请求
const fetchData = (params: any) => {
return new Promise((resolve, reject) => {
PublicApi.getLogisticsFreightTemplatePage({current:params.page, pageSize: params.rows}).then(res=> {
resolve(res.data)
})
})
}
interface Item {
key: string
}
//父页面传递来的参数
export interface ListProps {
title?: React.ReactNode,
type: string
}
export interface ListType {
checked: boolean //可选
}
interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
editing: boolean;
dataIndex: string;
title: any;
inputType: 'number' | 'text';
record: Item;
index: number;
children: React.ReactNode;
}
const EditableCell: React.FC<EditableCellProps> = ({
editing,
dataIndex,
title,
inputType,
record,
index,
children,
...restProps
}) => {
const inputNode = inputType === 'number' ? <InputNumber /> : <Input />;
return (
<td {...restProps}>
{editing ? (
<Form.Item
name={dataIndex}
style={{ margin: 0 }}
rules={[
{
required: true,
message: `Please Input ${title}!`,
},
]}
>
{inputNode}
</Form.Item>
) : (
children
)}
</td>
);
};
/**
* @description:
* @param {type}
* @return:
*/
const Template: React.FC<ListProps> = (props) => {
console.log(props)
const ref = useRef<any>({})
const [form] = Form.useForm();
const [table, setTable] = useState([])
const [editingKey, setEditingKey] = useState('');
const edit = (record: Item) => {
setEditingKey(record.key);
form.setFieldsValue({ code: '', ...record });
console.log(record.key)
};
const columns: ColumnType<any>[] = [
{
title: '模板名称',
dataIndex: 'name',
align: 'center',
key: 'name',
},
{
title: '计价方式',
align: 'center',
dataIndex: 'pricingMode',
key: 'pricingMode',
render: (_:any,record:any) => {
return (
<>{record.transportMode === 1?'按重量':''}</>
)
}
},
{
title: '运送方式',
dataIndex: 'transportMode',
align: 'center',
key: 'transportMode',
render: (_:any,record:any) => {
return (
<>{record.transportMode === 1?'快递':''}</>
)
}
},
{
title: '运费说明',
align: 'center',
dataIndex: 'explain',
key: 'explain',
},
{
title: '状态',
align: 'center',
dataIndex: 'status',
key: 'status',
render: (_:any,record: any) => {
return (
<Button type="link" style={record.status === 1 ? { color: '#00B37A' } : { color: 'red' }}>{record.status === 1 ? '有效' : '无效'}
{record.status === 1 ? <PlayCircleOutlined /> : <PauseCircleOutlined />}
</Button>
)
}
},
{
title: '操作',
dataIndex: 'option',
align: 'center',
render: (_: any, record: any) => {
const status = record.status === 0?'启用':'停用'
const title = `确定要${status}吗?`
return (
<>
<Popconfirm title={title} okText="是" cancelText="否" onConfirm={() => handleChangeStatus(record.id,record.status)}>
<Button type='link'>
{ record.status === 0?'启用':'停用'}
</Button>
</Popconfirm>
{
record.status === 0 ?
<>
<Button type='link' onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/list/templateForm?id=${record.id}`)}>编辑</Button>
<Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() =>handleDelete(record.id)}>
<Button type='link'>
删除
</Button>
</Popconfirm>
</> : ''
}
<Button type='link' onClick={() => handleSee(record.id)}>查看</Button>
</>
)
}
}
];
//生命周期
// useEffect(() => {
// effect
// return () => {
// cleanup
// }
// }, [input])
const onDefaultChange = (id: any, checked: boolean) => {
console.log(id, checked)
columns.forEach((v, index) => {
})
}
const handleChangeStatus = (id:any,status:any) => {
let _status = status == 0 ? 1: 0
PublicApi.postLogisticsFreightTemplateEnable({id:id,status:_status}).then(res => {
if(res.code === 1000){
console.log(ref)
ref.current.reload()
}
})
}
const handleDelete = (id:number) => {
PublicApi.postLogisticsFreightTemplateDelete({id:id}).then(res => {
if(res.code === 1000){
ref.current.reload()
}
})
}
const search: IFormFilter[] = [
{
type: 'Input',
value: 'keywords',
col: 4,
placeHolder: '输入属性名称'
}
]
const handleSee = (id: number) => {
history.push(`/memberCenter/logisticsAbility/logistics/list/templateForm?id=${id}&isSee=${true}`)
}
const confirm = () => {
console.log('confirm')
}
const cancel = () => {
console.log('cancel')
}
const handleModify = (record: object) => {
// 通过传入的params字符串判断是修改那种类型的数据
console.log('执行状态修改', record)
}
return (
<PageHeaderWrapper>
<Card>
<StandardTable
columns={columns}
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
rowClassName="editable-row"
formilyChilds={{
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/logisticsAbility/logistics/list/templateForm?id=0`)}>
新建
</Button>
</>
)
}}
/>
</Card>
</PageHeaderWrapper>
)
}
Template.defaultProps = {
}
export default Template
\ No newline at end of file
src/pages/logistics/logisticsResult/orderSearchList.tsx deleted 100644 → 0
View file @ b6848bd0
import React, { Component } from 'react'
import OrderList from '../components/orderSearchList'
const List = () => {
return (
<OrderList title='处理' type='1'/>
)
}
export default List
\ No newline at end of file
src/pages/logistics/schema/index.tsx 0 → 100644
View file @ bc4f5696
import { ISchema} from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { PublicApi } from '@/services/api';
/**
* @description: 询价单
* @param {type}
* @return {type}
*/
export const logisticsSearchSchema: ISchema = {
type:'object',
properties:{
megalayout:{
type:'object',
"x-component":'mega-layout',
properties:{
logisticsOrderNo:{
type:'string',
"x-component":"Search",
"x-mega-props":{
},
"x-component-props":{
placeholder:'物流单号',
align: 'flex-left',
}
}
}
},
[FORM_FILTER_PATH]:{
type:'object',
"x-component":"flex-layout",
"x-component-props":{
rowStyle:{
justifyContent: 'flex-start',
flexWrap:'nowrap'
},
colStyle:{//改变间隔
marginRight: 20
}
},
properties:{
PRO_LAYOUT:{
type:'object',
"x-component":'mega-layout',
"x-mega-props":{
span: 5
},
"x-component-props":{
inline: true
},
properties:{
relevanceOrderCode:{
type:'string',
"x-component-props":{
placeholder:'订单号'
}
},
companyId: {
type: 'string',
"x-component": 'SearchSelect',
"x-component-props": {
placeholder: '物流服务商',
className: 'fixed-ant-selected-down',
fetchSearch: PublicApi.getLogisticsSelectListMemberCompanyQuery,
style: {
width: 160
}
},
},
shipperMemberName:{
type:'string',
"x-component-props":{
placeholder:'发货方'
}
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
}
},
status:{
type:'string',
"x-component-props":{
placeholder:'外部状态'
},
enum: [
{
label: '待提交', value: 1
},
{
label: '待确认', value: 2
},
{
label: '不接受物流单', value: 3
},
{
label: '接受物流单', value: 4
}
]
},
}
},
sumbit:{
"x-component":'Submit',
"x-mega-props":{
span: 1
},
"x-component-props":{
children:'查询'
}
}
}
}
}
}
src/pages/orderSystem/orderDetail/index.tsx
View file @ bc4f5696
......@@ -20,7 +20,7 @@ import OrderDeleveRecord from './components/orderDeleveRecord'
export interface CommonOrderDetailProps {}
const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const [formData, setFormData] = useState<any>(null)
let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
page_type = Number(page_type)
......@@ -50,7 +50,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
setData: setFormData
}
}
const detailList = [
{ label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
{ label: '订单摘要', name: 'orderThe', span: 8 },
......@@ -59,7 +59,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
{ label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
{ label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
{ label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
{ label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
// { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
]
const headerTiTle = formData ? {
picName: '单',
......@@ -74,12 +74,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
<OrderDetailWrapper>
<div className='gray-wrap'>
{/* 工作流进度 */}
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
customTitleKey='operationalProcess'
customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
></AuditProcess> }
......@@ -106,4 +106,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
CommonOrderDetail.defaultProps = {}
export default CommonOrderDetail
\ No newline at end of file
export default CommonOrderDetail
src/pages/orderSystem/readyConfirmPayList/detail.tsx
View file @ bc4f5696
......@@ -23,7 +23,7 @@ import OrderDeleveRecord from '../orderDetail/components/orderDeleveRecord'
export interface CommonOrderDetailProps {}
const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const [formData, setFormData] = useState<any>(null)
let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
page_type = Number(page_type)
......@@ -63,7 +63,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const renderExtra = () => {
return <Button type='primary' onClick={startPush}>确认支付结果</Button>
}
const detailList = [
{ label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
{ label: '订单摘要', name: 'orderThe', span: 8 },
......@@ -72,7 +72,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
{ label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
{ label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
{ label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
{ label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
// { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
]
const headerTiTle = formData ? {
picName: '单',
......@@ -87,12 +87,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
<OrderDetailWrapper>
<div className='gray-wrap'>
{/* 工作流进度 */}
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
customTitleKey='operationalProcess'
customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
></AuditProcess> }
......@@ -120,4 +120,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
CommonOrderDetail.defaultProps = {}
export default CommonOrderDetail
\ No newline at end of file
export default CommonOrderDetail
src/pages/ruleSettingManage/paySetting/settingIndex.tsx
View file @ bc4f5696
......@@ -5,7 +5,7 @@
* @LastEditTime: 2020-08-21 15:05:26
*/
import React, { useEffect, useState, useRef, Fragment, ReactNode } from 'react'
import { Card, Button, Tabs, Radio, Space, Row, Col, Table, Popconfirm } from 'antd'
import { Card, Button, Tabs, Radio, Space, Row, Col, Table, Popconfirm, Input } from 'antd'
import { PlusOutlined, SaveOutlined } from '@ant-design/icons'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import EyePreview from '@/components/EyePreview'
......@@ -81,7 +81,7 @@ const PaySetting: React.FC<{}> = () => {
/**
* @description: 保存 编辑的时候遍历id是否一样 一样就替换
* @param {type} type： 1支付宝 2支付宝银行卡 3微信
* @return {type}
* @return {type}
*/
const handleModalOK = (obj: any) => {
// console.log('选项卡:', tabid, '弹窗id:', type)
......@@ -137,16 +137,16 @@ const PaySetting: React.FC<{}> = () => {
// const tableAddButton = <Button style={{ marginBottom: 16 }} block icon={<PlusOutlined />} onClick={() => handleAddMemberBtn(1)} type='dashed'>新增参数配置1</Button>
// const tableAddButton2 = <Button style={{ marginBottom: 16 }} block icon={<PlusOutlined />} onClick={() => handleAddMemberBtn(2)} type='dashed'>新增参数配置2</Button>
// const tableAddButton3 = <Button style={{ marginBottom: 16 }} block icon={<PlusOutlined />} onClick={() => handleAddMemberBtn(3)} type='dashed'>新增参数配置3</Button>
const codeText = (text:any) => {
const codeText = (text: any) => {
let code: ReactNode = '';
text === 1 ? code = <span>mchId</span>:
text === 2 ? code = <span>mchKey</span>:
text === 3 ? code = <span>appId</span>:
code = <span>appSecret</span>
text === 1 ? code = <span>mchId</span> :
text === 2 ? code = <span>mchKey</span> :
text === 3 ? code = <span>appId</span> :
code = <span>appSecret</span>
return code;
}
const tableColumns: ColumnType<any>[] = [
{ dataIndex: 'code', title: '参数代码', align: 'center', render:(text:any) => codeText(text) },
{ dataIndex: 'code', title: '参数代码', align: 'center', render: (text: any) => codeText(text) },
{ dataIndex: 'value', align: 'center', title: '参数值', render: (_, record) => <EyePreview url={`/memberCenter/memberAbility/manage/addMember?id=${record.memberId}&preview=1`}>{_}</EyePreview> },
{ dataIndex: 'describe', title: '参数描述', align: 'center' },
{
......@@ -284,6 +284,17 @@ const PaySetting: React.FC<{}> = () => {
</Col>
</Row>
}
{
(v.id === 6 && isPitchOn) &&
<div style={{ marginTop: 42 }}>
<Space direction="horizontal" size={16}>
初始申请额度不超过
<Input addonBefore="￥" />
允许满<Input />
天后申请上调<Input addonAfter="%" />
</Space>
</div>
}
</TabPane>
</Fragment>
)
......@@ -303,4 +314,4 @@ const PaySetting: React.FC<{}> = () => {
</PageHeaderWrapper>
)
}
export default PaySetting
\ No newline at end of file
export default PaySetting
src/pages/systemManage/platformArg/index.tsx
View file @ bc4f5696
......@@ -30,7 +30,12 @@ const SensitiveWords: React.FC<{}> = () => {
key: 'state',
dataIndex: 'state',
render: (text: any, record: any) => (
<StatusSwitch fieldNames="status" handleConfirm={() => handleChangeStatus(record.id, record.status)} record={record} />
<StatusSwitch
fieldNames="status"
handleConfirm={() => handleChangeStatus(record.id, record.status)}
record={record}
expectTrueValue={1}
/>
)
},{
title: '操作',
......@@ -42,7 +47,7 @@ const SensitiveWords: React.FC<{}> = () => {
/**切换状态 */
const handleChangeStatus = async (id: any, status: any) => {
let _status = status === 1 ? 0 : 1
await PublicApi.postManageParameterManageUpdateState({ id: id, status: _status })
await PublicApi.postManageParameterManageUpdateState({ id: id, state: _status })
ref.current.reload()
}
/**获取单位列表数据 */
......
src/pages/systemManage/platformArg/template.tsx
View file @ bc4f5696
......@@ -22,7 +22,6 @@ const Template: React.FC<{}> = () => {
PublicApi.postManageParameterManageUpdate(values).then(res => {
if (res.code === 1000) {
history.goBack();
message.success('修改敏感词成功')
}
})
}
......
src/pages/systemManage/unit/index.tsx
View file @ bc4f5696
......@@ -17,10 +17,10 @@ const SensitiveWords: React.FC<{}> = () => {
ref.current.reload()
}
const confirmCancel = (id: number) => {
PublicApi.postManageSensitiveWordDelete({ id }).then(res => {
PublicApi.postManageSensitiveWordDelete({ ids: [id] }).then(res => {
if (res.code === 1000) {
message.success('删除成功')
ref.current.Reload()
ref.current.reload()
}
})
}
......@@ -37,32 +37,42 @@ const SensitiveWords: React.FC<{}> = () => {
title: '英文简称',
key: 'englishShortName',
dataIndex: 'englishShortName',
},{
}, {
title: '状态',
key: 'status',
dataIndex: 'status',
render: (text: any, record: any) => (
<StatusSwitch fieldNames="status" handleConfirm={() => handleChangeStatus(record.id, record.status)} record={record} />
<StatusSwitch
fieldNames="status"
handleConfirm={() => handleChangeStatus(record.id, record.status)}
record={record}
expectTrueValue={true}
/>
)
},{
}, {
title: '操作',
key: 'options',
dataIndex: 'options',
render: (text: any, record: any) => {
return (
<>
<Button
type='link'
href={`/system/sensitiveWords/edit?id=${record.id}}`}
>修改</Button>
<Popconfirm
onConfirm={() => confirmCancel(record.id)}
title="确定要执行这个操作?"
okText="确定"
cancelText="取消"
>
<Button type='link'>删除</Button>
</Popconfirm>
{
!record.status &&
<>
<Button
type='link'
href={`/system/unit/edit?id=${record.id}&name=${btoa(encodeURIComponent(record.name))}&englishShortName=${btoa(encodeURIComponent(record.englishShortName))}`}
>修改</Button>
<Popconfirm
onConfirm={() => confirmCancel(record.id)}
title="确定要执行这个操作?"
okText="确定"
cancelText="取消"
>
<Button type='link'>删除</Button>
</Popconfirm>
</>
}
</>
)
}
......
src/pages/systemManage/unit/template.tsx
View file @ bc4f5696
import React from 'react';
import React, { useEffect } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { history } from 'umi';
import ReutrnEle from '@/components/ReturnEle';
......@@ -14,34 +14,49 @@ const tailLayout = {
wrapperCol: { style: { marginLeft: '174px' } },
};
const [form] = Form.useForm();
const { pathname, query } = history.location;
const type = pathname.split('/')[pathname.split('/').length - 1];
const onFinish = (values: any) => {
if (type === 'add') {
PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
if (res.code === 1000) {
history.goBack();
message.success('新增单位成功')
}
})
const Template: React.FC<{}> = () => {
const [form] = Form.useForm();
const { pathname, query } = history.location;
const type = pathname.split('/')[pathname.split('/').length - 1];
const onFinish = (values: any) => {
if (type === 'add') {
PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
if (res.code === 1000) {
history.goBack();
message.success('新增单位成功')
}
})
}
else {
values.id = query.id;
PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
if (res.code === 1000) {
history.goBack();
message.success('修改单位成功')
}
})
}
}
else {
values.id = query.id;
PublicApi.postManageUnitSaveOrUpdateUnit(values).then(res => {
if (res.code === 1000) {
history.goBack();
message.success('修改单位成功')
}
})
const confirmCancel = () => {
history.goBack()
}
}
const confirmCancel = () => {
history.goBack()
}
useEffect(() => {
try {
const data: {name: string, englishShortName: string} = {
name: decodeURIComponent(atob(query.name)),
englishShortName: decodeURIComponent(atob(query.englishShortName)),
}
form.setFieldsValue({
name: data.name,
englishShortName: data.englishShortName
})
}catch(error) {
console.log(error)
}
}, [])
const Template: React.FC<{}> = () => {
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
......@@ -61,7 +76,7 @@ const Template: React.FC<{}> = () => {
</Form.Item>
<Form.Item {...tailLayout}>
<Space size={24}>
<Button type='primary' htmlType="submit">保存</Button>
<Button type='primary' htmlType="submit">保存</Button>
<Popconfirm
onConfirm={confirmCancel}
title="确定要执行这个操作?"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment