合并冲突

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;
   }
@@ -30,7 +28,8 @@
    flex-wrap: wrap;
   }
  .tables{
    width: 800px;
    /* width: 800px; */
    margin-bottom: 16px;
  }
  .tables td{
    height: 40px;
@@ -44,7 +43,7 @@
    height: 100%;
    align-items: center;
    justify-content: left;
    padding: 2px;
    padding: 5px;
    box-sizing: border-box;
  }
  .content-h-0{
@@ -131,9 +130,9 @@
                :key="j"
                :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
                :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['0']}px;height:${item.style.rowlen[i]}px;font-wight:${n.v.bl?'bold':''};`">
                :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>
@@ -144,19 +143,21 @@
      title="样品切换"
      :visible.sync="sampleVisible"
      size="50%">
      <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName">
      <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
      :current-row-key="currentKey" :row-key="record=>record.index"
      v-if="sampleVisible">
            <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
            </el-table-column>
            <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>
@@ -200,7 +201,7 @@
                  userId: 0
               },
               isIndex: false,
               showSelect: true,
               showSelect: false,
               select: false,
          selectMethod:'handleChangeTask',
               sort: false,
@@ -215,9 +216,10 @@
                     select: []
                  },
          },
          currentId:'',
               selectField: {},
               requiredAdd: [],
               requiredUp: []
               requiredUp: [],
            },
        upIndex: 0,
            insOrder: {},
@@ -226,7 +228,8 @@
        urgentList:[],
        currentSample:{},//当前样品信息
        tableList:[],
        loading: false
        loading: false,
        currentKey:1,
         }
      },
      created() {
@@ -254,6 +257,8 @@
               if(this.currentSample.index==undefined)this.currentSample['index'] = 1
               this.loading = false
          this.handleTableData()
          this.componentData.currentId = val;
          this.currentKey = 1;
            })
         }
      },
@@ -262,6 +267,7 @@
        this.currentSample = row;
        this.handleTableData()
        this.sampleVisible = false;
        this.currentKey=row.index
      },
      handleChangeTask(row){
            if(row.length > 0)this.id = row[0].id;
@@ -354,6 +360,7 @@
          item.arr = arr;
          return item
        })
            console.log(this.tableList);
      }
      }
   }