Commit c79b2a9d authored by alwayOnlie's avatar alwayOnlie

‘bug修复

parent 578defc9
......@@ -20,7 +20,7 @@ const { TextArea } = Input;
const pageToBeSubmitExamine = () => {
const ref = useRef<any>({});
const [form] = Form.useForm();
const [isPass, setIsAllMember] = useState()
const [isPass, setIsAllMember] = useState(1)
const [Visible, setIsModalVisible] = useState<boolean>(false)
const [id, setid] = useState("")
//表头
......
......@@ -28,7 +28,7 @@ const QueryList = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -41,7 +41,7 @@ const QueryList = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
multiple: 1,
......@@ -54,13 +54,13 @@ const QueryList = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.totalAmount - b.totalAmount,
multiple: 1,
......@@ -73,7 +73,7 @@ const QueryList = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
render: (text, record) => {
let sourceTypeList = [
"",
......@@ -100,7 +100,7 @@ const QueryList = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -110,7 +110,7 @@ const QueryList = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......
......@@ -30,7 +30,7 @@ const addList = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -43,7 +43,7 @@ const addList = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
multiple: 1,
......@@ -56,12 +56,12 @@ const addList = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.totalAmount - b.totalAmount,
multiple: 1,
......@@ -74,7 +74,7 @@ const addList = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
render: (text, record) => {
let sourceTypeList = [
"",
......@@ -97,7 +97,7 @@ const addList = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -107,7 +107,7 @@ const addList = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
......@@ -120,7 +120,7 @@ const addList = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (text, record) => {
// 内部状态为待提交乙方签订合同,
// 外部状态为待提交乙方签订合同、
......
......@@ -24,7 +24,7 @@ const Auction = () => {
const columns: ColumnType<any>[] = [{
title: '竞价单号',
dataIndex: 'viePriceNO',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -37,22 +37,22 @@ const Auction = () => {
}, {
title: '竞价单摘要',
dataIndex: 'viePriceNO',
align: 'center',
align: 'left',
},
{
title: '发布时间',
dataIndex: 'publishTime',
align: 'center',
align: 'left',
},
{
title: '授标会员',
dataIndex: 'awardName',
align: 'center',
align: 'left',
},
{
title: '授标时间',
dataIndex: 'awardTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.bidWinnerNoticeTime - b.bidWinnerNoticeTime,
multiple: 1,
......@@ -61,7 +61,7 @@ const Auction = () => {
{
title: '授标金额',
dataIndex: 'awardAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.bidWinnerAmount - b.bidWinnerAmount,
multiple: 1,
......@@ -70,7 +70,7 @@ const Auction = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text) => {
return (
<StatusTag type="success" title={text} />
......@@ -80,7 +80,7 @@ const Auction = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text) => {
return (
<div>
......@@ -92,7 +92,7 @@ const Auction = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (_, record) => {
return (
<div>
......
......@@ -31,7 +31,7 @@ const Examine = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -44,7 +44,7 @@ const Examine = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
multiple: 1,
......@@ -57,12 +57,12 @@ const Examine = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.totalAmount - b.totalAmount,
multiple: 1,
......@@ -75,7 +75,7 @@ const Examine = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
render: (text, record) => {
let sourceTypeList = [
"",
......@@ -99,7 +99,7 @@ const Examine = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -109,7 +109,7 @@ const Examine = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......@@ -121,7 +121,7 @@ const Examine = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......
......@@ -32,7 +32,7 @@ const Levelexamine = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -45,7 +45,7 @@ const Levelexamine = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.startTime) - getdate(b.startTime),
multiple: 2,
......@@ -58,12 +58,12 @@ const Levelexamine = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.totalAmount - b.totalAmount,
multiple: 1,
......@@ -76,7 +76,7 @@ const Levelexamine = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
render: (text, record) => {
let sourceTypeList = [
"",
......@@ -99,7 +99,7 @@ const Levelexamine = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -109,7 +109,7 @@ const Levelexamine = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text, record) => {
return (
......@@ -122,7 +122,7 @@ const Levelexamine = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......
......@@ -22,7 +22,7 @@ const PurchaseList = () => {
const columns: ColumnType<any>[] = [{
title: '需求单号/摘要',
dataIndex: 'demandNO',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -36,7 +36,7 @@ const PurchaseList = () => {
}, {
title: '需求发布时间',
dataIndex: 'demandPublishTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.demandPublishTime) - getdate(b.demandPublishTime),
multiple: 1,
......@@ -44,12 +44,12 @@ const PurchaseList = () => {
}, {
title: '授标会员',
dataIndex: 'awardName',
align: 'center',
align: 'left',
},
{
title: '授标时间',
dataIndex: 'awardTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => getdate(a.awardTime) - getdate(b.awardTime),
multiple: 1,
......@@ -58,7 +58,7 @@ const PurchaseList = () => {
{
title: '授标金额',
dataIndex: 'awardAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.awardAmount - b.awardAmount,
multiple: 1,
......@@ -74,7 +74,7 @@ const PurchaseList = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
align: 'left',
render: (text) => {
......@@ -86,7 +86,7 @@ const PurchaseList = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
render: (text) => {
return (
<div>
......@@ -98,7 +98,7 @@ const PurchaseList = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (_, record) => {
return (
<div>
......
......@@ -348,7 +348,7 @@ export const QueryListSchema: ISchema = {
innerStatus: {
type: 'string',
"x-component-props": {
placeholder: '请选择部状态'
placeholder: '请选择部状态'
},
enum: [
{ label: '所有状态', value: 0 },
......
......@@ -27,7 +27,7 @@ const Secondaryexamine = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -40,7 +40,7 @@ const Secondaryexamine = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
multiple: 1,
......@@ -53,12 +53,12 @@ const Secondaryexamine = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
multiple: 1,
......@@ -71,7 +71,7 @@ const Secondaryexamine = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
align: 'left',
filters: [
{ text: '采购询价', value: 1 },
{ text: '采购招标', value: 2 },
......@@ -99,11 +99,8 @@ const Secondaryexamine = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
filters: [
{ text: 'Joe', value: 'Joe' },
{ text: 'Jim', value: 'Jim' },
],
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -113,11 +110,8 @@ const Secondaryexamine = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
filters: [
{ text: 'Joe', value: 'Joe' },
{ text: 'Jim', value: 'Jim' },
],
align: 'left',
render: (text, record) => {
return (
......@@ -130,7 +124,7 @@ const Secondaryexamine = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......
......@@ -28,7 +28,7 @@ const Signacontract = () => {
const columns: ColumnType<any>[] = [{
title: '合同编号/摘要',
dataIndex: 'contractNo',
align: 'center',
align: 'left',
render: (text, record) =>
<div>
<EyePreview
......@@ -41,7 +41,7 @@ const Signacontract = () => {
}, {
title: '合同生效/失效时间',
dataIndex: 'startTime',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
multiple: 1,
......@@ -54,12 +54,12 @@ const Signacontract = () => {
}, {
title: '合同乙方',
dataIndex: 'partyBName',
align: 'center',
align: 'left',
},
{
title: '合同总金额',
dataIndex: 'totalAmount',
align: 'center',
align: 'left',
sorter: {
compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
multiple: 1,
......@@ -72,12 +72,8 @@ const Signacontract = () => {
{
title: '对应单据/寻源类型',
dataIndex: 'sourceNo',
align: 'center',
filters: [
{ text: '采购询价', value: 1 },
{ text: '采购招标', value: 2 },
{ text: '采购竞价', value: 3 },
],
align: 'left',
render: (text, record) => {
let sourceTypeList = [
"",
......@@ -100,11 +96,8 @@ const Signacontract = () => {
{
title: '外部状态',
dataIndex: 'outerStatus',
align: 'center',
filters: [
{ text: 'Joe', value: 'Joe' },
{ text: 'Jim', value: 'Jim' },
],
align: 'left',
render: (text, record) => {
return (
<StatusTag type="warning" title={record.outerStatusName} />
......@@ -114,7 +107,7 @@ const Signacontract = () => {
{
title: '内部状态',
dataIndex: 'innerStatus',
align: 'center',
align: 'left',
// filters: [
// { text: 'Joe', value: 'Joe' },
// { text: 'Jim', value: 'Jim' },
......@@ -131,7 +124,7 @@ const Signacontract = () => {
}, {
title: '操作',
dataIndex: 'state',
align: 'center',
align: 'left',
render: (text, record) => {
return (
<div>
......
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