Merge remote-tracking branch 'origin/master'

config/gulpConfig.js

@@ -3,7 +3,7 @@
  */
 
 module.exports = {
-    version:'1.0.1',
+    version:'1.0.2',
     common_jspaths:[
         'lib/jquery/jquery-3.2.1.min.js',
         'lib/jquery-ui/jquery-ui.min.js',

web/building_saas/report/html/rpt_main.html

@@ -36,7 +36,7 @@
                                 <!--
                                 <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDF()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
                                 -->
-                                <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFEx()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
+                                <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFPre()"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">0</span></button>
                             </div>
                         </div>
                         <div class="panel-foot text-muted">

web/building_saas/report/js/rpt_main.js

@@ -28,8 +28,10 @@ let rptTplObj = {
             if (JpcJsPDFHelper.doc === null) {
                 JpcJsPDFHelper.initialize('p', 'pt', 'a4');
             }
-            dynamicLoadJs('/lib/jspdf/SmartSimsun-normal.js');
-            dynamicLoadJs('/lib/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
+            // dynamicLoadJs('/lib/jspdf/SmartSimsun-normal.js');
+            // dynamicLoadJs('/lib/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-normal.js');
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);
         }
     },
     pdfFontSimsunCallBack: function() {
@@ -943,6 +945,22 @@ let rptControlObj = {
             }
         }
     },
+    getPdfFontCallback: function(fontProperty) {
+        let me = rptControlObj;
+        rptTplObj.pdfFont['SmartSimsun'].push(fontProperty);
+        if (rptTplObj.pdfFont['SmartSimsun'].length === 2) {
+            me.getPDFEx();
+        }
+    },
+    getPDFPre: function () {
+        let me = rptControlObj;
+        if (rptTplObj.pdfFont['SmartSimsun'].length === 2) {
+            me.getPDFEx();
+        } else {
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-normal.js', me.getPdfFontCallback('normal'));
+            dynamicLoadJs('http://d2.smartcost.com.cn/cach/SmartSimsun-bold.js', me.getPdfFontCallback('bold'));
+        }
+    },
     getPDFEx: function () {
         let me = rptControlObj;
         if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0) {

web/over_write/js/anhui_2019.js

@@ -17,10 +17,10 @@ function overwriteRationCalcBases (){
     rationCalcBases['施工机械使用费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
-/*    rationCalcBases['施工机械人工费'] = function (node, isTender) {
+    rationCalcBases['施工机械人工费'] = function (node, isTender) {
         return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
     };
-    rationCalcBases['设备购置费'] = function (node, isTender) {
+   /* rationCalcBases['设备购置费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
     };*/
 
@@ -53,7 +53,7 @@ function overwriteRationCalcBases (){
         {type: 'marketLabour', name: '人工费'},
         {type: 'marketMaterial', name: '材料费'},
         {type: 'marketMachine', name: '施工机械使用费'},
-        // {type: 'marketMachineLabour', name: '施工机械人工费'},
+        {type: 'marketMachineLabour', name: '施工机械人工费'},
         // {type: 'marketEquipment', name: '设备购置费'},
         {type: 'marketDirect', name: '直接费'},