Skip to content

J
jinfa-platform
Commit 191f7335 authored by alwayOnlie's avatar alwayOnlie
Browse files
Options

修改常量 签署合同

parent 14f482fb
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 124 deletions
src/pages/contract/components/detailCard/basic/index.tsx
View file @ 191f7335
......@@ -32,14 +32,11 @@ const Basic: React.FC<Iprops> = ({
<div className={style.list} key={`col1_${index + 1}`}>
<h5 className={style.listLable}>{item.label}</h5>
{
item.url
?
<h5 className={style.gesture} onClick={() => history.push(item.url)}>{item.extra}</h5>
: item.label === '外部状态：' ?
<StatusTag type="success" title={item.extra} />
:
<h5 className={style.listContent}>{item.extra}</h5>
item.url ? <h5 className={style.gesture} onClick={() => history.push(item.url)}>{item.extra}</h5>
:
item.type == 'StatusTag' ? <StatusTag type="success" title={item.extra} /> : <h5 className={style.listContent}>{item.extra}</h5>
}
</div>
))}
</Col>
......
src/pages/contract/constants/index.tsx
View file @ 191f7335
import React from 'react'
import {history} from 'umi'
import { history } from 'umi'
import { formatTimeString } from '@/utils'
import EyePreview from '@/components/EyePreview'
import { PlayCircleOutlined, PoweroffOutlined } from '@ant-design/icons'
......@@ -130,7 +130,7 @@ export const baseTenderListColumns: any[] = [
key: 'memberId',
render: (text, record) => <>
<EyePreview url={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${record.inviteTender.id}`}>
{record.inviteTender.code}
{record.inviteTender.code}
</EyePreview>
<div>{record.inviteTender.memberName}</div>
</>
......@@ -141,7 +141,7 @@ export const baseTenderListColumns: any[] = [
dataIndex: 'inviteTender',
key: 'inviteTender',
render: (text, record) => <>
<div><PlayCircleOutlined />&nbsp;{formatTimeString(record.inviteTender.inviteTenderStartTime)}</div>
<div><PlayCircleOutlined />&nbsp;{formatTimeString(record.inviteTender.inviteTenderStartTime)}</div>
<div><PoweroffOutlined />&nbsp;{formatTimeString(record.inviteTender.inviteTenderEndTime)}</div>
</>,
width: 200
......
src/pages/contract/contractexecution/schema/index.ts
View file @ 191f7335
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
/**
* 除了订单必填字段, 默认
*/
......
src/pages/contract/coordination/details/index.tsx
View file @ 191f7335
......@@ -52,10 +52,10 @@ const Details = (props: any) => {
const [outerTaskStepList, setouterTaskStepList] = useState<any>([])
const [innerTaskStepList, setinnerTaskStepList] = useState<any>([])
const [ListData, setListData] = useState<any>([])
const [payPlanList, setpayPlanList] = useState<any>([])
const [contractText, setcontractText] = useState<any>([])
const [signatureLogId, setsignatureLogId] = useState<any>('') // 签署地址id
const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
const [contractAbstract, setcontractAbstract] = useState('');
......@@ -67,11 +67,12 @@ const Details = (props: any) => {
if (res.code === 1000) {
let { basics, outerTaskStepList, innerTaskStepList, payPlanList, contractText } = res.data
let contractAbstract = res.data.basics.contractAbstract;
setsignatureLogId(basics.signatureLogId)
const basicInfo = {
col1: [
{ label: '合同编号', extra: basics.contractNo ? basics.contractNo : '' },
{ label: '合同编号', extra: basics.contractNo ? basics.contractNo : '', url: `/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${contractId}` },
{ label: '合同摘要', extra: basics.contractAbstract ? basics.contractAbstract : '' },
{ label: '外部状态', extra: basics.outerStatusName ? basics.outerStatusName : '' },
{ label: '外部状态', extra: basics.outerStatusName ? basics.outerStatusName : '', type: 'StatusTag' },
{ label: '内部状态', extra: basics.innerStatusName ? basics.innerStatusName : '' },
],
col2: [
......@@ -155,7 +156,7 @@ const Details = (props: any) => {
},
}
/* 提交表单 */
const submitExamine = () => {
const submitExamine = async () => {
let flag = false;
ListData.every((item => {
if (item.associatedDataId && item.associatedMaterielNo) {
......@@ -165,7 +166,16 @@ const Details = (props: any) => {
if (!flag) {
message.info('请先关联报价商品');
} else {
setIsModalVisible(!Visible)
if (type === 'Sign' && contractText.isUseElectronicContract == 1) {
console.log(signatureLogId)
let res = await PublicApi.getContractSignatureGetHandSignatureUrl({ signatureLogId: 98 });
if (res.code == 1000) {
console.log(res);
window.open(res.data.url)
}
} else {
setIsModalVisible(!Visible)
}
}
}
......
src/pages/contract/funds/bill/index.tsx
View file @ 191f7335
......@@ -109,7 +109,6 @@ const Bill: React.FC<{}> = () => {
// 0.全部,1.待提交审核,2.待审核(一级),3.审核不通过(一级),4.待审核(二级),5.审核不通过(二级),6.待提交财务付款,7.待付款,8.已付款,9.已作废
record.status != 7 || record.status != 8 || record.status != 1 || record.status != 9 && <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => invalid(record.id)}>作废</span>
}
{/* <span style={{ color: '#00B37A', marginRight: 20, cursor: 'pointer', }} onClick={() => history.push(`}>查看</span> */}
</>
)
}
......
src/pages/contract/funds/details/components/materials.tsx
View file @ 191f7335
......@@ -10,7 +10,6 @@ import Submit from '@/components/NiceForm/components/Submit'
const Materials = (props: any) => {
const { applyId, type } = props;
console.log(type, 'type是什么玩意 ')
const ref = useRef({});
/***
* @function fetchData 请求表格数据
......@@ -122,7 +121,6 @@ const Materials = (props: any) => {
formilyProps={{
ctx: {
inline: false,
effects: ($, actions) => {
useStateFilterSearchLinkageEffect(
$,
......
src/pages/contract/funds/details/index.tsx
View file @ 191f7335
......@@ -56,37 +56,31 @@ const BillDetails = (props: any) => {
PublicApi.getContractApplyAmountGetDetail({ applyId }).then(res => {
if (res.code === 1000) {
let { basics, taskStepList } = res.data
let payWay = [
"",
"现结",
"账期",
"月结",
]
const basicInfo = {
col1: [
{ label: '请款单号', extra: basics.applyNo ? basics.applyNo : '' },
{ label: '请款摘要', extra: basics.applyAbstract ? basics.applyAbstract : '' },
{ label: '内部状态', extra: basics.statusName ? basics.statusName : '' },
{ label: '发票编号', extra: basics.innerStatusName ? basics.innerStatusName : '' },
{ label: '开票日期', extra: basics.orderTime ? basics.orderTime : '' },
{ label: '单据时间', extra: basics.orderTime ? basics.orderTime : '' },
{ label: '请款单号:', extra: basics.applyNo ? basics.applyNo : '' },
{ label: '请款摘要:', extra: basics.applyAbstract ? basics.applyAbstract : '' },
{ label: '内部状态:', extra: basics.statusName ? basics.statusName : '' },
{ label: '发票编号:', extra: basics.innerStatusName ? basics.innerStatusName : '' },
{ label: '开票日期:', extra: basics.orderTime ? basics.orderTime : '' },
{ label: '单据时间:', extra: basics.orderTime ? basics.orderTime : '' },
],
col2: [
{ label: '合同编号', extra: basics.contractNo ? basics.contractNo : '' },
{ label: '收款方', extra: basics.payeeMemberName ? basics.payeeMemberName : '' },
{ label: '收款账户', extra: basics.payeeName ? basics.payeeName : '' },
{ label: '银行账号', extra: basics.bankAccount ? basics.bankAccount : '' },
{ label: '开户行', extra: basics.bankDeposit ? basics.bankDeposit : '' },
{ label: '请款备注', extra: basics.remark ? basics.remark : '' },
{ label: '合同编号:', extra: basics.contractNo ? basics.contractNo : '', url: `/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${basics.contractId}` },
{ label: '收款方:', extra: basics.payeeMemberName ? basics.payeeMemberName : '' },
{ label: '收款账户:', extra: basics.payeeName ? basics.payeeName : '' },
{ label: '银行账号:', extra: basics.bankAccount ? basics.bankAccount : '' },
{ label: '开户行:', extra: basics.bankDeposit ? basics.bankDeposit : '' },
{ label: '请款备注:', extra: basics.remark ? basics.remark : '' },
],
col3: [
{ label: '合同付款阶段', extra: basics.payStage ? basics.payStage : '' },
{ label: '合同付款比例', extra: basics.payRatio ? `${basics.payRatio}%` : '' },
{ label: '请款金额', extra: basics.applyAmount ? `￥${basics.applyAmount}` : '' },
{ label: '预计付款时间', extra: basics.expectPayTime ? basics.expectPayTime : '' },
{ label: '付款方式', extra: basics.payWayName },
{ label: '支付方式', extra: basics.moneyPayWay == 2 ? '线下支付' : '' },
{ label: '合同付款阶段:', extra: basics.payStage ? basics.payStage : '' },
{ label: '合同付款比例:', extra: basics.payRatio ? `${basics.payRatio}%` : '' },
{ label: '请款金额:', extra: basics.applyAmount ? `￥${basics.applyAmount}` : '' },
{ label: '预计付款时间:', extra: basics.expectPayTime ? basics.expectPayTime : '' },
{ label: '付款方式:', extra: basics.payWayName },
{ label: '支付方式:', extra: basics.moneyPayWay == 2 ? '线下支付' : '' },
],
}
......
src/pages/contract/manage/add/components/FormList.tsx
View file @ 191f7335
......@@ -71,7 +71,9 @@ const FormList = (props: any) => {
parmas.memberId = Row.partyBMemberId;
parmas.memberRoleId = Row.partyBRoleId;
fn = PublicApi.getPurchaseQuotedPriceProductlistListContract
console.log(sourceType)
}
if (sourceType == '2') {
parmas.submitTenderId = Row.bidId;
fn = PublicApi.getPurchaseSubmitTenderMaterielGetSubmitTenderMaterielList
......
src/pages/contract/manage/add/components/contractText.tsx
View file @ 191f7335
......@@ -55,7 +55,7 @@ const ContractText = (props: any) => {
templateId: Templatel.id,
isUseElectronicContract: checkNick ? 1 : 0,
contractName: Templatel.name,
contractUrl: Templatel.fileExampleUrl,
contractUrl: Templatel.fileUrl,
contractFlag: contractFlag,
}
resolve(contractText)
......@@ -74,7 +74,6 @@ const ContractText = (props: any) => {
contractTemplateId: Templatel.id,
memberId,
}
// console.log(Templatel)
PublicApi.postContractSignatureContractCreate(param).then(res => {
console.log(res);
if (res.code == 1000) {
......@@ -88,7 +87,8 @@ const ContractText = (props: any) => {
}
/**下载 */
const onDownload = () => {
window.location.href = `/api/contract/contractTemplate/downloadContract?contractName=${Templatel.name}&contractUrl=${Templatel.contractUrl}`
window.location.href = `/api/contract/contractTemplate/downloadContract?contractName=${Templatel.name}&contractUrl=${Templatel.fileUrl}`
}
/**判断文件类型和大小 */
const beforeDocUpload = (file: any) => {
......
src/pages/contract/manage/details/index.tsx
View file @ 191f7335
......@@ -7,6 +7,7 @@ import { StandardTable } from 'god';
import StatusTag from '@/components/StatusTag';
import { PublicApi } from '@/services/api';
import { history } from 'umi'
import Basic from '../../components/detailCard/basic'
import {
FileWordFilled
......@@ -79,7 +80,7 @@ const Details = (props: any) => {
col1: [
{ label: '合同编号：', extra: basics.contractNo ? basics.contractNo : '' },
{ label: '合同摘要：', extra: basics.contractAbstract ? basics.contractAbstract : '' },
{ label: '外部状态：', extra: basics.outerStatusName ? basics.outerStatusName : '' },
{ label: '外部状态：', extra: basics.outerStatusName ? basics.outerStatusName : '', type: "StatusTag" },
{ label: '内部状态：', extra: basics.innerStatusName ? basics.innerStatusName : '' },
],
col2: [
......@@ -363,54 +364,7 @@ const Details = (props: any) => {
</div>
</div>
{/* 基本信息 */}
<div id='process' className='ant-card ant-card-bordered'>
<div className='ant-card-head'>
<div className='ant-card-head-wrapper'>
<div className='ant-card-head-wrapper'>
基本信息
</div>
</div>
</div>
<div className='ant-card-body'>
<Row gutter={[8, 8]}>
<Col span={8}>
{basicInfo.col1.map((item: any, index: number) => (
<div className={style.list} key={`col1_${index + 1}`}>
<h5 className={style.listLable}>{item.label}：</h5>
{
item.label === '外部状态：' ?
<StatusTag type="success" title={item.extra} />
:
<h5 className={style.listContent}>{item.extra}</h5>
}
</div>
))}
</Col>
<Col span={8}>
{basicInfo.col2.map((item: any, index: number) => (
<div className={style.list} key={`col2_${index + 1}`}>
<h5 className={style.listLable}>{item.label}：</h5>
{
item.label === '对应单据：' ?
<h5 style={{ color: '#00B37A' }}>{item.extra}</h5>
:
<h5 className={style.listContent}>{item.extra}</h5>
}
</div>
))}
</Col>
<Col span={8}>
{basicInfo.col3.map((item: any, index: number) => (
<div className={style.list} key={`col3_${index + 1}`}>
<h5 className={style.listLable}>{item.label}：</h5>
<h5 className={style.listContent}>{item.extra}</h5>
</div>
))}
</Col>
</Row>
</div>
</div>
<Basic basicInfo={basicInfo} />
{/* 采购材料 */}
<div id='materials' className='ant-card ant-card-bordered'>
<div className='ant-card-head'>
......
src/pages/contract/manage/examine/index.tsx
View file @ 191f7335
......@@ -204,15 +204,15 @@ const Examine = () => {
span: 24
}
}}
formilyChilds={{
children: <Space>
<Button >批量提交审核</Button>
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
</Space>,
layouts: {
span: 8
}
}}
// </Space>,
// layouts: {
// span: 8
// }
// }}
/>
<ExamineFrom
ExamineFlag={Visible}
......
src/pages/contract/manage/levelexamine/index.tsx
View file @ 191f7335
......@@ -200,15 +200,15 @@ const Levelexamine = () => {
span: 24
}
}}
formilyChilds={{
children: <Space>
<Button >批量提交审核</Button>
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
</Space>,
layouts: {
span: 8
}
}}
// </Space>,
// layouts: {
// span: 8
// }
// }}
/>
</Card>
<ExamineFrom
......
src/pages/contract/manage/schema/index.ts
View file @ 191f7335
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
import { PublicApi } from '@/services/api';
import Search from '@/components/NiceForm/components/Search';
import Submit from '@/components/NiceForm/components/Submit';
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants/order';
import moment from 'moment';
/**
......
src/pages/contract/manage/secondaryexamine/index.tsx
View file @ 191f7335
......@@ -196,14 +196,14 @@ const Secondaryexamine = () => {
span: 24
}
}}
formilyChilds={{
children: <Space>
<Button >批量提交审核</Button>
</Space>,
layouts: {
span: 8
}
}}
// formilyChilds={{
// children: <Space>
// <Button >批量提交审核</Button>
// </Space>,
// layouts: {
// span: 8
// }
// }}
/>
</Card>
<ExamineFrom
......
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