Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 301cbea766080fb65b8c6af563388b61606322f3

 src/views/operate/inventoryAdjustment/index.vue

@@ -25,7 +25,7 @@
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="180" fixed="right" align="center">
            <el-table-column label="操作" width="180" align="center">
              <template slot-scope="scope">
                <span v-if="scope.row.isEdit" @click.stop="handleHistoryClick(scope.row)" class="yes-cursor">
                  <i class="el-icon-refresh-left"></i>
@@ -87,7 +87,8 @@
      productId: 0,
      differenceAmount: 0,
      amount: 0,
      operationId: 0
      operationId: 0,
      adjustAmount:0,
    }
  },
  created() {
@@ -98,7 +99,8 @@
    setTable() {
      this.tableList = {
        tableData: this.tableData,
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        tableColumn: [
          { label: "位置", prop: "locationName", location: true },
          { label: "产品", prop: "productName", product: true },
@@ -120,11 +122,13 @@
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount=0
            return {
              ...item,
              isSet: false,
              isEdit: true,
              editable: true
              editable: true,
              adjustAmount: 0
            }
          })
          this.tableList.tableData = list || []
@@ -136,7 +140,10 @@
    // 操作输入
    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
    },
    // 新增
    addProductClick() {
@@ -151,7 +158,7 @@
        this.operationId = 0
        this.currentRowId = 0
        this.countId++
        this.tableData.push({
        this.tableData.unshift({
          countId: this.countId,
          amount: 0,
          adjustAmount: 0,
@@ -172,8 +179,9 @@
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
        requestUrl({
          amount: this.amount,
          differenceAmount: this.differenceAmount,
          // amount: this.amount,
          adjustAmount:this.adjustAmount,
          // differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
          productId: this.productId
@@ -211,7 +219,7 @@
          item.isEdit = true
        })
      } else {
        this.tableData.splice(this.tableData.length - 1, 1)
        this.tableData.splice(0, 1)
      }
      this.addTitle = "新建"
      this.showDiscard = false
@@ -260,7 +268,7 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      console.log("11111")
      this.rowIndex=rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")