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

haoxuan

2023-10-19 d0343f5e1435b45141962d7a90c6c2e3fedb8cbb

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

 src/components/makepager/CommonFormTableView.vue

@@ -121,7 +121,6 @@
                  v-else
                  v-model="scope.row[item.prop]"
                  placeholder=""
                  :min="0"
                  :precision="2"
                  :controls="false"
                  size="mini"

 src/views/operate/inventoryAdjustment/index.vue

@@ -87,7 +87,8 @@
      productId: 0,
      differenceAmount: 0,
      amount: 0,
      operationId: 0
      operationId: 0,
      adjustAmount:0,
    }
  },
  created() {
@@ -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,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() {
@@ -174,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
@@ -262,7 +268,7 @@
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      console.log("11111")
      this.rowIndex=rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -168,7 +168,10 @@
    async getData() {
      if (this.params.name === "报表") {
        await getHistory({
          productId: this.params.id,
          keyWord:this.params.row.productTypeName,
          produceId:this.params.row.id,
          productName:this.params.row.productName,
          unit:this.params.row.unit,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }).then((res) => {

 src/views/reportForm/inventoryReport/index.vue

@@ -5,7 +5,7 @@
      <SearchCommonView
        :showAdd="false"
        :add-title="'新建'"
        :placeholder="''"
        :placeholder="'请输入产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -22,11 +22,11 @@
              v-for="(item, index) in warehouseList"
              :key="index"
              v-model="stashRadio"
              :label="item.name"
              :label="item.code"
              @change="radioHandleChange"
              >{{ item.name }}</el-radio
            >
            <!-- <el-radio v-model="stashRadio" label="2">备选项</el-radio> -->
            <!-- @click.prevent.native="checkRadio(item.code)"   取消单选项 -->
          </template>
        </div>
        <p style="margin-top: 30px">类别</p>
@@ -46,20 +46,20 @@
            <template slot="tableButton">
              <el-table-column label="操作" width="220" align="center">
                <template slot-scope="scope">
                  <span @click="handleHistoryClick(scope.row)">
                  <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                    <i class="el-icon-refresh-left"></i>
                    <span>历史</span>
                  </span>
                  <span @click="handleAddGoods(scope)" class="margin_left_5px">
                  <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                    <i class="el-icon-refresh"></i>
                    <span>补货</span>
                  </span>
                  <template>
                    <span @click="handleLocation(scope)" class="margin_left_5px">
                    <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor">
                      <i class="el-icon-menu"></i>
                      <span>位置</span>
                    </span>
                    <span @click="handleForecast(scope)" class="margin_left_5px">
                    <span @click="handleForecast(scope)" class="margin_left_5px no-cursor">
                      <i class="el-icon-s-data"></i>
                      <span>预测</span>
                    </span>
@@ -145,7 +145,8 @@
      stashRadio: "1",
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title
      metaTitle: this.$route.meta.title,
      searchStr: ""
    }
  },
  created() {
@@ -166,6 +167,12 @@
      this.warehouseListName = e
      this.getData()
    },
    // checkRadio(val){
    //   console.log(val)
    //   val == this.stashRadio ? this.stashRadio = '' : this.stashRadio = val
    //   this.warehouseListName = val
    //   this.getData()
    // },
    setTable() {
      if (this.isIconIndex === "1") {
        this.pageSizes = [30, 60]
@@ -268,7 +275,12 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    getList(val) {
      console.log(val)
      this.searchStr = val
      this.getInventoryData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
    },
    // 行点击
    tableRowClick(row) {
@@ -280,8 +292,8 @@
    // 新建
    addBtnClick() {
      // this.editConfig.visible = true;
      this.editConfig.title = "新建"
      this.getData()
      // this.editConfig.title = "新建"
      // this.getData()
    },
    // 状态
    getStatus(val) {
@@ -329,14 +341,7 @@

    //接口请求-----------------------------------------------------------------------------------------------
    // 获取库存报表数据
    async getData() {
      let params = {
        categoryIds: this.categoryListId,
        keyWord:this.productName,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName
      }
    async getInventoryData(params) {
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data
@@ -345,6 +350,16 @@
        }
      })
    },
    getData() {
      let params = {
        keyWord: this.searchStr,
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName
      }
      this.getInventoryData(params)
    },
    // 获取产品类型列表数据
    async getProductCategoryList() {
      await getProductCategoryList({

 src/views/reportForm/locationReport/index.vue

@@ -2,17 +2,15 @@
<template>
  <div class="rightContent">
    <div class="top">
      <div>
        <SearchCommonView
          :add-title="'新建'"
          :showAdd="false"
          :placeholder="''"
          :amount-view="false"
          @addCommonClick="addBtnClick"
          @searchClick="getList"
          :isDisabled="true"
        />
      </div>
      <SearchCommonView
        :add-title="'新建'"
        :showAdd="false"
        :placeholder="'请输入位置名称、产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
        :isDisabled="true"
      />
    </div>
    <div class="list-view">
      <div class="table">
@@ -26,11 +24,11 @@
          <template slot="tableButton">
            <el-table-column label="操作" width="210" align="center">
              <template slot-scope="scope">
                <span @click="handleHistoryClick(scope.row)">
                <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <span @click="handleAddGoods(scope)" class="margin_left_5px">
                <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                  <i class="el-icon-refresh"></i>
                  <span>补货</span>
                </span>
@@ -199,11 +197,8 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData() {
      await getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
    async getLocationData(params) {
      await getLocationData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data
          this.tableList.tableInfomation = list || []
@@ -211,10 +206,20 @@
        }
      })
    },
    getData() {
      this.getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
    },

    // 搜索
    getList(val) {
      console.log(val)
      this.getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
    },
    // 行点击
    tableRowClick(row) {
@@ -238,7 +243,8 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          id: row.produceId,
          row: row,
          // id: row.produceId,
          name: "报表"
        }
      })