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

zouyu

2023-11-22 a1ac98cf842c89083966e6228c43513b8f66e363

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

@@ -164,20 +164,13 @@
                          :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                          v-model="scope.row.testValueList[index]"
                          placeholder="请输入或选择检测值" @change="updateTestValue(scope.row,scope.$index)">
                            <!-- <el-option label="是" value="是"/>
                            <el-option label="否" value="否"/> -->
                            <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '是' : '否')" :value="item.value"></el-option>


                            <el-option label="是" value="是"/>
                            <el-option label="否" value="否"/>
                          </el-select>
                        </el-tooltip>
                      </div>
                    </template>
                  </el-table-column>




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


      <div class="rawMaterial-result">
        <el-row>
          <el-col :span="24">检验结论</el-col>
@@ -283,13 +274,6 @@
    },
    data(){
        return{
          dataVal: [{
                label: '1',
                value: '1'
            }, {
                label: '0',
                value: '0'
            }],
            userdata:[],
            currentRow:[],
            userlist:[],
@@ -395,7 +379,6 @@
        }
        this.showPart = true
      },

      updateDevice(row, index) {
            let rowId=JSON.stringify(row.rpId)
            updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
@@ -590,17 +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(",")
                        console.log(arr);
                      }

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