Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-18 5948315e24e88cf5b87c0aefb12c51c886da7601

 src/components/makepager/FormBtnsView.vue

@@ -7,17 +7,20 @@
        <div class="right-label">额外的价格</div>
      </div>
    </div> -->
    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border no-cursor">
    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct"
         class="sub-number left_border cursor_pointer"
         @click="inLibraryClick()"
    >
      <div class="left"><i class="el-icon-present"></i></div>
      <div class="right">
        <div class="right-label">{{ countObject.inLibrary + "件" }}</div>
        <div class="right-label">{{ (countObject?.inLibrary ?? 0) + "件" }}</div>
        <div class="right-label">在库</div>
      </div>
    </div>
    <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number no-cursor">
      <div class="left"><i class="el-icon-present"></i></div>
      <div class="right">
        <div class="right-label">{{ countObject.forecast + "件" }}</div>
        <div class="right-label">{{ (countObject?.forecast ?? 0) + "件" }}</div>
        <div class="right-label">预测</div>
      </div>
    </div>
@@ -29,8 +32,8 @@
    >
      <div class="left icon-view"><i class="el-icon-sort"></i></div>
      <div class="right">
        <div class="right-label">{{ "进: " + countObject.enter }}</div>
        <div class="right-label">{{ "出: " + countObject.exit }}</div>
        <div class="right-label">{{ "进: " + (countObject?.enter ?? 0) }}</div>
        <div class="right-label">{{ "出: " + (countObject?.exit ?? 0) }}</div>
      </div>
    </div>
    <!-- <div
@@ -48,14 +51,14 @@
    <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor">
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
        <div class="right-label">{{ countObject.reorderRule }}</div>
        <div class="right-label">{{ (countObject?.reorderRule ?? 0) }}</div>
        <div class="right-label">重订货规则</div>
      </div>
    </div>
    <div v-if="showProduct" class="sub-number left_border yes-cursor" @click="productClick">
      <div class="left"><i class="el-icon-s-fold"></i></div>
      <div class="right">
        <div class="right-label">{{ countObject.product }}</div>
        <div class="right-label">{{ (countObject?.product ?? 0) }}</div>
        <div class="right-label">产品</div>
      </div>
    </div>
@@ -146,6 +149,10 @@
    // 产品
    productClick() {
      this.$emit("productClick")
    },
    // 在库
    inLibraryClick(){
      this.$emit("inLibraryClick")
    }
  }
}