合并冲突

licp

2024-03-28 70bf5f310d85c3a0700d75a7a877f5a1e403d83f

 src/components/do/b1-ins-order/add.vue

@@ -216,7 +216,7 @@
         </div> -->
         <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
            border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;" >
            <el-table-column type="selection" width="60" :selectable="selectable"></el-table-column>
            <el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
            <el-table-column type="index" label="序号" width="65" align="center"></el-table-column>
            <el-table-column prop="sample" label="样品名称" align="center" min-width="100">
               <template slot-scope="scope">
@@ -295,7 +295,7 @@
         <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
            @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
            :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
            <el-table-column type="selection" width="65" :selectable="selectable"></el-table-column>
            <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
            <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
            <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
               show-overflow-tooltip></el-table-column>
@@ -417,9 +417,9 @@
            <el-button type="primary" @click="onSample()" :loading="getProductLoad">确 定</el-button>
         </span>
      </el-dialog>
      <el-dialog title="保存模板" :visible.sync="templateDia" width="30%">
         <div class="body" style="height: 10vh;display: flex;align-items: center;" v-if="templateDia">
            <div class="search_label"><span class="required-span">* </span>模板名称：</div>
      <el-dialog title="保存模板" :visible.sync="templateDia" width="400px">
         <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
            <div class="search_label" style="width: 90px;"><span class="required-span">* </span>模板名称：</div>
            <div class="search_input">
               <el-input size="small" clearable v-model="templateName"></el-input>
            </div>