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

zuozhengqing

2023-10-20 8e2f1c51203a5b0965da0d29642f13c6a1906127

 src/views/operate/inventoryAdjustment/index.vue

@@ -87,7 +87,8 @@
      productId: 0,
      differenceAmount: 0,
      amount: 0,
      operationId: 0
      operationId: 0,
      adjustAmount: 0
    }
  },
  created() {
@@ -101,7 +102,7 @@
        selectBox: false,
        selectIndex: true,
        tableColumn: [
          { label: "位置", prop: "locationName", location: true },
          { label: "位置", prop: "locationName", location: false },
          { label: "产品", prop: "productName", product: true },
          { label: "在库数量", prop: "amount" },
          { label: "计量单位", prop: "unit" },
@@ -121,6 +122,7 @@
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount = 0
            return {
              ...item,
              isSet: false,
@@ -138,7 +140,11 @@
    // 操作输入
    inputContent(val, prop, row) {
      console.log(val, prop, row)
      this.differenceAmount = val
      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() {
@@ -173,8 +179,10 @@
        this.addTitle = "新建"
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
        
        requestUrl({
          amount: this.amount,
          // adjustAmount: this.adjustAmount,
          differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
@@ -198,7 +206,7 @@
    // 是否选择产品
    isSel() {
      for (let i = 0; i < this.tableData.length; i++) {
        if (this.tableData[i].productName.length === 0) {
        if (this.tableData && this.tableData[i].productName.length === 0) {
          this.isNoProduct = false
          break
        } else {
@@ -208,6 +216,12 @@
    },
    // 取消
    discardBtnClick() {
      console.log(this.tableList.tableData,"看看")
      this.tableList.tableData.forEach((item)=>{
        item.differenceAmount=0;
        item.adjustAmount=0
      })
      this.tableList
      if (this.isRowClick) {
        this.tableData.map((item) => {
          item.isEdit = true
@@ -245,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) => {
@@ -262,7 +276,9 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      console.log("11111")
      console.log(row,"kankna")
      this.locationId=row.locationId
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")