Xiaopeng Zhang пре 6 месеци
родитељ
комит
e1ebd1e5d4
2 измењених фајлова са 13 додато и 4 уклоњено
  1. 6 1
      front/src/Qingdan.js
  2. 7 3
      front/src/Service.js

+ 6 - 1
front/src/Qingdan.js

@@ -340,8 +340,13 @@ export default function Qingdan({name, bh, bt, rgde, jxde, clde, beizhu, clickCa
           if (changes == null) {
 
           } else {
+               let data =  hotRcjRef.current?.hotInstance?.getData();
+               for(let i = 1; i < data.length; i++) {
+                    data[i][11] = Number(data[i][10]) * Number(data[i][5]);
+                }
+                setRcjhl(data);
           
-          let newData = updateDercj(selectedRowKeys[0], hotRcjRef.current?.hotInstance?.getData());
+          let newData = updateDercj(selectedRowKeys[0], data);
           setDetail(newData);
           }
         };

+ 7 - 3
front/src/Service.js

@@ -1021,7 +1021,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     let A =  "=F".concat((j+1).toString());
                     let B = A.concat("*K");//2";
                     let C = B.concat((j+1).toString());
-                    qd["children"][i]["dercj"][j][11] = C;
+                    //qd["children"][i]["dercj"][j][11] = C;
                 }
 
             }
@@ -1029,8 +1029,12 @@ async generateQingdanTuijian(name, bh, bt, bm) {
     }
 
     updateDercj(row, data) {
+        for(let i = 1; i < data.length; i++) {
+            data[i][11] = Number(data[i][10]) * Number(data[i][5]);
+        }
         this.updateDercj_(row, data);
-        
+        let qd = this.cache.filter(x=>x["children"].filter(y=>y['key']==row).length > 0)[0];
+
         let newData = this.cache.map(x=>{
             if (x['key'] == qd['key']) {
                 return qd;
@@ -1146,7 +1150,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 '备注': null,
                 "dercj": [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
                 "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志" ],
-                   ['', bh, '', '', danwei, '', '', '', '2', '', '1', '=F2*K2', '',  '', '', '' ]
+                   ['', bh, '', '', danwei, '', '', '', '2', '', '1', '', '',  '', '', '' ]
                       ],
                 'key' :   uuidv4()