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

web/maintain/bills_lib/html/qingdan.html

@@ -746,7 +746,8 @@
             }
             if(controller.tree.selected  && args.oldSelections[0].row !== args.newSelections[0].row|| controller.tree.selected && args.oldSelections[0].row === 0){
                 //rechargeArea
-                codeEditor.setValue(controller.tree.selected.data.recharge);
+                const recharge = controller.tree.selected.data.recharge || '';
+                codeEditor.setValue(recharge);
                 //$('#exampleTextarea').val(controller.tree.selected.data.recharge);
                 if(field === 'jobs'){
                     tools.clearData(sheet);

web/maintain/bills_lib/scripts/db_controller.js

@@ -244,7 +244,8 @@ var dbController = {
                 let nowNode = controller.tree.selected ;
                 if(nowNode){
                     let jobs = controller.tree.selected.jobs;
-                    codeEditor.setValue(controller.tree.selected.data.recharge);
+                    const recharge = controller.tree.selected.data.recharge || '';
+                    codeEditor.setValue(recharge);
                     //$('#exampleTextarea').val(controller.tree.selected.data.recharge);
                     setSheet.setMaxRowCount(jobsSheet, jobs);
                     tools.orderReshowData(jobsSheet, jobs, jobsSetting, 'job', false);