Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-11-22 59d52aad1c52714688dda99d3c8febf892faddbd

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

@@ -171,10 +171,6 @@
                      </div>
                    </template>
                  </el-table-column>




                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
@@ -215,8 +211,6 @@
            </el-col>
        </el-row>
      </div>


      <div class="rawMaterial-result">
        <el-row>
          <el-col :span="24">检验结论</el-col>
@@ -385,7 +379,6 @@
        }
        this.showPart = true
      },

      updateDevice(row, index) {
            let rowId=JSON.stringify(row.rpId)
            updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
@@ -580,16 +573,19 @@
                    }
                    ele.iid = Math.random()
                    ele.father = item.rpFather
                    if (item.children != undefined) {
                    item.children.forEach(obj => {
                      let arr= []
                      if(obj.userName){
                        userNameList.push(obj.userName)
                      }
                      let arr= []

                  
                      if(obj.testValue){
                        arr = obj.testValue.split(",")
                      }

                      if (arr.length > this.empiricalValueAdd) {
                                    this.empiricalValueAdd = arr.length
                                }
                      let o = {
                        deviceId: obj.deviceId,
                        deviceName: obj.deviceName,
@@ -607,7 +603,7 @@
                      ele.children.push(o)
                    })
                    this.list.push(ele)
                }
                }}
            })
            this.conclusionTable = [{
              code: data.code,