优化报告生成、修改电路下单传参

licp

2024-09-10 cb57bc6b4abf45dbb0605c94359c63e3b31b4b87

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

@@ -282,7 +282,7 @@
          <el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="请输入" ></el-input>
        </el-form-item>
        <el-form-item label="试验标准:">
          <span>{{ insOrder.testRequirements?insOrder.testRequirements:'-' }}</span>
          <span>{{ currentSample.testRequirements?currentSample.testRequirements:'-' }}</span>
        </el-form-item>
        <el-form-item label="下发时间:">
          <el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="请输入"></el-input>
@@ -309,11 +309,11 @@
            <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
              size="small">{{ item.templateName }}</el-radio-button>
          </el-radio-group>
          <span style="margin-left: 20px;margin-right: 10px;">模板版本:</span>
          <!-- <span style="margin-left: 20px;margin-right: 10px;">模板版本:</span>
          <el-radio-group v-model="currentTableState" size="small">
            <el-radio-button label="0" size="small">版本一</el-radio-button>
            <el-radio-button label="1" size="small">版本二</el-radio-button>
          </el-radio-group>
          </el-radio-group> -->
        </div>
        <div style="display: flex;align-items: center;">
          <span v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='成品缆检验原始记录'">&nbsp;&nbsp;套管：</span>
@@ -800,8 +800,8 @@
      <!-- 电路试验 -->
      <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"></CircuitParameters1>
        <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state"></CircuitParameters2>
        <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1"></CircuitParameters1>
        <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1"></CircuitParameters2>
      </div>
      <el-upload :action="action"
      :data="{
@@ -913,6 +913,21 @@
        <el-button type="primary" @click="submitDataGet()" :loading="getDataIndexLoading">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog
      title="选择电路检验模板版本"
      :visible.sync="versionDialogVisible"
      width="30%"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
      :show-close="false">
      <el-radio-group v-model="currentTableState">
        <el-radio :label="0">电调-电路检验原始记录</el-radio>
        <el-radio :label="1">非电调-电路检验原始记录</el-radio>
      </el-radio-group>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" :loading="versionLoading" @click="saveVersion">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -924,7 +939,7 @@
  import CircuitParameters1 from './circuit-parameters1.vue'
  import CircuitParameters2 from './circuit-parameters2.vue'
  export default {
    props: ['sonLaboratory', 'orderId', 'state','inspectorList'],
    props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId'],
    components: {
      ValueTable,
      Circuit,
@@ -933,6 +948,8 @@
    },
    data() {
      return {
        versionLoading:false,
        versionDialogVisible:false,
        currentTableState:0,
        sagData: [],
        sagForm: {
@@ -1110,7 +1127,7 @@
        getDataIndexLoading:false,
        changeType:null,
        getDataTypeId:'',
        getDataType:null
        getDataType:null,
      }
    },
    // 用于上传文件的信息
@@ -1137,6 +1154,7 @@
      this.scrollInit()
      this.getPower()
      this.startWorker()
      this.currentTableState = this.version
    },
    watch: {
      // 监听任务id，获取任务信息
@@ -2365,6 +2383,9 @@
          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){
            this.versionDialogVisible = true
          }
          // 处理页面列表数据
          this.handleTableData()
        }
@@ -3298,7 +3319,8 @@
          if(this.param){
            this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
              param: JSON.stringify(this.param),
              currentTable:this.currentTable
              currentTable:this.currentTable,
              num:this.currentSample.num1
            }).then(res => {
              if (res.code == 201) {
                this.$message.error('保存失败')
@@ -3593,6 +3615,23 @@
      async getCurrentItem(){
        let list = await this.getCurrentProduct(this.currentSample.id,0)
        this.currentSample.insProduct = this.HaveJson(list)
      },
      saveVersion(){
        if(this.currentTableState!=0&&this.currentTableState!=1){
          this.$message.error('请选择版本')
          return
        }
        this.versionLoading = true;
        this.$axios.post(this.$api.insOrderPlan.chooseVersion, {
          orderStateId: this.orderStateId,
          version: this.currentTableState
        }).then(res => {
          this.versionLoading = false;
          if(res.code==201){
            return
          }
          this.versionDialogVisible = false
        })
      }
    }
  }