Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/operate/inventoryAdjustment/index.vue

@@ -88,7 +88,7 @@
      differenceAmount: 0,
      amount: 0,
      operationId: 0,
      adjustAmount:0,
      adjustAmount: 0
    }
  },
  created() {
@@ -122,7 +122,7 @@
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount=0
            item.adjustAmount = 0
            return {
              ...item,
              isSet: false,
@@ -140,10 +140,11 @@
    // 操作输入
    inputContent(val, prop, row) {
      console.log(val, prop, row)
      console.log(val-row.amount,"结果")
      this.adjustAmount=val-row.amount
      this.tableList.tableData[row.index].adjustAmount=this.adjustAmount   
      console.log(val - row.amount, "结果")
      this.adjustAmount = val - row.amount
      this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
      // this.differenceAmount = val
      this.differenceAmount = val
    },
    // 新增
    addProductClick() {
@@ -178,10 +179,11 @@
        this.addTitle = "新建"
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment

        requestUrl({
          // amount: this.amount,
          adjustAmount:this.adjustAmount,
          // differenceAmount: this.differenceAmount,
          amount: this.amount,
          // adjustAmount: this.adjustAmount,
          differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
          productId: this.productId
@@ -204,7 +206,7 @@
    // 是否选择产品
    isSel() {
      for (let i = 0; i < this.tableData.length; i++) {
        if (this.tableData[i].productName.length === 0) {
        if (this.tableData[i].productName?.length === 0) {
          this.isNoProduct = false
          break
        } else {
@@ -214,13 +216,19 @@
    },
    // 取消
    discardBtnClick() {
      if (this.isRowClick) {
        this.tableData.map((item) => {
          item.isEdit = true
        })
      } else {
        this.tableData.splice(0, 1)
      }
      this.getData()
      // this.tableList.tableData.forEach((item) => {
      //   item.differenceAmount = 0
      //   item.adjustAmount = 0
      // })
      // this.tableList
      // if (this.isRowClick) {
      //   this.tableData.map((item) => {
      //     item.isEdit = true
      //   })
      // } else {
      //   this.tableData.splice(0, 1)
      // }
      this.addTitle = "新建"
      this.showDiscard = false
    },
@@ -236,7 +244,7 @@
        console.log("历史")
        this.$router.push({
          name: "inventoryAdjustmentHistory",
          params: { locationId: row.locationId, productId: row.productId }
          params: { locationId: row.locationId, productId: row.productId, baseOperationType: row.baseOperationType }
        })
      }
    },
@@ -251,7 +259,7 @@
    handleUseClick(row) {
      // scope.row.isSet = !scope.row.isSet
      finishInventoryAdjustment({
        locationProductAmountId: row.locationProductAmount,
        locationProductAmountId: row.locationProductAmountId,
        operationId: row.operationId,
        productId: row.productId
      }).then((res) => {
@@ -268,7 +276,8 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      this.rowIndex=rowIndex
      this.locationId = row.locationId
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")