prepare_AI

src/AI.js

@@ -205,7 +205,7 @@ export default function AI() {
       { field: '组价定额', headerName: '组价定额', width : 250 , sortable: false, renderCell: RenderDe},
       { field: '定额名称', headerName: '定额名称', width : 250, sortable: false, renderCell: RenderDemc },
       { field: '数量', headerName: '数量',  },
-      { field: '综合单价', headerName: '综合单价',  },
+      { field: '综合单价', headerName: '综合单价', width: 150 },
       
  
       
@@ -604,6 +604,7 @@ function FolderArrow({ node }) {
                 sx={{ my: 2, color: 'white', display: 'block' }}
               >
                 统计AI
+	    { !tab && <span style={{height: "3px", width : "48px", backgroundColor: "white", display : "flex", position: "absolute"}}> </span> }
               </Button>
             <Button
                 key={'组价AI'}
@@ -611,6 +612,7 @@ function FolderArrow({ node }) {
                 sx={{ my: 2, color: 'white', display: 'block' }}
               >
                 组价AI
+	    { tab && <span style={{height: "3px", width : "48px", backgroundColor: "white", display : "flex", position: "absolute"}}> </span> }
               </Button>
             </Stack>
          

src/App2.js

@@ -498,12 +498,6 @@ function a11yProps(index) {
               setZhuanye(res["actual_zhuanye"]);
               let id = res['reverse'];
               if (id && id != "None") {
-                    setRgde(res["rgde"]);
-                    setJxde(res["jxde"]);
-                    setClde(res["clde"]);
-                    console.log(res["rgde"]);
-                    console.log(res["jxde"]);
-                    console.log(res["clde"]);
                     setBeizhu(res["bz_selected"]);
                     setBeizhuFK(res["bz_selected2"]);
                     SimpleService.generateDingeshu(res["actual_zhuanye"]).then(x=>{
@@ -1377,9 +1371,6 @@ function a11yProps(index) {
                                 name={location["id"]}
                                 bh={qdbh}
                                 bt={x}
-                                rgde={rgde}
-                                jxde={jxde}
-                                clde={clde}
                                 beizhu={beizhu}
                                 beizhuFK={beizhuFK}
                                 clickCallback={clickCallback}
@@ -1411,9 +1402,6 @@ function a11yProps(index) {
                      <Djcs3
                          name={location["id"]} 
                          bh={dwgc}
-                         rgde={rgde}
-                         jxde={jxde}
-                         clde={clde}
                          beizhu={beizhu}
                          clickCallback={clickCallback}
                          loadingCallback={loadingCallback_djcs}

src/Djcs3.js

@@ -31,7 +31,7 @@ function number_equal(a, b) {
      }
      return false;
 }
-export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, clickCallback, loadingCallback, dingeclick, azfycallback, azfySelect, azfyConfirm}) {
+export default function Djcs3({name, bh,  beizhu, beizhuFK, clickCallback, loadingCallback, dingeclick, azfycallback, azfySelect, azfyConfirm}) {
      const navigate = useNavigate();
     
      var editCheck = function(cell){
@@ -214,62 +214,6 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                                isQdrcj.current = false;
                                setFuzhuEnable(x[1]);
                                let toHighlight = [];
-                               for(let i = 0; i < y.length; i++) {
-                                   let entry = y[i];
-                                   let bianhao = entry['人材机编码'];
-                                   let rcjlb = entry['人材机类别'];
-                                   if (Number(rcjlb) == 1 &&  rgdeRef.current  ) {
-                                      for (let j = 0;j < rgdeRef.current.length; j++) {
-                                         if (rgdeRef.current[j]["CLBH"] == bianhao) {
-                                              let danjia = Number(entry['单价']);
-                                              if (!number_equal(danjia , rgdeRef.current[j]["YSJG"])) {
-                                                   console.log(`[${i},5]danjia bu yizhi`);
-                                                   toHighlight.push({row: i, col: 5, });
-                                              }
-                                              let hanliang = Number(entry['含量']);
-                                              if (!number_equal(hanliang , rgdeRef.current[j]["gr"])) {
-                                                   console.log(`[${i}, 10]hanliang bu yizhi`);
-                                                   toHighlight.push({row: i, col: 10, });
-                                              }
-                                         }
-                                      }
-
-                                   }   
-                                   if (Number(rcjlb) == 3 && jxdeRef.current  ) {
-                                      for (let j = 0; j < jxdeRef.current.length; j++) {
-                                         if (jxdeRef.current[j]["jxbh"] == bianhao) {
-                                               let danjia = Number(entry['单价']);
-                                               if (!number_equal(danjia , jxdeRef.current[j]["tbdj"])) {
-                                                    console.log(`[${i},5]danjia bu yizhi`);
-                                                    toHighlight.push({row: i, col: 5, });
-                                               }
-                                               let hanliang = Number(entry['含量']);
-                                               if (!number_equal(hanliang , jxdeRef.current[j]["sl"])) {
-                                                    console.log(`[${i}, 10]hanliang bu yizhi`);
-                                                    toHighlight.push({row: i, col: 10, });
-                                               }
-                                         }
-                                      }
-
-                                   }   
-                                   if (Number(rcjlb) == 2 && cldeRef.current  ) {
-                                      for (let j = 0; j < cldeRef.current.length; j++) {
-                                         if (cldeRef.current[j]["CLBH"] == bianhao) {
-                                               let danjia = Number(entry['单价']);
-                                               if (!number_equal(danjia , cldeRef.current[j]["YSJG"])) {
-                                                    console.log(`[${i},5]danjia bu yizhi`);
-                                                    toHighlight.push({row: i, col: 5, });
-                                               }
-                                               let hanliang = Number(entry['含量']);
-                                               if (!number_equal(hanliang , cldeRef.current[j]["SL"])) {
-                                                    console.log(`[${i}, 10]hanliang bu yizhi`);
-                                                    toHighlight.push({row: i, col: 10, });
-                                               }
-                                         }
-                                      }
-
-                                   }   
-                               }
                                highlight.current = toHighlight;
                              });
           }
@@ -809,99 +753,6 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
           }, [dingeclick]//常规添加定额
       );
 
-    React.useEffect(
-        () => {
-          console.log("rgde changed");
-          console.log(rgde);
-          rgdeRef.current = rgde;
-          jxdeRef.current = jxde;
-          cldeRef.current = clde;
-          if (isQdrcj.current) {
-             highlight.current = [];
-          } else {
-          let toHighlight = [];
-          for(let i = 0; i < rcjhl.length; i++) {
-              let entry = rcjhl[i];
-              let bianhao = entry['人材机编码'];
-              let rcjlb = entry['人材机类别'];
-              if (Number(rcjlb) == Number(1) && rgde) {
-                  for (let j = 0; j < rgde.length; j++) {
-                      if (rgde[j]["CLBH"] == bianhao) {
-                          let danjia = Number(entry['单价']);
-                          if (!number_equal(danjia , rgde[j]["YSJG"])) {
-                               console.log(`[${i},5]danjia bu yizhi`);
-                               toHighlight.push({row: i, col: 5});
-                          }
-                          let hanliang = Number(entry['含量']);
-                          if (!number_equal(hanliang , rgde[j]["gr"])) {
-                               console.log(`[${i}, 10]hanliang bu yizhi`);
-                               toHighlight.push({row: i, col: 10});
-                          }
-
-                      }              
-                  }
-
-              }   
-              if (Number(rcjlb) == Number(3) && jxde ) {
-                   for (let j = 0; j < jxde.length; j++) {
-                      if (jxde[j]["jxbh"] == bianhao) {
-                         let danjia = Number(entry['单价']);
-                         if (!number_equal(danjia , jxde[j]["tbdj"])) {
-                              console.log(`[${i},5]danjia bu yizhi`);
-                              toHighlight.push({row: i, col: 5, });
-                         }
-                         let hanliang = Number(entry['含量']);
-                         if (!number_equal(hanliang , jxde[j]["sl"])) {
-                              console.log(`[${i}, 10]hanliang bu yizhi`);
-                              toHighlight.push({row: i, col: 10, });
-                         }
-                      }
-                   }
-
-              }   
-              if (Number(rcjlb) == Number(2) && clde ) {
-                   for (let j = 0; j < clde.length; j++) {
-                      if (clde[j]["CLBH"] == bianhao) {
-                         let danjia = Number(entry['单价']);
-                         if (!number_equal(danjia , clde[j]["YSJG"])) {
-                              console.log(`[${i},5]danjia bu yizhi`);
-                              toHighlight.push({row: i, col: 5, });
-                         }
-                         let hanliang = Number(entry['含量']);
-                         if (!number_equal(hanliang ,clde[j]["SL"])) {
-                              console.log(`[${i}, 10]hanliang bu yizhi`);
-                              toHighlight.push({row: i, col: 10, });
-                         }
-                      }
-                   }
-
-              }   
-          }
-          console.log(toHighlight);
-          highlight.current = toHighlight;
-          }
-
-
-          let bzrcjhl = [] 
-          if (rgde)
-          for (let i = 0; i  < rgde.length; i++) {
-               bzrcjhl.push({'人材机编码': rgde[i]["CLBH"], '名称': rgde[i]["CLMC"], '单位': rgde[i]["JLDW"], '单价': rgde[i]["YSJG"], '合价': rgde[i]["gf"], '含量': rgde[i]["gr"]});
-          }
-          
-          if (clde)
-          for (let i = 0; i  < clde.length; i++) {
-               bzrcjhl.push({'人材机编码': clde[i]["CLBH"], '名称': clde[i]["CLMC"], '单位': clde[i]["JLDW"], '单价': clde[i]["YSJG"], '合价': clde[i]["HJ"], '含量': clde[i]["SL"]});
-          }
-          if (jxde)
-          for (let i = 0; i  < jxde.length; i++) {
-               bzrcjhl.push({'人材机编码': jxde[i]["jxbh"], '名称': jxde[i]["jxmc"], '单位': jxde[i]["DW"], '单价': jxde[i]["tbdj"], '合价': jxde[i]["hj"], '含量': jxde[i]["sl"]});
-          }
-          setRcjhl2(bzrcjhl);
-          if (rcj2Table.current) {
-               rcj2Table.current.replaceData(bzrcjhl);
-          }
-        }, [rgde, jxde, clde]
-      );
 
       const handleChange = (event, newValue) => {
         setValue(newValue);
@@ -1103,7 +954,6 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                        <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                          <TabList onChange={handleChange} aria-label="lab API tabs example"  sx={{minHeight: '24px'}}   >
                            <Tab sx={{p: 0, minHeight: '24px'}} label="人材机含量" value="1" />
-                           <Tab sx={{p: 0, minHeight: '24px'}} label="标准定额人材机含量" value="2" />
                            <Tab sx={{p: 0, minHeight: '24px'}} label="定额附注" value="3" />
                            <Tab sx={{p: 0, minHeight: '24px'}} label="组价推荐" value="4" />
                          </TabList>

src/Qingdan3.js

@@ -59,7 +59,7 @@ const {Column, HeaderCell, Cell} = Table;
 
 
 
-export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台传回来的附注信息，要整理后才能成为展示用的行*/ , beizhuFK, clickCallback, loadingCallback, dingeclick, tihuanCallback, tihuanClick, bctihuanClick, bctihuanCallback, suanshiCallback}) {
+export default function Qingdan3({name, bh, bt,  beizhu/*后台传回来的附注信息，要整理后才能成为展示用的行*/ , beizhuFK, clickCallback, loadingCallback, dingeclick, tihuanCallback, tihuanClick, bctihuanClick, bctihuanCallback, suanshiCallback}) {
     
      const myTable = React.useRef(null);
      const myRef = React.useRef(null);
@@ -519,69 +519,6 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                  //hotRcjRef.current?.hotInstance?.loadData(x);
                  isQdrcj.current = false;
                  let toHighlight = [];
-                 for(let i = 0; i < y.length; i++) {
-                     let entry = y[i];
-                     let bianhao = entry['人材机编码'];
-                     let rcjlb = entry['人材机类别'];
-                     let hit = false;
-                     if (Number(rcjlb) == 1 &&  rgdeRef.current  ) {
-                        for (let j = 0;j < rgdeRef.current.length; j++) {
-                           if (rgdeRef.current[j]["CLBH"] == bianhao) {
-                               if(rgdeRef.current[j]["CLMC"] == entry['名称'])hit = true;
-                                let danjia = Number(entry['单价']);
-                                if (danjia != rgdeRef.current[j]["YSJG"]) {
-                                     //console.log(`[${i},5]danjia bu yizhi`);
-                                     toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                                }
-                                let hanliang = Number(entry['含量']);
-                                if (hanliang != rgdeRef.current[j]["gr"]) {
-                                     //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                     toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                                }
-                           }
-                        }
-
-                     }   
-                     if (Number(rcjlb) == 3 && jxdeRef.current  ) {
-                        for (let j = 0; j < jxdeRef.current.length; j++) {
-                           if (jxdeRef.current[j]["jxbh"] == bianhao) {
-                               if(jxdeRef.current[j]["jxmc"] == entry['名称'])hit = true;
-                                 let danjia = Number(entry['单价']);
-                                 if (danjia != jxdeRef.current[j]["tbdj"]) {
-                                      //console.log(`[${i},5]danjia bu yizhi`);
-                                      toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                                 }
-                                 let hanliang = Number(entry['含量']);
-                                 if (hanliang != jxdeRef.current[j]["sl"]) {
-                                      //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                      toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                                 }
-                           }
-                        }
-
-                     }   
-                     if (Number(rcjlb) == 2 && cldeRef.current  ) {
-                        for (let j = 0; j < cldeRef.current.length; j++) {
-                           if (cldeRef.current[j]["CLBH"] == bianhao) {
-                               if(cldeRef.current[j]["CLMC"] == entry['名称'])hit = true;
-                                 let danjia = Number(entry['单价']);
-                                 if (danjia != cldeRef.current[j]["YSJG"]) {
-                                      //console.log(`[${i},5]danjia bu yizhi`);
-                                      toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                                 }
-                                 let hanliang = Number(entry['含量']);
-                                 if (hanliang != cldeRef.current[j]["SL"]) {
-                                      //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                      toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                                 }
-                           }
-                        }
-
-                     }
-                     if (!hit) {
-                          toHighlight.push({row: i, col: 1, renderer: "customStylesRenderer"});
-                     }   
-                 }
                  highlight.current = toHighlight;
                });
 
@@ -1054,99 +991,6 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
 
 
 
-        React.useEffect(
-          () => {
-            rgdeRef.current = rgde;
-            jxdeRef.current = jxde;
-            cldeRef.current = clde;
-            if (isQdrcj.current) {
-               highlight.current = [];
-            } else {
-            let toHighlight = [];
-            for(let i = 0; i < rcjhl.length; i++) {
-                let entry = rcjhl[i];
-                let bianhao = entry['人材机编码'];
-                let rcjlb = entry['人材机类别'];
-                let hit = false;
-                if (Number(rcjlb) == Number(1) && rgde) {
-                    for (let j = 0; j < rgde.length; j++) {
-                        if (rgde[j]["CLBH"] == bianhao) {
-                            if(rgde[j]["CLMC"] == entry['名称'])hit = true;
-                            let danjia = Number(entry['单价']);
-                            if (danjia != rgde[j]["YSJG"]) {
-                                 //console.log(`[${i},5]danjia bu yizhi`);
-                                 toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                            }
-                            let hanliang = Number(entry['含量']);
-                            if (hanliang != rgde[j]["gr"]) {
-                                 //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                 toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                            }
-  
-                        }              
-                    }
-  
-                }   
-                if (Number(rcjlb) == Number(3) && jxde ) {
-                     for (let j = 0; j < jxde.length; j++) {
-                        if (jxde[j]["jxbh"] == bianhao) {
-                           if(jxde[j]["jxmc"] == entry['名称'])hit = true;
-                           let danjia = Number(entry['单价']);
-                           if (danjia != jxde[j]["tbdj"]) {
-                                //console.log(`[${i},5]danjia bu yizhi`);
-                                toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                           }
-                           let hanliang = Number(entry['含量']);
-                           if (hanliang != jxde[j]["sl"]) {
-                                //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                           }
-                        }
-                     }
-  
-                }   
-                if (Number(rcjlb) == Number(2) && clde ) {
-                     for (let j = 0; j < clde.length; j++) {
-                        if (clde[j]["CLBH"] == bianhao) {
-                           if(clde[j]["CLMC"] == entry['名称'])hit = true;
-                           let danjia = Number(entry['单价']);
-                           if (danjia != clde[j]["YSJG"]) {
-                                //console.log(`[${i},5]danjia bu yizhi`);
-                                toHighlight.push({row: i, col: 5, renderer: "customStylesRenderer"});
-                           }
-                           let hanliang = Number(entry['含量']);
-                           if (hanliang != clde[j]["SL"]) {
-                                //console.log(`[${i}, 10]hanliang bu yizhi`);
-                                toHighlight.push({row: i, col: 10, renderer: "customStylesRenderer"});
-                           }
-                        }
-                     }
-  
-                }
-                if (!hit) {
-                   toHighlight.push({row: i, col: 1, renderer: "customStylesRenderer"});
-                }   
-            }
-            //console.log(toHighlight);
-            highlight.current = toHighlight;
-            }
-            let bzrcjhl = [/*["人材机编码", "名称", "单位", "单价", "合价", "含量"]*/] 
-            if (rgde)
-          for (let i = 0; i  < rgde.length; i++) {
-               bzrcjhl.push({'人材机编码': rgde[i]["CLBH"], '名称': rgde[i]["CLMC"], '单位': rgde[i]["JLDW"], '单价': rgde[i]["YSJG"], '合价': rgde[i]["gf"], '含量': rgde[i]["gr"]});
-          }
-          
-          if (clde)
-          for (let i = 0; i  < clde.length; i++) {
-               bzrcjhl.push({'人材机编码': clde[i]["CLBH"], '名称': clde[i]["CLMC"], '单位': clde[i]["JLDW"], '单价': clde[i]["YSJG"], '合价': clde[i]["HJ"], '含量': clde[i]["SL"]});
-          }
-          if (jxde)
-          for (let i = 0; i  < jxde.length; i++) {
-               bzrcjhl.push({'人材机编码': jxde[i]["jxbh"], '名称': jxde[i]["jxmc"], '单位': jxde[i]["DW"], '单价': jxde[i]["tbdj"], '合价': jxde[i]["hj"], '含量': jxde[i]["sl"]});
-          }
-            setRcjhl2(bzrcjhl);
-          }, [rgde, jxde, clde]
-        );
 
 
 
@@ -1333,12 +1177,6 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                             dataTree: false,
                             selectableRows:1, //make rows selectable
                             editTriggerEvent:"dblclick",
-                            rowFormatter:function(row){
-                              var data = row.getData();
-                              if (data['人材机编码'].includes('10000F')) {
-                                   row.getElement().style.backgroundColor = "#ffff00";
-                              }
-                          },
                             columns: [ //Define Table Columns
                                          {title:"ID", field:"ID", width:80, headerSort:false, },
                                          {title:"人材机编码", field:"人材机编码", width:120, headerSort:false, formatter: sparklineFormatter2}, //never hide this column
@@ -1612,7 +1450,6 @@ const EditableCell = ({ rowData, dataType, dataKey, onChange, ...props }) => {
                        <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                          <TabList sx={{minHeight: '24px'}} onChange={handleChange} aria-label="lab API tabs example">
                            <Tab sx={{p: 0, minHeight: '24px'}} label="人材机含量" value="1" />
-                           <Tab sx={{p: 0, minHeight: '24px'}} label="标准定额人材机含量" value="2" />
                            <Tab sx={{p: 0, minHeight: '24px'}} label="人材机补充" value="3" />
                            <Tab sx={{p: 0, minHeight: '24px'}} label="定额附注" value="4" />
                            <Tab sx={{p: 0, minHeight: '24px'}} label="预拌砂浆" value="5" />