检测中心-检验任务-修改设备选择bug

licp

2024-07-25 649d67784a207f79eb1f4a5842d5ed89664e2e74

检测中心-检验任务-修改设备选择bug

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -309,16 +309,16 @@
          </el-select>
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='检测中心'">
            <el-form-item label="温度:" style="margin-bottom: 0;">
              <el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
              <el-input v-model="otherForm.temperature" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')" ></el-input>
              <span style="margin-left: 4px;">℃</span>
            </el-form-item>
            <el-form-item label="湿度:" style="margin-bottom: 0;">
              <el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
              <el-input v-model="otherForm.humidity" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
              <span style="margin-left: 4px;">%</span>
            </el-form-item>
          </el-form>
          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&tableLists.find(m=>m.templateId==currentTable).templateName!='热循环检验原始记录')">
@@ -469,7 +469,7 @@
            <el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code0" placeholder="请选择" size="small">
            <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
@@ -482,7 +482,7 @@
            <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code1" placeholder="请选择" size="small">
            <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
@@ -533,7 +533,7 @@
                {{ '外端'+(index+1) }}
              </template>
              <template slot-scope="scope">
                <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
                <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" :disabled="state>1" @change="m=>changeItem(scope.row.arr[index])"></el-input>
              </template>
            </el-table-column>
            <el-table-column
@@ -545,7 +545,7 @@
                {{ '内端'+(index+1) }}
              </template>
              <template slot-scope="scope">
                <el-input size="small" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
                <el-input size="small" :disabled="state>1" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
              </template>
            </el-table-column>
            <el-table-column
@@ -609,7 +609,7 @@
        <el-divider></el-divider>
        <el-form :inline="true" :model="equipForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code0" placeholder="请选择" size="small">
            <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
@@ -619,7 +619,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="equipForm.code1" placeholder="请选择" size="small">
            <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="请选择" size="small">
              <el-option
                v-for="item in equipOptions"
                :key="item.value"
@@ -631,8 +631,8 @@
          <el-form-item label="循环次数:" v-if="thermalCyclingInfo.inspectionItemClass=='直流电阻'">
            <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
          </el-form-item>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal">删除</el-button>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-if="state==1">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-if="state==1">删除</el-button>
        </el-form>
        <div class="table-container" v-loading="thermalCyclingLoading">
          <table border="1" cellpadding="10" class="thermal-table">
@@ -646,12 +646,12 @@
              <td v-for="(m,i) in thermalCyclingInfo.length" style="min-width: 150px;">
                <div style="display: flex;align-items: center;margin-bottom: 5px;">
                  <label style="width: 100px;white-space: nowrap;font-size: 12px;">温度:</label>
                  <el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
                  <el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" :disabled="state>1" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
                  <span style="font-size: 12px;margin-left: 13px;margin-right: 13px;"> ℃</span>
                </div>
                <div style="display: flex;align-items: center;" v-if="item.name!='环境温度'&&thermalCyclingInfo.inspectionItemClass=='直流电阻'">
                  <label style="width: 100px;white-space: nowrap;font-size: 12px;">直流电阻:</label>
                  <el-input clearable size="small" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
                  <el-input clearable size="small" :disabled="state>1" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
                  <span style="margin-left: 5px;font-size: 12px;"> Ω/km</span>
                </div>
              </td>
@@ -678,7 +678,7 @@
        accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
        style="width: 80px !important;"
        :on-error="onError" ref='upload'>
        <el-button size="small" type="primary">附件上传</el-button></el-upload>
        <el-button size="small" type="primary" v-if="state==1">附件上传</el-button></el-upload>
      <ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
        :componentData="componentData0"
        :delUrl="$api.insOrderPlan.delfile"
@@ -1527,7 +1527,6 @@
                      num0 = c.arr[i].value0
                    }
                  })
                  
                  if(!num0||!b.value0){
                    b.state = null
                  }else if(Number(num0)>Number(b.value0)){
@@ -1646,7 +1645,7 @@
            }
          }
        })
        console.log(1111,this.param)
        // console.log(1111,this.param)
        this.saveInsContext()
      },
      // 热循环---结束
@@ -2238,13 +2237,15 @@
          } catch (e) {}
          try {
            let equipValue = JSON.parse(a.insProductResult.equipValue)
            this.param[a.id].equipValue = []
            for (let i = 0; i < equipValue.length; i++) {
              this.param[a.id].equipValue.push({
                v:{
                  v:''
                }
              })
            if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录')){
              this.param[a.id].equipValue = []
              for (let i = 0; i < equipValue.length; i++) {
                this.param[a.id].equipValue.push({
                  v:{
                    v:''
                  }
                })
              }
            }
            for (let i = 0; i < equipValue.length; i++) {
              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录')){
@@ -2275,13 +2276,15 @@
          } catch (e) {}
          try {
            let equipName = JSON.parse(a.insProductResult.equipName)
            this.param[a.id].equipName = []
            for (let i = 0; i < equipName.length; i++) {
              this.param[a.id].equipName.push({
                v:{
                  v:''
                }
              })
            if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录')){
              this.param[a.id].equipName = []
              for (let i = 0; i < equipName.length; i++) {
                this.param[a.id].equipName.push({
                  v:{
                    v:''
                  }
                })
              }
            }
            for (let i = 0; i < equipName.length; i++) {
              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='温度循环检验原始记录'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='热循环检验原始记录')){
@@ -2747,6 +2750,7 @@
            })
          }
        }
        console.log(this.param)
        this.saveInsContext()
      },
      getAuthorizedPerson() {