licp
2024-12-31 54b1d5908bc6173160a3db6288a27c0944afaba9
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -259,8 +259,8 @@
    <el-row class="title">
      <el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">检验单详情
      </el-col>
      <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;margin-bottom: 16px;">
        <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')">电调/非电调模板切换</el-button>
      <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;height: 60px;">
        <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')&&insOrder.sampleType!='无源器件'">电调/非电调模板切换</el-button>
        <el-select v-model="template" size="medium" placeholder="电路预设模板" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')"
          @change="selectInsProductTemplateById">
          <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
@@ -738,8 +738,12 @@
      <!-- 电路试验 -->
      <div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')" style="width: 100%;overflow-x: auto;overflow-y: visible;">
        <!-- <Circuit></Circuit> -->
         <!-- 电调 -->
        <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters1>
        <!-- 非电调 -->
        <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters2>
        <!-- 无源器件 -->
        <CircuitParameters3 v-if="this.insOrder.sampleType=='无源器件' "  :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters3>
      </div>
      <!-- 温湿度试验 -->
      <div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('温湿度试验')">
@@ -963,6 +967,7 @@
  import excelFunction from '../../../util/excelFountion'
  import CircuitParameters1 from './circuit-parameters1.vue'
  import CircuitParameters2 from './circuit-parameters2.vue'
  import CircuitParameters3 from './circuit-parameters3.vue'
  import Humidity from './humidity.vue'
  import PowerCapacity from './power-capacity.vue'
  import filePreview from '../../tool/file-preview.vue'
@@ -972,6 +977,7 @@
      ValueTable,
      CircuitParameters1,
      CircuitParameters2,
      CircuitParameters3,
      filePreview,
      Humidity,
      PowerCapacity,
@@ -1206,7 +1212,6 @@
      this.scrollInit()
      this.getPower()
      this.startWorker()
      this.selectInsProductTemplate()
    },
    watch: {
      // 监听任务id,获取任务信息
@@ -1220,6 +1225,7 @@
          this.componentData0.entity.insSampleId = val;
          this.componentData0.entity.insOrderId = this.orderId0;
          this.$refs.fileList.selectList()
          this.selectInsProductTemplate()
          this.urgentList.forEach(m => {
            if (m.value == this.insOrder.type) {
              this.insOrder.typeName = m.label
@@ -2445,7 +2451,7 @@
          this.tableList = null;
          this.tableList = [this.tableLists[0]]
          this.currentTable = this.tableLists[0].templateId;
          if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('电路试验')&&this.currentTableState!=0&&this.currentTableState!=1){
          if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('电路试验')&&this.currentTableState!=0&&this.currentTableState!=1&&this.insOrder.sampleType!='无源器件'){
            this.versionDialogVisible = true
          }
          // 处理页面列表数据
@@ -3328,8 +3334,12 @@
          this.$message.error('请输入湿度')
          return
        }
        this.loading = true
        if(this.sonLaboratory === '电路试验'&&!(await this.$refs.CircuitParameters.saveAll())){
          this.loading = false
          return
        }else{
          this.loading = false
        }
        this.experimentDia = true
        this.newUserInfo = []
@@ -3732,14 +3742,18 @@
            this.currentSample.insProduct = this.HaveJson(list)
            this.currentNum++
          }
            }else {
          this.$message.error(response.message);
            }
         },
      async beforeUpload(file) {
        if(this.sonLaboratory === '电路试验'&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
      beforeUpload(file) {
        if(this.sonLaboratory === '电路试验'&&(file.name.includes('交调')||file.name.includes('互调'))&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
          this.$message.error('上传附件前请先填写并保存频段');
          return false
        }else{
          await this.$refs.CircuitParameters.saveAll()
          // if(file.name.includes('交调')||file.name.includes('互调')){
          //   this.$refs.CircuitParameters.saveAll()
          // }
          if (file.size > 1024 * 1024 * 10) {
            this.$message.error('上传文件不超过10M');
            this.$refs.upload.clearFiles()
@@ -3847,8 +3861,12 @@
            cancelButtonText: '取消',
            type: 'warning'
          }).then(async () => {
            this.loading = true
            if(await this.$refs.CircuitParameters.saveAll()){
              this.$emit('goback')
              this.loading = false
            }else{
              this.loading = false
            }
          })
        }else{
@@ -3859,7 +3877,9 @@
        }
      },
      selectInsProductTemplate(){
        this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate).then(res => {
        this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate,{
          version:this.insOrder.sampleType=='无源器件'?2:''
        }).then(res => {
          if (res.code == 201) return
          this.templates = res.data
        })
@@ -3869,7 +3889,7 @@
          this.$axios.post(this.$api.insProductTemplate.getInsProductTemplate + '?id=' + e).then(res => {
            if (res.code == 201) return
            let obj = JSON.parse(res.data.message)
            if(this.currentTableState!=res.data.version){
            if(this.currentTableState!=res.data.version&&this.insOrder.sampleType!='无源器件'){
              this.$message.error('电调/非电调模板版本不一致,请重新选择')
              this.template = null
              return
@@ -3911,7 +3931,7 @@
          this.templateLoading = true;
          this.$axios.post(this.$api.insProductTemplate.addInsProductTemplate, {
            name: this.templateName,
            version:this.currentTableState,
            version:this.insOrder.sampleType=='无源器件'?2:this.currentTableState,
            message:JSON.stringify(obj)
          }, {
            headers: {