Commit c1d38475 authored by Bill's avatar Bill

Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

parents 5b67679d 923e955a
...@@ -25,6 +25,7 @@ const Details = (props: any) => { ...@@ -25,6 +25,7 @@ const Details = (props: any) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [Visible, setIsModalVisible] = useState<boolean>(false) const [Visible, setIsModalVisible] = useState<boolean>(false)
const [isPass, setIsAllMember] = useState(1) const [isPass, setIsAllMember] = useState(1)
const [contractNo, setcontractNo] = useState();
/* 合同id */ /* 合同id */
const { location: { query: { contractId, type } } } = props; const { location: { query: { contractId, type } } } = props;
console.log(type, 'type') console.log(type, 'type')
...@@ -90,6 +91,7 @@ const Details = (props: any) => { ...@@ -90,6 +91,7 @@ const Details = (props: any) => {
setinnerTaskStepList(innerTaskStepList) setinnerTaskStepList(innerTaskStepList)
setpayPlanList(payPlanList) setpayPlanList(payPlanList)
setcontractText(contractText) setcontractText(contractText)
setcontractNo(basics.contractNo)
setcontractAbstract(contractAbstract) setcontractAbstract(contractAbstract)
} }
}) })
...@@ -273,7 +275,7 @@ const Details = (props: any) => { ...@@ -273,7 +275,7 @@ const Details = (props: any) => {
marginLeft: '8px', marginLeft: '8px',
}} }}
> >
{contractAbstract} {contractAbstract} | {contractNo}
</span> </span>
</div> </div>
......
// import React, { useEffect, useState, useRef } from 'react';
// import { Anchor, Radio, Steps, Row, Table, Space, Typography, Button } from 'antd';
// import { ArrowLeftOutlined } from '@ant-design/icons';
// import { PublicApi } from '@/services/api';
// import { history } from 'umi'
// import Basic from '../../components/detailCard/basic'
// import style from './index.less';
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import { Anchor, Radio, Steps, Row, Form, Input, Table, message, Space, Typography, Button, Modal } from 'antd'; import { StandardTable } from 'god';
import { Anchor, Radio, Steps, Row, Table, Space, Typography, Button } from 'antd';
import style from './index.less'; import style from './index.less';
import { ArrowLeftOutlined } from '@ant-design/icons'; import { ArrowLeftOutlined } from '@ant-design/icons';
import { StandardTable } from 'god'; import { history } from 'umi';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { history } from 'umi'
import Basic from '../../components/detailCard/basic'
import ExamineFrom from '../../components/examine' import ExamineFrom from '../../components/examine'
import Basic from '../../components/detailCard/basic'
import { import {
FileWordFilled FileWordFilled
} from '@ant-design/icons' } from '@ant-design/icons'
const { TextArea } = Input;
const { Link } = Anchor; const { Link } = Anchor;
const { Step } = Steps; const { Step } = Steps;
...@@ -22,11 +33,8 @@ const activeAnchorClassName = 'ant-anchor-link-active' ...@@ -22,11 +33,8 @@ const activeAnchorClassName = 'ant-anchor-link-active'
const Details = (props: any) => { const Details = (props: any) => {
/* 合同id */ /* 合同id */
const { location: { query: { contractId, type } } } = props; const { location: { query: { contractId, type } } } = props;
console.log(type);
const ref = useRef({}); const ref = useRef({});
const [currLink, setCurrLink] = useState(activeAnchorClassName) const [currLink, setCurrLink] = useState(activeAnchorClassName)
const [form] = Form.useForm();
const [isPass, setIsAllMember] = useState()
/** /**
* 渲染信息 * 渲染信息
* @param basics 基础信息 * @param basics 基础信息
...@@ -266,7 +274,6 @@ const Details = (props: any) => { ...@@ -266,7 +274,6 @@ const Details = (props: any) => {
} }
/* 提交表单 */ /* 提交表单 */
const submitExamine = async () => { const submitExamine = async () => {
if (type === 'Signacontract' && contractText.isUseElectronicContract == 1) { if (type === 'Signacontract' && contractText.isUseElectronicContract == 1) {
let res = await PublicApi.getContractSignatureGetHandSignatureUrl({ signatureLogId: 98 }); let res = await PublicApi.getContractSignatureGetHandSignatureUrl({ signatureLogId: 98 });
if (res.code == 1000) { if (res.code == 1000) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import React, { useRef, useState } from 'react' import React, { useRef, useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { Card, Space, Button, Input, Form } from 'antd'; import { Card } from 'antd';
import statuStyle from '../../common/colorTag' import statuStyle from '../../common/colorTag'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from 'god'; import { StandardTable } from 'god';
...@@ -20,9 +20,7 @@ import moment from 'moment'; ...@@ -20,9 +20,7 @@ import moment from 'moment';
const Examine = () => { const Examine = () => {
const ref = useRef<any>({}); const ref = useRef<any>({});
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
const [Visible, setIsModalVisible] = useState<boolean>(false) const [Visible, setIsModalVisible] = useState<boolean>(false)
const [form] = Form.useForm();
const [id, setid] = useState("") const [id, setid] = useState("")
const getdate = (time) => { const getdate = (time) => {
return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000; return new Date(Date.parse(time.replace(/-/g, "/"))).getTime() / 1000;
...@@ -135,7 +133,6 @@ const Examine = () => { ...@@ -135,7 +133,6 @@ const Examine = () => {
setIsModalVisible(!Visible) setIsModalVisible(!Visible)
} }
// 列表数据 // 列表数据
const fetchData = (params?: any) => { const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数 console.log(params)//可以直接打印参数
...@@ -154,7 +151,6 @@ const Examine = () => { ...@@ -154,7 +151,6 @@ const Examine = () => {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => { onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectedRowKeys(selectedRowKeys) setSelectedRowKeys(selectedRowKeys)
setSelectRow(selectedRows)
} }
}; };
...@@ -199,15 +195,6 @@ const Examine = () => { ...@@ -199,15 +195,6 @@ const Examine = () => {
span: 24 span: 24
} }
}} }}
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
// </Space>,
// layouts: {
// span: 8
// }
// }}
/> />
<ExamineFrom <ExamineFrom
ExamineFlag={Visible} ExamineFlag={Visible}
......
import React, { useRef, useState } from 'react' import React, { useRef, useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { Card, Space, Button } from 'antd'; import { Card } from 'antd';
import statuStyle from '../../common/colorTag' import statuStyle from '../../common/colorTag'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from 'god'; import { StandardTable } from 'god';
...@@ -26,8 +26,6 @@ const Levelexamine = () => { ...@@ -26,8 +26,6 @@ const Levelexamine = () => {
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [Visible, setIsModalVisible] = useState<boolean>(false) const [Visible, setIsModalVisible] = useState<boolean>(false)
const [id, setid] = useState("") const [id, setid] = useState("")
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
//表头 //表头
const columns: ColumnType<any>[] = [{ const columns: ColumnType<any>[] = [{
title: '合同编号/摘要', title: '合同编号/摘要',
...@@ -153,7 +151,6 @@ const Levelexamine = () => { ...@@ -153,7 +151,6 @@ const Levelexamine = () => {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => { onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectedRowKeys(selectedRowKeys) setSelectedRowKeys(selectedRowKeys)
setSelectRow(selectedRows)
} }
}; };
/* 提交审核的回调 */ /* 提交审核的回调 */
...@@ -197,15 +194,6 @@ const Levelexamine = () => { ...@@ -197,15 +194,6 @@ const Levelexamine = () => {
span: 24 span: 24
} }
}} }}
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
// </Space>,
// layouts: {
// span: 8
// }
// }}
/> />
</Card> </Card>
<ExamineFrom <ExamineFrom
......
import React, { useRef, useState } from 'react' import React, { useRef, useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { Card, Space, Button } from 'antd'; import { Card } from 'antd';
import statuStyle from '../../common/colorTag' import statuStyle from '../../common/colorTag'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from 'god'; import { StandardTable } from 'god';
...@@ -21,7 +21,6 @@ const Secondaryexamine = () => { ...@@ -21,7 +21,6 @@ const Secondaryexamine = () => {
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [Visible, setIsModalVisible] = useState<boolean>(false) const [Visible, setIsModalVisible] = useState<boolean>(false)
const [id, setid] = useState("") const [id, setid] = useState("")
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
//表头 //表头
const columns: ColumnType<any>[] = [{ const columns: ColumnType<any>[] = [{
title: '合同编号/摘要', title: '合同编号/摘要',
...@@ -148,7 +147,6 @@ const Secondaryexamine = () => { ...@@ -148,7 +147,6 @@ const Secondaryexamine = () => {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => { onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectedRowKeys(selectedRowKeys) setSelectedRowKeys(selectedRowKeys)
setSelectRow(selectedRows)
} }
}; };
/* 提交审核的回调 */ /* 提交审核的回调 */
...@@ -192,14 +190,6 @@ const Secondaryexamine = () => { ...@@ -192,14 +190,6 @@ const Secondaryexamine = () => {
span: 24 span: 24
} }
}} }}
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
// </Space>,
// layouts: {
// span: 8
// }
// }}
/> />
</Card> </Card>
<ExamineFrom <ExamineFrom
...@@ -208,7 +198,7 @@ const Secondaryexamine = () => { ...@@ -208,7 +198,7 @@ const Secondaryexamine = () => {
applyId={id} applyId={id}
type="PageToBeExamineStepTwo" type="PageToBeExamineStepTwo"
/> />
</PageHeaderWrapper > </PageHeaderWrapper>
) )
} }
......
import React, { useRef, useState } from 'react' import React, { useRef, useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { Card, Space, Button, Input, Form } from 'antd'; import { Card } from 'antd';
import statuStyle from '../../common/colorTag' import statuStyle from '../../common/colorTag'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from 'god'; import { StandardTable } from 'god';
...@@ -14,17 +14,11 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -14,17 +14,11 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import ExamineFrom from '../../components/examine'
import moment from 'moment'; import moment from 'moment';
import '../../constants/index.less'
const Signacontract = () => { const Signacontract = () => {
const ref = useRef<any>({}); const ref = useRef<any>({});
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([]) const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [selectRow, setSelectRow] = useState<any[]>([]) // 模态框选择的行数据
const [Visible, setIsModalVisible] = useState<boolean>(false)
const [id, setid] = useState("")
//表头 //表头
const columns: ColumnType<any>[] = [{ const columns: ColumnType<any>[] = [{
title: '合同编号/摘要', title: '合同编号/摘要',
...@@ -74,9 +68,7 @@ const Signacontract = () => { ...@@ -74,9 +68,7 @@ const Signacontract = () => {
title: '对应单据/寻源类型', title: '对应单据/寻源类型',
dataIndex: 'sourceNo', dataIndex: 'sourceNo',
align: 'left', align: 'left',
render: (text, record) => { render: (text, record) => {
return ( return (
<div> <div>
{ {
...@@ -98,7 +90,6 @@ const Signacontract = () => { ...@@ -98,7 +90,6 @@ const Signacontract = () => {
title: '外部状态', title: '外部状态',
dataIndex: 'outerStatus', dataIndex: 'outerStatus',
align: 'left', align: 'left',
render: (text, record) => { render: (text, record) => {
return ( return (
<StatusTag type="warning" title={record.outerStatusName} /> <StatusTag type="warning" title={record.outerStatusName} />
...@@ -110,7 +101,6 @@ const Signacontract = () => { ...@@ -110,7 +101,6 @@ const Signacontract = () => {
dataIndex: 'innerStatus', dataIndex: 'innerStatus',
align: 'left', align: 'left',
render: (text, record) => { render: (text, record) => {
return ( return (
<div> <div>
<span style={statuStyle.point}> </span> <span style={statuStyle.point}> </span>
...@@ -118,7 +108,8 @@ const Signacontract = () => { ...@@ -118,7 +108,8 @@ const Signacontract = () => {
</div> </div>
) )
} }
}, { },
{
title: '操作', title: '操作',
dataIndex: 'state', dataIndex: 'state',
align: 'left', align: 'left',
...@@ -144,21 +135,13 @@ const Signacontract = () => { ...@@ -144,21 +135,13 @@ const Signacontract = () => {
}) })
}) })
} }
// 多选操作
const rowSelection: any = { const rowSelection: any = {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => { onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectedRowKeys(selectedRowKeys) setSelectedRowKeys(selectedRowKeys)
setSelectRow(selectedRows)
} }
}; };
/* 提交审核的回调 */
const getfetchData = (data) => {
console.log(data)
setIsModalVisible(data.ExamineFlag)
if (data.code === 1000) {
ref.current.reload()
}
}
return ( return (
<PageHeaderWrapper> <PageHeaderWrapper>
<Card> <Card>
...@@ -194,15 +177,6 @@ const Signacontract = () => { ...@@ -194,15 +177,6 @@ const Signacontract = () => {
}} }}
/> />
</Card> </Card>
<ExamineFrom
ExamineFlag={Visible}
getfetchData={getfetchData}
applyId={id}
type="Signacontract"
agreeText="同意签订"
disagree="不同意签订"
/>
</PageHeaderWrapper> </PageHeaderWrapper>
) )
} }
......
...@@ -218,8 +218,8 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => { ...@@ -218,8 +218,8 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
const firstCategory: any = await fetchFirstCategory() const firstCategory: any = await fetchFirstCategory()
for (const item of firstCategory) { for (const item of firstCategory) {
if(item.id) { if(item.categoryId) {
const categoryDetail: any = await fetchCategoryById(item.id) const categoryDetail: any = await fetchCategoryById(item.categoryId)
let floorLineConfigItem = {} let floorLineConfigItem = {}
floorLineKeys.push(String(initIndex + 1)) floorLineKeys.push(String(initIndex + 1))
...@@ -228,7 +228,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => { ...@@ -228,7 +228,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
[String(initIndex + 1)]: { [String(initIndex + 1)]: {
"componentName": "ShopFloorLine", "componentName": "ShopFloorLine",
"props": { "props": {
title: item.name title: item.categoryName
}, },
"childNodes": [String(initIndex + 2), String(initIndex + 3)] "childNodes": [String(initIndex + 2), String(initIndex + 3)]
} }
......
...@@ -166,8 +166,8 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => { ...@@ -166,8 +166,8 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const firstCategory: any = await fetchFirstCategory() const firstCategory: any = await fetchFirstCategory()
for (const item of firstCategory) { for (const item of firstCategory) {
if (item.id ){ if (item.categoryId ){
const categoryDetail: any = await fetchCategoryById(item.id) const categoryDetail: any = await fetchCategoryById(item.categoryId)
let floorLineConfigItem = {} let floorLineConfigItem = {}
floorLineKeys.push(String(initIndex + 1)) floorLineKeys.push(String(initIndex + 1))
...@@ -176,7 +176,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => { ...@@ -176,7 +176,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
[String(initIndex + 1)]: { [String(initIndex + 1)]: {
"componentName": "ShopFloorLine", "componentName": "ShopFloorLine",
"props": { "props": {
title: item.name title: item.categoryName
}, },
"childNodes": [String(initIndex + 2), String(initIndex + 3)] "childNodes": [String(initIndex + 2), String(initIndex + 3)]
} }
......
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