Merge remote-tracking branch 'origin/master'

王震

2023-11-09 e855dbe46e6161add15b91df4e8067e05b866326

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -442,14 +442,14 @@
      },
      // 添加行
      clickAddLine(row) {
        console.log(row);
        let ele = {
            fId: Math.random(),
            father: row.father?row.father:null,
            father: null,
            iid: Math.random(),
            children:[]
        }
        if(row){
          ele.father = row.father?row.father:null
          row.children.forEach(item => {
              ele.children.push({
                deviceId: null,