fix_buchong

src/Djcs3.js

@@ -943,16 +943,16 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                               <CheckCell dataKey="id" checkedKeys={checkedKeys} onChange={handleCheck} disabled={!fuzhuEnable}></CheckCell>
                          </Column>
                          <Column width={80} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>序号</HeaderCell>
-                              <Cell dataKey="序号" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>序号</HeaderCell>
+                              <Cell dataKey="序号" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                          <Column width={120} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>编号</HeaderCell>
-                              <Cell dataKey="编号" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>编号</HeaderCell>
+                              <Cell dataKey="编号" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                          <Column fullText width={650} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>说明</HeaderCell>
-                              <Cell dataKey="说明" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>说明</HeaderCell>
+                              <Cell dataKey="说明" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                         </Table>
                         </CustomProvider>

src/Qingdan3.js

@@ -252,7 +252,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           //get row data
           //console.log(cell);
           if(isQdrcj.current) return false;
-          if (cell._cell.row.getData()['人材机编码'] == '410000F') {
+          if (cell._cell.row.getData()['人材机编码'].includes('10000F')) {
                return false;
           }
           if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
@@ -270,7 +270,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           //get row data
           //console.log(cell);
           if(isQdrcj.current) return false;
-          if (cell._cell.row.getData()['人材机编码'] == '410000F') {
+          if (cell._cell.row.getData()['人材机编码'].includes('10000F')) {
                return false;
           }
           if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
@@ -702,10 +702,12 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           const handleClick = () => {
             const id = uuidv4();
             let a = [];
+            let temp = debmRef.current;
+            let temp2 = temp.split('-')[0];
             setRcjrows((oldRows) => {
                a = [
                  ...oldRows,
-                 { id, '人材机编码': '410000F', '名称': '', '规格型号': '', '单位': '', '单价':'0','产地': '', '供应厂商': '', '人材机类别':'2',
+                 { id, '人材机编码': temp2.concat('10000F'), '名称': '', '规格型号': '', '单位': '', '单价':'0','产地': '', '供应厂商': '', '人材机类别':'2',
                 '甲供标志':'', '含量':'1', '暂估价标志':'', '主要材料标志':'true', '主材标志':'true', '设备标志':'' },
                ];
                return a;
@@ -1160,7 +1162,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               //row - row component
                               
                               var data = row.getData();
-                              if (data['人材机编码'] == '410000F') {
+                              if (data['人材机编码'].includes('10000F')) {
                                    row.getElement().style.backgroundColor = "#ffff00";
                               }
                               
@@ -1195,7 +1197,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                          rcjTable.current.on("cellDblClick", function(e, cell){
                               //e - the click event object
                               //cell - cell component
-                              let determine = cell._cell.row.getData()['人材机编码'] != '410000F';
+                              let determine = !cell._cell.row.getData()['人材机编码'].includes('10000F');
                               let determine2 = !cell._cell.row.getData()['人材机编码'].includes('000FE'); 
                               let determine3 = !cell._cell.row.getData()['人材机编码'].startsWith('D'); 
                               if(cell._cell.column.getPosition() == 2  && !isQdrcj.current && determine && determine2 && determine3) {
@@ -1412,16 +1414,16 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               <CheckCell dataKey="id" checkedKeys={checkedKeys} onChange={handleCheck} disabled={!fuzhuEnable}></CheckCell>
                          </Column>
                          <Column width={80} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>序号</HeaderCell>
-                              <Cell dataKey="序号" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>序号</HeaderCell>
+                              <Cell dataKey="序号" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                          <Column width={120} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>编号</HeaderCell>
-                              <Cell dataKey="编号" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>编号</HeaderCell>
+                              <Cell dataKey="编号" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                          <Column fullText width={650} align="center">
-                              <HeaderCell style={{ "font-size": "0.875rem" }}>说明</HeaderCell>
-                              <Cell dataKey="说明" style={{ "font-size": "0.875rem" }}></Cell>
+                              <HeaderCell style={{ "fontSize": "0.875rem" }}>说明</HeaderCell>
+                              <Cell dataKey="说明" style={{ "fontSize": "0.875rem" }}></Cell>
                          </Column>
                         </Table>
                         </CustomProvider>

src/Service.js

@@ -1677,7 +1677,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         }
 
 
-        de['dercj'] = de['dercj'].filter(x=>x[1] != '410000F')//补充
+        de['dercj'] = de['dercj'].filter(x=>x[1].includes('10000F'))//补充
         for(let i = 0; i < rcjbc.length; i++) {
             de['dercj'].push(['', rcjbc[i]['人材机编码'], rcjbc[i]['名称'], rcjbc[i]['规格型号'], rcjbc[i]['单位'], rcjbc[i]['单价'], rcjbc[i]['产地'], rcjbc[i]['供应厂商'], rcjbc[i]['人材机类别'], rcjbc[i]['甲供标志'], rcjbc[i]['含量'], '', rcjbc[i]['暂估价标志'],rcjbc[i]['主要材料标志'],rcjbc[i]['主材标志'],rcjbc[i]['设备标志']]);
         }