Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/operate/inventoryAdjustment/index.vue

@@ -4,7 +4,7 @@
      <SearchCommonView
        :add-title="addTitle"
        :show-discard="showDiscard"
        :show-apply="true"
        :show-apply="false"
        :placeholder="'请输入位置/产品'"
        :amount-view="false"
        @addCommonClick="addProductClick"
@@ -16,31 +16,34 @@
    <div class="list-view">
      <div class="table">
        <CommonFormTableView
          ref="tablelistRef"
          :isinventory="true"
          :product-table-list="tableList"
          @inputContent="inputContent"
          @selLocationClick="selLocationClick"
          @selProductClick="selProductClick"
          @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 @click="handleHistoryClick(scope.row)">
                <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">
                <!-- <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>
                  </span> -->
                </template>
              </template>
            </el-table-column>
@@ -57,7 +60,13 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getLocationList } from "@/api/warehouseManage/warehouse"
import {
  getInventoryAdjustmentList,
  addInventoryAdjustment,
  updateInventoryAdjustment,
  finishInventoryAdjustment
} from "@/api/operate/inventoryAdjustment"
import { currentTime } from "@/common/config/index"
export default {
  name: "InventoryAdjustment",
  props: {},
@@ -69,23 +78,17 @@
      addTitle: "新建",
      showDiscard: false,
      tableList: {},
      tableData: [
        {
          location: "HC/销售区",
          productName: "夏季真丝吊带裙",
          amount: "0.00",
          unit: "件",
          count: "0.00",
          date: "2023-12-31",
          user: "管理员",
          isSet: true,
          isEdit: true
        }
      ],
      tableData: [],
      searchOptions: [],
      countId: 0,
      isNoProduct: true, // 添加明细行时是否有产品未选择
      isRowClick: false
      isRowClick: false,
      locationId: 0,
      productId: 0,
      differenceAmount: 0,
      amount: 0,
      operationId: 0,
      adjustAmount: 0
    }
  },
  created() {
@@ -96,56 +99,114 @@
    setTable() {
      this.tableList = {
        tableData: this.tableData,
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        tableColumn: [
          { label: "位置", prop: "location", location: true },
          { label: "位置", prop: "locationName", location: true },
          { label: "产品", prop: "productName", product: true },
          { label: "在库数量", prop: "amount" },
          { label: "计量单位", prop: "unit" },
          { label: "计数的数量", prop: "count", inputFloat: true },
          { label: "差异", prop: "difference" },
          { label: "日期", prop: "date", date: true },
          { label: "计数的数量", prop: "differenceAmount", inputFloat: true },
          { label: "差异", prop: "adjustAmount" },
          { label: "日期", prop: "createDate" },
          { label: "用户", prop: "user", user: true }
        ]
      }
    },
    // 操作输入
    inputContent(val, prop, row) {
      this.countId = row.countId
      this.tableData.map((item) => {
        if (item.countId === row.countId) {
          item[prop] = val
    // 请求数据
    async getData() {
      await getInventoryAdjustmentList({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount = 0
            return {
              ...item,
              isSet: false,
              isEdit: true,
              editable: true,
              adjustAmount: 0
            }
          })
          this.tableList.tableData = list || []
          this.tableData = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    // 操作输入
    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
      // this.differenceAmount = val
      this.differenceAmount = val
    },
    // 新增
    addProductClick() {
      console.log(this.tableData)
      console.log(this.addTitle)
      this.isSel()
      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({
        this.tableData.unshift({
          countId: this.countId,
          productId: "",
          amount: 0,
          unit: "",
          productName: "",
          count: "0.00",
          adjustAmount: 0,
          productId: "",
          differenceAmount: 0,
          locationId: 0,
          createDate: this.currentTime(),
          isSet: true,
          isEdit: false
          isEdit: false,
          editable: false
        })
      } else if (this.isNoProduct && this.addTitle === "保存") {
        this.locationId = 0
        this.subLocationId = 0
        this.productCategoryId = 0
        this.productId = 0
      } else {
        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,
          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()
          })
        // }
      }
    },
    // 是否选择产品
    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 {
@@ -155,13 +216,19 @@
    },
    // 取消
    discardBtnClick() {
      if (this.isRowClick) {
        this.tableData.map((item) => {
          item.isEdit = true
        })
      } else {
        this.tableData.splice(this.tableData.length - 1, 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
    },
@@ -177,7 +244,7 @@
        console.log("历史")
        this.$router.push({
          name: "inventoryAdjustmentHistory",
          params: { id: row.id }
          params: { locationId: row.locationId, productId: row.productId, baseOperationType: row.baseOperationType }
        })
      }
    },
@@ -189,8 +256,19 @@
      }
    },
    // 应用
    handleUseClick(scope) {
      scope.row.isSet = !scope.row.isSet
    handleUseClick(row) {
      // scope.row.isSet = !scope.row.isSet
      finishInventoryAdjustment({
        locationProductAmountId: row.locationProductAmountId,
        operationId: row.operationId,
        productId: row.productId
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.$message.success("应用成功")
          this.getData()
        }
      })
    },
    // 清除
    handleCleanupClick(scope) {
@@ -198,35 +276,32 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      console.log(row, rowIndex)
      this.addTitle = "保存"
      this.showDiscard = true
      this.isRowClick = true
      this.locationId = row.locationId
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct) {
        this.tableData.splice(this.tableData.length - 1, 1)
      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
      }
      this.tableData.map((item, index) => {
        if (index === rowIndex) {
          item.isEdit = false
        } else {
          item.isEdit = true
        }
      })
    },
    // 请求数据
    async getData() {
      await getLocationList({
        keyword: this.keyword,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.tableList.tableInfomation = list
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    // 搜索
    getList(val) {
@@ -234,26 +309,31 @@
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 新建
    addBtnClick() {
      this.editConfig.infomation = {
        name: "",
        parentId: null,
        type: 3,
        isScrapLocation: null,
        isReturnLocation: null,
        replenishLocation: null,
        countFrequency: 0,
        recentlyCount: "",
        nextCount: "",
        notes: ""
      }
      this.editConfig.visible = true
      this.editConfig.title = "新建"
    // 选择位置方法
    selLocationClick(item, prop) {
      console.log(item, prop)
      this.locationId = item.value
    },
    // 选中产品方法
    selProductClick(item) {
      console.log(item)
      this.productId = item.value
    },
    // 获取当前时间
    currentTime() {
      return currentTime()
    }
  }
}
</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>