Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/operate/orderPoint/index.vue

@@ -7,9 +7,11 @@
        :show-apply="false"
        :placeholder="'请输入位置/产品'"
        :amount-view="false"
        :search-task-map="searchTaskMap"
        @addCommonClick="addProductClick"
        @searchClick="getList"
        @discardBtnClick="discardBtnClick"
        @delSelectClick="delSelectClick"
      />
    </div>
    <div class="content_wrap">
@@ -136,11 +138,14 @@
      maxInventory: 0,
      orderNumber: 0,
      unit: "",
      reorderId: 0
      reorderId: 0,
      searchTaskMap: [],
      type: "bh"
    }
  },
  created() {
    this.setTable()
    this.searchTaskMap = [{ type: this.type, title: "重新订购" }]
    this.getData()
    this.getLocationList()
  },
@@ -164,14 +169,17 @@
      }
    },
    // 请求数据
    async getData() {
    async getData(data) {
      await getReorderRuleList({
        locationId: data?.id,
        type: this.type,
        keyWord: data?.jointName,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
          const list = res.data?.map((item) => {
            let orderNum = 0
            if (parseFloat(item.minInventory) - parseFloat(item.prediction) > 0) {
              orderNum = this.caculateOrderNumber(
@@ -384,42 +392,7 @@
    //树点击
    handleNodeClick(data) {
      console.log(data, "sss")
      getReorderRuleList({
        locationId: data.id,
        page: 1,
        pageSize: 15,
        type: "",
        keyWord: data.jointName
      }).then((res) => {
        console.log(res, "res999")
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            let orderNum = 0
            if (parseFloat(item.minInventory) - parseFloat(item.prediction) > 0) {
              orderNum = this.caculateOrderNumber(
                parseFloat(item.minInventory),
                parseFloat(item.maxInventory),
                parseFloat(item.prediction)
              )
            }
            return {
              ...item,
              productName: item.product.name,
              locationName: item.location.name,
              isSet: false,
              isEdit: true,
              editable: true,
              isOrder: true,
              isView: item?.minInventory - item?.prediction > 0 ? true : false,
              orderNumber: orderNum
            }
          })
          this.tableList.tableData = list || []
          this.tableData = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
      this.getData(data)
    },
    async getLocationList() {
      await getLocationTreeList().then((res) => {
@@ -433,6 +406,11 @@
        ]
        console.log(res, "res666")
      })
    },
    // 删除type
    delSelectClick() {
      this.type = ""
      this.getData()
    }
  }
}