chenshilong před 7 roky
rodič
revize
5ed26283ec

+ 14 - 1
web/building_saas/main/js/views/project_property_labour_coe_view.js

@@ -56,7 +56,20 @@ let labourCoeView = {
         var me = labourCoeView;
         if (args.propertyName !== "value"){return;};
         let cell = me.sheet.getCell(args.row, args.col);
-        me.addNeedUpdateData({ID: cell.tag(), coe: cell.value()});
+        let value = args.newValue;
+        let oValue = args.oldValue;
+        if (number_util.isNumber(value)) {
+            value = value.toDecimal(3);
+            me.sheet.suspendEvent();
+            cell.value(value);
+            me.sheet.resumeEvent();
+            me.addNeedUpdateData({ID: cell.tag(), coe: value});
+        } else {
+            me.sheet.suspendEvent();
+            cell.value(oValue);  // 屏蔽事件,否则这句会导致死循环
+            me.sheet.resumeEvent();
+            alert('当前输入的数据类型不正确,请重新输入。');
+        }
     },
 
     addNeedUpdateData: function (data) {

+ 2 - 2
web/building_saas/main/js/views/project_view.js

@@ -806,14 +806,14 @@ $('#property_ok').click(function () {
         };
     };
 
-    // console.log(mixDatas);
+    console.log(mixDatas);
     // return;   // for test.
     function hasMixData() {
         return Object.keys(mixDatas.properties).length > 0 ||
             mixDatas.labourCoes.updateData || mixDatas.rations.length > 0 || mixDatas.bills.length > 0;
     }
 
-    if(hasMixData){
+    if(hasMixData()){
         CommonAjax.post('/pm/api/updateMixDatas', {user_id: userID, mixDataArr: mixDatas}, function (rstData) {
 /*            if (changedNodes.length > 0) {
                 for (let node of changedNodes){delete node.changed};