修改结论

licp

2024-03-27 580f22683e0a7032c6891d49e93b008159cd98d5

修改结论

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -22,12 +22,16 @@
        background-color: #fff;
        border-radius: 3px;
        padding: 20px;
    position: relative;
    }
  .center-box{
    height: 100%;
    display: flex;
    align-items: center;
    justify-content: center;
    flex-wrap: wrap;
        overflow-y: auto;
    }
  }
  .tables{
    /* width: 800px; */
    margin-bottom: 16px;
@@ -92,13 +96,13 @@
<template>
    <div v-loading="loading">
        <el-row class="title">
                    <el-col :span="12" style="padding-left: 20px;">检验单详情</el-col>
                    <el-col :span="12" style="text-align: right;">
                        <el-button size="small" type="primary" @click="sampleVisible=true">样品切换</el-button>
            <el-button size="small" type="primary" @click="taskVisible=true">任务切换</el-button>
            <el-button size="small" @click="$emit('goback')">返回</el-button>
                    </el-col>
                </el-row>
      <el-col :span="12" style="padding-left: 20px;">检验单详情</el-col>
      <el-col :span="12" style="text-align: right;">
        <el-button size="small" type="primary" @click="sampleVisible=true">样品切换</el-button>
        <el-button size="small" type="primary" @click="taskVisible=true">任务切换</el-button>
        <el-button size="small" @click="$emit('goback')">返回</el-button>
      </el-col>
    </el-row>
        <div class="search">
            <el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
                <el-form-item label="委托编号:">
@@ -128,7 +132,8 @@
            </el-form>
        </div>
        <div class="center">
      <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
      <div class="center-box">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
              <tr v-for="(m,i) in item.arr" :key="i">
                <td
@@ -159,6 +164,7 @@
              </tr>
            </tbody>
        </table>
      </div>
        </div>
    <el-drawer
      title="样品切换"
@@ -284,7 +290,8 @@
                        this.param[a.id] = {
                            insValue: [],
                            comValue: [],
                            resValue: []
                            resValue: [],
              intResult: null
                        }
                    })
                    if(this.currentSample.index==undefined)this.currentSample['index'] = 1
@@ -302,7 +309,8 @@
                    this.param[a.id] = {
                        insValue: [],
                        comValue: [],
                        resValue: []
                        resValue: [],
            intResult: null
                    }
                })
        this.handleTableData()
@@ -458,9 +466,12 @@
                            }
                        }
            if (b.v.ps!=undefined&&b.v.ps.value==='结论'){
              for(var c in this.param){
                this.param[c].insResult = b
              }
                            conclusionList.forEach((n,i)=>{
                if(n.r==b.r&&n.c==b.c){
                  b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].r-1)).label}${finalList[i].r+1})`
                  b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].r)).label}${finalList[i].r+1})`
                }
              })
                        }
@@ -537,7 +548,7 @@
                                }
                            })
                        })
                        // console.log('当前的方法',item.methodName)
                        // console.log('当前的方法',item.methodName,item.r,item.c,this.excelMethodList)
            if(item.methodName=='自定义方法'&&item.v.ps&&item.v.ps.value=='结论'){
              if(this.tableList.find(m=>m.id==item.i)){
                  let ask = this.tableList.find(m=>m.id==item.i).ask.split('&');
@@ -564,6 +575,7 @@
                  }else{
                    item.v.v = 0
                  }
                  console.log(33333333333,this.param)
                }
            }else{
              let comResult = 0;