完成检验下单、检验任务优化

licp

2024-06-04 8d1f60e54adb75d9c252b514174f287a2cbd7864

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

@@ -224,7 +224,7 @@
            size="small">{{ item.templateName }}</el-radio-button>
        </el-radio-group>
      </div>
      <div class="center-box" id="nav">
      <div class="center-box" id="nav" v-loading="tableLoading">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
@@ -325,9 +325,9 @@
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="bushingVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="color" label="管色标" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="num2" label="标量" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="num3" label="测试量" min-width="90px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="color" label="管色标" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="standNum" label="标量" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="testNum" label="测试量" min-width="100px" show-overflow-tooltip></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="样品切换" :visible.sync="sampleVisible" :size="500">
@@ -393,9 +393,6 @@
</template>

<script>
  import {
    set
  } from 'shelljs';
  import ValueTable from '../../tool/value-table.vue'
  export default {
    props: ['sonLaboratory', 'orderId', 'state'],
@@ -473,6 +470,7 @@
        currentFiberOpticTape:null,//当前光纤带
        currentFiberOptic:null,//当前光纤
        currentBushing:null,//当前套管
        tableLoading:false,
      }
    },
    created() {
@@ -501,7 +499,7 @@
            }
          })
          this.sampleProduct = res.data.sampleProduct
          this.currentSample = this.sampleProduct[0]
          this.currentSample = this.HaveJson(this.sampleProduct[0])
          this.currentSample.insProduct.forEach(a => {
            this.param[a.id] = {
              insValue: [],
@@ -513,6 +511,7 @@
            }
          })
          if (this.currentSample.index == undefined) this.currentSample['index'] = 1
          let bushing = this.currentSample.bushing
          this.loading = false
          // this.handleTableData()
          this.getTableLists();
@@ -526,6 +525,9 @@
          this.currentFiberOptic = null;
          this.bushing = []
          this.currentBushing = null;
          if(bushing&&bushing.length>0){
            this.bushing = bushing
          }
        })
      },
      currentTable(val1, val0) {
@@ -541,6 +543,12 @@
      }
    },
    methods: {
      async getCurrentProduct(id,type){
        this.tableLoading = true;
        let res = await this.$axios.post(this.$api.insOrderPlan.getInsProduct+'?id='+id+'&type='+type+'&laboratory='+this.sonLaboratory)
        this.tableLoading = false;
        return res.data
      },
      handleChangeBushing(row, column, event){
        this.currentBushing = row;
        this.fiberOpticTape = []
@@ -556,7 +564,7 @@
        }
        this.bushingVisible = false;
      },
      handleChangeOptic(row, column, event){
      async handleChangeOptic(row, column, event){
        this.currentFiberOptic = row;
        this.currentFiberOptic.productList.forEach(a => {
          this.param[a.id] = {
@@ -568,11 +576,12 @@
            insResult: null
          }
        })
        this.getTableLists0(row)
        this.fiberOpticVisible = false;
        let list = await this.getCurrentProduct(row.id,2)
        this.getTableLists0(list)
        this.currentKey = row.index
      },
      handleChangeTape(row, column, event){
      async handleChangeTape(row, column, event){
        this.currentFiberOpticTape = row;
        this.param = {}
        this.fiberOptic = []
@@ -587,16 +596,16 @@
            insResult: null
          }
        })
        this.getTableLists0(row)
        this.fiberOpticTapeVisible = false;
        let list = await this.getCurrentProduct(row.id,1)
        this.getTableLists0(list)
        if(row.fiber&&row.fiber.length>0){
          // 配置光纤
          this.fiberOptic = row.fiber;
        }
        this.fiberOpticTapeVisible = false;
        this.currentKey = row.index
      },
      handleChangeSample(row, column, event) {
        this.currentSample = row;
      async handleChangeSample(row, column, event) {
        this.param = {}
        // 清空光纤配置相关数据
        this.fiberOpticTape = []
@@ -605,7 +614,9 @@
        this.currentFiberOptic = null;
        this.bushing = []
        this.currentBushing = null;

        this.sampleVisible = false;
        let list = await this.getCurrentProduct(row.id,0)
        this.currentSample.insProduct = this.HaveJson(list)
        this.currentSample.insProduct.forEach(a => {
          this.param[a.id] = {
            insValue: [],
@@ -616,13 +627,12 @@
            insResult: null
          }
        })
        let bushing = this.currentSample.insProduct.bushing
        let bushing = this.currentSample.bushing
        if(bushing&&bushing.length>0){
          this.bushing = bushing
        }
        // this.handleTableData()
        this.getTableLists();
        this.sampleVisible = false;
        this.currentKey = row.index
      },
      handleChangeTask(row) {
@@ -714,9 +724,9 @@
        }
      },
      // 光纤配置相关模板table列表
      getTableLists0(obj){
      getTableLists0(list){
        const mySet1 = new Set();
        this.tableLists = obj.productList.filter(m => {
        this.tableLists = list.filter(m => {
          let num0 = mySet1.size;
          if (m.templateId != null&&m.template != null) {
            mySet1.add(JSON.stringify({
@@ -733,6 +743,7 @@
          this.tableList = null;
          this.tableList = [this.tableLists[0]]
          this.currentTable = this.tableLists[0].templateId;
          this.currentSample.insProduct = this.HaveJson(list)
          this.handleTableData()
        }
      },
@@ -1024,6 +1035,15 @@
                    return res < m.split('<')[1]
                  }else if (m.includes('>')) {
                    return res > m.split('>')[1]
                  }else if (m.includes('~')) {
                    let k = m.split('~')
                    return res >= k[0] && res <= k[1]
                  }else if(m.includes('-')){
                    let k = m.split('-')
                    return res >= k[0] && res <= k[1]
                  }else if(m.includes('±')){
                    let k = m.split('±')
                    return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
                  }
                })
                if(this.getInspectionValueType(item.i)==1){