报表填报配置页面调整（查看页面多余元素去掉、版本号迭代）

Procedure/backend/project/src/main/java/com/sundata/product/rwa/reportformconfigreportcreater/service/ReportFillingConfigService.java

@@ -21,6 +21,8 @@ import org.springframework.stereotype.Service;
 
 import java.io.*;
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 @Service
@@ -41,9 +43,10 @@ public class ReportFillingConfigService {
     }
 
     public void updateReportData(ReportDefinitionModel model) {
+        double version = Double.parseDouble(model.getReportVersion());
+        model.setReportVersion(String.valueOf(new DecimalFormat("#.##").format(version + 0.1)));
         reportFillingConfigMapper.updateReportData(model);
     }
-
     public void deleteReportData(ReportDefinitionModel model) {
         boolean flag = reportFillingConfigMapper.deleteReportData(model);
         if (flag){

Procedure/frontend/projectb/src/pages/product/report_form_config_reportcreater/reportfillingconfig.tsx

@@ -94,18 +94,6 @@ const reportfillingconfig : React.FC<widowRush> = (prop:widowRush) => {
      
      }
 
-
-  /**上传属性 */
-  const fileProps = {
-    onRemove: () => {
-    setFileData(undefined);
-  },
-    beforeUpload(info: any) {
-    setFileData(info);
-  }, 
-  };
-
-
     // 删除
     const delRows =async(record:any)=>{ 
        baseFun.confirm('确认删除？',async() =>{
@@ -189,10 +177,9 @@ const analyseFile = async (data: ReportDefinitionModel) => {
           dataIndex: 'reportType',
           hideInTable: false,
           valueType: 'treeSelect',
-          request: () => fetchDict('customerTypeCd'),
+          request: () => fetchDict('REPORT_TYPE'),
           fieldProps: {
            treeDefaultExpandAll: true,
-           treeCheckable:true,
         },
         },
         {
@@ -200,7 +187,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
           dataIndex: 'reportOrgcode',
           hideInTable: false,
           valueType: 'treeSelect',
-          request: () => fetchDict('customerTypeCd'),
+          request: () => fetchDict('org'),
           fieldProps: {
            treeDefaultExpandAll: true,
            treeCheckable:true,
@@ -224,8 +211,12 @@ const analyseFile = async (data: ReportDefinitionModel) => {
               onClick={
                 ()=>{ 
                 selectData(record);
+                setAnalysis(true);
                 setDetailVisible(true);
-                setEditType('update')
+                setEditType('update');
+                if (record.reportNo) {
+                  setBusiPk(record.reportNo);
+                }
                } }
             >
               修改
@@ -301,7 +292,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       ellipsis:true,
       formItemProps:{
         rules:[
-          {required:true}
+          {required:true},
+          {validator:validateFun.zinteger,message:'请输入整数'}
         ]
       }
     },
@@ -314,7 +306,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       ellipsis:true,
       formItemProps:{
         rules:[
-          {required:true}
+          {required:true},
+          {validator:validateFun.zinteger,message:'请输入整数'}
         ]
       }
     },
@@ -327,7 +320,8 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       ellipsis:true,
       formItemProps:{
         rules:[
-          {required:true}
+          {required:true},
+          {validator:validateFun.zinteger,message:'请输入整数'}
         ]
       }
     },
@@ -422,7 +416,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       }
     },
 
-    {
+    editType == 'update' || editType == 'create'? {
       title: '操作',
       dataIndex: 'operate',
       valueType: 'option',
@@ -441,7 +435,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
           编辑
         </SDOperate>,
       ],
-    },
+    }:{},
 
   ];
 
@@ -509,11 +503,11 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       }
     },
 
-    {
+    editType == 'update' || editType == 'create'? {
       title: '操作',
       dataIndex: 'operate',
       valueType: 'option',
-      render: (_, record) => [
+      render: (_, record) =>  [
         <SDOperate
           key="roleCfg"
           icon={<WomanOutlined />}
@@ -526,7 +520,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
           编辑
         </SDOperate>,
       ],
-    },
+    }:{},
   ];
 
 
@@ -549,10 +543,10 @@ const analyseFile = async (data: ReportDefinitionModel) => {
 
   const handanalyseReportFile = async (record:any,) => {
 
-    if (!fileData) {
-      baseFun.warning('请先上传模板文件后，在进行模板文件的解析');
-      return;
-    }
+    // if (!fileData) {
+    //   baseFun.warning('请先上传模板文件后，在进行模板文件的解析');
+    //   return;
+    // }
     const data = await analyseReportFile(record,"reportuploadconfig");
     setFillInFormData(data.FillIn);
     setCalculateFormData(data.Calc);
@@ -585,6 +579,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
               setDetailVisible(true);
               setFillInFormData([]);
               setCalculateFormData([]);
+              setAnalysis(false);
             }}
           >
             新增
@@ -615,6 +610,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
                 setCalculateFormData([]);
               }
 
+              // 报表类型值变化与计算过程下拉列表联动
               if (changeValues.reportType) {
                 const data = await selectCalcProcessType();
                 data?.forEach((item)=>{
@@ -670,9 +666,9 @@ const analyseFile = async (data: ReportDefinitionModel) => {
          }}]} label="报表名称"/>
             <SDFormDict dictKey='REPORT_TYPE' name="reportType"  label="报表类型" />
             <SDFormDict dictKey='org' name="reportOrgcode" label="所属机构"/>
-            <SDFormAttach name={"reportFile"}   label="模板文件" {...fileProps} 
+            <SDFormAttach name={"reportFile"} required={true}  label="模板文件"
             funcType={"reportuploadconfig"} filetype="" maxFileNum={1} busiPkId={busiPk}/>
-            <SDFormText name="reportVersion"  label="报表版本号"/>
+            <SDFormText name="reportVersion" readonlyCond="update"  label="报表版本号"/>
             <SDLayout footer={
               [
                <SDSubmitButton  editType={editType}   formRef={formRef}  doSubmit={