zouyu
2024-03-06 aa8684dfcf2ddbbadbd045770ff540e64c26bbee
src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -178,9 +178,21 @@
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                          <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备!" placement="top-start">
                            <el-autocomplete clearable
                            <el-dropdown>
                            <el-input placeholder="检测值"/>
                            <i style="line-height: normal;padding: 10px 7px;" class="el-icon-arrow-down el-icon--right"></i>
                            <el-dropdown-menu slot="dropdown">
                                <el-dropdown-item>黄金糕</el-dropdown-item>
                                <el-dropdown-item>狮子头</el-dropdown-item>
                                <el-dropdown-item>螺蛳粉</el-dropdown-item>
                                <el-dropdown-item>双皮奶</el-dropdown-item>
                                <el-dropdown-item>蚵仔煎</el-dropdown-item>
                            </el-dropdown-menu>
                            </el-dropdown>
                            <!-- <el-autocomplete clearable
                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                            @input="changeState(scope.row,scope.$index)"
                            @blur.stop="changeState(scope.row,scope.$index)"
                            @select="changeState(scope.row,scope.$index)"
                            v-model="scope.row.testValueList[index]"
                            :fetch-suggestions="querySearch"
                            placeholder="请输入或选择检测值" >
@@ -188,20 +200,7 @@
                            <template slot-scope="{ item }">
                                <div>{{ item.value }}</div>
                            </template>
                            </el-autocomplete>
                              <!-- <el-select style="width:100%" filterable
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                              v-model="scope.row.testValueList[index]"
                              placeholder="请输入或选择检测值"
                              allow-create
                              default-first-option
                              @change="changeState(scope.row,scope.$index)"
                              @blur="selectBlur"
                              >
                                <el-option label="是" value="是"/>
                                <el-option label="否" value="否"/>
                              </el-select> -->
                            </el-autocomplete> -->
                            </el-tooltip>
                          </div>
                        </template>
@@ -893,14 +892,15 @@
        console.log(e.target.value);
      },
      changeState(row, index) {
        this.$nextTick(()=>{
        if(row){
            let isTrue = true
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
                    if(!['是','否'].includes(val)){
              let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
              if(val.slice(-1)!='.'){
                  if(!reg.test(val) && !['是','否'].includes(val)){
                      row.testValueList[i] = null
                        if(!reg.test(val)){
                          row.testValueList = ''
                      this.$message.error("请输入6位数字或选择是否")
                      isTrue = false
                  }
@@ -910,6 +910,8 @@
              return
            }
        }
            console.log(row.testValueList.join(","));
            return
        if (row.rpId != null && row.rpId != '') {
          let val = row.testValueList.join(",")
          if (val === undefined || val === '' || val === null) {
@@ -930,6 +932,7 @@
              this.init(this.dataForm.id)
          })
        }
        })
      },
      // 删除子项目
      delChildren(row,index,isParent) {
@@ -961,7 +964,7 @@
          required: null,
          rpId: null,
          name: null,
          unit: 'mm',
          unit: '',
          userName: null,
          testValue: null,
          testValueList: [],