Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

config/gulpConfig.js

@@ -95,6 +95,7 @@ module.exports = {
         'public/web/uuid.js',
         'public/web/sheet/sheet_common.js',
         'public/calculate_util.js',
+        'web/building_saas/main/js/models/calc_data_tool.js',
         'web/building_saas/main/js/models/calc_program.js',
         'web/building_saas/main/js/models/calc_base.js',
         'web/building_saas/main/js/views/calc_program_manage.js',

web/building_saas/main/html/main.html

@@ -2112,8 +2112,8 @@
     <!--<script type="text/javascript" src="/web/building_saas/main/js/models/volume_price.js"></script>-->
     <script type="text/javascript" src="/web/building_saas/main/js/models/labour_coe.js"></script>
     <script type="text/javascript" src="/public/calculate_util.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/calc_data_tool.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/calc_base.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/installation_fee.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>