DBScript/张奇凯/002-DML.sql

@@ -11119,6 +11119,7 @@ INSERT INTO  sys_noun
 VALUES('UNIT_STYLE_TYPE', '3', '数字', 'UNIT_STYLE_TYPE', 3.000000000000000000000000000000, 3.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
 
 
+
 -- 计算过程类型
 delete from sys_noun where NOUNITEM ='CALC_PROCESS_TYPE';
 INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '01', '常量', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 1.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
@@ -11135,6 +11136,7 @@ INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNO
 
 
 
+
 -- 单元格数据类型
 delete from sys_noun where NOUNITEM ='UNIT_DATA_TYPE';
 INSERT INTO  sys_noun
@@ -11146,5 +11148,3 @@ VALUES('UNIT_DATA_TYPE', '1', '字符串', 'UNIT_DATA_TYPE', 3.00000000000000000
 INSERT INTO  sys_noun
 (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG)
 VALUES('UNIT_DATA_TYPE', '2', '数字', 'UNIT_DATA_TYPE', 3.000000000000000000000000000000, 2.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
-
-

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

@@ -372,7 +372,7 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       width:150,
       ellipsis:true,
       valueType: 'select',
-       request: () => fetchDict('CALC_PROCESS_TYPE'),
+       request: () => fetchDict('PARAM_CALC_TYPE'),
       fieldProps: {
         options: dictionArray,
         treeDefaultExpandAll: true,