栏舍配方批量编剧&牛头数修改对于关系没变-2个问题

src/views/formulationPlan/dhedFormula/index.vue

@@ -279,7 +279,7 @@
           <!-- <el-input v-model="history.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
           <el-button class="successBorder" @click="handleHistorySearch">查询</el-button>
           <el-button class="export" icon="el-icon-upload2"  @click="handleExport(3)">导出</el-button>
-          
+
         </div>
         <div class="table">
           <u-table
@@ -1686,9 +1686,10 @@ export default {
     // ratio系数
     // ccountratio系数牛头数
     blurCcount(row) { // 实际牛头数
+       console.log(row,'洗漱---')
       if (row.ftid !== '-1' && row.ftid !== '') {
-        row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid).Sfweight
-        row.SfweightLock = this.recipeTemplateList.find(obj => obj.id == row.ftid).SfweightLock
+        row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid)?.Sfweight || "0.0"
+        row.SfweightLock = this.recipeTemplateList.find(obj => obj.id == row.ftid)?.SfweightLock || "0.0"
       }
       if (row.w1 == '' || row.w1 == undefined || isNaN(row.w1)) { row.w1 = 0 }
       if (row.w2 == '' || row.w2 == undefined || isNaN(row.w2)) { row.w2 = 0 }
@@ -3200,7 +3201,7 @@ export default {
               }
             ]
           json2excel(excelDatas, '历史记录栏舍配方', true, 'xlsx')
-        } 
+        }
       })
       }else {
         console.log('点击了导出数据')
@@ -3314,7 +3315,7 @@ export default {
         })
       }
 
-      
+
     },
 
     beforeImport(file) {
@@ -3393,19 +3394,23 @@ export default {
       // row.Edit
     },
     focusData(row){
-      console.log(row,'row')
+      // console.log(row,'row')
       this.oldList.forEach((item,key)=>{
         if(row.id == item.id){
-          this.oldRowList = {...item}
+          this.oldRowList = { ...item }
+          // item = {...row}
         }
       })
-      console.log(this.oldRowList,'row')
+      // console.log(this.oldRowList,'row')
     },
     handle_batchEdit_save(){
+      console.log(this.oldList, 'oldList')
+      console.log(this.table.list, 'this.table.list')
       const arr = this.table.list.filter(item2 => {
-        console.log(item2,'item2')
-          return !this.oldList.some(item1 => item1.r1 === item2.r1 && item1.r2 === item2.r2 && item1.r3 === item2.r3 && item1.r4 === item2.r4 && item1.r5 === item2.r5 && item1.r6 === item2.r6);
+        // console.log(item2,'item2')
+          return !this.oldList.some(item1 => item1.ccount == item2.ccount && item1.r1 === item2.r1 && item1.r2 === item2.r2 && item1.r3 === item2.r3 && item1.r4 === item2.r4 && item1.r5 === item2.r5 && item1.r6 === item2.r6);
       });
+      console.log(arr,'arr')
       const barList = []
       arr.forEach((item)=>{
         let obj = {}
@@ -3422,6 +3427,7 @@ export default {
         obj.times6 = item.r6
         barList.push(obj)
       })
+      console.log(barList,'barList')
       const url = 'authdata/fpdetail/batch/edit'
       let data = {
         pastureId:Cookies.get('pastureid'),