Commit ec355f34 authored by 前端-吴智勇's avatar 前端-吴智勇

Merge branch 'jinfa-0518' into 'jinfa-0518'

Jinfa 0518 See merge request project/jinfa-platform!326
parents 6c2f1d20 b92031cd
......@@ -142,7 +142,6 @@ const QueryList = () => {
dataIndex: 'state',
align: 'left',
render: (text, record) => {
console.log(record.outerStatus)
return (
<div>
{
......@@ -211,7 +210,6 @@ const QueryList = () => {
});
postContractManageInvalid(values).then(res => {
console.log(res);
if (res.code === 1000) {
ref.current.reload();
setIsModalVisible(!isModalVisible);
......@@ -227,7 +225,6 @@ const QueryList = () => {
console.log('Failed:', errorInfo);
};
const fetchOptions = (service, Status) => {
console.log(service, 'service', Status)
return async function () {
const res = await service();
if (res.code === 1000) {
......
......@@ -224,7 +224,6 @@ const addList = () => {
}
// 列表数据
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => {
......
......@@ -38,13 +38,10 @@ const ContractText = (props: any) => {
pageSize: 99
}
getContractContractTemplatePage(data).then(res => {
console.log(res);
let list = [];
res.data.data.find((item: any) => {
item.version != null ? item.version : '';
console.log(item.version)
if (item.state == 1) {
console.log(item,)
list.push({
label: item.name + item.version,
value: item.id,
......
......@@ -567,7 +567,6 @@ const FormList = (props: any) => {
<Button
type='link'
onClick={() => {
console.log('guanlian click:', record.productNo)
setLookAssociatedproductNo(record.productNo)
setAssociatedDocumentsVisible(true)
}}
......
......@@ -64,7 +64,6 @@ const FormList = (props: any) => {
dataIndex: 'categories',
align: 'left',
render:(text)=> {
console.log(text)
if(!text?.length) return ''
let arr = text?.map(obj=>{ return obj.name })
let result = arr.join(",")
......@@ -218,7 +217,6 @@ const FormList = (props: any) => {
}
})
console.log('optionsDataadd', data, optionsData, 'optionsList')
setPlanList(data)
setoptions(optionsData)
......@@ -241,7 +239,6 @@ const FormList = (props: any) => {
};
const onblurkey = (e, name, idx) => {
let item = [...PlanList];
console.log(item[idx], 1231321)
switch (name) {
case 'payAmount':
item[idx].payAmount = Number(item[idx].payAmount).toFixed(2);
......@@ -334,7 +331,6 @@ const FormList = (props: any) => {
useEffect(()=>{
if(sourceType == 4) return
console.log('member change:-------',memberRoleId,memberId)
if( memberRoleId && memberId && !checkFirst) {
refs?.current?.reload()
}
......
......@@ -114,11 +114,9 @@ const Information = (props: any) => {
/* 获取合同编号 */
useEffect(() => {
getContractManageGetContractNo().then(res => {
console.log(res.data)
let basics: any = {}
if (res.code === 1000) {
basics.contractNo = res.data
console.log(basics)
setbasicsVO(basics)
}
})
......@@ -142,7 +140,6 @@ const Information = (props: any) => {
}, [])
/* 获取传入组建的值 */
useEffect(() => {
console.log(Row.sourceId)
basicsVO.contractNo = basicsVO.contractNo ? basicsVO.contractNo : '';
basicsVO.sourceType = Row.sourceType ? Row.sourceType + '' : '4';
basicsVO.contractId = Row.contractId ? Row.contractId : 0;
......
......@@ -59,7 +59,6 @@ const Add: React.FC<{}> = (props: any) => {
const getrow = (row) => {
let price = row.awardAmount ? row.awardAmount : row.bidWinnerAmount ? row.bidWinnerAmount : 0;
console.log(price, '10000')
setPrice(price)
setRow(row)
}
......@@ -79,7 +78,6 @@ const Add: React.FC<{}> = (props: any) => {
};
/* 设置选中值 */
const getsourceType = (type) => {
console.log(type)
setPurchasePaymentData(undefined)
setType(type)
}
......
......@@ -123,12 +123,10 @@ const BiddingList = () => {
record.partyBName = record.bidWinnerName;
record.sourceType = "2";
sessionStorage.setItem('record', JSON.stringify(record));
console.log(record);
history.push(`/memberCenter/contract/manage/add/addList/contracAdd?contractId=${record.id}&sourceType=2`)
}
// 列表数据
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => {
......
......@@ -142,7 +142,6 @@ const Levelexamine = () => {
// 列表数据
const fetchData = (params?: any) => {
console.log('待审核合同创建', isCreatExamine ? '(1级)' : '(2级)')
let api = isCreatExamine ? getContractManageCreatePageToBeExamineStepOne : getContractManageCreatePageToBeExamineStepTwo
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
......
......@@ -62,7 +62,6 @@ const TableList: React.FC<Iprops> = ({ contractId, listIndex }) => {
contractId,
...data
}).then(res => {
console.log(res);
if (res.code === 1000) {
setListData(res.data.data)
setTotal(res.data.totalCount)
......@@ -77,7 +76,6 @@ const TableList: React.FC<Iprops> = ({ contractId, listIndex }) => {
contractId,
...innerData
}).then(res => {
console.log(res);
if (res.code === 1000) {
setList(res.data.data)
setTotal(res.data.totalCount)
......
......@@ -127,7 +127,6 @@ const Details = (props: any) => {
// { label: intl.formatMessage({ id: 'contract.portDestination' }), extra: contractSourceVO.arrivalPortName ? contractSourceVO.arrivalPortName : '', },
]
}
// console.log(basics, basics.sourceType, basics.sourceId, basics.turn)
if (basics.sourceId) {
switch (basics.sourceType) {
case 1: {
......@@ -174,7 +173,6 @@ const Details = (props: any) => {
* 流转进度点击
*/
const handleBatchChange = (e, key) => {
console.log(key)
if (key == 'Steps') {
let StepList = e.target.value == 1 ? outerTaskStepList : innerTaskStepList;
setCurrentBatch(e.target.value);
......
......@@ -7,6 +7,7 @@ import { UPLOAD_TYPE } from '@/constants'
import { getContractContractTemplateGet, getContractContractTemplatePage, postContractSignatureContractCreate } from '@/services/ContractV2Api'
import { getIntl } from 'umi';
import FileHt from '@/pages/contract/components/fileHt';
import { isEmpty } from 'lodash';
const intl = getIntl();
const ContractText = (props: any) => {
const { currentRef, ctText, memberId,
......@@ -107,7 +108,7 @@ const ContractText = (props: any) => {
? await purchaseMate.current.get()
: [];
getOtherInfo().then(datas => {
if (!(picker.endTime && picker.startTime)) {
if (!isEmpty(picker) && !(picker.endTime && picker.startTime)) {
message.info('生成合同日期不可以为空!')
return
}
......
......@@ -35,7 +35,6 @@ const Information = (props: any) => {
if (oldContractId) {
let data = { oldContractNo: basic.contractNo }
getContractManageGetContractNo(data).then(res => {
console.log(res.data)
if (res.code === 1000) {
basic.contractNo = res.data;
const rangePicker = [];
......
......@@ -59,7 +59,6 @@ const Editing: React.FC<{}> = (props: any) => {
const getDetail = () => {
getContractManageGetDetail({ contractId }).then(res => {
if (res.code === 1000) {
console.log(res);
const { basics, contractSourceVO, payPlanList, contractText, contractBankInfoVO, contractFreightInformationVO, contractOtherInformationVO } = res.data;
setbasic({ ...basics, ...contractSourceVO })
setContractBankInfoVO_({ ...contractBankInfoVO })
......
......@@ -32,7 +32,6 @@ const Examine = () => {
const url = isExamineSubmit ? '/memberCenter/contract/manage/examineSubmit/details' : '/memberCenter/contract/manage/examine/details'
console.log('url:',url)
//表头
const columns: ColumnType<any>[] = [{
......@@ -145,10 +144,8 @@ const Examine = () => {
}]
// 列表数据
const fetchData = (params?: any) => {
console.log('页面为:',isExamineSubmit ? '待提交审核合同创建': '待提交审核合同签订')
const api = isExamineSubmit ? getContractManageCreatePageToBeSubmitExamine :getContractManagePageToBeSubmitExamine
console.log(params)//可以直接打印参数
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => {
......
......@@ -133,7 +133,6 @@ const Levelexamine = () => {
// 列表数据
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => {
......
......@@ -250,7 +250,6 @@ const BiddingList = () => {
}
if(isAllEqual(selectRow,'vendorMemberName') && isAllEqual(selectRow,'currency') && isAllEqual(selectRow,'businessType') && isAllEqual(selectRow,'arrivalArea')&& isAllEqual(selectRow,'deliveryMethod') && isAllEqual(selectRow,'payWayName')&& isAllEqual(selectRow,'payConditionName')){
console.log('供应商/币别/业务类型/到货区/付款方式/付款条件域一致,无需弹窗提醒')
handlePurchaseData()
}else{
Modal.info({
......
......@@ -149,7 +149,6 @@ const Secondaryexamine = () => {
// 列表数据
const fetchData = (params?: any) => {
console.log(params)//可以直接打印参数
params.startTime = params.startTime ? moment(Number(params.startTime)).format('YYYY-MM-DD') : '';
params.endTime = params.endTime ? moment(Number(params.endTime)).format('YYYY-MM-DD') : '';
return new Promise((resolve, reject) => {
......
......@@ -44,7 +44,6 @@ const PurchaseCenter: React.FC<Iprops> = () => {
const [hasFetchData, setHasFetchData] = useState(false)
useEffect(() => {
console.log("hasPurchaseAuth", hasPurchaseAuth);
if (!inViewPort || (!hasPurchaseAuth) || hasFetchData) {
return;
}
......
......@@ -67,7 +67,6 @@ function useViewRequest<T, P>(fn: (postData: P) => Promise<IRequestSuccess<T>>,
if (!responseData) {
return result
}
console.log(responseData, "responData");
Object.keys(responseData).forEach((_row) => {
if (responseData[_row] && responseData[_row].length !== 0) {
......@@ -77,7 +76,6 @@ function useViewRequest<T, P>(fn: (postData: P) => Promise<IRequestSuccess<T>>,
}
}
})
console.log(result, "result");
return result;
}, [responseData])
......
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