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

zzq

2023-09-28 2b78cf0cd68e1809bc4cad7d730bef6ab9c4c118

 src/views/operate/inventoryAdjustment/index.vue

@@ -22,28 +22,29 @@
          @inputContent="inputContent"
          @selLocationClick="selLocationClick"
          @selProductClick="selProductClick"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="180" fixed="right" align="center">
              <template slot-scope="scope">
                <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                <span v-if="scope.row.isEdit" @click.stop="handleHistoryClick(scope.row)" class="yes-cursor">
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <!-- <span v-if="scope.row.isSet" @click="handleSetClick(scope)" class="margin_left_5px">
                  <i class="el-icon-setting"></i>
                  <span>设置</span>
                </span>
                <template v-else>
                  <span @click="handleUseClick(scope)" class="margin_left_5px">
                </span> -->
                <template v-if="scope.row.status === 3">
                  <span @click.stop="handleUseClick(scope.row)" class="margin_left_5px">
                    <i class="el-icon-document"></i>
                    <span>应用</span>
                  </span>
                  <span @click="handleCleanupClick(scope)" class="margin_left_5px">
                  <!-- <span @click="handleCleanupClick(scope)" class="margin_left_5px">
                    <i class="el-icon-delete"></i>
                    <span>清除</span>
                  </span>
                </template> -->
                  </span> -->
                </template>
              </template>
            </el-table-column>
          </template>
@@ -59,7 +60,12 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getInventoryAdjustmentList, addInventoryAdjustment } from "@/api/operate/inventoryAdjustment"
import {
  getInventoryAdjustmentList,
  addInventoryAdjustment,
  updateInventoryAdjustment,
  finishInventoryAdjustment
} from "@/api/operate/inventoryAdjustment"
import { currentTime } from "@/common/config/index"
export default {
  name: "InventoryAdjustment",
@@ -80,7 +86,8 @@
      locationId: 0,
      productId: 0,
      differenceAmount: 0,
      Amount: 0
      amount: 0,
      operationId: 0
    }
  },
  created() {
@@ -128,31 +135,25 @@
    },
    // 操作输入
    inputContent(val, prop, row) {
      console.log("22222222222222")
      console.log(val, prop, row)
      // this.countId = row.countId
      // this.tableData.map((item) => {
      //   if (item.countId === row.countId) {
      //     item[prop] = val
      //   }
      // })
      this.differenceAmount = val
    },
    // 新增
    addProductClick() {
      console.log(this.tableData)
      console.log(this.addTitle)
      this.isSel()
      this.$refs.tablelistRef.getRuleList()
      if (this.isNoProduct && this.addTitle === "新建") {
        this.$refs.tablelistRef.getRuleList()
        this.addTitle = "保存"
        this.showDiscard = true
        this.isRowClick = false
        this.operationId = 0
        this.currentRowId = 0
        this.countId++
        this.tableData.push({
          countId: this.countId,
          Amount: 0,
          areaName: "",
          amount: 0,
          adjustAmount: 0,
          productId: "",
          differenceAmount: 0,
@@ -167,34 +168,29 @@
        this.productCategoryId = 0
        this.productId = 0
      } else {
        if (this.locationId === 0) {
          this.$message.error("请选择位置")
        } else if (this.productId === 0) {
          this.$message.error("请选择产品")
        } else {
          this.addTitle = "新建"
          this.showDiscard = false
          // let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateListingRules
          addInventoryAdjustment({
            // id: this.currentRowId,
            locationId: this.locationId,
            Amount: this.Amount,
            differenceAmount: this.differenceAmount,
            productId: this.productId
          })
            .then((res) => {
              console.log(res)
              if (res.code === 200) {
                // let tipStr = this.currentRowId === 0 ? "添加成功" : "修改成功"
                this.$message.success("添加成功")
                this.getData()
              }
            })
            .catch((err) => {
              console.log(err)
        this.addTitle = "新建"
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
        requestUrl({
          amount: this.amount,
          differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
          productId: this.productId
        })
          .then((res) => {
            console.log(res)
            if (res.code === 200) {
              let tipStr = this.currentRowId === 0 ? "添加成功" : "修改成功"
              this.$message.success(tipStr)
              this.getData()
            })
        }
            }
          })
          .catch((err) => {
            console.log(err)
            this.getData()
          })
        // }
      }
    },
    // 是否选择产品
@@ -244,8 +240,19 @@
      }
    },
    // 应用
    handleUseClick(scope) {
      scope.row.isSet = !scope.row.isSet
    handleUseClick(row) {
      // scope.row.isSet = !scope.row.isSet
      finishInventoryAdjustment({
        locationProductAmountId: row.locationProductAmount,
        operationId: row.operationId,
        productId: row.productId
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.$message.success("应用成功")
          this.getData()
        }
      })
    },
    // 清除
    handleCleanupClick(scope) {
@@ -253,22 +260,31 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      console.log(row, rowIndex)
      this.addTitle = "保存"
      this.showDiscard = true
      this.isRowClick = true
      console.log("11111")
      this.isSel()
      if (!this.isNoProduct) {
        this.tableData.splice(this.tableData.length - 1, 1)
      }
      this.tableData.map((item, index) => {
        if (index === rowIndex) {
          item.isEdit = false
          item.editable = true
        } else {
          item.isEdit = true
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")
      } else {
        this.currentRowId = row.id
        this.addTitle = "保存"
        this.showDiscard = true
        this.isRowClick = true
        if (!this.isNoProduct) {
          this.tableData.splice(this.tableData.length - 1, 1)
        }
      })
        this.tableData.map((item, index) => {
          if (index === rowIndex) {
            item.isEdit = false
            item.editable = true
          } else {
            item.isEdit = true
          }
        })
        this.differenceAmount = row.differenceAmount
        this.amount = row.amount
        this.productId = row.productId
        this.operationId = row.operationId
      }
    },
    // 搜索
    getList(val) {
@@ -295,4 +311,12 @@
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped></style>
<style lang="scss" scoped>
::v-deep {
  .el-table {
    border-top-left-radius: 12px;
    border-top-right-radius: 12px;
    overflow: auto;
  }
}
</style>