Merge remote-tracking branch 'origin/master'

zss

2024-08-08 07ea6a242b16b7ad61602915698a9852cc894246

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

@@ -418,7 +418,7 @@
                      <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-if="!currentFiberOpticTape&&!currentFiberOptic"></i>
                      <div :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`">{{currentSample.sampleCode}}</div>
                      <i class="el-icon-caret-right table_caret" style="width: 16px;"
                      v-if="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
                      v-if="!currentFiberOpticTape&&!currentFiberOptic" @click="caretSample(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品型号'">
@@ -1150,16 +1150,16 @@
        })
      },
      currentTable(val1, val0) {
        if (val0 != null && val1 != val0) {
          if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='成品缆检验原始记录')){
            if(this.casing.length>0){
              this.handleChange(this.casing[0].id,3)
            }
            return
        if(val0 !=null && val1 != val0){
        if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='成品缆检验原始记录')){
          if(this.casing.length>0){
            this.handleChange(this.casing[0].id,3)
          }
          if(this.changeType&&this.changeType>0){
            return
          }
          return
        }
        if(this.changeType && this.changeType>0){
          return
        }
          this.tableLists.forEach(async (m, i) => {
            if (m.templateId == val1) {
              let list = await this.getCurrentProduct(this.currentSample.id,0)
@@ -1203,6 +1203,7 @@
              }
            }
          })
          this.handleCasing()
        }
      },
      equipForm:{
@@ -2115,7 +2116,7 @@
        })
      },
      async handleChange(m,type){
        this.changeType = type
        this.changeType = type;
        if(m){
          let list = await this.getCurrentProduct(m,type)
          if(list.length>0){