Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/stage_im.js

@@ -815,6 +815,8 @@ const stageIm = (function () {
                     return imFields.indexOf(key) > -1 && !_.isUndefined(sV) && !_.isNull(sV) ? sV : oV;
                 });
                 detail.custom_define = d.custom_define;
+                detail.calc_img = d.calc_img;
+                detail.calc_img_org = d.calc_img_org;
             } else {
                 details.push(d);
             }
@@ -833,6 +835,8 @@ const stageIm = (function () {
                 _.assignInWith(imData, d, function (oV, sV, key) {
                     return imFields.indexOf(key) > -1 && !_.isUndefined(sV) && !_.isNull(sV) ? sV : oV;
                 });
+                imData.calc_img = d.calc_img;
+                imData.calc_img_org = d.calc_img_org;
             }
         }
     }