合并冲突

licp

2024-03-26 c7b4ae684df22079459495e04dc5566c891ba4a5

合并冲突

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

@@ -7,13 +7,11 @@
    .search {
        width: 100%;
        margin-bottom: 10px;
        height: 140px;
        background-color: #fff;
        border-radius: 3px;
    }

    .search .form-inline {
        height: 50px;
        padding-top: 20px;
        padding-left: 50px;
    }
@@ -45,7 +43,7 @@
    height: 100%;
    align-items: center;
    justify-content: left;
    padding: 2px;
    padding: 5px;
    box-sizing: border-box;
  }
  .content-h-0{
@@ -134,7 +132,7 @@
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg};font-family:${n.v.ff};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
                  <span>{{ n.v.v}}</span>
                  <span v-if="n.v.ps===undefined || n.v.ps.value!='检验值'">{{ n.v.v}}</span>
                </div>
                </td>
              </tr>
@@ -153,13 +151,13 @@
                <el-table-column prop="sampleCode" label="样品编号" min-width="100px"
                    show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="样品型号" min-width="100px" show-overflow-tooltip></el-table-column>
                <el-table-column prop="insState" label="检测状态" min-width="100px" show-overflow-tooltip>
                <el-table-column prop="insState" label="检测状态" width="95px" show-overflow-tooltip>
          <template slot-scope="scope">
            <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState"
                                        :type="item.type" size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
          </template>
        </el-table-column>
                <el-table-column prop="isLeave" label="是否留样" min-width="100px" show-overflow-tooltip>
                <el-table-column prop="isLeave" label="是否留样" width="95px" show-overflow-tooltip align="center">
          <template slot-scope="scope">
            <span>{{ scope.row.isLeave==0?'否':'是' }}</span>
          </template>
@@ -362,6 +360,7 @@
          item.arr = arr;
          return item
        })
                console.log(this.tableList);
      }
        }
    }