Преглед на файлове

页面自动刷新,版本号自增修改

ZhangYanJie преди 2 месеца
родител
ревизия
d1427de6de

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

@@ -84,8 +84,8 @@ public class ReportFillingConfigService {
      */
     public void updateReportData(ReportDefinitionModel model) {
         if (null != model) {
-            double version = Double.parseDouble(model.getReportVersion());
-            model.setReportVersion(String.valueOf(new DecimalFormat("#.##").format(version + 0.1)));
+//            double version = Double.parseDouble(model.getReportVersion());
+//            model.setReportVersion(String.valueOf(new DecimalFormat("#.##").format(version + 0.1)));
             reportFillingConfigMapper.updateReportData(model);
             ReportCalculationModel calcModel = new ReportCalculationModel();
             calcModel.setReportno(model.getReportNo());

+ 3 - 1
Procedure/frontend/projectb/src/pages/product/report_form_config_reportcreater/reportfillingconfig.tsx

@@ -95,6 +95,7 @@ const reportfillingconfig : React.FC<widowRush> = (prop:widowRush) => {
       if (data.calculateFormDataList) {
         setCalculateFormData(data.calculateFormDataList);
       }
+      closeAndRefresh();
       // if (formdata && formdata.reportNo) {
       //   const listData = await selectCalcReportData(formdata.reportNo);
       //   if (listData) {
@@ -613,6 +614,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
         ]}
          setDetailVisible={() => {setDetailVisible(true)}}
          setEditType={setEditType}
+         actionRef={actionRef}
          setCurrentRow={setCurrentRow}
          />
 
@@ -687,7 +689,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
             <SDFormDict dictKey='org' name="reportOrgcode" label="所属机构"/>
             <SDFormAttach name={"reportFile"}  label="模板文件"
             funcType={"reportuploadconfig"} filetype="" maxFileNum={1} busiPkId={busiPk}/>
-            <SDFormText name="reportVersion" readonlyCond="update" label="报表版本号"/>
+            <SDFormText name="reportVersion"  label="报表版本号"/>
             <SDLayout footer={
               [
                <SDSubmitButton  editType={editType}   formRef={formRef}  doSubmit={