bugs

modules/main/controllers/calc_program_controller.js

@@ -62,12 +62,17 @@ async function saveCalcItem(req, res) {
 };
 
 async function saveCalcItems(req, res) {
-    let result = {error: 0, message: ''};
+    let result = {};
 
     calcProgramFacade.saveCalcItems(req.body.data, function (err, msg) {
         if (err) {
             result.error = 1;
-        };
+            result.data = 0;
+        }
+        else{
+            result.error = 0;
+            result.data = 1;
+        }
         result.message = msg;
         res.json(result);
     });

modules/main/facade/calc_program_facade.js

@@ -138,9 +138,9 @@ function saveCalcItems(datas, callback) {
                                 data.templates[i].calcItems[j] = cI.calcItem;
                                 data.save(function (err) {
                                     if (err) {
-                                        callback({err:1, msg:'本条计算规则保存失败'});
+                                        callback(1, '本条计算规则保存失败');
                                     } else {
-                                        callback({err:0, msg:'本条计算规则保存成功'});
+                                        callback(0, '本条计算规则保存成功');
                                     }
                                 });
                                 break;
@@ -152,7 +152,7 @@ function saveCalcItems(datas, callback) {
             };
         }
         else {
-            callback( {err:1, msg:'没有找到计算程序文件'} );
+            callback(1, '没有找到计算程序文件');
         }
     });
 };

web/building_saas/main/html/calc_program_manage.html

@@ -11,8 +11,7 @@
     <div style="">
         <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
     </div>
-    <div class="toolsbar px-1">
-    </div>
+    <div class="toolsbar px-1" />
     <div class="container-fluid">
         <div class="row">
             <div class="col-lg-2 p-0">
@@ -25,6 +24,40 @@
             </div>
         </div>
     </div>
+
+    <!--自定义对话框-->
+    <div class="modal fade" id="hintBox" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="hintBox_title">标题</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <div id="cpm_delete_showinfo">
+                            <label id = "hintBox_info">提示明细</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer" style="justify-content: center">
+                    <button type="button" class="btn btn-primary" data-dismiss="modal" id="hintBox_btn_yes">是</button>
+                    <button type="button" class="btn btn-primary" data-dismiss="modal" id="hintBox_btn_no">否</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" id="hintBox_btn_cancel">取消</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        function hintBox(title, caption) {
+            $('#hintBox_title').text(title);
+            $('#hintBox_info').text(caption);
+            $("#hintBox").modal({show:true});
+        }
+    </script>
 </body>
 
 

web/building_saas/main/js/models/calc_program.js

@@ -1044,8 +1044,10 @@ class CalcProgram {
             let saveDatas = {};
             saveDatas.projectID = projectInfoObj.projectInfo.ID;
             saveDatas.calcItems = me.saveForReports;
-            CommonAjax.post('/calcProgram/saveCalcItems', saveDatas, function (data) {
-                me.saveForReports = [];
+            CommonAjax.post('/calcProgram/saveCalcItems', saveDatas, function (result) {
+                if (result){
+                    me.saveForReports = [];
+                };
             });
         };
     };

web/building_saas/main/js/views/calc_program_manage.js

@@ -6,7 +6,6 @@ let calcProgramManage = {
     datas: [],
     mainSpread: null,
     detailSpread: null,
-
     mainSetting: {
         header:[
             // {headerName:"ID",headerWidth:80,dataCode:"ID", hAlign: "center"},
@@ -19,7 +18,6 @@ let calcProgramManage = {
             rowHeaderWidth: CP_Col_Width.rowHeader
         }
     },
-
     detailSetting: {
         header:[
             // {headerName:"ID",headerWidth:80,dataCode:"ID", hAlign: "center"},
@@ -93,7 +91,7 @@ let calcProgramManage = {
         let dataCode = me.detailSetting.header[args.col].dataCode;
 
         if (dataCode == 'feeRate') {
-            projectObj.project.FeeRate.updateFeeRateFromCalc(args.editingText,editInfo);
+            projectObj.project.FeeRate.updateFeeRateFromCalc(args.newValue, editInfo);
             $.bootstrapLoading.end();
             return;
         };
@@ -310,6 +308,8 @@ let calcProgramManage = {
                     name: '删除行',
                     icon: 'fa-remove',
                     callback: function () {
+                        hintBox('自定义标题', '自定义内容pppppppppppppppppppppppppppppppppppppppppppppppppppp');
+                        return;
                         $.bootstrapLoading.start();
                         let template = calcProgramManage.getSelectionInfo().template;
                         let idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();