fix_buchong

src/App2.js

@@ -167,7 +167,10 @@ function a11yProps(index) {
 
     const [dingeclick, setDingeclick] = React.useState(null);
     const [tihuanClick, setTihuanClick] = React.useState(null);
+
+    const [bctihuanClick, setBctihuanClick] = React.useState(null);
     const tihuanRowRef = React.useRef(null);
+    const bctihuanRowRef = React.useRef(null);
 
     const relation = React.useRef({});
     const columns =[
@@ -182,7 +185,8 @@ function a11yProps(index) {
       {field: '编号', headerName: '定额编号', sortable: false},
       {field: '名称', headerName: '名称', width: 250, sortable: false}, 
       {field: '单位', headerName: '单位', sortable: false},
-      {field: '单价', headerName: '单价', sortable: false}
+      {field: '单价', headerName: '单价', sortable: false},
+      {field: '人材机类别', headerName: '人材机类别', sortable: false},
     ];
     let location = useParams();
 
@@ -292,8 +296,17 @@ function a11yProps(index) {
         setJxXilie([]);  
         setDopen(true);
         tihuanRowRef.current = row;
+        bctihuanRowRef.current = null;
     };
 
+    const bctihuanCallback = (row) => {
+      setPbXilie([]);  
+      setJxXilie([]);  
+      setDopen(true);
+      bctihuanRowRef.current = row;
+      tihuanRowRef.current = null;
+  };
+
 
     const tiaojiaCallback = (bh, bm, mingcheng, danwei, jiage) => {
       setOpen(true); 
@@ -457,16 +470,30 @@ function a11yProps(index) {
 
 
     const handleEvent = (A) => {
-      let state = {
-        'time': Date.now(),
-        'newBianhao': A.row['编号'],
-        'newName': A.row['名称'],
-        'newJia': A.row['单价'],
-        'old' : tihuanRowRef.current
-      };
-      setTihuanClick(JSON.stringify(state));
-      setDopen(false);
+      if (tihuanRowRef.current == null) {
+        let state = {
+          'time': Date.now(),
+          'newBianhao': A.row['编号'],
+          'newName': A.row['名称'],
+          'newJia': A.row['单价'],
+          'newDW': A.row['单位'],
+          'RcjLb' : A.row['人材机类别'],
+          'old' : bctihuanRowRef.current
+        };
+        setBctihuanClick(JSON.stringify(state));
+        setDopen(false);
+      }  else {
+         let state = {
+          'time': Date.now(),
+          'newBianhao': A.row['编号'],
+          'newName': A.row['名称'],
+          'newJia': A.row['单价'],
+          'old' : tihuanRowRef.current
+        };
+        setTihuanClick(JSON.stringify(state));
+        setDopen(false);
       
+      }
     };
 
 
@@ -497,7 +524,8 @@ function a11yProps(index) {
                       "编号":  y["PBBH"][key], 
                       "名称":  y["PBMC"][key],
                       "单位":  y["DW"][key],
-                      "单价":  y["PBDJ"][key]
+                      "单价":  y["PBDJ"][key],
+                      "人材机类别" : '2'
                     };
                     result.push(entry);
                     //setPbXilie(result);
@@ -524,7 +552,8 @@ function a11yProps(index) {
                     "编号":  y["jxbh"][key], 
                     "名称":  y["jxmc"][key],
                     "单位":  y["DW"][key],
-                    "单价":  y["tbdj"][key]
+                    "单价":  y["tbdj"][key],
+                    "人材机类别" : '3'
                   };
                   result.push(entry);
                   //setPbXilie(result);
@@ -552,7 +581,8 @@ function a11yProps(index) {
                   "编号":  y["CLBH"][key], 
                   "名称":  y["CLMC"][key],
                   "单位":  y["JLDW"][key],
-                  "单价":  y["YSJG"][key]
+                  "单价":  y["YSJG"][key],
+                  "人材机类别" : y["RcjLb"][key]
                 };
                 result.push(entry);
                 //setPbXilie(result);
@@ -1222,7 +1252,9 @@ function a11yProps(index) {
                                 loadingCallback={loadingCallback}
                                 dingeclick={dingeclick}
                                 tihuanCallback={tihuanCallback}
+                                bctihuanCallback={bctihuanCallback}
                                 tihuanClick={tihuanClick}
+                                bctihuanClick={bctihuanClick}
                                 suanshiCallback={suanshiCallback}
                              />                     
                      </TabPanel>

src/Djcs3.js

@@ -141,7 +141,8 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                               '主要材料标志' : x[i][13],
                               '主材标志' : x[i][14],
                               '设备标志' : x[i][15] ,
-                              'key' : ''
+                              'key' : '',
+                              'bc': ''
 
                          });
                     }
@@ -189,7 +190,8 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                                         '主要材料标志' : x[0][i][13],
                                         '主材标志' : x[0][i][14],
                                         '设备标志' : x[0][i][15] ,
-                                        'key' : x[0][i][16]
+                                        'key' : x[0][i][16],
+                                        'bc': x[0][i][17]
           
                                    });
                               }
@@ -330,7 +332,8 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                                           '主要材料标志' : newHl[i][13],
                                           '主材标志' : newHl[i][14],
                                           '设备标志' : newHl[i][15],
-                                          'key': newHl[i][16]
+                                          'key': newHl[i][16],
+                                          'bc': newHl[i][17]
 
                                       });
                                      }
@@ -682,11 +685,11 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
                               if (rcjTable.current) {
                                    rcjTable.current.replaceData(data);
                               }
-                              let data2 = [['ID', '人材机编码', '名称', '规格型号', '单位', '单价', '产地', '供应厂商', '人材机类别', '甲供标志', '含量', '合价', '暂估价标志', '主要材料标志', '主材标志', '设备标志', "key"]]
+                              let data2 = [['ID', '人材机编码', '名称', '规格型号', '单位', '单价', '产地', '供应厂商', '人材机类别', '甲供标志', '含量', '合价', '暂估价标志', '主要材料标志', '主材标志', '设备标志', "key", "bc"]]
                               for (let i = 0; i < data.length; i++) {
                                    data2.push([data[i]['ID'], data[i]['人材机编码'], data[i]['名称'], data[i]['规格型号'], data[i]['单位'], 
                                    data[i]['单价'], data[i]['产地'], data[i]['供应厂商'], data[i]['人材机类别'], 
-                                   data[i]['甲供标志'], data[i]['含量'], data[i]['合价'], data[i]['暂估价标志'], data[i]['主要材料标志'], data[i]['主材标志'], data[i]['设备标志'], data[i]['key']]);
+                                   data[i]['甲供标志'], data[i]['含量'], data[i]['合价'], data[i]['暂估价标志'], data[i]['主要材料标志'], data[i]['主材标志'], data[i]['设备标志'], data[i]['key'], data[i]['bc']]);
                               }
      
                               let newData = updateDercj_djcs(selectedRowKeysTable.current[0], data2);

src/Qingdan3.js

@@ -58,7 +58,7 @@ const {Column, HeaderCell, Cell} = Table;
 
 
 
-export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台传回来的附注信息，要整理后才能成为展示用的行*/ , beizhuFK, clickCallback, loadingCallback, dingeclick, tihuanCallback, tihuanClick, suanshiCallback}) {
+export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台传回来的附注信息，要整理后才能成为展示用的行*/ , beizhuFK, clickCallback, loadingCallback, dingeclick, tihuanCallback, tihuanClick, bctihuanClick, bctihuanCallback, suanshiCallback}) {
     
      const myTable = React.useRef(null);
      const myRef = React.useRef(null);
@@ -66,6 +66,13 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
      const handleChange = (event, newValue) => {
           setValueTab(newValue);
         };
+     const onCellDoubleClick = (params, event, detail) => {
+         
+          if (params.field == '人材机编码') {
+               console.log(params);
+               bctihuanCallback(params.id);
+          }
+     };
      const [rcjhl, setRcjhl] = React.useState([]);
      const [rcjhl2, setRcjhl2] = React.useState([]);
      const [fuzhu, setFuzhu] = React.useState([]);//展示用的附注行
@@ -141,7 +148,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                                           '主要材料标志' : newHl[i][13],
                                           '主材标志' : newHl[i][14],
                                           '设备标志' : newHl[i][15] ,
-                                          'key' : newHl[i][16]
+                                          'key' : newHl[i][16],
+                                          'bc': newHl[i][17]
 
                                           });
                                         }
@@ -203,7 +211,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                '主要材料标志' : newHl[i][13],
                '主材标志' : newHl[i][14],
                '设备标志' : newHl[i][15] ,
-               'key' : newHl[i][16]
+               'key' : newHl[i][16],
+               'bc': newHl[i][17]
 
                });
              }
@@ -306,6 +315,9 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
                return false;
           }
+          if (cell._cell.row.getData()['bc'].includes('true')) {
+               return false;
+          }
           if (cell._cell.row.getData()['甲供标志'] == 'true') {
                return false;
           }
@@ -324,6 +336,9 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
                return false;
           }
+          if (cell._cell.row.getData()['bc'].includes('true')) {
+               return false;
+          }
           
 
           return true;
@@ -406,7 +421,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               '主要材料标志' : x[i][13],
                               '主材标志' : x[i][14],
                               '设备标志' : x[i][15] ,
-                              'key' : ''
+                              'key' : '',
+                              'bc': ''
 
                          });
                     }
@@ -463,7 +479,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                                         '主要材料标志' : x[0][i][13],
                                         '主材标志' : x[0][i][14],
                                         '设备标志' : x[0][i][15] ,
-                                        'key' : x[0][i][16]
+                                        'key' : x[0][i][16],
+                                        'bc': x[0][i][17]
           
                                    });
                               }
@@ -622,13 +639,15 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                field: '人材机类别',
                headerName: '人材机类别',
                width: 120,
-               editable: true,
+               editable: false,
              },
              {
                field: '甲供标志',
                headerName: '甲供标志',
                width: 80,
                editable: true,
+               type: 'singleSelect',
+               valueOptions: ['true', 'false'] 
              },
              {
                field: '含量',
@@ -647,24 +666,32 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                headerName: '暂估价标志',
                width: 100,
                editable: true,
+               type: 'singleSelect',
+               valueOptions: ['true', 'false'] 
              },
              {
                field: '主要材料标志',
                headerName: '主要材料标志',
                width: 120,
                editable: true,
+               type: 'singleSelect',
+               valueOptions: ['true', 'false'] 
              },
              {
                field: '主材标志',
                headerName: '主材标志',
                width: 80,
                editable: true,
+               type: 'singleSelect',
+               valueOptions: ['true', 'false'] 
              },
              {
                field: '设备标志',
                headerName: '设备标志',
                width: 80,
                editable: true,
+               type: 'singleSelect',
+               valueOptions: ['true', 'false'] 
              },
        
         ];
@@ -717,7 +744,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                '主要材料标志' : newHl[i][13],
                '主材标志' : newHl[i][14],
                '设备标志' : newHl[i][15],
-               'key' : newHl[i][16]
+               'key' : newHl[i][16],
+               'bc': newHl[i][17]
 
                });
              }
@@ -778,7 +806,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                '主要材料标志' : newHl[i][13],
                '主材标志' : newHl[i][14],
                '设备标志' : newHl[i][15] ,
-               'key' : newHl[i][16]
+               'key' : newHl[i][16],
+               'bc': newHl[i][17]
 
                });
              }
@@ -850,7 +879,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                '主要材料标志' : newHl[i][13],
                '主材标志' : newHl[i][14],
                '设备标志' : newHl[i][15],
-               'key' : newHl[i][16]
+               'key' : newHl[i][16],
+               'bc': newHl[i][17]
 
                });
              }
@@ -1168,10 +1198,25 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           }, [dingeclick]//常规添加定额
       );
 
+      React.useEffect(
+          () => {
+               
+                    let obj = JSON.parse(bctihuanClick);
+                    if (obj != null) {
+                        processRowUpdate({'id': obj['old'], '人材机编码': obj['newBianhao'], '名称': obj['newName'], 
+                        '规格型号': '', '单位': obj['newDW'], '单价': obj['newJia'], '产地': '', '供应厂商': '',
+                         '人材机类别':obj['RcjLb'], '甲供标志': '', '含量': '', '暂估价标志':'', '主要材料标志':'', '主材标志':'','设备标志':''});
+                    }
+                    
+               
+               
+          }, [bctihuanClick]//替换定额人材机
+      );
+
 
       React.useEffect(
           () => {
-               if (selectedRowKeysTable.current.length > 0 ) {
+               if (selectedRowKeysTable.current.length > 0 && JSON.parse(tihuanClick) != null) {
                     const data = huan(JSON.parse(tihuanClick), selectedRowKeysTable.current[0]);
                     myTable.current.deselectRow();
                                           let former = myTable.current.element.children[1].scrollTop;
@@ -1292,7 +1337,8 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               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) {
+                              let determine4 = cell._cell.row.getData()['bc'] != 'true';
+                              if(cell._cell.column.getPosition() == 2  && !isQdrcj.current && determine && determine2 && determine3 && determine4) {
                                   tihuanCallback(cell._cell.row.position, cell._cell.column.getPosition());
                               }
                           });
@@ -1305,11 +1351,11 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                               if (rcjTable.current) {
                                    rcjTable.current.replaceData(data);
                               }
-                              let data2 = [['ID', '人材机编码', '名称', '规格型号', '单位', '单价', '产地', '供应厂商', '人材机类别', '甲供标志', '含量', '合价', '暂估价标志', '主要材料标志', '主材标志', '设备标志', 'key']]
+                              let data2 = [['ID', '人材机编码', '名称', '规格型号', '单位', '单价', '产地', '供应厂商', '人材机类别', '甲供标志', '含量', '合价', '暂估价标志', '主要材料标志', '主材标志', '设备标志', 'key', 'bc']]
                               for (let i = 0; i < data.length; i++) {
                                    data2.push([data[i]['ID'], data[i]['人材机编码'], data[i]['名称'], data[i]['规格型号'], data[i]['单位'], 
                                    data[i]['单价'], data[i]['产地'], data[i]['供应厂商'], data[i]['人材机类别'], 
-                                   data[i]['甲供标志'], data[i]['含量'], data[i]['合价'], data[i]['暂估价标志'], data[i]['主要材料标志'], data[i]['主材标志'], data[i]['设备标志'], data[i]['key']]);
+                                   data[i]['甲供标志'], data[i]['含量'], data[i]['合价'], data[i]['暂估价标志'], data[i]['主要材料标志'], data[i]['主材标志'], data[i]['设备标志'], data[i]['key'], data[i]['bc']]);
                               }
      
                               let newData = updateDercj(selectedRowKeysTable.current[0], data2);
@@ -1476,6 +1522,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
                             }}
                          
                          localeText={zhCN_MUI.components.MuiDataGrid.defaultProps.localeText}
+                         onCellDoubleClick={onCellDoubleClick}
 
                        />
                      </Box>

src/Service.js

@@ -783,7 +783,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         }
     }
     async generateSingleDingeXilie2(zhuanye, debh) {//清单页面展示用
-        const response = await fetch(this.ip().concat( "/singledexilie2/").concat(zhuanye.toString()).concat("/").concat(debh), {
+        const response = await fetch(this.ip().concat( "/singledexilie2/").concat(zhuanye.toString()).concat("/").concat(debh.replace(/\//g, '')), {
             method : "GET",
            
         });
@@ -1861,10 +1861,12 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             de['dercj'] = copy(data);
         }
 
-
+        if (de['dercj'][0].length > 17)
+        de['dercj'] = de['dercj'].filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
         de['dercj'] = de['dercj'].filter(x=>!x[1].includes('10000F'))//补充
+        de['dercj'] = de['dercj'].map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
         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]['设备标志'], '', 'false', [], []]);
+            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]['设备标志'], '', 'true']);
         }
         data = copy(de['dercj']);
 
@@ -1872,8 +1874,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         for(let i = 1; i < data.length; i++) {
             data[i][11] = Number(data[i][10]) * Number(data[i][5]);
         }
-        if (data[0].length > 17)
-        data = data.filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
+        
              
         let sum = 0;
         let rgf_sum = 0;
@@ -2212,7 +2213,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         }
         let qd = this.cache_djcs.filter(x=>x['key'] == row)[0];
         let dercj = [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
-                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key' ]];
+                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key', 'bc' ]];
         for(let i = 0; i < selected.length; i++) {
             let rgf = selected[i]['人工费'];
             let clf = selected[i]['材料费'];
@@ -2222,24 +2223,24 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 let sum = Number(sl) * Number(rgf) * Number(res['azfytag'][1]) / Number(100);
                 dercj.push(['', res['rgde'][0]['CLBH'], res['rgde'][0]['CLMC'], '', '元', 
                     '1', '', '', '1', '', Number(sum) * Number(res['azfytag'][2]) / Number(100), Number(sum) * Number(res['azfytag'][2]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
                 dercj.push(['', res['clde'][0]['CLBH'], res['clde'][0]['CLMC'], '', '元', 
                     '1', '', '', '2', '', Number(sum) * Number(res['azfytag'][3]) / Number(100), Number(sum) * Number(res['azfytag'][3]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
                 dercj.push(['', res['jxde'][0]['jxbh'], res['jxde'][0]['jxmc'], '', '元', 
                     '1', '', '', '3', '', Number(sum) * Number(res['azfytag'][4]) / Number(100), Number(sum) * Number(res['azfytag'][4]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
             } else if (res['azfytag'][0] == '人工费+机械费') {
                 let sum = Number(sl) * (Number(jxf) + Number(rgf)) * Number(res['azfytag'][1]) / Number(100);
                 dercj.push(['', res['rgde'][0]['CLBH'], res['rgde'][0]['CLMC'], '', '元', 
                     '1', '', '', '1', '', Number(sum) * Number(res['azfytag'][2]) / Number(100), Number(sum) * Number(res['azfytag'][2]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
                 dercj.push(['', res['clde'][0]['CLBH'], res['clde'][0]['CLMC'], '', '元', 
                     '1', '', '', '2', '', Number(sum) * Number(res['azfytag'][3]) / Number(100), Number(sum) * Number(res['azfytag'][3]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
                 dercj.push(['', res['jxde'][0]['jxbh'], res['jxde'][0]['jxmc'], '', '元', 
                     '1', '', '', '3', '', Number(sum) * Number(res['azfytag'][4]) / Number(100), Number(sum) * Number(res['azfytag'][4]) / Number(100),
-                    '', '', '', '', '' ]);
+                    '', '', '', '', '', '' ]);
 
             }
         }
@@ -2353,7 +2354,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 if (!qd.hasOwnProperty('_children')) {
                     qd["_children"] = [];
                 }
-                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
+                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
                 qd["_children"].push({
                     '操作': '',
                     '序号': null,
@@ -2468,7 +2469,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 if (!qd.hasOwnProperty('_children')) {
                     qd["_children"] = [];
                 }
-                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
+                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
                 qd["_children"].push({
                     '操作': '',
                     '序号': null,
@@ -2547,8 +2548,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 '综合人工工日': null,
                 '备注': null,
                 "dercj": [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
-                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key' ],
-                   ['', bh, mingcheng, '', danwei, '', '', '', '2', '', '1', '', '',  '', '', '', '' ]
+                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key', 'bc' ],
+                   ['', bh, mingcheng, '', danwei, '', '', '', '2', '', '1', '', '',  '', '', '', '', '' ]
                       ],
                 'key' :   uuidv4(),
                 "fuzhuEnable": false,
@@ -2600,8 +2601,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 '综合人工工日': null,
                 '备注': null,
                 "dercj": [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
-                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", "key"  ],
-                   ['', bh, mingcheng, '', danwei, '', '', '', '2', '', '1', '', '',  '', '', '', "" ]
+                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", "key" , "bc" ],
+                   ['', bh, mingcheng, '', danwei, '', '', '', '2', '', '1', '', '',  '', '', '', "", "" ]
                       ],
                 'key' :   uuidv4(),
                 "fuzhuEnable": false

src/editor.js

@@ -73,6 +73,7 @@ export const updateDercj_djcs = (row, data) => {
 
 
 export const huan = (replaceState, row) => {
+   
     return Service.huan(replaceState['old'],replaceState['newBianhao'],replaceState['newName'], replaceState['newJia'], row);
 
 };