Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx

@@ -262,8 +262,8 @@ const SupplierAnnualReview: React.FC = () => {
           <Button type="link" onClick={() => handleView(record)} size="small">
             {intl.formatMessage({ id: 'supplierAnnualReview.common.view' })}
           </Button>
-          {/* 只有待审核状态的可以打分 */}
-          {record.status !== '0' && record.reviewStatus === '0' && (
+          {/* 只有待审核状态的可以打分 status 0 未开始 1 进行中 2 已结束 , reviewStatus 0未提交 1 已提交  */}
+          {record.status === '1' && record.reviewStatus === '0' && (
             <Button type="link" onClick={() => handleScore(record)} size="small">
               {intl.formatMessage({ id: 'supplierAnnualReview.common.score' })}
             </Button>

src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx

@@ -20,7 +20,7 @@ const { Option } = Select;
 // 搜索参数类型
 interface AnnualTemplateSearchParams {
   templateName?: string;
-  deptId?: string;
+  orgId?: string;
   categoryId?: string;
   dateRange?: string[];
   [key: string]: any;
@@ -70,8 +70,8 @@ const SupplierAnnualTemplateManage: React.FC = () => {
       if (params.templateName) {
         requestParams.templateName = params.templateName;
       }
-      if (params.deptId) {
-        requestParams.deptId = params.deptId;
+      if (params.orgId) {
+        requestParams.orgId = params.orgId;
       }
       if (params.categoryId) {
         requestParams.categoryId = params.categoryId;
@@ -376,7 +376,7 @@ const SupplierAnnualTemplateManage: React.FC = () => {
             />
           </Form.Item>
           <Form.Item
-            name="deptId"
+            name="orgId"
             label={intl.formatMessage({ id: 'supplierAnnualTemplateManage.list.createUnit' })}
           >
             <AccessDepartmentSelect />

src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.tsx

@@ -337,7 +337,7 @@ const SupplierTemplateManage: React.FC = () => {
             />
           </Form.Item>
           <Form.Item
-            name="tenantName"
+            name="orgId"
             label={intl.formatMessage({ id: 'supplierTemplateManage.column.tenantName' })}
           >
             <AccessDepartmentSelect  />