完成首页等问题修改

licp

2024-03-29 41cad2434411b2eac1b9814d47d06e34c291f285

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

@@ -92,27 +92,34 @@
            </el-row>
            <el-row>
                <el-col :span="6">
                    <el-form-item label="报检日期" prop="createTime">
                    <el-form-item label="报检日期" prop="startTime">
                        <el-date-picker
                        :disabled="dataForm.id!=null"
                        v-model="dataForm.createTime"
                        disabled
                        v-model="dataForm.startTime"
                        type="datetime"
                        format="yyyy-MM-dd HH:mm:ss"
                        value-format="yyyy-MM-dd HH:mm:ss"
                        placeholder="报检日期">
                        </el-date-picker>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item label="报检人" prop="createUser" v-if="dataForm.id!=null">
                <el-col :span="6" v-if="dataForm.id!=null">
                  <el-form-item label="报检人" prop="createUser" >
                        <el-input v-model="dataForm.createUser" disabled />
                  </el-form-item>
                </el-col>
                <el-col :span="6">
                  <el-form-item  prop="projectName" label="项目名称" v-if="dataForm.id!=null">
                <el-col :span="6" v-if="dataForm.id!=null">
                  <el-form-item  prop="projectName" label="项目名称" >
                    <el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
                      <el-input v-model="dataForm.projectName" disabled ></el-input>
                    </el-tooltip>
                  </el-form-item>
              </el-col>
              <el-col :span="6">
                    <el-form-item label="备注" prop="remark">
                        <el-input v-model="dataForm.remark" />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
      </div>
@@ -178,13 +185,15 @@
                        <template slot-scope="scope">
                          <div v-if="!scope.row.children">
                            <!-- :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" -->
                            <!-- @blur.stop="changeState(scope.row)" -->
                                <!-- @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"
                                @input="$nextTick(()=>{checkTestValues(scope.row)})"
                                @blur="$nextTick(()=>{changeState(scope.row)})"
                                @blur="checkTestValues(scope.row,'blur',$event)"
                                @select="checkTestValues(scope.row,'select',$event)"
                                :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
                                v-model="scope.row.testValueList[index]"
                                :fetch-suggestions="querySearch"
                                placeholder="请输入或选择检测值" >
@@ -216,7 +225,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>
@@ -254,7 +263,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"
@@ -269,7 +278,6 @@
                </div>
              </el-upload>
            </div>

            <el-table :data="processConfigFileTableData" height="260px">
              <el-table-column
                prop="rawInsNo"
@@ -399,19 +407,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(){
@@ -423,8 +431,9 @@
              Authorization: 'Bearer ' + getStore({ name: 'access_token' })
            },
            paramData: {
              rawInsNo: '',
              lineNumber: ''
              no: '',
              lineNumber: '',
              type: 0
            },
            row: null,
            proIndex: 0,
@@ -456,6 +465,7 @@
                unit: '',
                number: '',
                supplier: '',
                remark:'',
                rawInsProducts: [{
                  deviceId: 0,
                  father:'',
@@ -477,7 +487,7 @@
            }],
            dataRule: {
              code:[{ required: true, message: '请扫描选择零件', trigger: 'blur' }],
              createTime: [{ required: true, message: '请选择报检日期', trigger: 'change' }]
            //   startTime: [{ required: true, message: '请选择报检日期', trigger: 'blur' }]
            },
            deviceList: [],
        }
@@ -520,8 +530,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
@@ -547,7 +558,7 @@
          })
      },
      submitUpload() {
        this.paramData.rawInsNo = this.dataForm.rawInsNo
        this.paramData.no = this.dataForm.rawInsNo
        this.paramData.lineNumber = this.dataForm.id
        this.progrecessFileLoading = true
      },
@@ -615,6 +626,7 @@
          this.dataForm.code = param.code
          this.dataForm.name = param.name
          this.dataForm.formTime = param.formTime
          this.dataForm.startTime = param.formTime
          this.dataForm.unit = param.unit
          this.dataForm.specs = param.specs
          this.dataForm.supplier = param.supplier
@@ -694,7 +706,9 @@
        });
      },
      addTeatValueColumn(){
        this.empiricalValueAdd = this.empiricalValueAdd + 1;
        this.$nextTick(()=>{
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        })
      },
      // 添加行
      clickAddLine(row,index) {
@@ -798,6 +812,8 @@
            this.dataForm.rawInsNo = data.rawInsNo
            this.dataForm.name = data.name
            this.dataForm.formTime = data.formTime
            this.dataForm.startTime = data.startTime
            this.dataForm.remark = data.remark
            this.dataForm.code = data.code
            this.dataForm.specs = data.specs
            this.dataForm.unit = data.runit
@@ -883,31 +899,37 @@
        console.log(e,e.target.tabIndex);
        console.log(e.target.value);
      },
      checkTestValues(row){
        if(row){
      checkTestValues(row,currentOption,event){
          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)){
                            row.testValueList[i] = null
                            this.$message.error("请输入6位数字或选择是否")
                            isTrue = false
                        }
                    }
              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
              }

              this.changeState(row)
          }
      },
      changeState(row) {
          console.log("更新--》",row.testValueList[0]);
          return
          this.$nextTick(()=>{
            if (row.rpId != null && row.rpId != '') {
                let val = row.testValueList.join(",")
@@ -978,6 +1000,7 @@
                this.list.forEach(item=>{
                item.children.forEach(c=>{
                    c.testValue=c.testValueList.join(",")
                    c.required = c.required.replace(',','，').replace('(','（').replace(')','）')
                })
                })
                data.rawInsProducts = this.list