Merge remote-tracking branch 'origin/master'

86134

2023-11-11 4652431ce329b4dec6c4dcc0758d5c4ff97e0666

 src/views/product/workbench/product-record-form.vue

@@ -10,7 +10,7 @@
  >
    <div class="product-record-form-header">
      <div>
        <span>生产模板</span>
        <span>记录模板：</span>
        <el-select
          v-model="selectedTemplateId"
          placeholder="生产记录模板"
@@ -63,7 +63,7 @@
        </div>
      </div>
    </div>
    <div class="product-record-form-header">
    <!-- <div class="product-record-form-header">
      <div>
        <span>分割模板</span>
        <el-select
@@ -117,9 +117,9 @@
          </el-input>
        </div>
      </div>
    </div>
    </div> -->
    <div class="table">
      <div class="table-sn">
      <!-- <div class="table-sn">
        <el-table :data="outputPartsList" :border="true">
          <el-table-column label="序号" type="index"></el-table-column>
          <el-table-column label="SN号">
@@ -138,7 +138,7 @@
            </template>
          </el-table-column>
        </el-table>
      </div>
      </div> -->
      <div class="table-product">
        <el-table
          ref="productRecordFormTable"
@@ -219,7 +219,7 @@
    flex: 0.35;
  }
  .table-product {
    flex: 0.6;
    flex: 1;
  }
}
.product-record-form-table >>> .stripe-row {