字典提交

DBScript/张奇凯/002-DML.sql

@@ -11117,3 +11117,15 @@ VALUES('UNIT_STYLE_TYPE', '2', '字符串', 'UNIT_STYLE_TYPE', 3.000000000000000
 INSERT INTO  sys_noun
 (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG)
 VALUES('UNIT_STYLE_TYPE', '3', '数字', 'UNIT_STYLE_TYPE', 3.000000000000000000000000000000, 3.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
+
+
+-- 计算过程类型
+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');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '02', '实现类', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 2.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '03', 'SQL语句', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 3.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '04', 'SQL语句-查询结果是一个Map', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 4.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '05', 'SQL语句-查询结果是一个MapList', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 5.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '06', '其他报表来源公式', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 6.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', 'CALC_PROCESS_TYPE', '计算过程类型', 'BUSDICT', 2.000000000000000000000000000000, 0.000000000000000000000000000000, 'common', '0', '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('PARAM_CALC_TYPE'),
+       request: () => fetchDict('CALC_PROCESS_TYPE'),
       fieldProps: {
         options: dictionArray,
         treeDefaultExpandAll: true,