tianjai remark

zss

2024-03-18 50ba0927c9644b072928b83d91820719dcb13ec9

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

@@ -177,58 +177,23 @@
                      <el-table-column prop="testValue" label="检测值" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-select
                            v-model="scope.row.testValueList[index]"
                            ref="testValueSelect"
                            id="testValueSelect"
                            clearable
                            filterable
                            @change="changeState(scope.row)"
                            @blur="onTypeBlur($event,scope.row,scope.$index,index)">
                                <el-option label="是" value="是"></el-option>
                                <el-option label="否" value="否"></el-option>
                            </el-select>
                            <!-- <testValueSelect
                            @input1="changeState(scope.row)"
                            :options="[{
                                label:'是',
                                value: '是'
                            },{
                                label:'否',
                                value: '否'
                            }]"
                            v-model="scope.row.testValueList[index]"
                            ></testValueSelect> -->
                            <!-- <div style="display:flex">
                                <el-input
                                ref="testValueInput"
                                clearable
                                @blur.stop="changeState(scope.row)"
                                v-model="scope.row.testValueList[index]"
                                placeholder="请输入检测值"/>
                                <el-dropdown @command="handleCommand" class="dropdown" trigger="click">
                                    <i class="el-icon-arrow-down el-icon--right"></i>
                                    <el-dropdown-menu slot="dropdown">
                                        <el-dropdown-item :command="{'index':index,'use':'是',...scope.row}">是</el-dropdown-item>
                                        <el-dropdown-item :command="{'index':index,'use':'否',...scope.row}">否</el-dropdown-item>
                                    </el-dropdown-menu>
                                </el-dropdown>
                            </div> -->
                            <!-- :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" -->
                            <!-- @blur.stop="changeState(scope.row)" -->
                            <!-- <el-autocomplete clearable
                            ref="testValueInput"
                            @input="testChange(scope.row)"
                            @blur="changeState(scope.row)"
                            v-model="scope.row.testValueList[index]"
                            :fetch-suggestions="querySearch"
                            placeholder="请输入或选择检测值" >
                            <template slot-scope="{ item }">
                                <div>{{ item.value }}</div>
                            </template>
                            </el-autocomplete> -->
                          <!-- <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                            </el-tooltip> -->
                                <!-- @input="$nextTick(()=>{checkTestValues(scope.row)})" -->
                                <!-- @blur.capture.native="changeState(scope.row)" -->
                            <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                <el-autocomplete clearable
                                cache="false"
                                ref="testValueInput"
                                @blur="checkTestValues(scope.row,'blur',$event)"
                                @select="checkTestValues(scope.row,'select',$event)"
                                v-model="scope.row.testValueList[index]"
                                :fetch-suggestions="querySearch"
                                placeholder="请输入或选择检测值" >
                                <template slot-scope="{ item }">
                                    <div>{{ item.value }}</div>
                                </template>
                                </el-autocomplete>
                            </el-tooltip>
                          </div>
                        </template>
                      </el-table-column>
@@ -252,7 +217,7 @@
                      <el-table-column prop="note" label="检验描述" width="160" >
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <el-input @blur="changeState(scope.row)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                            <el-input @blur="checkTestValues(scope.row,'blur',$event)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" v-model="scope.row.note" placeholder="检验描述"></el-input>
                          </div>
                        </template>
                      </el-table-column>
@@ -290,7 +255,7 @@
                :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
                action="/mes/attachment/upload"
                :auto-upload="true"
                :headers="headers"
                :before-upload="submitUpload"
@@ -305,7 +270,6 @@
                </div>
              </el-upload>
            </div>

            <el-table :data="processConfigFileTableData" height="260px">
              <el-table-column
                prop="rawInsNo"
@@ -435,19 +399,19 @@
  getObj,
  updateRawInsProduct,
  updateRawInspectsById,
  getProcessConfigFiles,
  downloadProcessConfigFile,
  deleteProcessConfigFile,
  updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
  import {
    getProcessConfigFiles,
    deleteProcessConfigFile,
    downloadProcessConfigFile
 } from '@/api/quality/attachment'
  import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
  import { getStore } from '@/util/store'
  import qrCodeApp from '@/views/common/qrCodeApp'
  import testValueSelect from './testValue-select'
  export default {
  components:{
    rawMaterialPartDialog,
    qrCodeApp,
    testValueSelect
  },
    computed:{},
    data(){
@@ -459,8 +423,9 @@
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              rawInsNo: '',
              lineNumber: ''
              no: '',
              lineNumber: '',
              type: 0
            },
            row: null,
            proIndex: 0,
@@ -513,7 +478,7 @@
            }],
            dataRule: {
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }],
              createTime: [{ required: true, message: '请选择报检日期', trigger: 'change' }]
              createTime: [{ required: true, message: '请选择报检日期', trigger: 'blur' }]
            },
            deviceList: [],
        }
@@ -556,8 +521,9 @@
      },
      getConfigFiles() {
        const param = {
          rawInsNo: this.dataForm.rawInsNo,
          lineNumber: this.dataForm.id
          no: this.dataForm.rawInsNo,
          lineNumber: this.dataForm.id,
          type: 0
        }
        getProcessConfigFiles(param).then((res) => {
          this.processConfigFileTableData = res.data.data
@@ -583,7 +549,7 @@
          })
      },
      submitUpload() {
        this.paramData.rawInsNo = this.dataForm.rawInsNo
        this.paramData.no = this.dataForm.rawInsNo
        this.paramData.lineNumber = this.dataForm.id
        this.progrecessFileLoading = true
      },
@@ -919,48 +885,38 @@
        console.log(e,e.target.tabIndex);
        console.log(e.target.value);
      },
      handleCommand(command){
        if(command.use && command.use==='是'){
            command.testValueList[command.index] = '是'
        }
        if(command.use && command.use==='否'){
            command.testValueList[command.index] = '否'
        }
        this.changeState(command)
      },
      onTypeBlur(event,row,rowIndex,index){
        console.log("失焦",event,row,rowIndex,index);
        console.log(event.target.value);
        console.log(this.list[rowIndex-1]);
      },
      changeState(row) {
        if(row.use){
            this.$refs.testValueSelect.$event.target.value = row.use
        }
          this.$nextTick(()=>{
            console.log("blur---",row.testValueList);
            return
            if(row){
                let isTrue = true
                for(var i=0;i<row.testValueList.length;i++){
                    let val = row.testValueList[i]
                    if(val != '' && val != null){
                        if(!['是','否'].includes(val)){
                            let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
                            if(!reg.test(val)){
                                val = null
                              this.$message.error("请输入6位数字或选择是否")
                              isTrue = false
      checkTestValues(row,currentOption,event){
          if(row){
              let isTrue = true
              if(currentOption==='blur'){
                  let targetVal = event.target.value
                  if( (targetVal && ['是','否'].includes(targetVal)) || !targetVal){
                    isTrue = false
                  }else{
                      for(var i=0;i<row.testValueList.length;i++){
                          let val = row.testValueList[i]
                          if(val != '' && val != null){
                              if(!['是','否'].includes(val)){
                                  let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
                                  if(!reg.test(val)){
                                    row.testValueList[i] = ''
                                    event.target.value = ''
                                    this.$message.error("请输入6位数字或选择是否")
                                    isTrue = false
                                }
                            }
                          }
                      }
                    }
                }
                if(!isTrue){
                    return
                }
            }
            console.log(row.testValueList);
            return
                  }
              }
              if(!isTrue){
                  return
              }
              this.changeState(row)
          }
      },
      changeState(row) {
          this.$nextTick(()=>{
            if (row.rpId != null && row.rpId != '') {
                let val = row.testValueList.join(",")
                if (val === undefined || val === '' || val === null) {