Merge remote-tracking branch 'origin/master'

Crunchy

2023-11-18 7c4b02892b24bc2d219217b5f9e352d0eb531c4e

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

@@ -144,14 +144,14 @@
            ><span style="font-size:14px;font-weight:bold">线边仓合格物料</span>
          </div>
          <div>
            <el-button
            <!-- <el-button
              v-if="permissions.product_feed_scan"
              class="feeding-btn"
              type="primary"
              icon="feed-btn-feeding"
              @click="scanAddFeed()"
              >扫码投料</el-button
            >
            > -->
            <el-button
              class="feeding-btn"
              type="primary"
@@ -1130,7 +1130,7 @@
        ><span style="font-size:14px;font-weight:bold">已投入未消耗物料</span>
      </div>
      <div>
            <el-button
            <!-- <el-button
              class="return-btn"
              type="primary"
              @click="submitIns()"
@@ -1141,7 +1141,7 @@
              type="primary"
              @click="inputHandle()"
              >尾料处理</el-button
            >
            > -->
        <el-button
          class="return-btn"
          type="primary"