Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/pages/member/memberEvaluate/createEvaluate/add.tsx

@@ -122,7 +122,7 @@ const EvaluateAdd = (props) => {
       }
     })
     if (totalScoreWeight > 100) {
-      message.error(`添加的评估项目的权重和为${totalScoreWeight}, 大于100, 请修改`);
+      message.error(`当前添加的评估项目的权重和为${totalScoreWeight}, 大于100, 请修改`);
       return
     }
 
@@ -226,7 +226,6 @@ const EvaluateAdd = (props) => {
       });
       const scoreWeight = formActions.getFieldValue(`items.${numberIndex}.scoreWeight`) || 0
       const grade = formActions.getFieldValue(`items.${numberIndex}.grade`) || 0;
-      console.log(scoreWeight)
       formActions.setFieldValue(`items.${numberIndex}.score`, +scoreWeight !== 0 ? scoreWeight * grade / 100 : grade);
     })
   }
@@ -274,7 +273,7 @@ const EvaluateAdd = (props) => {
     return {
       appraisalDayStart: moment(appraisalDayEnd, 'YYYY-MM-DD'),
       appraisalDayEnd: moment(appraisalDayEnd, 'YYYY-MM-DD'),
-      selectedProject: selectedProject,
+      selectProject: selectedProject,
       items: itmesList,
       ...rest,
     }
@@ -287,6 +286,7 @@ const EvaluateAdd = (props) => {
         subMemberId: initialValue.subMemberId,
         subRoleId: initialValue.subRoleId,
       }])
+      console.log(initialValue);
     }
   }, [initialValue])
 

src/pages/member/memberEvaluate/tobeSubmitSummary/detail.tsx

@@ -81,6 +81,7 @@ const TobeEvaluateDetail = () => {
   }, [projectColumns, isView])
 
   const editScore = (record: any) => {
+    console.log(record);
     setEditingScoreData(record);
     toggle(true);
   }
@@ -206,12 +207,13 @@ const TobeEvaluateDetail = () => {
         <div className={styles.form}>
           <SchemaForm
             onSubmit={onSubmit}
-            initialValues={editingScoreData}
+            value={editingScoreData}
             schema={modifyEvaluateScore}
             actions={formActions}
             components={{
               FormilyUploadFiles,
               ArrayTable,
+              FormilyCheckbox
             }}
           />
         </div>

src/pages/member/memberEvaluate/tobeSubmitSummary/schema.tsx

@@ -38,14 +38,15 @@ export const modifyEvaluateScore: ISchema = {
         sendAppraisal: {
           title: '考评人打分',
           type: 'string',
-          editable: false
+          editable: false,
+          "x-component": 'FormilyCheckbox'
         },
         scoreWeight: {
           title: '权重',
           type: 'string',
           'x-rules': [
             {
-              pattern: /^((\d+))$/,
+              pattern: /^\d+$/,
               message: '请填写整数'
             }
           ],

src/pages/member/memberQuery/rectificationQuery/detail.tsx

@@ -133,7 +133,7 @@ const rectificationAddDetail = () => {
           visible={visible}
           onClose={() => toggle(false)}
           width={540}
-          title="确认整改结果"
+          title="整改报告"
           footer={
             <div style={{ textAlign: 'right'}}>
               <Button onClick={() => toggle(false)} style={{ marginRight: 8 }}>
@@ -150,7 +150,7 @@ const rectificationAddDetail = () => {
             actions={formActions}
             onSubmit={handleSubmit}
             components={{FormilyUploadFiles}}
-            initialValues={formValue}
+            value={formValue}
           />
         </Drawer>
       </AnchorPage>

src/pages/member/memberQuery/rectificationQuery/schema.tsx

@@ -83,7 +83,7 @@ export const rectificationReportSchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       'x-component-props': {
-        labelCol: 4,
+        labelCol: 5,
         labelAlign: 'left',
         full: true,
       },
@@ -102,7 +102,7 @@ export const rectificationReportSchema: ISchema = {
           }
         },
         reportAttachments: {
-          title: "附件",
+          title: "整改报告文件",
           type: 'array',
           'x-component': 'FormilyUploadFiles',
           'x-rules': [