This commit is contained in:
ylj20011123 2025-07-02 19:30:44 +08:00
parent ae1f3a5b42
commit ad597dcc99
13 changed files with 3278 additions and 240 deletions

View File

@ -957,6 +957,12 @@ export default [
name: 'HomepageAds',
component: './travelMember/HomepageAds/index'
},
// 服务区详情
{
path: 'serverpartInfo',
name: 'serverpartInfo',
component: './travelMember/serverpartInfo/index'
},
]
},
{

View File

@ -205,6 +205,21 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
// 拿到所有枚举的方法
const handleGetAllFieldEnum = async () => {
// 承载情况
getFieldEnumTree({ FieldExplainField: 'LOAD_BEARING' }).then((LOADBEARING: any) => {
if (LOADBEARING && LOADBEARING.length > 0) {
const obj: any = {}
const list: any = []
LOADBEARING.forEach((item: any) => {
list.push({ label: item.label, value: item.value })
obj[item.value] = item.label
})
session.set('LOADBEARINGList', list);
session.set('LOADBEARINGObj', obj);
session.set('LOADBEARINGTree', LOADBEARING);
}
})
// 成长值规则类型
getFieldEnumTree({ FieldExplainField: 'GROWTH_TYPE' }).then((GROWTHSETTINGTYPE: any) => {
if (GROWTHSETTINGTYPE && GROWTHSETTINGTYPE.length > 0) {

View File

@ -328,6 +328,7 @@ const marketResearch: React.FC<{ currentUser: CurrentUser}> = (props) => {
list.push({ label: item.USER_NAME, value: `${item.USER_NAME}-${item.USER_ID}` })
})
}
setAPPROVALSTAFFIDList(list)
}
}

View File

@ -181,6 +181,11 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
}])
}
if (record?.PRESALE_TYPE) {
setFormPRESALE_TYPE(true)
}
setCurrentRow({ ...record });
handleModalVisible(true);
}}
@ -395,7 +400,11 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
autoFocusFirstInput
submitter={false}
preserve={false}
initialValues={currentRow ? currentRow : {
initialValues={currentRow ? {
...currentRow,
PRESALE_TIME: currentRow?.PRESALE_TYPE ? [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME] : ""
} : {
USERDEFINEDTYPE_STATE: 1,
USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
OWNERUNIT_NAME: currentUser?.OwnerUnitName
}}
@ -524,6 +533,12 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
width={'lg'}
name="PRESALE_TIME"
label="预售时间"
rules={[
{
required: true,
message: "请选择预售时间"
}
]}
/>
</Col>
: ""

View File

@ -1,15 +1,279 @@
// 商城评价管理
import { ConnectState } from "@/models/connect";
import { connect, CurrentUser } from "umi";
import React, { useRef, useState, Suspense } from 'react';
import moment from 'moment'; // 时间相关引用,没有使用可以删除
import numeral from "numeral"; // 数字相关引用,没有使用可以删除
import { connect } from 'umi';
import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
import Draggable from 'react-draggable';
import SubMenu from "antd/lib/menu/SubMenu";
import ProTable from '@ant-design/pro-table';
import ProDescriptions from '@ant-design/pro-descriptions';
import ProForm, { ProFormDatePicker, ProFormDateRangePicker, ProFormDateTimePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from '@ant-design/pro-form';
import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { PageContainer } from '@ant-design/pro-layout';
import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect, Divider } from 'antd';
import type { CurrentUser } from "umi";
import type { ConnectState } from '@/models/connect';
import type { ActionType, ProColumns } from '@ant-design/pro-table';
import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import type { FormInstance } from 'antd';
import type { COMMODITYModel } from './data';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用,没有使用可以删除
import { getList, delcommodity, updatecommodity } from './service'; // 接口相关对象的引用
import PageTitleBox from "@/components/PageTitleBox";
import { handeDeleteCOMMODITY, handeDeleteMALLCOMMENT, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMALLCOMMENTList, handeSynchroCOMMODITY, handleGetBRANDList } from '../service';
import session from '@/utils/session';
import LeftSelectMallType from '../ProductListingManagement/component/LeftSelectMallType';
const MallEvaluationManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
const { currentUser } = props
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const [currentRow, setCurrentRow] = useState<COMMODITYModel>();
const [showDetail, setShowDetail] = useState<boolean>();
const [modalVisible, handleModalVisible] = useState<boolean>();
const [confirmLoading, handleConfirmLoading] = useState<boolean>(false) // 弹出框的内容表单是否在提交
const [searchParams, setSearchParams] = useState<any>();
const [collapsible, setCollapsible] = useState<boolean>(false)
// 弹出框拖动效果
const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置
const [disabled, setDraggleDisabled] = useState<boolean>() // 是否拖动
const draggleRef = React.createRef<any>()
// 拿到左侧树的数据
const [leftTreeData, setLeftTreeData] = useState<any>()
// 树相关的属性和方法
const [selectedId, setSelectedId] = useState<string>()
const onDraggaleStart = (event, uiData) => {
const { clientWidth, clientHeight } = window.document.documentElement;
const targetRect = draggleRef.current?.getBoundingClientRect();
if (!targetRect) {
return;
}
setBounds({
left: -targetRect.left + uiData.x,
right: clientWidth - (targetRect.right - uiData.x),
top: -targetRect.top + uiData.y,
bottom: clientHeight - (targetRect.bottom - uiData.y),
});
};
// 定义列表字段内容
const columns: any = [
{
dataIndex: 'index',
title: '序号',
align: 'center',
width: 70,
ellipsis: true,
valueType: 'index',
hideInSearch: true,
},
{
dataIndex: 'MERCHANTS_NAME',
title: '商家名称',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'COMMODITY_NAME',
title: '评价商品',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'CREATE_DATE',
title: '评价时间',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
render: (_, record) => {
return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD HH:mm:ss') : ""
}
},
{
dataIndex: 'MEMBERSHIP_NAME',
title: '评价人员',
align: 'center',
hideInSearch: true,
hideInDescriptions: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'MEMBERSHIP_TYPE',
title: '会员类型',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'MALLCOMMENT_SCORE',
title: '评分',
align: 'center',
hideInSearch: true,
width: 120,
ellipsis: true,
},
{
dataIndex: 'MALLCOMMENT_CONTENT',
title: '评价内容',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'MALLCOMMENT_REPLY',
title: '回复内容',
align: 'center',
hideInSearch: true,
width: 150,
ellipsis: true,
},
{
dataIndex: 'option',
title: '操作',
valueType: 'option',
align: 'center',
hideInSearch: true,
width: 120,
fixed: "right",
ellipsis: true,
render: (_, record) => {
return (
<Space>
{/* <a
onClick={() => {
setCurrentRow({ ...record });
handleModalVisible(true);
}}
>
</a> */}
<Popconfirm
title="确认删除该商品管理列表信息吗?"
onConfirm={async () => {
await handelDelete(record.MALLCOMMENT_ID);
}}
>
<a></a>
</Popconfirm>
</Space>
);
},
},
];
const handelDelete = async (MALLCOMMENT_ID: number) => {
const result = await handeDeleteMALLCOMMENT({ MALLCOMMENTId: MALLCOMMENT_ID });
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功!');
actionRef.current?.reload()
}
};
const handleAddUpdate = async (res: any) => {
let req: any = {}
if (currentRow?.USERDEFINEDTYPE_ID) {
req = {
...currentRow,
...res,
OWNERUNIT_ID: currentUser?.OwnerUnitId,
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 4000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
} else {
req = {
...res,
OWNERUNIT_ID: currentUser?.OwnerUnitId,
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 4000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
}
const data = await handeSynchroCOMMODITY(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功!")
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
}
};
return (
<div>
</div>
)
<div style={{ backgroundColor: '#fff', display: 'flex' }}>
<LeftSelectMallType setSelectedId={setSelectedId} setCollapsible={setCollapsible} collapsible={collapsible} setData={setLeftTreeData} />
<div style={{
width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
paddingTop: 0,
paddingBottom: 0,
paddingRight: 0
}}>
{/* 最外层的列表 */}
<ProTable<COMMODITYModel>
scroll={{ x: "100%", y: 'calc(100vh - 370px)' }}
rowKey={(record) => {
return `${record?.COMMODITY_ID}`
}}
formRef={formRef}
bordered
headerTitle={<PageTitleBox props={props} />} // 列表表头
actionRef={actionRef}
search={{ span: 6, labelWidth: 'auto' }}
// 请求数据
request={async (params, sorter) => {
const req: any = {
searchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: currentUser?.ProvinceCode,
ISVALID: 1
},
PageIndex: 1,
PageSize: 999999,
SortStr: "CREATE_DATE desc"
}
const data = await handeGetMALLCOMMENTList(req)
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
}
return { data: [], success: true }
}}
columns={columns}
toolbar={{
actions: [
],
}}
/>
</div>
</div>
</div>
);
};
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
}))(MallEvaluationManage);

View File

@ -1,15 +1,638 @@
// 点餐类别管理
import { ConnectState } from "@/models/connect";
import { connect, CurrentUser } from "umi";
import React, { useRef, useState, Suspense } from 'react';
import moment from 'moment'; // 时间相关引用,没有使用可以删除
import numeral from "numeral"; // 数字相关引用,没有使用可以删除
import { connect } from 'umi';
const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
return (
<div>
import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
import Draggable from 'react-draggable';
import SubMenu from "antd/lib/menu/SubMenu";
import ProTable from '@ant-design/pro-table';
import ProDescriptions from '@ant-design/pro-descriptions';
import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormDateTimeRangePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from '@ant-design/pro-form';
import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { PageContainer } from '@ant-design/pro-layout';
import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd';
</div>
)
import type { CurrentUser } from "umi";
import type { ConnectState } from '@/models/connect';
import type { ActionType, ProColumns } from '@ant-design/pro-table';
import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用,没有使用可以删除
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox';
import { uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png'
const beforeUpload = (file: any) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
if (!isJpgOrPng) {
message.error('请上传JPEG、jpg、png格式的图片文件!');
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.error('图片大小不超过 2MB!');
}
return isJpgOrPng && isLt2M;
}
const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
const { currentUser } = props
const { confirm } = Modal;
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const [currentRow, setCurrentRow] = useState<any>();
const [showDetail, setShowDetail] = useState<boolean>();
const [modalVisible, handleModalVisible] = useState<boolean>();
const [confirmLoading, handleConfirmLoading] = useState<boolean>(false) // 弹出框的内容表单是否在提交
const [searchParams, setSearchParams] = useState<any>();
// 分类的树形结构数据
const [typeTreeData, setTypeTreeData] = useState<any>()
// 表单里面的是否预售
const [formPRESALE_TYPE, setFormPRESALE_TYPE] = useState<boolean>(false)
// 弹出框拖动效果
const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置
const [disabled, setDraggleDisabled] = useState<boolean>() // 是否拖动
const draggleRef = React.createRef<any>()
// 文件列表
const [fileList, setFileList] = useState<any>([])
const [imagePreviewVisible, setImagePreviewVisible] = useState<boolean>(false) // 预览图片
const onDraggaleStart = (event, uiData) => {
const { clientWidth, clientHeight } = window.document.documentElement;
const targetRect = draggleRef.current?.getBoundingClientRect();
if (!targetRect) {
return;
}
setBounds({
left: -targetRect.left + uiData.x,
right: clientWidth - (targetRect.right - uiData.x),
top: -targetRect.top + uiData.y,
bottom: clientHeight - (targetRect.bottom - uiData.y),
});
};
// 拖动结束
// 定义列表字段内容
const columns: any = [
// {
// title: '上级类别',
// align: 'center',
// width: 150,
// ellipsis: true,
// dataIndex: 'USERDEFINEDTYPE_PID',
// hideInSearch: true,
// hideInDescriptions: true,
// },
{
dataIndex: 'USERDEFINEDTYPE_NAME',
title: '类别名称',
align: 'center',
width: 300,
ellipsis: true,
hideInSearch: true,
hideInDescriptions: true,
render: (_, record) => {
return <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-start' }}>
<img style={{ width: '30px', height: '30px', marginRight: '5px', borderRadius: '50%' }} src={record?.USERDEFINEDTYPE_ICO || defaultIcon} />
<span style={{ width: '240px', display: "inline-block", whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', textAlign: 'left' }}>{record?.USERDEFINEDTYPE_NAME}</span>
</div>
}
},
{
dataIndex: 'USERDEFINEDTYPE_INDEX',
title: '类别索引',
align: 'center',
width: 120,
ellipsis: true,
hideInSearch: true,
},
{
dataIndex: 'USERDEFINEDTYPE_STATE',
title: '有效状态',
align: 'center',
width: 120,
ellipsis: true,
valueType: "select",
valueEnum: {
"1": "有效",
"0": "无效"
},
initialValue: "1"
},
{
dataIndex: 'SCANCODE_ORDER',
title: '上架状态',
align: 'center',
width: 120,
ellipsis: true,
hideInSearch: true,
valueType: "select",
valueEnum: {
"1": "上架",
"0": "下架"
}
},
{
dataIndex: "PRESALE_TYPE",
title: "是否预售",
align: 'center',
hideInSearch: true,
width: 120,
ellipsis: true,
valueType: "select",
valueEnum: {
"0": "否",
"1": "是"
}
},
{
dataIndex: 'OWNERUNIT_NAME',
title: '业主单位',
align: 'center',
width: 180,
ellipsis: true,
hideInSearch: true,
},
{
dataIndex: 'option',
title: '操作',
width: 100,
ellipsis: true,
valueType: 'option',
align: 'center',
hideInSearch: true,
render: (_, record) => {
return (
<Space>
<a
onClick={() => {
console.log('recordrecordrecord', record);
if (record?.USERDEFINEDTYPE_ICO) {
setFileList([{
name: "",
url: record?.USERDEFINEDTYPE_ICO
}])
}
if (record?.PRESALE_TYPE) {
setFormPRESALE_TYPE(true)
}
setCurrentRow({ ...record });
handleModalVisible(true);
}}
>
</a>
<Popconfirm
title="确认删除该点餐自定义类别列表信息吗?"
onConfirm={async () => {
handelDelete(record.USERDEFINEDTYPE_ID);
}}
>
<a></a>
</Popconfirm>
</Space>
);
},
},
];
// 预览上传后的图片
const handlePreview = async () => {
setFileList(fileList)
setImagePreviewVisible(true)
};
const handleChangePreview = (val: any) => {
setImagePreviewVisible(val)
}
// 删除点餐类别
const handelDelete = async (id: any) => {
const req: any = {
USERDEFINEDTYPEId: id
}
const result = await handlDeleteUSERDEFINEDTYPE(req)
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功!');
actionRef.current?.reload()
}
}
// 同步点餐列表
const handleAddUpdate = async (res: any) => {
let req: any = {}
if (currentRow?.USERDEFINEDTYPE_ID) {
req = {
...currentRow,
...res,
GOODSTYPE: 3000,
USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "",
PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "",
PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "",
PROVINCE_CODE: currentUser?.ProvinceCode,
STAFF_ID: currentUser?.ID,
STAFF_NAME: currentUser?.Name,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
}
} else {
req = {
...res,
GOODSTYPE: 3000,
USERDEFINEDTYPE_ICO: fileList && fileList.length > 0 ? fileList[0].url : "",
PRESALE_STARTTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[0] : "",
PRESALE_ENDTIME: res.PRESALE_TIME && res.PRESALE_TIME.length > 0 ? res.PRESALE_TIME[1] : "",
PROVINCE_CODE: currentUser?.ProvinceCode,
STAFF_ID: currentUser?.ID,
STAFF_NAME: currentUser?.Name,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
}
}
const data = await handlSynchroUSERDEFINEDTYPE(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功!")
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
setFormPRESALE_TYPE(false)
setFileList([])
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
}
}
return (
<PageContainer header={{
title: '',
breadcrumb: {}
}}>
<ProTable
style={{ height: 'calc(100vh - 135px)', background: '#fff' }}
scroll={{ y: 'calc(100vh - 410px)' }}
rowKey={(record) => {
return `${record?.USERDEFINEDTYPE_PID}-${record?.USERDEFINEDTYPE_ID}`
}}
formRef={formRef}
headerTitle={<PageTitleBox props={props} />} // 列表表头
actionRef={actionRef}
search={{ span: 6, labelWidth: 'auto' }}
bordered
// 请求数据
request={async (params, sorter) => {
const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "",
GOODSTYPE: 3000,
USERDEFINEDTYPE_STATE: params?.USERDEFINEDTYPE_STATE
// SearchKey: ""
}
const data = await handlGetUSERDEFINEDTYPEList(req);
console.log('datadatadatadatadata', data);
if (data && data.length > 0) {
setTypeTreeData(data)
return { data: data, success: true, total: data.length }
}
return { data: [], success: true }
}}
columns={columns}
toolbar={{
actions: [
// 新增按钮
<Button
key="new"
icon={<PlusOutlined />}
type="primary"
onClick={() => {
handleModalVisible(true);
}}
>
</Button>,
],
}}
/>
{/* 图片预览组件 */}
{fileList && fileList.length > 0 && <div style={{ display: 'none' }}>
<Image.PreviewGroup
preview={{
visible: imagePreviewVisible,
onVisibleChange: vis => {
handleChangePreview(vis)
}
}}>
{
fileList.map((n) => <Image src={n.url} key={n.url} />)
}
</Image.PreviewGroup>
</div>}
<Modal
title={
<div
style={{
width: '100%',
cursor: 'move',
}}
onMouseOver={() => {
if (disabled) {
setDraggleDisabled(false)
}
}}
onMouseOut={() => {
setDraggleDisabled(true)
}}
onFocus={() => { }}
onBlur={() => { }}
>
{currentRow ? '更新点餐自定义类别' : '新建点餐自定义类别'}
</div>
}
destroyOnClose={true}
width={900}
visible={modalVisible}
confirmLoading={confirmLoading}
afterClose={() => {
formRef.current?.resetFields();
setCurrentRow(undefined);
}}
onCancel={() => {
handleConfirmLoading(false)
handleModalVisible(false)
setFormPRESALE_TYPE(false)
setFileList([])
}}
onOk={async () => { // 提交框内的数据
formRef?.current?.validateFields().then(() => {
handleConfirmLoading(true)
formRef?.current?.submit()
})
}}
modalRender={(modal) => {
return <Draggable
disabled={disabled}
bounds={bounds}
onStart={(event, uiData) => onDraggaleStart(event, uiData)}
>
<div ref={draggleRef}>{modal}</div>
</Draggable>
}}
>
<ProForm
layout={'horizontal'}
formRef={formRef}
autoFocusFirstInput
submitter={false}
preserve={false}
initialValues={currentRow ? {
...currentRow,
PRESALE_TIME: currentRow?.PRESALE_TYPE ? [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME] : ""
} : {
USERDEFINEDTYPE_STATE: 1,
USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
OWNERUNIT_NAME: currentUser?.OwnerUnitName
}}
onFinish={async (values) => {
let newValue = { ...values };
if (currentRow) {
// 编辑数据
newValue = { ...values, USERDEFINEDTYPE_ID: currentRow.USERDEFINEDTYPE_ID };
}
console.log('fileListfileList', fileList);
console.log('newValuenewValuenewValue', newValue);
// 如果有开关,要把开关的代码写进去
await handleAddUpdate(newValue);
handleConfirmLoading(false)
setFormPRESALE_TYPE(false)
}}
>
<Row gutter={8}>
<Col span={12}>
<ProFormTreeSelect
name="USERDEFINEDTYPE_PID"
label="上级类别"
request={async () => {
if (typeTreeData && typeTreeData.length > 0) {
let list: any = [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }, ...typeTreeData]
return list
} else {
const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "",
GOODSTYPE: 3000,
}
const data = await handlGetUSERDEFINEDTYPEList(req);
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
data.List.unshirft({ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 })
setTypeTreeData(data.List)
return data.List
} else {
return [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }]
}
}
}}
fieldProps={{
fieldNames: {
label: 'USERDEFINEDTYPE_NAME',
value: 'USERDEFINEDTYPE_ID',
children: 'children'
},
showSearch: true,
filterTreeNode: (input, node) =>
(node.USERDEFINEDTYPE_NAME || '').toLowerCase().includes(input.toLowerCase())
}}
rules={[
{
required: true,
message: "请选择上级类别"
}
]}
/>
</Col>
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_NAME"
label="类别名称"
rules={[
{
required: true,
message: "请输入类别名称"
}
]}
/>
</Col>
<Col span={12}>
<ProFormDigit
name="USERDEFINEDTYPE_INDEX"
label="类别索引"
rules={[
{
required: true,
message: "请输入类别索引"
}
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="SCANCODE_ORDER"
label="上架状态"
options={[{ label: "上架", value: 1 }, { label: "下架", value: 0 }]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="USERDEFINEDTYPE_STATE"
label="有效状态"
options={[{ label: "有效", value: 1 }, { label: "无效", value: 0 }]}
rules={[
{
required: true,
message: "请选择有效状态"
}
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="PRESALE_TYPE"
label="是否预售"
options={[{ label: "是", value: 1 }, { label: "否", value: 0 }]}
fieldProps={{
onChange: (e: any) => {
setFormPRESALE_TYPE(e)
}
}}
/>
</Col>
{
formPRESALE_TYPE ?
<Col span={12}>
<ProFormDateTimeRangePicker
width={'lg'}
name="PRESALE_TIME"
label="预售时间"
rules={[
{
required: true,
message: "请选择预售时间"
}
]}
/>
</Col>
: ""
}
<Col span={12}>
<ProFormUploadButton
name="USERDEFINEDTYPE_ICO"
label="图标地址"
fileList={fileList || []}
listType="picture-card"
accept="image/*"
fieldProps={{
beforeUpload,
maxCount: 1,
onPreview: handlePreview,
customRequest: async (info) => {
const formData = new FormData();
formData.append('files', info.file);
formData.append('TableType', '1215');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) {
const success = await uploadPicture(formData)
if (success) {
const list = [{
// uid: `${success.ImageId}`, // 注意这个uid一定不能少否则上传失败
name: success.Result_Data.ImageName,
// status: 'done',
url: success.Result_Data.ImageUrl, // url 是展示在页面上的绝对链接
// imgUrl: success.ImagePath // + success.ImageUrl,
}]
setFileList(list)
}
} else {
message.error("您上传的图片不存在.")
}
},
onChange: async (info: any) => {
if (info.file.status === 'removed') {
confirm({
title: '确认删除该图片吗?',
icon: <ExclamationCircleOutlined rev={undefined} />,
async onOk() {
setFileList([])
// const deleteLoading = message.loading('正在删除...')
// try {
// const deleteIndex = fileList?.findIndex((n: any) => n.uid === info.file.uid)
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, '1208')
// if (deleteIndex !== -1) {
// const files = [...fileList]
// files.splice(deleteIndex, 1)
// setFileList(files)
// }
// deleteLoading()
// return true
// } catch (error) {
// deleteLoading()
// return false
// }
}
});
}
}
}}
/>
</Col>
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_DATE"
label="添加时间"
disabled
/>
</Col>
<Col span={12}>
<ProFormText
name="OWNERUNIT_NAME"
label="业主单位"
disabled
/>
</Col>
<Col span={24}>
<ProFormTextArea
name="USERDEFINEDTYPE_DESC"
label="备注"
/>
</Col>
</Row>
</ProForm>
</Modal>
</PageContainer>
);
};
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
}))(OrderCategoryManage);

View File

@ -0,0 +1,223 @@
import { connect } from "umi";
import type { ConnectState } from "@/models/connect";
import ProCard from "@ant-design/pro-card";
import searchIcon from '@/assets/ai/searchIcon.png'
import { useRef, useState } from "react";
import { MenuFoldOutlined } from "@ant-design/icons";
import ProForm, { ProFormText } from "@ant-design/pro-form";
import { Button, Col, FormInstance, Row, Tree } from "antd";
import close from '@/assets/ai/close.png'
import { getServerpartTree } from "@/services/options";
import useRequest from "@ahooksjs/use-request";
import './style.less'
import { getMerchantShopTree } from "@/pages/Setting/Users/service";
import { handlGetUSERDEFINEDTYPEList } from "../../service";
type DetailProps = {
setSelectedId: any; // 把选择的服务区 可以带给外层
reload?: boolean; // 选择服务区 是否可以刷新组件之外的内容
actionRef?: any; // 和reload配合使用 确认要刷新的内容
currentUser: any; // 当前用户的信息
width?: number; // 组件的宽度
otherFun?: any; // 点击之后要进行的其他操作 多个操作可以写在一个方法里面传进来
setCollapsible: any; // 是否收缩组件
collapsible: boolean; // 收缩组件的判断依据
haveTest?: boolean;// 是否有测试服务区
handleGetLeftTreeData?: any // 拿到树数据的方法 必须要有输出值的
noWj?: any // 把万佳商贸隐藏
selectOnly?: boolean// 传入的时候 仅支持单选
setData?: any // 把树形的数据 传出去
}
const OrderCategoryTree = ({ setSelectedId, reload, actionRef, currentUser, width, otherFun, setCollapsible, collapsible, haveTest, handleGetLeftTreeData, noWj, selectOnly, setData }: DetailProps) => {
const searchTreeRef = useRef<FormInstance>();
// 默认的服务区树
const [allTreeViews, setAllTreeViews] = useState<any>()
// 是否要显示全部
const [isShowAllInTree, setIsShowAllInTree] = useState<boolean>(false)
// 加载服务区树
const { loading: treeLoading, data: treeViews } = useRequest(async () => {
})
// 显示服务区树搜索框
const [showServiceSearchBox, setShowServiceSearchBox] = useState<boolean>(false)
// 实际显示在左侧的服务区树
const [treeView, setTreeView] = useState<any>()
// 树要展开的行
const [treeShowRow, setTreeShowRow] = useState<any>()
// 筛选左侧的服务区树
const handleFilterServiceTree = async (value?: string) => {
const resList: any = JSON.parse(JSON.stringify(allTreeViews))
setSelectedId('')
if (resList && resList.length > 0 && value) {
setTreeView([])
const list: any = []
resList.forEach((item: any) => {
if (item.label.indexOf(value) !== -1) {
list.push(item)
} else {
if (item.children && item.children.length > 0) {
const childrenList: any = []
item.children.forEach((subItem: any) => {
if (subItem.label.indexOf(value) !== -1) {
childrenList.push(subItem)
}
})
item.children = childrenList
if (childrenList && childrenList.length > 0) {
list.push(item)
}
}
}
})
if (list && list.length > 0) {
const keyList: any = ['0-0']
list.forEach((item: any) => {
keyList.push(item.key)
})
setTreeShowRow(keyList)
}
setTimeout(() => {
setTreeView(list)
}, 100)
} else {
setTreeView([])
setTreeShowRow([])
setTreeView(allTreeViews)
}
}
// 根据传入的服务区id筛选剔除掉这个服务区
const handleFilterList = (list: any, id: any) => {
let res: any = []
list.forEach((item: any) => {
if (item.value === id) {
} else {
res.push(item)
}
})
console.log('res', res);
return res
}
// 仅支持单选一个服务区的时候 调用的方法
const convertTreeForSelectOnly = (treeData: any[]): any[] => {
return treeData.map(item => {
const newItem = {
...item,
disabled: item.type !== 1,
};
if (item.children) {
newItem.children = convertTreeForSelectOnly(item.children);
}
return newItem;
});
};
return (
<div>
<ProCard
style={{ width: !collapsible ? width ? `${width}px` : "300px" : "60px" }}
className="pageTable-leftnav"
bodyStyle={{ padding: 0, paddingTop: 20, paddingLeft: 20, width: !collapsible ? width ? `${width}px` : "300px" : "60px" }}
extra={<div className="leftSelectBox">
{/* <img className="searchIcon" src={searchIcon} onClick={() => {
setShowServiceSearchBox(true)
}} /> */}
<MenuFoldOutlined onClick={() => {
setCollapsible(!collapsible);
}} />
<div className="fixedBox" style={{ display: showServiceSearchBox ? 'flex' : 'none', width: width ? `${width}px` : '275px' }}>
<ProForm
formRef={searchTreeRef}
layout={'horizontal'}
submitter={{
render: () => {
return []
}
}}
isKeyPressSubmit
onFinish={(values: any) => {
return handleFilterServiceTree(values?.searchValue || '')
}}
>
<Row>
<Col span={15} className={'noBottom'}>
<ProFormText
name={'searchValue'}
fieldProps={{
placeholder: '请输入服务区名称'
}}
allowClear
/>
</Col>
<Col span={2}></Col>
<Col span={5}>
<Button type={'primary'} onClick={() => {
searchTreeRef.current?.submit()
}}></Button>
</Col>
</Row>
</ProForm>
<img style={{ width: '20px', height: '20px', cursor: 'pointer', marginLeft: '5px' }} src={close} onClick={() => {
setShowServiceSearchBox(false)
}} />
</div>
</div>}
colSpan={!collapsible ? "300px" : "60px"}
title={!collapsible ? "请选择商城分类" : ""}
headerBordered
collapsed={collapsible}
>
{treeView && treeView.length > 0 ? <Tree
checkable
treeData={selectOnly
? (isShowAllInTree
? [{
label: '全部',
value: 0,
key: '0-0',
children: convertTreeForSelectOnly(treeView)
}]
: convertTreeForSelectOnly(treeView))
: (isShowAllInTree
? [{
label: '全部',
value: 0,
key: '0-0',
children: treeView
}]
: treeView)}
blockNode
// defaultExpandAll={isShowAllInTree ? false : true}
// defaultExpandedKeys={isShowAllInTree ? treeShowRow && treeShowRow.length > 0 ? treeShowRow : ['0-0'] : []}
onCheck={(checkedKeys: React.Key[] | any, info) => {
console.log('checkedKeyscheckedKeyscheckedKeys', checkedKeys);
console.log('infoinfoinfoinfoinfoinfo', info);
// 多选逻辑
// const selectedIds = info.checkedNodes.filter((n: any) => n?.USERDEFINEDTYPE_PID !== -1)
const selectedIds = info.checkedNodes.filter((n: any) => n?.USERDEFINEDTYPE_ID)
console.log('selectedIdsselectedIds', selectedIds);
setSelectedId(selectedIds.map((n: any) => n?.USERDEFINEDTYPE_ID)?.toString() || '')
if (reload) {
actionRef?.current?.reload()
}
if (otherFun) {
otherFun(info)
}
}}
fieldNames={{
title: "USERDEFINEDTYPE_NAME",
key: "USERDEFINEDTYPE_ID"
}}
/> : ''}
</ProCard>
</div>
)
}
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser,
}))(OrderCategoryTree);

View File

@ -0,0 +1,29 @@
.pageTable-leftnav{
.leftSelectBox{
position: relative;
.searchIcon{
width: 20px;
height: 20px;
cursor: pointer;
margin-right: 15px;
}
.fixedBox{
position: absolute;
width: 275px;
background: #fff;
right: -10px;
box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
border-radius: 8px;
box-sizing: border-box;
padding: 12px;
z-index: 2;
display: flex;
align-items: center;
.noBottom{
.ant-form-item{
margin-bottom: 0!important;
}
}
}
}
}

View File

@ -1,15 +1,642 @@
// 点餐商品管理
import { ConnectState } from "@/models/connect";
import { connect, CurrentUser } from "umi";
import React, { useRef, useState, Suspense } from 'react';
import moment from 'moment'; // 时间相关引用,没有使用可以删除
import numeral from "numeral"; // 数字相关引用,没有使用可以删除
import { connect } from 'umi';
const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
return (
<div>
import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
import Draggable from 'react-draggable';
import SubMenu from "antd/lib/menu/SubMenu";
import ProTable from '@ant-design/pro-table';
import ProDescriptions from '@ant-design/pro-descriptions';
import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormDateTimeRangePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from '@ant-design/pro-form';
import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { PageContainer } from '@ant-design/pro-layout';
import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd';
</div>
)
import type { CurrentUser } from "umi";
import type { ConnectState } from '@/models/connect';
import type { ActionType, ProColumns } from '@ant-design/pro-table';
import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用,没有使用可以删除
import { handeDeleteCOMMODITY, handeGetCOMMODITYList, handeSynchroCOMMODITY, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox';
import { uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png'
import OrderCategoryTree from './components/OrderCategoryTree';
const beforeUpload = (file: any) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
if (!isJpgOrPng) {
message.error('请上传JPEG、jpg、png格式的图片文件!');
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.error('图片大小不超过 2MB!');
}
return isJpgOrPng && isLt2M;
}
const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
const { currentUser } = props
const { confirm } = Modal;
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const [currentRow, setCurrentRow] = useState<any>();
const [showDetail, setShowDetail] = useState<boolean>();
const [modalVisible, handleModalVisible] = useState<boolean>();
const [confirmLoading, handleConfirmLoading] = useState<boolean>(false) // 弹出框的内容表单是否在提交
const [searchParams, setSearchParams] = useState<any>();
// 分类的树形结构数据
const [typeTreeData, setTypeTreeData] = useState<any>()
// 表单里面的是否预售
const [formPRESALE_TYPE, setFormPRESALE_TYPE] = useState<boolean>(false)
// 弹出框拖动效果
const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置
const [disabled, setDraggleDisabled] = useState<boolean>() // 是否拖动
const draggleRef = React.createRef<any>()
const [collapsible, setCollapsible] = useState<boolean>(false)
// 文件列表
const [fileList, setFileList] = useState<any>([])
const [imagePreviewVisible, setImagePreviewVisible] = useState<boolean>(false) // 预览图片
// 树相关的属性和方法
const [selectedId, setSelectedId] = useState<string>()
const onDraggaleStart = (event, uiData) => {
const { clientWidth, clientHeight } = window.document.documentElement;
const targetRect = draggleRef.current?.getBoundingClientRect();
if (!targetRect) {
return;
}
setBounds({
left: -targetRect.left + uiData.x,
right: clientWidth - (targetRect.right - uiData.x),
top: -targetRect.top + uiData.y,
bottom: clientHeight - (targetRect.bottom - uiData.y),
});
};
// 拖动结束
// 定义列表字段内容
const columns: any = [
// {
// title: '上级类别',
// align: 'center',
// width: 150,
// ellipsis: true,
// dataIndex: 'USERDEFINEDTYPE_PID',
// hideInSearch: true,
// hideInDescriptions: true,
// },
{
dataIndex: 'USERDEFINEDTYPE_NAME',
title: '类别名称',
align: 'center',
width: 300,
ellipsis: true,
hideInSearch: true,
hideInDescriptions: true,
render: (_, record) => {
return <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-start' }}>
<img style={{ width: '30px', height: '30px', marginRight: '5px', borderRadius: '50%' }} src={record?.USERDEFINEDTYPE_ICO || defaultIcon} />
<span style={{ width: '240px', display: "inline-block", whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', textAlign: 'left' }}>{record?.USERDEFINEDTYPE_NAME}</span>
</div>
}
},
{
dataIndex: 'USERDEFINEDTYPE_INDEX',
title: '类别索引',
align: 'center',
width: 120,
ellipsis: true,
hideInSearch: true,
},
{
dataIndex: 'USERDEFINEDTYPE_STATE',
title: '有效状态',
align: 'center',
width: 120,
ellipsis: true,
valueType: "select",
valueEnum: {
"1": "有效",
"0": "无效"
},
initialValue: "1"
},
{
dataIndex: 'SCANCODE_ORDER',
title: '上架状态',
align: 'center',
width: 120,
ellipsis: true,
hideInSearch: true,
valueType: "select",
valueEnum: {
"1": "上架",
"0": "下架"
}
},
{
dataIndex: "PRESALE_TYPE",
title: "是否预售",
align: 'center',
hideInSearch: true,
width: 120,
ellipsis: true,
valueType: "select",
valueEnum: {
"0": "否",
"1": "是"
}
},
{
dataIndex: 'OWNERUNIT_NAME',
title: '业主单位',
align: 'center',
width: 180,
ellipsis: true,
hideInSearch: true,
},
{
dataIndex: 'option',
title: '操作',
width: 100,
ellipsis: true,
valueType: 'option',
align: 'center',
hideInSearch: true,
render: (_, record) => {
return (
<Space>
<a
onClick={() => {
console.log('recordrecordrecord', record);
if (record?.USERDEFINEDTYPE_ICO) {
setFileList([{
name: "",
url: record?.USERDEFINEDTYPE_ICO
}])
}
if (record?.PRESALE_TYPE) {
setFormPRESALE_TYPE(true)
}
setCurrentRow({ ...record });
handleModalVisible(true);
}}
>
</a>
<Popconfirm
title="确认删除该商品自定义类别列表信息吗?"
onConfirm={async () => {
handelDelete(record.USERDEFINEDTYPE_ID);
}}
>
<a></a>
</Popconfirm>
</Space>
);
},
},
];
// 预览上传后的图片
const handlePreview = async () => {
setFileList(fileList)
setImagePreviewVisible(true)
};
const handleChangePreview = (val: any) => {
setImagePreviewVisible(val)
}
const handelDelete = async (commodityid: number) => {
const result = await handeDeleteCOMMODITY({ COMMODITYId: commodityid });
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功!');
actionRef.current?.reload()
}
};
const handleAddUpdate = async (res: any) => {
let req: any = {}
if (currentRow?.USERDEFINEDTYPE_ID) {
req = {
...currentRow,
...res,
OWNERUNIT_ID: currentUser?.OwnerUnitId,
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 3000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
} else {
req = {
...res,
OWNERUNIT_ID: currentUser?.OwnerUnitId,
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 3000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
}
const data = await handeSynchroCOMMODITY(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功!")
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
}
};
return (
<div>
<div style={{ backgroundColor: '#fff', display: 'flex' }}>
<OrderCategoryTree setSelectedId={setSelectedId} setCollapsible={setCollapsible} collapsible={collapsible} />
<div style={{
width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
paddingTop: 0,
paddingBottom: 0,
paddingRight: 0
}}>
<ProTable
style={{ height: 'calc(100vh - 135px)', background: '#fff' }}
scroll={{ y: 'calc(100vh - 410px)' }}
rowKey={(record) => {
return `${record?.USERDEFINEDTYPE_PID}-${record?.USERDEFINEDTYPE_ID}`
}}
formRef={formRef}
headerTitle={<PageTitleBox props={props} />} // 列表表头
actionRef={actionRef}
search={{ span: 6, labelWidth: 'auto' }}
bordered
// 请求数据
request={async (params, sorter) => {
const req = {
searchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: currentUser?.ProvinceCode,
USERDEFINEDTYPE_IDS: selectedId,
UPPER_STATE: params?.UPPER_STATE,
DUTY_PARAGRAPH: params?.DUTY_PARAGRAPH === "-1" ? "" : params?.DUTY_PARAGRAPH,
COMMODITY_TYPE: 3000
},
PageIndex: 1,
PageSize: 999999,
}
const data = await handeGetCOMMODITYList(req);
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
}
return { data: [], success: true }
}}
columns={columns}
toolbar={{
actions: [
// 新增按钮
<Button
key="new"
icon={<PlusOutlined />}
type="primary"
onClick={() => {
handleModalVisible(true);
}}
>
</Button>,
],
}}
/>
</div>
</div>
{/* 图片预览组件 */}
{fileList && fileList.length > 0 && <div style={{ display: 'none' }}>
<Image.PreviewGroup
preview={{
visible: imagePreviewVisible,
onVisibleChange: vis => {
handleChangePreview(vis)
}
}}>
{
fileList.map((n) => <Image src={n.url} key={n.url} />)
}
</Image.PreviewGroup>
</div>}
<Modal
title={
<div
style={{
width: '100%',
cursor: 'move',
}}
onMouseOver={() => {
if (disabled) {
setDraggleDisabled(false)
}
}}
onMouseOut={() => {
setDraggleDisabled(true)
}}
onFocus={() => { }}
onBlur={() => { }}
>
{currentRow ? '更新商品自定义类别' : '新建商品自定义类别'}
</div>
}
destroyOnClose={true}
width={900}
visible={modalVisible}
confirmLoading={confirmLoading}
afterClose={() => {
formRef.current?.resetFields();
setCurrentRow(undefined);
}}
onCancel={() => {
handleConfirmLoading(false)
handleModalVisible(false)
setFormPRESALE_TYPE(false)
setFileList([])
}}
onOk={async () => { // 提交框内的数据
formRef?.current?.validateFields().then(() => {
handleConfirmLoading(true)
formRef?.current?.submit()
})
}}
modalRender={(modal) => {
return <Draggable
disabled={disabled}
bounds={bounds}
onStart={(event, uiData) => onDraggaleStart(event, uiData)}
>
<div ref={draggleRef}>{modal}</div>
</Draggable>
}}
>
<ProForm
layout={'horizontal'}
formRef={formRef}
autoFocusFirstInput
submitter={false}
preserve={false}
initialValues={currentRow ? {
...currentRow,
PRESALE_TIME: currentRow?.PRESALE_TYPE ? [currentRow?.PRESALE_STARTTIME, currentRow?.PRESALE_ENDTIME] : ""
} : {
USERDEFINEDTYPE_STATE: 1,
USERDEFINEDTYPE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
OWNERUNIT_NAME: currentUser?.OwnerUnitName
}}
onFinish={async (values) => {
let newValue = { ...values };
if (currentRow) {
// 编辑数据
newValue = { ...values, USERDEFINEDTYPE_ID: currentRow.USERDEFINEDTYPE_ID };
}
console.log('fileListfileList', fileList);
console.log('newValuenewValuenewValue', newValue);
// 如果有开关,要把开关的代码写进去
await handleAddUpdate(newValue);
handleConfirmLoading(false)
setFormPRESALE_TYPE(false)
}}
>
<Row gutter={8}>
<Col span={12}>
<ProFormTreeSelect
name="USERDEFINEDTYPE_PID"
label="上级类别"
request={async () => {
if (typeTreeData && typeTreeData.length > 0) {
let list: any = [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }, ...typeTreeData]
return list
} else {
const req = {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
PROVINCE_CODE: "",
GOODSTYPE: 4000,
}
const data = await handlGetUSERDEFINEDTYPEList(req);
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
data.List.unshirft({ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 })
setTypeTreeData(data.List)
return data.List
} else {
return [{ USERDEFINEDTYPE_NAME: "默认类别", USERDEFINEDTYPE_ID: -1 }]
}
}
}}
fieldProps={{
fieldNames: {
label: 'USERDEFINEDTYPE_NAME',
value: 'USERDEFINEDTYPE_ID',
children: 'children'
},
showSearch: true,
filterTreeNode: (input, node) =>
(node.USERDEFINEDTYPE_NAME || '').toLowerCase().includes(input.toLowerCase())
}}
rules={[
{
required: true,
message: "请选择上级类别"
}
]}
/>
</Col>
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_NAME"
label="类别名称"
rules={[
{
required: true,
message: "请输入类别名称"
}
]}
/>
</Col>
<Col span={12}>
<ProFormDigit
name="USERDEFINEDTYPE_INDEX"
label="类别索引"
rules={[
{
required: true,
message: "请输入类别索引"
}
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="SCANCODE_ORDER"
label="上架状态"
options={[{ label: "上架", value: 1 }, { label: "下架", value: 0 }]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="USERDEFINEDTYPE_STATE"
label="有效状态"
options={[{ label: "有效", value: 1 }, { label: "无效", value: 0 }]}
rules={[
{
required: true,
message: "请选择有效状态"
}
]}
/>
</Col>
<Col span={12}>
<ProFormSelect
name="PRESALE_TYPE"
label="是否预售"
options={[{ label: "是", value: 1 }, { label: "否", value: 0 }]}
fieldProps={{
onChange: (e: any) => {
setFormPRESALE_TYPE(e)
}
}}
/>
</Col>
{
formPRESALE_TYPE ?
<Col span={12}>
<ProFormDateTimeRangePicker
width={'lg'}
name="PRESALE_TIME"
label="预售时间"
rules={[
{
required: true,
message: "请选择预售时间"
}
]}
/>
</Col>
: ""
}
<Col span={12}>
<ProFormUploadButton
name="USERDEFINEDTYPE_ICO"
label="图标地址"
fileList={fileList || []}
listType="picture-card"
accept="image/*"
fieldProps={{
beforeUpload,
maxCount: 1,
onPreview: handlePreview,
customRequest: async (info) => {
const formData = new FormData();
formData.append('files', info.file);
formData.append('TableType', '1215');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) {
const success = await uploadPicture(formData)
if (success) {
const list = [{
// uid: `${success.ImageId}`, // 注意这个uid一定不能少否则上传失败
name: success.Result_Data.ImageName,
// status: 'done',
url: success.Result_Data.ImageUrl, // url 是展示在页面上的绝对链接
// imgUrl: success.ImagePath // + success.ImageUrl,
}]
setFileList(list)
}
} else {
message.error("您上传的图片不存在.")
}
},
onChange: async (info: any) => {
if (info.file.status === 'removed') {
confirm({
title: '确认删除该图片吗?',
icon: <ExclamationCircleOutlined rev={undefined} />,
async onOk() {
setFileList([])
// const deleteLoading = message.loading('正在删除...')
// try {
// const deleteIndex = fileList?.findIndex((n: any) => n.uid === info.file.uid)
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, '1208')
// if (deleteIndex !== -1) {
// const files = [...fileList]
// files.splice(deleteIndex, 1)
// setFileList(files)
// }
// deleteLoading()
// return true
// } catch (error) {
// deleteLoading()
// return false
// }
}
});
}
}
}}
/>
</Col>
<Col span={12}>
<ProFormText
name="USERDEFINEDTYPE_DATE"
label="添加时间"
disabled
/>
</Col>
<Col span={12}>
<ProFormText
name="OWNERUNIT_NAME"
label="业主单位"
disabled
/>
</Col>
<Col span={24}>
<ProFormTextArea
name="USERDEFINEDTYPE_DESC"
label="备注"
/>
</Col>
</Row>
</ProForm>
</Modal>
</div>
);
};
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
}))(OrderProductManage);

View File

@ -345,6 +345,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 4000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
} else {
@ -354,6 +355,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
OWNERUNIT_NAME: currentUser?.OwnerUnitName,
PROVINCE_CODE: currentUser?.ProvinceCode,
OPERATE_PERSON: currentUser?.ID,
COMMODITY_TYPE: 4000,
OPERATE_TIME: moment().format('YYYY-MM-DD HH:mm:ss'),
}
}
@ -402,7 +404,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
PROVINCE_CODE: currentUser?.ProvinceCode,
USERDEFINEDTYPE_IDS: selectedId,
UPPER_STATE: params?.UPPER_STATE,
DUTY_PARAGRAPH: params?.DUTY_PARAGRAPH === "-1" ? "" : params?.DUTY_PARAGRAPH
DUTY_PARAGRAPH: params?.DUTY_PARAGRAPH === "-1" ? "" : params?.DUTY_PARAGRAPH,
COMMODITY_TYPE: 4000
},
PageIndex: 1,
PageSize: 999999,

View File

@ -0,0 +1,910 @@
import React, { useRef, useState, Suspense, useImperativeHandle, useEffect } from 'react';
import moment from 'moment'; // 时间相关引用,没有使用可以删除
import numeral from "numeral"; // 数字相关引用,没有使用可以删除
import { connect } from 'umi';
import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
import Draggable from 'react-draggable';
import SubMenu from "antd/lib/menu/SubMenu";
import ProTable from '@ant-design/pro-table';
import ProDescriptions from '@ant-design/pro-descriptions';
import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from '@ant-design/pro-form';
import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import { PageContainer } from '@ant-design/pro-layout';
import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect, Divider, Radio } from 'antd';
import type { CurrentUser } from "umi";
import type { ConnectState } from '@/models/connect';
import type { ActionType, ProColumns } from '@ant-design/pro-table';
import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用,没有使用可以删除
import { handleGetServerpartInfo, handleNewGetSERVERPARTDetail } from '@/pages/newDataAnalysis/service';
import session from '@/utils/session';
import { handleGetNOTICEINFOList } from '@/pages/basicManage/highwayHeadlines/service';
type DetailProps = {
currentRow?: any;
onShow?: boolean;
onRef?: any
}
const SERVERPARTTable = ({ currentRow, onShow, onRef }: DetailProps) => {
const actionRef = useRef<ActionType>();
const formRef = useRef<FormInstance>();
const [modalVisible, handleModalVisible] = useState<boolean>();
const [confirmLoading, handleConfirmLoading] = useState<boolean>(false) // 弹出框的内容表单是否在提交
// 服务区类型
const [serverPartType, setServerPartType] = useState<number>(2)
// 表单请求服务区的详情
const [serverPartDetail, setServerPartDetail] = useState<any>()
// 表单请求服务区的详情
const [formDetailAll, setFormDetailAll] = useState<any>()
const LOADBEARINGList = session.get('LOADBEARINGList')
// 拖动结束
// 站点类型(服务区、加油站、单位部门)枚举解析
const { data: serverpartsite_typeTree = [] } = useRequest(async () => {
return await getFieldEnumTree({ FieldExplainField: 'SERVERPARTSITE_TYPE', sessionName: 'SERVERPARTSITE_TYPE' })
})
// 统计类型(1000正式2000测试3000替代)枚举解析
const { data: datastatistics_typeTree = [] } = useRequest(async () => {
return await getFieldEnumTree({ FieldExplainField: 'DATASTATISTICS_TYPE', sessionName: 'DATASTATISTICS_TYPE' })
})
// 服务区类型枚举解析
const { data: serverpart_typeTree = [] } = useRequest(async () => {
return await getFieldEnumTree({ FieldExplainField: 'SERVERPART_TYPE', sessionName: 'SERVERPART_TYPE' })
})
useImperativeHandle(onRef, () => ({
formRef,
serverPartDetail,
formDetailAll
}));
useEffect(() => {
if (onShow) {
}
}, [onShow])
return (
<div>
<ProForm
layout={'horizontal'}
wrapperCol={{ span: 18 }} // 表单项 填写部分所占的栅格数
labelCol={{ span: 6 }} // 表单项 标题所占的栅格数
formRef={formRef}
autoFocusFirstInput
submitter={false}
preserve={false}
request={async () => {
if (currentRow?.SERVERPART_ID) {
const req: any = {
ServerpartId: currentRow?.SERVERPART_ID
}
const data = await handleNewGetSERVERPARTDetail(req)
console.log('detaildsdas', data);
const carryReq: any = {
SearchParameter: {
NOTICEINFO_TYPES: "3020",
SERVERPART_ID: currentRow?.SERVERPART_ID
}
}
const carryData = await handleGetNOTICEINFOList(carryReq)
console.log('carryDatacarryData', carryData);
setServerPartDetail(data)
const regionInfoList: any = data.ServerPartInfo
const serviceA: any = {}
const serviceB: any = {}
if (regionInfoList && regionInfoList.length > 0) {
setServerPartType(regionInfoList.length === 1 ? 1 : 2)
regionInfoList.forEach((item: any, index: number) => {
if (index === 0) {
for (const key in item) {
serviceA[`${key}_A`] = item[key] ? item[key] : item[key] === 0 ? 0 : ''
}
} else {
for (const key in item) {
serviceB[`${key}_B`] = item[key] ? item[key] : item[key] === 0 ? 0 : ''
}
}
})
}
console.log('serviceA', serviceA);
console.log('serviceB', serviceB);
const obj: any = {
...data,
...data.RtServerPart,
...serviceA,
...serviceB,
carryingCapacity: carryData && carryData.length > 0 ? Number(carryData[0].FEEDBACK_CONTENT) : "",
carryingCapacityObj: carryData && carryData.length > 0 ? carryData[0] : ""
}
console.log('dataProForm', obj);
setFormDetailAll(obj)
return obj
}
return {}
}}
onFinish={async (values) => {
}}
>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="SERVERPART_NAME"
label="服务区名称"
/>
</Col>
<Col span={8}>
<Form.Item
name="SERVERPART_TYPE"
label="服务区类型"
>
<TreeSelect
placeholder="请选择服务区类型"
dropdownStyle={{ maxHeight: 300, overflow: 'auto' }}
treeData={serverpart_typeTree}
allowClear
/>
</Form.Item>
</Col>
<Col span={8}>
<ProFormText
name="SERVERPART_CODE"
label="服务区编码"
disabled
/>
</Col>
<Col span={8}>
<ProFormText
name="EXPRESSWAY_NAME"
label="所在高速"
/>
</Col>
<Col span={8}>
<ProFormText
name="CENTERSTAKE_NUM"
label="中心桩号"
/>
</Col>
<Col span={8}>
<ProFormDigit
width="lg"
name="SERVERPART_INDEX"
label="服务区索引"
/>
</Col>
<Col span={8}>
<ProFormSelect
name="carryingCapacity"
label="承载情况"
options={LOADBEARINGList}
/>
</Col>
<Col span={16}>
<ProFormTextArea
name="SERVERPART_DESC"
label="路段说明"
labelCol={{ span: 3 }}
wrapperCol={{ span: 21 }}
/>
</Col>
<Col span={8}>
<ProFormText
name="MANAGERCOMPANY"
label="管理单位"
/>
</Col>
<Col span={8}>
<ProFormText
name="SERVERPART_ADDRESS"
label="市区县镇"
/>
</Col>
<Col span={8}>
<ProFormDatePicker
name="STARTDATE"
label="运营时间"
/>
</Col>
<Col span={8}>
<ProFormText
name="SERVERPART_X"
label="经  度"
/>
</Col>
<Col span={8}>
<ProFormText
name="SERVERPART_Y"
label="纬  度"
/>
</Col>
<Col span={8}>
<ProFormSelect
name="WATERINTAKE_TYPE"
label="取水形式"
fieldProps={{
options: [{ label: '自来水', value: 1 }, { label: '井水', value: 2 }]
}}
/>
</Col>
<Col span={8}>
<ProFormText
name="OWNEDCOMPANY"
label="产权单位"
/>
</Col>
<Col span={8}>
<ProFormText
name="TAXPAYER_IDENTIFYCODE"
label="信用代码"
/>
</Col>
<Col span={8}>
<ProFormSelect
name="SEWAGEDISPOSAL_TYPE"
label="污水处理形式"
fieldProps={{
options: [{ label: '市政', value: 1 }, { label: '污水处理设备', value: 2 }]
}}
/>
</Col>
<Col span={24}>
<ProFormTextArea
name="SERVERPART_INFO"
label="服务区说明"
labelCol={{ span: 2 }}
wrapperCol={{ span: 22 }}
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="FLOORAREA"
label="占地面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="SHAREAREA"
label="停车场面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="SERVERPART_AREA"
label="建筑面积"
/>
</Col>
</Row>
<Row style={{ marginBottom: '8px' }}>
<Col span={1}>
</Col>
<Col span={21}>
<Radio.Group onChange={(e: any) => {
setServerPartType(Number(e.target.value))
}} value={serverPartType}>
<Radio value={1}></Radio>
<Radio value={2}></Radio>
</Radio.Group>
</Col>
</Row>
<Row>
<Col span={1}>
</Col>
<Col span={5}>
<ProFormSelect
label={"当前分区"}
name={"currentArea"}
disabled={serverPartType === 2 && currentRow?.currentArea}
request={async () => {
if (currentRow?.SERVERPART_ID) {
const req: any = {
ServerpartId: currentRow?.SERVERPART_ID
}
const regData = await handleNewGetSERVERPARTDetail(req)
const list: any = regData.ServerPartInfo
console.log('regData', regData);
console.log('formDetailAll', formDetailAll);
if (list && list.length > 0) {
const obj: any = session.get('shopregionObj')
const res: any = []
list.forEach((item: any) => {
if (item.SERVERPART_REGION) {
res.push({ label: obj[item.SERVERPART_REGION], value: item.SERVERPART_REGION })
}
})
console.log('res', res);
formRef.current?.setFieldsValue({ currentArea: res[0].value })
return res
}
}
}}
/>
</Col>
<Col span={17}>
</Col>
</Row>
{/* 下面开始是一个方位区一块的内容 */}
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="FLOORAREA_A"
label="占地面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="PARKINGAREA_A"
label="停车场面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="BUILDINGAREA_A"
label="停车场面积"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="REFUELINGGUN92_A"
label="92#加油枪"
/>
</Col>
<Col span={8}>
<ProFormText
name="REFUELINGGUN95_A"
label="95#加油枪"
/>
</Col>
<Col span={8}>
<ProFormText
name="REFUELINGGUN0_A"
label="0#加油枪"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="STATEGRIDCHARGE_A"
label="国网数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="LIAUTOCHARGE_A"
label="理想5C数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="GACENERGYCHARGE_A"
label="广汽能源数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="OTHERCHARGE_A"
label="其他品牌"
/>
</Col>
<Col span={8}>
<ProFormText
name="LIVESTOCKPACKING_A"
label="充电桩总数"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormSelect
name="HASMOTHER_A"
label="母婴室"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASTHIRDTOILETS_A"
label="第三卫生间"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASWATERROOM_A"
label="开水器数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASPANTRY_A"
label="男厕数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASWIFI_A"
label="女厕数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="TOILETCOUNT_A"
label="潮汐厕位数量"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASCHILD_A"
label="车辆维修"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="VEHICLEWATERFILLING_A"
label="车辆加水"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASPILOTLOUNGE_A"
label="司机之家"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASSHOWERROOM_A"
label="淋浴房数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="MICROWAVEOVEN_A"
label="微波炉数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="WASHERCOUNT_A"
label="洗衣机数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="SLEEPINGPODS_A"
label="睡眠舱数量"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="SMALLPARKING_A"
label="轿车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="PACKING_A"
label="客车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="TRUCKPACKING_A"
label="货车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="DANPACKING_A"
label="危化品车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="LONGPACKING_A"
label="超长车位"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormSelect
name="BUSINESSTYPE_A"
label="餐饮模式"
/>
</Col>
<Col span={8}>
<ProFormText
name="DININGROOMCOUNT_A"
label="餐饮店数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASBACKGROUNDRADIO_A"
label="便利店数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="DININGBXCOUNT_A"
label="商铺数量"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASMESSAGESEARCH_A"
label="具备住宿"
/>
</Col>
<Col span={8}>
<ProFormText
name="POINTCONTROLCOUNT_A"
label="客房数量"
/>
</Col>
</Row>
{
serverPartType === 2 ?
<>
<Divider orientation="left"></Divider>
<Row>
<Col span={1}></Col>
<Col span={5}>
<ProFormSelect
label={"对向分区"}
name={"otherArea"}
disabled={currentRow?.otherArea}
request={async () => {
// let list = session.get('shopregionList')
// return list
if (currentRow?.SERVERPART_ID) {
const req: any = {
ServerpartId: currentRow?.SERVERPART_ID
}
const regData = await handleNewGetSERVERPARTDetail(req)
const list: any = regData.ServerPartInfo
console.log('list', list);
if (list && list.length > 0) {
const obj: any = session.get('shopregionObj')
const res: any = []
list.forEach((item: any) => {
if (item.SERVERPART_REGION) {
res.push({ label: obj[item.SERVERPART_REGION], value: item.SERVERPART_REGION })
}
})
console.log('res', res);
const other: any = formRef.current?.getFieldValue('currentArea')
res.forEach((item: any) => {
if (Number(item.value) !== Number(other)) {
formRef.current?.setFieldsValue({ otherArea: item.value })
}
})
return res
}
}
}}
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="FLOORAREA_B"
label="占地面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="PARKINGAREA_B"
label="停车场面积"
/>
</Col>
<Col span={8}>
<ProFormText
name="BUILDINGAREA_B"
label="停车场面积"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="REFUELINGGUN92_B"
label="92#加油枪"
/>
</Col>
<Col span={8}>
<ProFormText
name="REFUELINGGUN95_B"
label="95#加油枪"
/>
</Col>
<Col span={8}>
<ProFormText
name="REFUELINGGUN0_B"
label="0#加油枪"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="STATEGRIDCHARGE_B"
label="国网数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="LIAUTOCHARGE_B"
label="理想5C数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="GACENERGYCHARGE_B"
label="广汽能源数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="OTHERCHARGE_B"
label="其他品牌"
/>
</Col>
<Col span={8}>
<ProFormText
name="LIVESTOCKPACKING_B"
label="充电桩总数"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormSelect
name="HASMOTHER_B"
label="母婴室"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASTHIRDTOILETS_B"
label="第三卫生间"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASWATERROOM_B"
label="开水器数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASPANTRY_B"
label="男厕数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASWIFI_B"
label="女厕数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="TOILETCOUNT_B"
label="潮汐厕位数量"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASCHILD_B"
label="车辆维修"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="VEHICLEWATERFILLING_B"
label="车辆加水"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASPILOTLOUNGE_B"
label="司机之家"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASSHOWERROOM_B"
label="淋浴房数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="MICROWAVEOVEN_B"
label="微波炉数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="WASHERCOUNT_B"
label="洗衣机数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="SLEEPINGPODS_B"
label="睡眠舱数量"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormText
name="SMALLPARKING_B"
label="轿车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="PACKING_B"
label="客车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="TRUCKPACKING_B"
label="货车车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="DANPACKING_B"
label="危化品车位"
/>
</Col>
<Col span={8}>
<ProFormText
name="LONGPACKING_B"
label="超长车位"
/>
</Col>
</Row>
<Divider orientation="left"></Divider>
<Row>
<Col span={8}>
<ProFormSelect
name="BUSINESSTYPE_B"
label="餐饮模式"
/>
</Col>
<Col span={8}>
<ProFormText
name="DININGROOMCOUNT_B"
label="餐饮店数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="HASBACKGROUNDRADIO_B"
label="便利店数量"
/>
</Col>
<Col span={8}>
<ProFormText
name="DININGBXCOUNT_B"
label="商铺数量"
/>
</Col>
<Col span={8}>
<ProFormSelect
width="lg"
fieldProps={{
options: [{ label: '有', value: 1 }, { label: '无', value: 0 }]
}}
name="HASMESSAGESEARCH_B"
label="具备住宿"
/>
</Col>
<Col span={8}>
<ProFormText
name="POINTCONTROLCOUNT_B"
label="客房数量"
/>
</Col>
</Row>
</> : ''
}
</ProForm>
</div >
);
};
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
}))(SERVERPARTTable);

View File

@ -0,0 +1,299 @@
import { connect } from "umi";
import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
import React, { useRef, useState } from "react";
import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree";
import ServerpartInfo from "./components/serverpartInfo";
import ProCard from "@ant-design/pro-card";
import { MenuFoldOutlined } from "@ant-design/icons";
import { Button, message, Tree } from "antd";
import LoadingBox from "@/pages/reports/Finance/businessAnalysis/components/loading";
import session from "@/utils/session";
import moment from 'moment'
import { handleSynchroSERVERPART } from "@/pages/newDataAnalysis/service";
import useRequest from "@ahooksjs/use-request";
import { getServerpartTree } from "@/services/options";
import { handleSynchroNOTICEINFO } from "@/pages/basicManage/highwayHeadlines/service";
const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
const { currentUser } = props
const [collapsible, setCollapsible] = useState<boolean>(false)
const [treeView, setTreeView] = useState<any>()
// 树相关的属性和方法
const [selectedId, setSelectedId] = useState<string>()
// 显示右边的表单
const [showRightForm, setShowRightForm] = useState<boolean>(true)
const serverPartRef = useRef<any>()
const shopregionObj = session.get('shopregionObj')
const { loading: treeLoading, data: treeViews } = useRequest(async () => {
const data = await getServerpartTree(currentUser?.ProvinceCode, currentUser?.CityAuthority, true, true, true)
let list: any = []
data.forEach((item: any) => {
if (item.value !== 424) {
list.push(item)
}
})
setTreeView(list)
return data
})
// 保存方法
const handleSubmitForm = async () => {
let res: any = serverPartRef.current?.formRef.current?.getFieldsValue()
console.log('res', res);
// 表单查到的详情 更新里面的全部数据
let detailObj: any = serverPartRef.current?.serverPartDetail
console.log('detailObj', detailObj);
let formDetailAll: any = serverPartRef.current?.formDetailAll
console.log('formDetailAll', formDetailAll);
// 把分区的数据取出来
let objA: any = {
SERVERPART_REGION: res?.currentArea,
SERVERPART_REGIONNAME: res?.currentArea ? shopregionObj[res?.currentArea] : '',
}
let objB: any = {
SERVERPART_REGION: res?.otherArea,
SERVERPART_REGIONNAME: res?.otherArea ? shopregionObj[res?.otherArea] : ''
}
for (let key in res) {
if (key.indexOf('_A') > 0) {
let newKey: string = key.split('_A')[0]
objA[newKey] = res[key]
} else if (key.indexOf('_B') > 0) {
let newKey: string = key.split('_B')[0]
objB[newKey] = res[key]
}
}
// 详情里面本身的服务区数组数据
let detailServerPartList: any = detailObj?.ServerPartInfo
if (detailServerPartList && detailServerPartList.length === 2) {
detailServerPartList.forEach((item: any) => {
if (Number(item.SERVERPART_REGION) === Number(objA.SERVERPART_REGION)) {
objA.SERVERPARTINFO_ID = item.SERVERPARTINFO_ID
objA.SERVERPART_ID = selectedId
objA.GREENSPACEAREA = item.GREENSPACEAREA
objA.SCENICAREA = item.SCENICAREA
}
if (Number(item.SERVERPART_REGION) === Number(objB.SERVERPART_REGION)) {
objB.SERVERPARTINFO_ID = item.SERVERPARTINFO_ID
objB.SERVERPART_ID = selectedId
objB.GREENSPACEAREA = item.GREENSPACEAREA
objB.SCENICAREA = item.SCENICAREA
}
})
} else {
if (objB.SERVERPART_REGION) {
objB.SERVERPART_ID = selectedId
}
}
const req: any = {
SERVERPART_ID: detailObj?.SERVERPART_ID,
SERVERPART_NAME: res?.SERVERPART_NAME,
SERVERPART_ADDRESS: res?.SERVERPART_ADDRESS,
SERVERPART_INDEX: res?.SERVERPART_INDEX,
EXPRESSWAY_NAME: res?.EXPRESSWAY_NAME,
SELLERCOUNT: detailObj?.SELLERCOUNT,
SERVERPART_AREA: res?.SERVERPART_AREA,
SERVERPART_X: res?.SERVERPART_X,
SERVERPART_Y: res?.SERVERPART_Y,
SERVERPART_TEL: detailObj?.SERVERPART_TEL,
SERVERPART_INFO: res?.SERVERPART_INFO,
PROVINCE_CODE: detailObj?.PROVINCE_CODE,
SERVERPART_CODE: res?.SERVERPART_CODE,
SERVERPART_TYPE: res?.SERVERPART_TYPE,
STARTDATE: res?.STARTDATE,
OWNEDCOMPANY: res?.OWNEDCOMPANY,
FLOORAREA: res?.FLOORAREA,
BUSINESSAREA: detailObj?.BUSINESSAREA,
SHAREAREA: res?.SHAREAREA,
MANAGERCOMPANY: res?.MANAGERCOMPANY,
SPREGIONTYPE_ID: detailObj?.SPREGIONTYPE_ID,
SPREGIONTYPE_NAME: detailObj?.SPREGIONTYPE_NAME,
SPREGIONTYPE_INDEX: detailObj?.SPREGIONTYPE_INDEX,
STATISTICS_TYPE: detailObj?.STATISTICS_TYPE,
FIELDENUM_ID: detailObj?.FIELDENUM_ID,
CITY_CODE: detailObj?.CITY_CODE,
COUNTY_CODE: detailObj?.COUNTY_CODE,
SERVERPART_IPADDRESS: detailObj?.SERVERPART_IPADDRESS,
DAYINCAR: detailObj?.DAYINCAR,
HKBL: detailObj?.HKBL,
TOTALPARKING: detailObj?.TOTALPARKING,
SHORTNAME: detailObj?.SHORTNAME,
REGIONTYPE_ID: detailObj?.REGIONTYPE_ID,
STATISTIC_TYPE: detailObj?.STATISTIC_TYPE,
PROVINCE_NAME: detailObj?.PROVINCE_NAME,
REGIONTYPE_NAME: detailObj?.REGIONTYPE_NAME,
STAFF_ID: currentUser?.ID,
STAFF_NAME: currentUser?.Name,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
SERVERPART_DESC: detailObj?.SERVERPART_DESC,
OWNERUNIT_ID: detailObj?.OWNERUNIT_ID,
OWNERUNIT_NAME: detailObj?.OWNERUNIT_NAME,
RtServerPart: {
RTSERVERPART_ID: detailObj?.RtServerPart?.RTSERVERPART_ID,
SERVERPART_ID: detailObj?.RtServerPart?.SERVERPART_ID,
SERVERPART_ADDRESS: res?.SERVERPART_ADDRESS,
EXPRESSWAY_NAME: res?.EXPRESSWAY_NAME,
SELLERCOUNT: detailObj?.RtServerPart?.SELLERCOUNT,
SERVERPART_X: res?.SERVERPART_X,
SERVERPART_Y: res?.SERVERPART_Y,
SERVERPART_TEL: detailObj?.RtServerPart?.SERVERPART_TEL,
STARTDATE: res?.STARTDATE,
SERVERPART_AREA: res?.SERVERPART_AREA,
FLOORAREA: res?.FLOORAREA,
BUSINESSAREA: detailObj?.RtServerPart?.BUSINESSAREA,
SHAREAREA: res?.SHAREAREA,
TOTALPARKING: detailObj?.RtServerPart?.TOTALPARKING,
OWNEDCOMPANY: res?.OWNEDCOMPANY,
MANAGERCOMPANY: res?.MANAGERCOMPANY,
STAFF_ID: currentUser?.ID,
STAFF_NAME: currentUser?.Name,
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
SERVERPART_INFO: res?.SERVERPART_INFO,
CENTERSTAKE_NUM: res?.CENTERSTAKE_NUM,
TAXPAYER_IDENTIFYCODE: res?.TAXPAYER_IDENTIFYCODE,
WATERINTAKE_TYPE: res?.WATERINTAKE_TYPE,
SEWAGEDISPOSAL_TYPE: res?.SEWAGEDISPOSAL_TYPE,
BUSINESS_REGION: detailObj?.RtServerPart?.BUSINESS_REGION,
},
ServerPartInfo: objB.SERVERPART_REGION ? [objA, objB] : [objA]
}
console.log('req', req);
const data = await handleSynchroSERVERPART(req)
if (res.carryingCapacity) {
let carryReq: any = {}
if (formDetailAll?.carryingCapacity) {
carryReq = {
...formDetailAll.carryingCapacityObj,
NOTICEINFO_TYPE: "3020",
SERVERPART_ID: selectedId,
FEEDBACK_CONTENT: res.carryingCapacity
}
} else {
carryReq = {
NOTICEINFO_TYPE: "3020",
SERVERPART_ID: selectedId,
FEEDBACK_CONTENT: res.carryingCapacity
}
}
console.log('carryReq', carryReq);
const carryData = await handleSynchroNOTICEINFO(carryReq)
console.log('carryData', carryData);
} else {
if (formDetailAll?.carryingCapacity) {
let carryReq: any = {
...formDetailAll.carryingCapacity,
FEEDBACK_CONTENT: ""
}
console.log('carryReq2', carryReq);
const carryData = await handleSynchroNOTICEINFO(carryReq)
console.log('carryData2', carryData);
}
}
if (data.Result_Code === 100) {
message.success(data.Result_Desc)
setShowRightForm(false)
setTimeout(() => {
setShowRightForm(true)
}, 1000)
} else {
message.error(data.Result_Desc)
}
}
return (
<div >
<div style={{ backgroundColor: '#fff', display: 'flex' }}>
<ProCard
style={{ width: !collapsible ? "300px" : "60px" }}
className="pageTable-leftnav"
bodyStyle={{ padding: 0, paddingTop: 20, paddingLeft: 20, width: !collapsible ? "300px" : "60px" }}
colSpan={!collapsible ? "300px" : "60px"}
title={!collapsible ? "请选择服务区" : ""}
headerBordered
collapsed={collapsible}
extra={
<MenuFoldOutlined onClick={() => {
setCollapsible(!collapsible);
}} rev={undefined} />
}
>
{treeView && treeView.length > 0 ? <Tree
treeData={[{
label: '全部',
value: 0,
key: '0-0',
children: treeView
}]}
fieldNames={{
title: "label",
key: "key"
}}
blockNode
defaultExpandedKeys={['0-0']}
onSelect={(selectedKeys: any, info: any) => {
setShowRightForm(false)
const selectedIds = info.selectedNodes.filter((n: any) => n?.type === 1)
console.log('selectedIds', selectedIds);
setSelectedId(selectedIds.map(n => n?.value)?.toString() || '')
console.log('serverPartRef', serverPartRef.current?.formRef);
if (selectedIds && selectedIds.length > 0) {
setTimeout(() => {
setShowRightForm(true)
}, 1000)
} else {
setTimeout(() => {
setShowRightForm(true)
}, 1)
serverPartRef.current?.formRef.current?.setFieldsValue({})
}
}}
/> : ''}
</ProCard>
<div style={{
width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
height: "calc(100vh - 170px)",
paddingTop: 0,
paddingBottom: 0,
paddingRight: 0,
overflowY: "auto"
}}>
<div style={{ height: 'calc(100% - 60px)', overflowY: 'auto', }}>
{
showRightForm ?
<ServerpartInfo onRef={serverPartRef} currentRow={{ SERVERPART_ID: selectedId ? selectedId : '' }} onShow={showRightForm} /> :
<LoadingBox />
}
</div>
<div style={{ height: '60px', width: '100%', display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
{
selectedId ?
<Button type="primary" onClick={() => {
handleSubmitForm()
}}></Button> : ''
}
</div>
</div>
</div>
</div>
)
}
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
}))(serverpartInfo);

View File

@ -380,3 +380,26 @@ export async function handeGetSALEBILLList(params: any) {
return data.Result_Data
}
// 获取商城评价列表
export async function handeGetMALLCOMMENTList(params: any) {
const data = await requestEncryption(`/Comment/GetMALLCOMMENTList`, {
method: 'POST',
data: { ...params, requestEncryption: true }
})
if (data.Result_Code !== 100) {
return []
}
return data.Result_Data
}
// 删除商品评价列表
export async function handeDeleteMALLCOMMENT(params: any) {
const data = await requestEncryption(`/Comment/DeleteMALLCOMMENT`, {
method: 'POST',
data: { ...params, requestEncryption: true }
})
if (data.Result_Code !== 100) {
return []
}
return data
}