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

zuozhengqing

2023-11-06 f9b2a039afe6f674908e483bf19915c0ba06eb71

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

 src/components/makepager/CommonFormTableView.vue

@@ -510,17 +510,16 @@
      })
    },
    selProductNameClick(item) {
      console.log(item)
      this.tableList.tableData.map((ite) => {
      this.productIndex = this.tableList.tableData.length - 1
      this.tableList.tableData.map((ite, index) => {
        console.log(ite)
        // if (ite.productName === item.name) {
        ite.productId = item.id
        ite.productName = item.name
        ite.amount = item.amount
        ite.unit = item.unit
        // }
        if (index === this.productIndex) {
          ite.productId = item.id
          ite.productName = item.name
          ite.amount = item.amount
          ite.unit = item.unit
        }
      })
      console.log(this.tableList.tableData)
    },
    // 选择产品
    selProductClick(item) {

 src/views/overview/AddOverviewDialog.vue

@@ -144,7 +144,12 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -158,7 +163,12 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    <el-option
                      v-for="item in toLocationOptions"
                      :key="item.id"
                      :label="item.jointName"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -374,7 +384,7 @@
    async getLocationList() {
      await getLocationList({
        keyWord: "",
        jointName:this.editConfig.code,
        jointName: this.editConfig.code,
        page: 0,
        pageSize: 0
      }).then((res) => {
@@ -517,7 +527,7 @@
        contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
      }
      let params = {
        baseOperationType:data.baseOperationType,
        baseOperationType: data.baseOperationType,
        comment: data.comment || "",
        companyID: companyID,
        companyName: companyName,
@@ -589,6 +599,7 @@
    },
    // 新增
    addProductClick(value) {
      console.log(value)
      if (value === "操作") {
        console.log(this.tableData)
        for (let i = 0; i < this.tableData.length; i++) {

 src/views/productManage/productCategory/AddProductCategoryDialog.vue

@@ -268,23 +268,25 @@
    },
    // 获取产品数量
    getProductCount() {
      getProductList({
        keyWord: "",
        categoryId: this.editConfig.title === "新建" ? null : this.editConfig.infomation.id,
        page: 1,
        pageSize: 1
      })
        .then((res) => {
          if (res.code === 200) {
            this.statisticsMap.product = res?.total ?? 0
          } else {
      if (this.editConfig.title !== "新建") {
        getProductList({
          keyWord: "",
          categoryId: this.editConfig.title === "新建" ? null : this.editConfig.infomation.id,
          page: 1,
          pageSize: 1
        })
          .then((res) => {
            if (res.code === 200) {
              this.statisticsMap.product = res?.total ?? 0
            } else {
              this.statisticsMap.product = 0
            }
          })
          .catch((err) => {
            console.error(err)
            this.statisticsMap.product = 0
          }
        })
        .catch((err) => {
          console.error(err)
          this.statisticsMap.product = 0
        })
          })
      }
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {