Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/components/makepager/FormBtnsView.vue

@@ -7,17 +7,21 @@
        <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">{{ "0.00" + "件" }}</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">{{ "0.00" + "件" }}</div>
        <div class="right-label">{{ (countObject?.forecast ?? 0) + "件" }}</div>
        <div class="right-label">预测</div>
      </div>
    </div>
@@ -29,8 +33,8 @@
    >
      <div class="left icon-view"><i class="el-icon-sort"></i></div>
      <div class="right">
        <div class="right-label">{{ "进: " + 0 }}</div>
        <div class="right-label">{{ "出: " + 0 }}</div>
        <div class="right-label">{{ "进: " + (countObject?.enter ?? 0) }}</div>
        <div class="right-label">{{ "出: " + (countObject?.exit ?? 0) }}</div>
      </div>
    </div>
    <!-- <div
@@ -45,21 +49,25 @@
        <div class="right-label">BOM</div>
      </div>
    </div> -->
    <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor">
    <div
      v-if="!showProduct && !showWarehouse && !showPosition"
      class="sub-number yes-cursor"
      @click="reorderRulesClick"
    >
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
        <div class="right-label">{{ 0 }}</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">{{ 0 }}</div>
        <div class="right-label">{{ countObject?.product ?? 0 }}</div>
        <div class="right-label">产品</div>
      </div>
    </div>
    <div v-if="!showWarehouse" class="sub-number left_border no-cursor">
    <div v-if="!showWarehouse" class="sub-number left_border yes-cursor" @click="listingRulesClick">
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
        <div class="right-one">上架规则</div>
@@ -120,6 +128,19 @@
    showSale: {
      type: Boolean,
      default: true
    },
    countObject: {
      type: Object,
      default: () => {
        return {
          inLibrary: 0, // 在库
          forecast: 0, // 预测
          enter: 0, // 进
          exit: 0, // 出
          reorderRule: 0, // 重订货规则
          product: 0 // 产品
        }
      }
    }
  },
  data() {
@@ -133,6 +154,18 @@
    // 产品
    productClick() {
      this.$emit("productClick")
    },
    // 在库
    inLibraryClick() {
      this.$emit("inLibraryClick")
    },
    // 上架规则
    listingRulesClick() {
      this.$emit("listingRulesClick")
    },
    // 重订货规则
    reorderRulesClick() {
      this.$emit("reorderRulesClick")
    }
  }
}