소스 검색

fix_suanshi

Xiaopeng Zhang 5 달 전
부모
커밋
64e8e6c80c
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      src/Qingdan3.js
  2. 1 1
      src/Service.js

+ 2 - 1
src/Qingdan3.js

@@ -1173,7 +1173,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               //cell - cell component
                               let determine = cell._cell.row.getData()['人材机编码'] != '410000F';
                               let determine2 = !cell._cell.row.getData()['人材机编码'].includes('000FE'); 
-                              if(cell._cell.column.getPosition() == 2  && !isQdrcj.current && determine && determine2) {
+                              let determine3 = !cell._cell.row.getData()['人材机编码'].startsWith('D'); 
+                              if(cell._cell.column.getPosition() == 2  && !isQdrcj.current && determine && determine2 && determine3) {
                                   tihuanCallback(cell._cell.row.position, cell._cell.column.getPosition());
                               }
                           });

+ 1 - 1
src/Service.js

@@ -1642,7 +1642,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         let clf_sum = 0;
         let zcf_sum = 0;
         for(let i = 1; i < data.length; i++) {
-            if (data[i][1].includes('000FE') && data[i][4] == '%')continue;
+            if (data[i][1].includes('000FE') && data[i][4] == '%')continue;//azfy
             sum += Number(data[i][11]);//11-> hejia
             if (Number(data[i][8]) == 1) {
                 rgf_sum += Number(data[i][11]);