Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/reportForm/inventoryReport/index.vue

@@ -3,8 +3,9 @@
  <div class="rightContent">
    <div class="top">
      <SearchCommonView
        :showAdd="false"
        :add-title="'新建'"
        :placeholder="'请输入参考'"
        :placeholder="'请输入产品名称或产品类别'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -21,25 +22,22 @@
              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>
        <el-checkbox-group v-model="checkList" @change="checkListHandler">
          <el-checkbox
            v-for="item in categoryList"
            :key="item.id"
            :label="item.id"
            >{{ item.name }}</el-checkbox
          >
        </el-checkbox-group>
          <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">
            {{ item.name }}
          </el-checkbox>
          </el-checkbox-group>
      </div>
      <div class="con_right">
        <div class="list-view">
      <div class="list-view">
        <div class="table">
          <TableCommonView
            ref="tableListRef"
            :table-list="tableList"
@@ -50,26 +48,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>
@@ -78,38 +70,25 @@
              </el-table-column>
            </template>
          </TableCommonView>
          <div class="btn-pager">
            <PagerView
              class="page"
              :pager-options="pagerOptions"
              :page-size="pageSizes"
              v-on="pagerEvents"
            />
          </div>
        </div>
        <div class="btn-pager">
          <PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
        </div>
      </div>
    </div>

    <!-- 编辑 dialog-->
    <AddOverviewDialog
      v-if="editConfig.visible"
      :edit-common-config="editConfig"
      :add-name="this.$route.params.name"
    />
    <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
  </div>
</template>

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
import {
  getInventoryData,
  getProductCategoryList,
  getWarehouseList,
} from "@/api/reportForm/inventoryRwport";
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"

export default {
  name: "InboundOutboundDetail",
  name: "inventoryReport",
  props: {},
  components: { AddOverviewDialog },
  mixins: [pageMixin],
@@ -130,7 +109,7 @@
          inStorage: "100.00", // 入库
          toStore: "20.00", // 出库
          forecast: "0.00", //预测
          unit: "件", //单位
          unit: "件" //单位
        },
        {
          product: "南方丝巢12306xxx",
@@ -142,8 +121,8 @@
          inStorage: "0.00",
          toStore: "0.00",
          forecast: "0.00",
          unit: "件",
        },
          unit: "件"
        }
      ],
      tableList: {},
      showcol: ["产品类别", "单位成本", "总价值", "入库", "出库"],
@@ -152,12 +131,12 @@
      commonDetail: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      productId: this.$route.params.id,
      productName: this.$route.params.name,
@@ -169,48 +148,56 @@
      pageSizes: [15, 30],
      oldRadioBtn: "",
      metaTitle: this.$route.meta.title,
    };
      searchStr: this.$route.params.name ?? ''
    }
  },
  created() {
    this.setTable();
    this.getData(); //库存报表
    this.getStashData(); // 仓库列表数据
    this.getProductCategoryList();
    this.setTable()
    this.getData() //库存报表
    this.getStashData() // 仓库列表数据
    this.getProductCategoryList()
  },
  mounted() {
    this.countSums();
    this.countSums()
  },
  methods: {
    checkListHandler(e) {
      this.categoryListId = e;
      this.getData();
      this.categoryListId = e
      this.getData()
    },
    radioHandleChange(e) {
      this.warehouseListName = e;
      this.getData();
      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];
        this.pagerOptions.pageSize = 30;
        this.pageSizes = [30, 60]
        this.pagerOptions.pageSize = 30
      }
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol),
      };
        tableColumn: this.setTableColumn(this.showcol)
      }
      // this.tableList.tableInfomation = this.testArr;
      let allcol = [];
      let allcol = []
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        if (!this.tableList.tableColumn[i].default) {
          const label = this.tableList.tableColumn[i].label;
          allcol.push(label);
          const label = this.tableList.tableColumn[i].label
          allcol.push(label)
        }
      }
      this.tableList.allcol = allcol;
      this.tableList.allcol = allcol
    },
    setTableColumn(showcol) {
      let tableColumn = [
@@ -219,20 +206,21 @@
          prop: "productName",
          default: true,
          width: 300,
          isShowColumn: true,
          isShowColumn: true
          // date: true, // 是否为日期格式
        },
        {
          label: "产品类别",
          prop: "productType",
          default: true,
          isShowColumn: showcol.includes("产品类别"),
          isShowColumn: showcol.includes("产品类别")
        },
        {
          label: "单位成本",
          prop: "cost",
          default: false,
          isShowColumn: showcol.includes("单位成本"),
          textAlign:"right"
        },
        {
          label: "总价值",
@@ -240,6 +228,7 @@
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "￥",
          textAlign:"right"
        },
        {
          label: "在库",
@@ -247,6 +236,7 @@
          default: true,
          isShowColumn: true,
          unit: "",
          textAlign:"right"
        },
        {
          label: "可用库存",
@@ -254,6 +244,7 @@
          default: true,
          isShowColumn: true,
          unit: "",
          textAlign:"right"
        },
        {
          label: "入库",
@@ -261,6 +252,7 @@
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: "",
          textAlign:"right"
        },
        {
          label: "出库",
@@ -268,83 +260,83 @@
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: "",
          textAlign:"right"
        },
        {
          label: "预测",
          prop: "forecast",
          isShowColumn: showcol.includes("预测"),
          default: false,
          unit: "",
          unit: ""
        },
        {
          label: "单位",
          prop: "unit",
          default: true,
          isShowColumn: true,
        },
      ];
      return tableColumn;
          isShowColumn: true
        }
      ]
      return tableColumn
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setTableColumn(val);
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    getList(val) {
      console.log(val);
      this.searchStr = val
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord: val
      })
    },
    // 行点击
    tableRowClick(row) {
      console.log(row);
      console.log(row)
      // this.editConfig.visible = true;
      this.editConfig.title = "查看";
      this.editConfig.infomation = { ...row };
      this.editConfig.title = "查看"
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {
      // this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.getData();
      // this.editConfig.title = "新建"
      // this.getData()
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成"
    },
    // 历史
    handleHistoryClick(row) {
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          name: this.metaTitle,
          product: {
            page: this.pagerOptions.currPage,
            pageSize: this.pagerOptions.pageSize,
            produceId: row.produceId,
            productName: row.productName,
            unit: row.unit,
          },
          pageName:"报表",
          paramsKey: {
            amount: "amount",
            status: "status", //状态
            productName:"productName", //产品名称
            contactedName: "contactedName",
            date: "date",
            fromLocation: "fromLocation",
            number: "number",
            toLocation: "toLocation",
            unit: "unit",
          },
        },
      });
          keyWord:row.productType,
          produceId:row.produceId,
          unit:row.unit,
          productName:row.productName,
          name: "报表"
        }
      })
    },

    // 补货
    handleAddGoods(row) {
      console.log(row);
      console.log(row)
    },
    // 位置
    handleLocation() {
      this.$router.push("/reportForm/locationReport");
    handleLocation(row) {
      console.log(row,"rowwww")
      this.$router.push({
        name:"locationReport",
        params:{
          // keyWord:row.row.productName,
          wareHouseCode:this.warehouseListName,
          productId:row.row.produceId,
          name:"库存报表"
        }
      })
    },
    // 预测
    handleForecast() {},
@@ -361,90 +353,95 @@
          inStorage: item.inStorage, // 入库
          toStore: item.toStore, // 出库
          forecast: item.forecast, //预测
          unit: item.unit, //单位
        };
        this.testArr.push(obj);
      });
          unit: item.unit //单位
        }
        this.testArr.push(obj)
      })
    },

    //接口请求-----------------------------------------------------------------------------------------------
    // 获取库存报表数据
    async getData() {
    async getInventoryData(params) {
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    getData() {
      let params = {
        keyWord: this.searchStr,
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName,
      };
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          const list = res.data;
          this.tableList.tableInfomation = list || [];
          this.pagerOptions.totalCount = res.total;
        }
      });
        warehouseCode: this.warehouseListName
      }
      this.getInventoryData(params)
    },
    // 获取产品类型列表数据
    async getProductCategoryList() {
      await getProductCategoryList({
        keyWord: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          this.categoryList = res.data;
          this.categoryList = res.data
        }
      });
      })
    },
    // 请求仓库列表数据
    async getStashData() {
      await getWarehouseList({
        keyword: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          this.warehouseList = res.data.data;
        if (res.code === 200) {
          this.warehouseList = res.data
        }
      });
    },
  },
};
      })
    }
  }
}
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.rightContent {
  height: 100%;
  background: #e6ecf2;
  // width: 100%;
  padding: 10px;
  .top {
    margin-bottom: 20px;
    height: 60px;
    background: #fff;
    border-radius: 8px;
.content_wrap {
  height: calc(100% - 0px);
  display: flex;
  justify-content: space-between;
  .con_left {
    width: 200px;
    .el-checkbox-group {
      width:100%;
      display: flex;
      flex-direction: column;
    }
    .stash {
      display: flex;
      flex-direction: column;
    }
  }
  .content_wrap {
    height: calc(100% - 50px);
    display: flex;
    justify-content: space-between;
    .con_left {
      width: 200px;
      .el-checkbox-group {
        display: flex;
        flex-direction: column;
      }
      .stash {
        display: flex;
        flex-direction: column;
      }
    }
    .con_right {
      width: calc(100% - 200px);
    }
  .list-view {
    flex: 1;
  }
}
::v-deep {
  .el-checkbox {
    padding: 5px;
  }
  .el-checkbox__label {
    width: 95%;
    box-sizing: border-box;
    padding-right: 5px;
    word-break: break-all;
    word-wrap: break-word;
    white-space: pre-wrap !important;
  }
}

// }
</style>