Commit e1c2c6e1 authored by Bill's avatar Bill

fix: 修改会员部分bug

parent dea5b597
......@@ -23,10 +23,9 @@ const Voucher: React.FC<Iprops> = (props) => {
return (
<>
{
files.map((item: VoucherFileProps, key: number) => {
files?.map((item: VoucherFileProps, key: number) => {
return (
<div className={styles.container} key={key}>
{/* <div></div>/ */}
<div className={styles.image}>
<img src={image_icon} className={styles.icon} />
</div>
......
......@@ -220,8 +220,11 @@ function useFetchColumns(mode: 'payable' | 'receiveable') {
render: (text: string, record: any) => {
if (mode === 'payable') {
// 待对账的时候可以手动结算
if (record.status === TO_BE_RECONCILED && record.orderType !== CONTRACT_FUND_BILL) {
return <a onClick={() => handleManualsettlement(record.id)}>手动结算</a>
if (record.status === TO_BE_RECONCILED) {
if (record.orderType !== CONTRACT_FUND_BILL) {
return <a onClick={() => handleManualsettlement(record.id)}>手动结算</a>
}
return null
}
if (record.status === TO_BE_PAY) {
return <a onClick={() => handlePay({id: record.id, settlementId: record.memberId, roleId: record.roleId})}>付款</a>
......
......@@ -4,7 +4,7 @@ import { Link } from 'umi'
export const commonColumns = [
{
title: '考评单号/主题',
title: '整改单号/主题',
dataIndex: 'id',
render: (text, record) => {
......@@ -17,7 +17,7 @@ export const commonColumns = [
}
},
{
title: '会员名称',
title: '上级会员名称',
dataIndex: 'upperMemberName',
},
{
......
......@@ -25,13 +25,13 @@ export const querySchema: ISchema = {
grid: true,
full: true,
autoRow: true,
columns: 3,
columns: 6,
},
properties: {
subject: {
type: 'string',
'x-component-props': {
placeholder: '考评主题',
placeholder: '整改主题',
allowClear: true,
style: {
width: 160,
......@@ -41,7 +41,7 @@ export const querySchema: ISchema = {
'[rectifyDayStart,rectifyDayEnd]': {
type: 'daterange',
'x-component-props': {
placeholder: ['考评开始时间', '考评完成时间'],
placeholder: ['整改开始时间', '整改完成时间'],
allowClear: true,
style: {
width: 240,
......
......@@ -122,7 +122,7 @@ const InspectionAdd = (props) => {
if(isEdit) {
return "修改整改通知单"
}
return "新增整改通知到哪"
return "新增整改通知"
}
return (
......
......@@ -51,9 +51,9 @@ export const querySchema: ISchema = {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '搜索通知单号',
placeholder: '搜索整改单号',
align: 'flex-left',
tip: '输入通知单号进行搜索',
tip: '输入整改单号进行搜索',
},
},
[FORM_FILTER_PATH]: {
......@@ -69,33 +69,32 @@ export const querySchema: ISchema = {
subject: {
type: 'string',
'x-component-props': {
placeholder: '通知单摘要',
placeholder: '整改主题',
allowClear: true,
style: {
width: 160,
},
},
},
processName: {
type: 'string',
'x-component-props': {
placeholder: '加工企业名',
allowClear: true,
},
},
outerStatus: {
type: 'string',
default: undefined,
enum: [],
'[rectifyDayStart,rectifyDayEnd]': {
type: 'daterange',
'x-component-props': {
placeholder: '外部状态(全部)',
placeholder: ['整改开始时间', '整改完成时间'],
allowClear: true,
style: {
width: 240,
},
},
},
innerStatus: {
status: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '内部状态(全部)',
placeholder: '外部状态',
allowClear: true,
style: {
width: 160,
},
},
},
submit: {
......
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