Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-07 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2

 src/views/product/workbench/feed-pane.vue

@@ -250,9 +250,9 @@
              <span>{{ scope.row.partName }}</span>
            </template>
          </el-table-column>
          <el-table-column label="IFS批次号" prop="ifsBatchNo" align="center">
          <el-table-column label="批次号" prop="ifsBatchNo" align="center">
            <template slot="header">
              <div style="line-height: 14px;">IFS批次号</div>
              <div style="line-height: 14px;">批次号</div>
              <div class="th" @click.stop>
                <el-input
                  type="text"
@@ -268,7 +268,7 @@
              <span>{{ scope.row.ifsBatchNo }}</span>
            </template>
          </el-table-column>
               <el-table-column label="WDR号" prop="ifsWdr" align="center">
               <!-- <el-table-column label="WDR号" prop="ifsWdr" align="center">
                 <template slot="header">
                   <div style="line-height: 14px;">WDR号</div>
                   <div class="th" @click.stop>
@@ -285,7 +285,7 @@
                 <template slot-scope="scope">
                   <span>{{ scope.row.ifsWdr }}</span>
                 </template>
               </el-table-column>
               </el-table-column> -->
          <!-- <el-table-column label="SN号" prop="partBatchNo" align="center">
            <template slot="header">
              <div style="line-height: 14px;">SN号</div>
@@ -1242,9 +1242,9 @@
          <span>{{ scope.row.partName }}</span>
        </template>
      </el-table-column>
      <el-table-column label="IFS批次号" prop="ifsBatchNo" align="center">
      <el-table-column label="批次号" prop="ifsBatchNo" align="center">
        <template slot="header" slot-scope="scope">
          <div style="line-height: 14px;">IFS批次号</div>
          <div style="line-height: 14px;">批次号</div>
          <div class="th" @click.stop>
            <el-input
              type="text"
@@ -1260,7 +1260,7 @@
          <span>{{ scope.row.ifsBatchNo }}</span>
        </template>
      </el-table-column>
         <el-table-column label="WDR号" prop="ifsWdr" align="center">
         <!-- <el-table-column label="WDR号" prop="ifsWdr" align="center">
           <template slot="header" slot-scope="scope">
             <div style="line-height: 14px;">WDR号</div>
             <div class="th" @click.stop>
@@ -1277,7 +1277,7 @@
           <template slot-scope="scope">
             <span>{{ scope.row.ifsWdr }}</span>
           </template>
         </el-table-column>
         </el-table-column> -->
      <!-- <el-table-column label="SN号" prop="partBatchNo" align="center">
        <template slot="header" slot-scope="scope">
          <div style="line-height: 14px;">SN号</div>