合并s冲突

licp

2024-06-04 58420e1c44780e408ea62a4a8a275e4e52d108a2

合并s冲突

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

@@ -120,6 +120,19 @@
  .collection:active {
    opacity: .7;
  }
  .table_caret{
    font-size: 16px;
    margin: 0 5px;
    color: rgba(0, 0, 0, 0.1);
  }
  .table_caret:hover{
    color: #409eff;
    cursor: pointer;
  }

  .table_caret:active{
    opacity: .8;
  }
</style>
<style>
  .inspection .el-form-item__label {
@@ -284,6 +297,16 @@
                      <el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
                    </el-select> -->
                    <span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品编号'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
                      <i class="el-icon-caret-left table_caret" @click="caretSample(-1)"></i>
                      <div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div>
                      <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品型号'">
                    <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&&currentSample.model!==null">{{currentSample.model}}</div>
                  </template>
                  <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
                </div>
@@ -1459,6 +1482,29 @@
        nav.addEventListener("mouseleave", function(event) {
          flag = false;
        });
      },
      caretSample(num){
        let index = this.currentKey + num
        if(index < 1){
          this.$message.error('当前是第一个样品')
          return
        } else if(index > this.sampleProduct.length){
          this.$message.error('当前是最后一个样品')
          return
        }
        this.currentKey = index
        this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
        this.currentSample.insProduct.forEach(a => {
          this.param[a.id] = {
            insValue: [],
            comValue: [],
            resValue: null,
            equipValue: [],
            equipName: [],
            insResult: null
          }
        })
        this.getTableLists()
      }
    }
  }

 src/components/tool/excel.vue

@@ -120,7 +120,7 @@
                    cellFormat: false // 设置单元格格式
                },
                option.myFolderUrl = this.LOCATIONVUE + '/',
                option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | 检测方法&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="excelClosed()" class="save">保存</button>'
                option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10样品编号&#10样品型号&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | 检测方法&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="excelClosed()" class="save">保存</button>'
                luckysheet.create(option)
            }
        }