Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev
This commit is contained in:
@ -262,8 +262,8 @@ const SupplierAnnualReview: React.FC = () => {
|
|||||||
<Button type="link" onClick={() => handleView(record)} size="small">
|
<Button type="link" onClick={() => handleView(record)} size="small">
|
||||||
{intl.formatMessage({ id: 'supplierAnnualReview.common.view' })}
|
{intl.formatMessage({ id: 'supplierAnnualReview.common.view' })}
|
||||||
</Button>
|
</Button>
|
||||||
{/* 只有待审核状态的可以打分 */}
|
{/* 只有待审核状态的可以打分 status 0 未开始 1 进行中 2 已结束 , reviewStatus 0未提交 1 已提交 */}
|
||||||
{record.status !== '0' && record.reviewStatus === '0' && (
|
{record.status === '1' && record.reviewStatus === '0' && (
|
||||||
<Button type="link" onClick={() => handleScore(record)} size="small">
|
<Button type="link" onClick={() => handleScore(record)} size="small">
|
||||||
{intl.formatMessage({ id: 'supplierAnnualReview.common.score' })}
|
{intl.formatMessage({ id: 'supplierAnnualReview.common.score' })}
|
||||||
</Button>
|
</Button>
|
||||||
|
@ -20,7 +20,7 @@ const { Option } = Select;
|
|||||||
// 搜索参数类型
|
// 搜索参数类型
|
||||||
interface AnnualTemplateSearchParams {
|
interface AnnualTemplateSearchParams {
|
||||||
templateName?: string;
|
templateName?: string;
|
||||||
deptId?: string;
|
orgId?: string;
|
||||||
categoryId?: string;
|
categoryId?: string;
|
||||||
dateRange?: string[];
|
dateRange?: string[];
|
||||||
[key: string]: any;
|
[key: string]: any;
|
||||||
@ -70,8 +70,8 @@ const SupplierAnnualTemplateManage: React.FC = () => {
|
|||||||
if (params.templateName) {
|
if (params.templateName) {
|
||||||
requestParams.templateName = params.templateName;
|
requestParams.templateName = params.templateName;
|
||||||
}
|
}
|
||||||
if (params.deptId) {
|
if (params.orgId) {
|
||||||
requestParams.deptId = params.deptId;
|
requestParams.orgId = params.orgId;
|
||||||
}
|
}
|
||||||
if (params.categoryId) {
|
if (params.categoryId) {
|
||||||
requestParams.categoryId = params.categoryId;
|
requestParams.categoryId = params.categoryId;
|
||||||
@ -376,7 +376,7 @@ const SupplierAnnualTemplateManage: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="deptId"
|
name="orgId"
|
||||||
label={intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.createUnit' })}
|
label={intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.createUnit' })}
|
||||||
>
|
>
|
||||||
<AccessDepartmentSelect />
|
<AccessDepartmentSelect />
|
||||||
|
@ -337,7 +337,7 @@ const SupplierTemplateManage: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="tenantName"
|
name="orgId"
|
||||||
label={intl.formatMessage({ id: 'supplierTemplateManage.column.tenantName' })}
|
label={intl.formatMessage({ id: 'supplierTemplateManage.column.tenantName' })}
|
||||||
>
|
>
|
||||||
<AccessDepartmentSelect />
|
<AccessDepartmentSelect />
|
||||||
|
Reference in New Issue
Block a user