add some comment

front/src/AppDrawer.js

@@ -1,834 +0,0 @@
-import * as React from 'react';
-import Box from "@mui/material/Box";
-import 'handsontable/dist/handsontable.full.min.css';
-//import 'handsontable/styles/ht-theme-main.min.css';
-import { HandsonTable } from 'handsontable/base';
-import {HotTable} from "@handsontable/react";
-import { registerAllModules } from 'handsontable/registry';
-import {RichTreeView } from "@mui/x-tree-view/RichTreeView";
-import { Grid } from '@mui/material';
-import Tab from "@mui/material/Tab";
-import TabContext from "@mui/lab/TabContext";
-import TabList from "@mui/lab/TabList";
-import TabPanel from "@mui/lab/TabPanel";
-//import { registerPlugin, NestedRows } from 'handsontable/plugins';
-//registerPlugin(NestedRows);
-import Qingdan from './Qingdan';
-import Zjcs from './Zjcs';
-import Djcs from './Djcs';
-import Service from './Service';
-import {useLocation} from "react-router";
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import Typography from '@mui/material/Typography';
-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
-import Accordion from '@mui/material/Accordion';
-import AccordionActions from '@mui/material/AccordionActions';
-import AccordionSummary from '@mui/material/AccordionSummary';
-import AccordionDetails from '@mui/material/AccordionDetails';
-import Stack from '@mui/material/Stack';
-import { DataGrid } from '@mui/x-data-grid';
-import { styled, useTheme } from '@mui/material/styles';
-
-
-//registerAllModules();
-const MUI_X_PRODUCTS = [
-    {
-      id: 'grid',
-      label: 'Data Grid',
-      children: [
-        { id: 'grid-community', label: '@mui/x-data-grid' },
-        { id: 'grid-pro', label: '@mui/x-data-grid-pro' },
-        { id: 'grid-premium', label: '@mui/x-data-grid-premium' },
-      ],
-    },
-    {
-      id: 'pickers',
-      label: 'Date and Time Pickers',
-      children: [
-        { id: 'pickers-community', label: '@mui/x-date-pickers' },
-        { id: 'pickers-pro', label: '@mui/x-date-pickers-pro' },
-      ],
-    },
-    {
-      id: 'charts',
-      label: 'Charts',
-      children: [
-        { id: 'charts-community', label: '@mui/x-charts' },
-        { id: 'charts-pro', label: '@mui/charts-pro' },
-      ],
-    },
-    {
-      id: 'tree-view',
-      label: 'Tree View',
-      children: [
-        { id: 'tree-view-community', label: '@mui/x-tree-view' },
-        { id: 'tree-view-pro', label: '@mui/x-tree-view-pro' },
-      ],
-    },
-  ];
-
-  const INFO = [
-
-                      ['', 'Tesla', 'Volvo', 'Toyota', 'Ford'],
-                      ['2019', 10, 11, 12, 13],
-                      ['2020', 20, 11, 14, 13],
-                      ['2021', 30, 15, 12, 13]
-  ];
-
-
-  export default function AppDrawer() {
-
-
-    const [outline, setOutline] = React.useState([]);
-    const [peibishu, setPeibishu] = React.useState([]);
-    const [outlineDes, setOutlineDes] = React.useState([]);
-    const [columnHeaders, setColumnHeaders] = React.useState([]);
-    const [detail, setDetail] = React.useState(INFO);
-    const [deXilie, setDeXilie] = React.useState([]);
-    const [pbXilie, setPbXilie] = React.useState([]);
-    const [nestDetail, setNestDetail] = React.useState(INFO);
-    const [nest, setNest] = React.useState(false);
-    const [qingdan, setQingdan] = React.useState(false);
-    const [cuoshi, setCuoshi] = React.useState(false);
-    const [qdbt, setQdbt] = React.useState([]);
-    const [qdbh, setQdbh] = React.useState(null);
-    const [value, setValue] = React.useState('1');
-    const [dwgc, setDwgc] = React.useState(null);
-    const [zhuanye, setZhuanye] = React.useState(10);
-    const [expandedQd, setExpandedQd] = React.useState(true);
-    const [expandedPb, setExpandedPb] = React.useState(false);
-    const [expandedDe, setExpandedDe] = React.useState(false);
-    const [zylb, setZylb] = React.useState('');
-    const [selectedItems, setSelectedItems] = React.useState(null);
-    const [expandedItems, setExpandedItems] = React.useState([]);
-    const [rgde, setRgde] = React.useState(null);
-    const [beizhu, setBeizhu] = React.useState(null);
-    const [clde, setClde] = React.useState(null);
-    const [jxde, setJxde] = React.useState(null);
-    const relation = React.useRef({});
-    const columns =[
-    
-      {field: '定额编号', headerName: '定额编号'},
-      {field: '名称', headerName: '名称'}, 
-      {field: '单位', headerName: '单位'},
-      {field: '单价', headerName: '单价'}
-    ];
-    const columns2 =[
-    
-      {field: '编号', headerName: '定额编号'},
-      {field: '名称', headerName: '名称'}, 
-      {field: '单位', headerName: '单位'},
-      {field: '单价', headerName: '单价'}
-    ];
-    let location = useLocation();
-
-
-    const traverse = (shu) => {
-       for(let i = 0; i < shu.length; i++) {
-          let id = shu[i]["id"];
-          let children = shu[i]["children"];
-          for (let j = 0; j < children.length; j++) {
-             let id2 = children[j]["id"];
-             relation.current[id2]=id;
-          }
-          traverse(children);
-       }
-    };
-    const setOutlineDes_ = (x) => {
-       setOutlineDes(x);
-       relation.current = {};
-       traverse(x);
-      
-    };
-       const handleChangeZhuanye = (event) => {
-           //console.log(event.target.value);
-           Service.generateDingeshu(event.target.value).then(x=>{
-               setOutlineDes_(x);
-           });
-           setZhuanye(event.target.value);
-        };
-
-    const handleChange = (event, newValue) => {
-      setValue(newValue);
-    };
-
-
-
-    const findparent = (id) => {
-        let result = [];
-        while(id) {
-           result.push(id);
-           id = relation.current[id];
-        }
-        return result;
-    };
-
-    const clickCallback = (qdbm, debh) => {
-      console.log('####################################zylb#####################'.concat(zylb.toString()));
-       //console.log(debh);
-       setExpandedQd(false);
-       setExpandedDe(true);//1 jianzhu 2 zhuangshi 3 anzhuang 4 shizheng 5 yuanlin 6 guidao 7 xiushantujian 8 xiushananzhuang 9 xiushanjiagu  
-       if (qdbm.startsWith("01")) {
-        let suggestion = 10;
-        if (zylb == "7") {
-          suggestion = 50;
-        }  
-        setZhuanye(suggestion);
-          Service.generateSingleDingeXilie(suggestion, debh).then(x=>{
-              //console.log(x);
-              let res = JSON.parse(x);
-              console.log(res);
-              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"]);
-                    Service.generateDingeshu(res["actual_zhuanye"]).then(x=>{
-                        setOutlineDes_(x);
-                        setSelectedItems(id);
-                        setExpandedItems(findparent(id));
-                           Service.generateDingeXilie(res["actual_zhuanye"], id).then(x=>{
-                                let y = JSON.parse(x);
-                                //console.log(y);
-                                let result = [];
-                                let keys = Object.keys(y["DW"])
-                                for(let i = 0; i < keys.length; i++) {
-                                    let key = keys[i];
-                                    let entry = {
-                                      "id": y["DEBH"][key],
-                                      "定额编号":  y["DEBH"][key], 
-                                      "名称":  y["GCLMC"][key],
-                                      "单位":  y["DW"][key],
-                                      "单价":  y["GCLSJDJ"][key]
-                                    };
-                                    result.push(entry);
-                                }
-                                setDeXilie(result);
-                           });
-                    });
-              } else {
-              
-                    setRgde(null);
-                    setJxde(null);
-                    setClde(null);
-                    setBeizhu(res["bz_selected"]);
-              }
-           });
-       
-       } else if (qdbm.startsWith("03")) {//安装
-        let suggestion = 30;
-        if (zylb == "8") {
-          suggestion = 60;
-        }   
-        setZhuanye(suggestion);
-         Service.generateSingleDingeXilie(suggestion, debh).then(x=>{
-          //console.log(x);
-          let res = JSON.parse(x);
-          console.log(res);
-          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"]);
-                Service.generateDingeshu(res["actual_zhuanye"]).then(x=>{
-                    setOutlineDes_(x);
-                    setSelectedItems(id);
-                    setExpandedItems(findparent(id));
-                       Service.generateDingeXilie(res["actual_zhuanye"], id).then(x=>{
-                            let y = JSON.parse(x);
-                            //console.log(y);
-                            let result = [];
-                            let keys = Object.keys(y["DW"])
-                            for(let i = 0; i < keys.length; i++) {
-                                let key = keys[i];
-                                let entry = {
-                                  "id": y["DEBH"][key],
-                                  "定额编号":  y["DEBH"][key], 
-                                  "名称":  y["GCLMC"][key],
-                                  "单位":  y["DW"][key],
-                                  "单价":  y["GCLSJDJ"][key]
-                                };
-                                result.push(entry);
-                            }
-                            setDeXilie(result);
-                       });
-                });
-          } else {
-          
-                setRgde(null);
-                setJxde(null);
-                setClde(null);
-                setBeizhu(res["bz_selected"]);
-          }
-       });
-       } else if (qdbm.startsWith("04")) {////市政
-         setZhuanye(20);
-         Service.generateSingleDingeXilie(20, debh).then(x=>{
-          //console.log(x);
-          let res = JSON.parse(x);
-          console.log(res);
-          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"]);
-                Service.generateDingeshu(res["actual_zhuanye"]).then(x=>{
-                    setOutlineDes_(x);
-                    setSelectedItems(id);
-                    setExpandedItems(findparent(id));
-                       Service.generateDingeXilie(res["actual_zhuanye"], id).then(x=>{
-                            let y = JSON.parse(x);
-                            //console.log(y);
-                            let result = [];
-                            let keys = Object.keys(y["DW"])
-                            for(let i = 0; i < keys.length; i++) {
-                                let key = keys[i];
-                                let entry = {
-                                  "id": y["DEBH"][key],
-                                  "定额编号":  y["DEBH"][key], 
-                                  "名称":  y["GCLMC"][key],
-                                  "单位":  y["DW"][key],
-                                  "单价":  y["GCLSJDJ"][key]
-                                };
-                                result.push(entry);
-                            }
-                            setDeXilie(result);
-                       });
-                });
-          } else {
-          
-                setRgde(null);
-                setJxde(null);
-                setClde(null);
-                setBeizhu(res["bz_selected"]);
-          }
-       });
-       }
-       else if (qdbm.startsWith("05")) {//园林
-        setZhuanye(40);
-        Service.generateSingleDingeXilie(40, debh).then(x=>{
-         //console.log(x);
-         let res = JSON.parse(x);
-         console.log(res);
-         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"]);
-               Service.generateDingeshu(res["actual_zhuanye"]).then(x=>{
-                   setOutlineDes_(x);
-                   setSelectedItems(id);
-                   setExpandedItems(findparent(id));
-                      Service.generateDingeXilie(res["actual_zhuanye"], id).then(x=>{
-                           let y = JSON.parse(x);
-                           //console.log(y);
-                           let result = [];
-                           let keys = Object.keys(y["DW"])
-                           for(let i = 0; i < keys.length; i++) {
-                               let key = keys[i];
-                               let entry = {
-                                 "id": y["DEBH"][key],
-                                 "定额编号":  y["DEBH"][key], 
-                                 "名称":  y["GCLMC"][key],
-                                 "单位":  y["DW"][key],
-                                 "单价":  y["GCLSJDJ"][key]
-                               };
-                               result.push(entry);
-                           }
-                           setDeXilie(result);
-                      });
-               });
-         } else {
-         
-               setRgde(null);
-               setJxde(null);
-               setClde(null);
-               setBeizhu(res["bz_selected"]);
-         }
-      });
-       } else {
-        console.log('####################################zylb#####################'.concat(zylb.toString()));
-       }
-    };
-
-
-     const handleChangeAccord = (panel) => (event, newExpanded) => {
-          if (panel == 'qingdan') {
-             setExpandedQd(newExpanded);
-          }
-          else if (panel == 'peibi'){
-             setExpandedPb(newExpanded);
-          } else {
-             setExpandedDe(newExpanded);
-          }
-       };
-    const handleItemSelectionTogglePbs = (event, itemId, isSelected) => {
-      if (isSelected) {
-        console.log(itemId);
-        if (["3", "4", "6", "7", "8", "9", "11", "12", "13", "15", "16", "18", "19", "20", "21"].includes(itemId)) {
-            Service.generatePeibiXilie(itemId).then(x=>{
-                let y = JSON.parse(x);
-                console.log(y);
-               
-                let result = [];
-                let keys = Object.keys(y["PBBH"])
-                for(let i = 0; i < keys.length; i++) {
-                    let key = keys[i];
-                    let entry = {
-                      "id": y["id"][key],
-                      "编号":  y["PBBH"][key], 
-                      "名称":  y["PBMC"][key],
-                      "单位":  y["DW"][key],
-                      "单价":  y["PBDJ"][key]
-                    };
-                    result.push(entry);
-                    setPbXilie(result);
-                }
-            });
-        }
-      }
-    }
-    const handleItemSelectionToggleDes = (event, itemId, isSelected) => {
-      if (isSelected) {
-        //console.log(itemId);
-        setSelectedItems(itemId);
-        setExpandedItems(findparent(itemId));
-           Service.generateDingeXilie(zhuanye, itemId).then(x=>{
-                let y = JSON.parse(x);
-                //console.log(y);
-                let result = [];
-                let keys = Object.keys(y["DW"])
-                for(let i = 0; i < keys.length; i++) {
-                    let key = keys[i];
-                    let entry = {
-                      "id": y["DEBH"][key],
-                      "定额编号":  y["DEBH"][key], 
-                      "名称":  y["GCLMC"][key],
-                      "单位":  y["DW"][key],
-                      "单价":  y["GCLSJDJ"][key]
-                    };
-                    result.push(entry);
-                }
-                setDeXilie(result);
-           });
-      }
-    }
-
-    const handleItemSelectionToggle = (event, itemId, isSelected) => {
-      if (isSelected) {
-        //console.log(itemId);
-        let pos = itemId.indexOf("Zylb");
-        let Zylb = itemId.substring(pos+4, pos+5);
-        setZylb(Zylb);
-        //console.log("Zylb=".concat(Zylb));
-        if (itemId.includes("bao jia hui zong")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          Service.generateBaojiahuizong(location.state.name, id).then(x=>{
-                  setNestDetail(x);
-                  setNest(true);
-                  setQingdan(false);
-                  setCuoshi(false);
-                  setColumnHeaders(["序号", "名称", "金额", "暂估价", "类别"]);
-                });
-        }
-        else if (itemId.includes("gui fei shui jin")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          Service.generateGuifeishuijin(location.state.name, id).then(x=>{
-                  setNestDetail(x);
-                  setNest(true);
-                  setQingdan(false);
-                  setCuoshi(false);
-                  setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-                });
-
-        }
-        else if (itemId.includes("qing dan xiang mu")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          Service.generateQingdanxiangmu(location.state.name, id).then(x=>{
-                  setValue("1");
-                  setNest(false);
-                  setQingdan(true);
-                  setCuoshi(false);
-                  setQdbt(x);
-                  setQdbh(id);
-                  //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-                });
-
-        }
-        else if (itemId.includes("cuo shi xiang mu")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          setNest(false);
-          setQingdan(false);
-          setCuoshi(true);
-          setDwgc(id);
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-
-        }
-        else if (itemId.includes("qi ta xiang mu")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateQitaxiangmu(location.state.name, id).then(x=>{
-                  setNestDetail(x);
-                  setNest(true);
-                  setQingdan(false);
-                  setCuoshi(false);
-                  setColumnHeaders(["序号", "名称", "金额", "项目类别", "备注"]);
-                });
-
-        }
-        else if (itemId.includes("zan lie jin e")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateZanliejine(location.state.name, id).then(x=>{
-                  setDetail(x);
-                  setNest(false);
-                  setQingdan(false);
-                  setCuoshi(false);
-                });
-
-        }
-        else if (itemId.includes("ji ri gong")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateJirigong(location.state.name, id).then(x=>{
-                  setDetail(x);
-                  setNest(false);
-                  setQingdan(false);
-                  setCuoshi(false);
-                });
-
-        }
-        else if (itemId.includes("zong cheng bao fu wu fei")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateZongchengbaofuwufei(location.state.name, id).then(x=>{
-                  setDetail(x);
-                  setNest(false);
-                  setQingdan(false);
-                  setCuoshi(false);
-                });
-
-        }
-        else if (itemId.includes("fa bao ren gong ying cai liao")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateFabaorengongyingcailiao(location.state.name, id).then(x=>{
-                  setDetail(x);
-                  setNest(false);
-                  setQingdan(false);
-                  setCuoshi(false);
-                });
-
-        }
-        else if (itemId.includes("ren cai ji hui zong")) {
-          let regex = /[0-9]*/; 
-          let id = itemId.match(regex)[0];     
-          setValue("1");
-          //setColumnHeaders(["序号", "名称", "取费基数", "计算基础", "金额", "类别"]);
-          Service.generateRencaijihuizong(location.state.name, id).then(x=>{
-                  setDetail(x);
-                  setNest(false);
-                  setQingdan(false);
-                  setCuoshi(false);
-                });
-
-        }
-        else if (itemId.includes("TouBiaoXx")) {
-            Service.generateDetail(location.state.name).then(x=>{
-            setQingdan(false);
-            setCuoshi(false);
-            setDetail(x);
-            setNest(false);
-        });
-
-        }
-      }
-    };
-    React.useEffect(
-      () => {
-        //console.log(location.state.name);
-        Service.generateOutline(location.state.name).then(x=>{
-
-        setOutline(x);
-        });
-        Service.generateDetail(location.state.name).then(x=>{
-
-        setDetail(x);
-        });
-           Service.generateDingeshu(10).then(x=>{
-               setOutlineDes_(x);
-           });
-      }, [location]
-    );
-    React.useEffect(
-      () => {
-        Service.generatePeibishu(zhuanye).then(x=>{
-            setPeibishu(x);
-        });
-      }, [zhuanye]
-    );
-
-
-    const drawerWidth = 240;
-
-    const Main = styled('main', { shouldForwardProp: (prop) => prop !== 'open' })(
-      ({ theme }) => ({
-        flexGrow: 1,
-        padding: theme.spacing(3),
-        transition: theme.transitions.create('margin', {
-          easing: theme.transitions.easing.sharp,
-          duration: theme.transitions.duration.leavingScreen,
-        }),
-        marginRight: -drawerWidth,
-        /**
-         * This is necessary to enable the selection of content. In the DOM, the stacking order is determined
-         * by the order of appearance. Following this rule, elements appearing later in the markup will overlay
-         * those that appear earlier. Since the Drawer comes after the Main content, this adjustment ensures
-         * proper interaction with the underlying content.
-         */
-        position: 'relative',
-        variants: [
-          {
-            props: ({ open }) => open,
-            style: {
-              transition: theme.transitions.create('margin', {
-                easing: theme.transitions.easing.easeOut,
-                duration: theme.transitions.duration.enteringScreen,
-              }),
-              marginRight: 0,
-            },
-          },
-        ],
-      }),
-    );
-
-
-    const [open, setOpen] = React.useState(false);
-
-
-    return (
-      <Main open={open}>
-        
-          <Grid container spacing={2}>
-            <Grid size={3}>
-
-
-
-                <Accordion expanded={expandedQd}
-                     onChange={handleChangeAccord('qingdan')}>
-                   <AccordionSummary
-                     expandIcon={<ExpandMoreIcon />}
-                     aria-controls="panel1-content"
-                     id="panel1-header"
-                   >
-                     <Typography component="span">清单</Typography>
-                   </AccordionSummary>
-                   <AccordionDetails>
-                     <RichTreeView sx={{overflow: "scroll", maxHeight: "98vh"}}
-                     onItemSelectionToggle={handleItemSelectionToggle}
-                     items={outline}/>
-                   </AccordionDetails>
-                 </Accordion>
-                <Accordion expanded={expandedDe}
-                      onChange={handleChangeAccord('dinge')}>
-                   <AccordionSummary
-                     expandIcon={<ExpandMoreIcon />}
-                     aria-controls="panel1-content"
-                     id="panel1-header"
-                   >
-                     <Typography component="span">定额</Typography>
-                   </AccordionSummary>
-                   <AccordionDetails>
-                     <FormControl fullWidth>
-                     <InputLabel id="demo-multiple-name-label">专业</InputLabel>
-                     <Select
-                       labelId="demo-multiple-name-label"
-                       id="demo-multiple-name"
-                       value={zhuanye}
-                       onChange={handleChangeZhuanye}
-                       label="专业" 
-                     >
-                     <MenuItem value={10}>土建</MenuItem>
-                     <MenuItem value={20}>市政</MenuItem>
-                     <MenuItem value={30}>安装</MenuItem>
-                     <MenuItem value={40}>园林</MenuItem>
-                     <MenuItem value={50}>修缮（土建）</MenuItem>
-                     <MenuItem value={60}>修缮（安装）</MenuItem>
-                     </Select>
-                   </FormControl> 
-                   <Stack spacing={2}>
-                    <RichTreeView sx={{overflow: "scroll", maxHeight: "48vh"}}
-                     onItemSelectionToggle={handleItemSelectionToggleDes}
-                     selectedItems={selectedItems}
-                     expandedItems={expandedItems}
-                     items={outlineDes}/>
-                  <div style={{ height: 350 }}>
-
-                    <DataGrid
-                       getRowHeight={() => 'auto'}
-                      rows={deXilie}
-                      columns={columns}
-                      hideFooter={true}
-                    />
-                   </div>
-                   </Stack>
-                   </AccordionDetails>
-                 </Accordion>
-                <Accordion expanded={expandedPb}
-                     onChange={handleChangeAccord('peibi')}>
-                   <AccordionSummary
-                     expandIcon={<ExpandMoreIcon />}
-                     aria-controls="panel1-content"
-                     id="panel1-header"
-                   >
-                     <Typography component="span">配合比</Typography>
-                   </AccordionSummary>
-                   <AccordionDetails>
-                   <Stack spacing={2}>
-                     <RichTreeView sx={{overflow: "scroll", maxHeight: "38vh"}}
-                     onItemSelectionToggle={handleItemSelectionTogglePbs}
-                     items={peibishu}/>
-                    <div style={{ height: 350 }}>
-
-                    <DataGrid
-                       getRowHeight={() => 'auto'}
-                      rows={pbXilie}
-                      columns={columns2}
-                      hideFooter={true}
-                     />
-                    </div>
-                   </Stack>
-                   </AccordionDetails>
-                 </Accordion>
-
-
-
-            </Grid>
-            <Grid size={9}>
-             
-            {!nest && !qingdan && !cuoshi && <HotTable nestedRows={false}
-                    data={detail
-                    }
-                    rowHeaders={true}
-                    colHeaders={true}
-                    fixedRowsTop={1}
-
-                    height="800"
-                    readOnly={true}
-                    autoWrapRow={false}
-                    autoWrapCol={false}
-                    licenseKey="non-commercial-and-evaluation" // for non-commercial use only
-                  />}
-            {nest && !qingdan && !cuoshi && <HotTable nestedRows={true}
-                    data={nestDetail
-                    }
-                    readOnly={true}
-                    fixedRowsTop={1}
-
-                    rowHeaders={true}
-                    colHeaders={columnHeaders}
-                    height="auto"
-                    contextMenu={true}
-                    bindRowsWithHeaders={true}
-                    autoWrapRow={false}
-                    autoWrapCol={false}
-                    licenseKey="non-commercial-and-evaluation" // for non-commercial use only
-                  />}
-
-            {!nest && qingdan && !cuoshi && <TabContext value={value}>
-                   <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
-                      <TabList scrollButtons='auto' 
-                              variant="scrollable"
-                      onChange={handleChange} aria-label="lab API tabs example">
-                        {qdbt.map((x, index)=> <Tab label={x} value={(index+1).toString()} />)}
-                      </TabList>
-                   </Box>
-                   {qdbt.map((x, index)=><TabPanel value={(index+1).toString()}>
-                             <Qingdan
-                                name={location.state.name}
-                                bh={qdbh}
-                                bt={x}
-                                rgde={rgde}
-                                jxde={jxde}
-                                clde={clde}
-                                beizhu={beizhu}
-                                clickCallback={clickCallback}
-                             />                     
-                     </TabPanel>
-                      )}
-                </TabContext>}
-            {!nest && !qingdan && cuoshi && <TabContext value={value}>
-                   <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
-                      <TabList scrollButtons='auto' 
-                              variant="scrollable"
-                      onChange={handleChange} aria-label="lab API tabs example">
-                        <Tab label="总价措施" value="1" />
-                        <Tab label="单价措施" value="2" />
-                      </TabList>
-                   </Box>
-                   <TabPanel value="1">
-                     <Zjcs name={location.state.name} bh={dwgc}/>
-                   </TabPanel>
-                   <TabPanel value="2">
-                     <Djcs 
-                         name={location.state.name} 
-                         bh={dwgc}
-                         rgde={rgde}
-                         jxde={jxde}
-                         clde={clde}
-                         beizhu={beizhu}
-                         clickCallback={clickCallback}
-                     />
-                   </TabPanel>
-                      
-                </TabContext>}
-
-
-            </Grid>
-
-          </Grid>
-            
-        
-
-
-        </Main>
-    );
-  }

front/src/Qingdan.js

@@ -328,6 +328,7 @@ export default function Qingdan({name, bh, bt, rgde, jxde, clde, beizhu, beizhuF
           let newData = updateDercj(selectedRowKeys[0], data);
           setDetail(newData);
           detailRef.current = newData;
+          handleSelection(selectedRowKeys);
           }
         };
 

front/src/Service.js

@@ -1,5 +1,5 @@
 import { getTableHeadUtilityClass } from '@mui/material';
-import {copy, danxiangdinge_index, renameDingE} from './utils';
+import {copy, danxiangdinge_index, renameDingE, extractFuzhu} from './utils';
 import { v4 as uuidv4 } from 'uuid';
 class Service{
     
@@ -734,7 +734,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             return data;
         }
     }
-    async generateDingeXilie(value, id) {
+    async generateDingeXilie(value, id) {//定额书的一个栏目的所有具体定额
         const response = await fetch(this.ip().concat(":8000/dexilie/"), {
             method : "POST",
             headers: {
@@ -755,7 +755,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             return data;
         }
     }
-    async generateSingleDingeXilie(zhuanye, debh) {
+    async generateSingleDingeXilie(zhuanye, debh) {//清单页面展示用
         const response = await fetch(this.ip().concat( ":8000/singledexilie/"), {
             method : "POST",
             headers: {
@@ -1075,6 +1075,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         //是否手动设置含量
         let qd = this.cache.filter(x=>x["children"].filter(y=>y['key']==row).length > 0)[0];
         let de = qd["children"].filter(x=>x['key'] == row)[0];
+        let bm = de['清单编码'];
+        let alreadyFuzhu = extractFuzhu(bm);//[xuhao]
         let origin = de['dercj'];
         let change = false;
         for(let i = 1; i < data.length; i++) {
@@ -1091,8 +1093,9 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             de['fuzhuEnable'] = false;
         }
 
+
         
-        this.updateDercj_(row, data, []);
+        this.updateDercj_(row, data, alreadyFuzhu);
         //let qd = this.cache.filter(x=>x["children"].filter(y=>y['key']==row).length > 0)[0];
 
         let newData = this.cache.map(x=>{