计量审批流程补漏

app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -224,9 +224,11 @@ const JpcDiscreteHelper = {
                 } else {
                     pID = df[JV.PROP_ID];
                 }
+                const iParam = JE.P(pID, $CURRENT_RPT);
                 const interactItem = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, df[JV.PROP_DFT_VALUE], true);
                 interactItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
                 interactItem[JV.PROP_BAND_NAME] = band.Name;
+                interactItem[JV.PROP_DATA_TYPE] = iParam[JV.PROP_DATA_TYPE];
                 interactRst.push(interactItem);
                 rst = true;
             }

app/reports/rpt_component/jpc_param.js

@@ -6,6 +6,7 @@ const JpcParam = {
         const JpcParamResult = {};
         JpcParamResult[JV.NODE_DYNAMIC_DATE_PARAMS] = {};
         JpcParamResult[JV.NODE_SIGNATURE_AUDIT_PARAMS] = {};
+        JpcParamResult[JV.NODE_INTERACTION_PARAMS] = {};
         const me = this;
         if (rptTpl[JV.NODE_DISCRETE_PARAMS]) {
             for (let i = 0; i < rptTpl[JV.NODE_DISCRETE_PARAMS].length; i++) {
@@ -24,7 +25,7 @@ const JpcParam = {
         }
         if (rptTpl[JV.NODE_INTERACTION_PARAMS]) {
             for (let i = 0; i < rptTpl[JV.NODE_INTERACTION_PARAMS].length; i++) {
-                me.createSingle(rptTpl[JV.NODE_INTERACTION_PARAMS][i], JpcParamResult[JV.NODE_INTERACTION_PARAMS], rptTpl, i);
+                me.createSingle(rptTpl[JV.NODE_INTERACTION_PARAMS][i], JpcParamResult[JV.NODE_INTERACTION_PARAMS], rptTpl, i, true);
             }
         }
         return JpcParamResult;