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

zzq

2023-09-27 7eb332b94fcc4d06000c38dda3ef49ca3b35f7c2

 src/views/reportForm/locationReport/index.vue

@@ -1,3 +1,4 @@
<!-- 位置报表 -->
<template>
  <div class="rightContent">
    <div class="top">
@@ -18,13 +19,10 @@
        :table-list="tableList"
        @selTableCol="selTableCol"
        @tableRowClick="tableRowClick"
        :showSummary="true"
      >
        <template slot="tableButton">
          <el-table-column
            label="操作"
            width="210"
            align="center"
          >
          <el-table-column label="操作" width="210" align="center">
            <template slot-scope="scope">
              <span @click="handleHistoryClick(scope.row)">
                <i class="el-icon-refresh-left"></i>
@@ -57,7 +55,7 @@

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import { getProductOperatonList } from "@/api/product/product";
import { getLocationData,} from "@/api/locationApi/locationApi";
import AddOverviewDialog from "@/views/overview/AddOverviewDialog";

export default {
@@ -70,30 +68,36 @@
    return {
      tableList: {},
      showcol: ["存储类别", "产品类别", "预留数量", "价值"],
      // countcol: [
      //   { label: "在库数量", unit: "" },
      //   { label: "预留数量", unit: "" },
      //   { label: "价值", unit: "￥" },
      // ],
      countcol:["在库数量","预留数量","价值"],
      testArr: [
        {
          product:"HC/销售区/b区",
          category:"丝绸制品/真丝睡袍",
          cost:"800.00",
          totalPrices:"0.00",
          inStore:"0.00",
          availableStore:"0.00",
          inStorage:"0.00",
          toStore:"0.00",
          forecast:"0.00",
          unit:"件"
          product: "HC/销售区/b区",
          category: "丝绸制品/真丝睡袍",
          cost: "800.00",
          totalPrices: "2000.00",
          inStore: "00.00",
          availableStore: "200.00",
          inStorage: "00.00",
          toStore: 65432.0,
          forecast: "0.00",
          unit: "件",
        },
        {
          product:"HC销售区/A区",
          category:"丝绸制品/真丝睡袍",
          cost:"9980.00",
          totalPrices:"0.00",
          inStore:"0.00",
          availableStore:"0.00",
          inStorage:"0.00",
          toStore:"0.00",
          forecast:"0.00",
          unit:"件"
          product: "HC销售区/A区",
          category: "丝绸制品/金丝睡袍",
          cost: "9980.00",
          totalPrices: "00.00",
          inStore: "00.00",
          availableStore: "20.00",
          inStorage: "0.00",
          toStore: 32618.0,
          forecast: "0.00",
          unit: "件",
        },
      ],
      searchOptions: [],
@@ -113,14 +117,15 @@
  },
  created() {
    this.setTable();
    // this.getData();
    this.getData();
  },
  methods: {
    setTable() {
      this.tableList = {
        tableInfomation:[],
        tableInfomation: [],
        selectBox: true,
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol),
      };
@@ -132,77 +137,62 @@
        }
      }
      this.tableList.allcol = allcol;
      this.tableList.tableInfomation=this.testArr
    },
    setTableColumn(showcol) {
      let tableColumn = [
        /* 
          product:"南方丝巢xxx",
          category:"丝绸制品/真丝睡袍",
          cost:"800.00",
          totalPrices:"0.00",
          inStore:"0.00",
          availableStore:"0.00",
          inStorage:"0.00",
          toStore:"0.00",
          forecast:"0.00",
          unit:"件"
        */
        {
          label: "位置",
          prop: "product",
          isShowColumn: true,
          prop: "locationName",
          default: true,
          isShowColumn: true,
        },

        {
          label: "存储类别",
          prop: "category",
          isShowColumn: true,
          default: false,
          isShowColumn: showcol.includes("存储类别"),
        },
        {
          label: "产品",
          prop: "cost",
          isShowColumn: true,
          prop: "productName",
          default: true,
          isShowColumn: true,
        },
        {
          label: "产品类别",
          prop: "totalPrices",
          isShowColumn: true,
          prop: "productTypeName",
          default: false,
          isShowColumn: showcol.includes("产品类别"),
        },
        {
          label: "在库数量",
          prop: "inStore",
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit:""
        },
        {
          label: "预留数量",
          prop: "availableStore",
          // isShowColumn: true,
          default: false,
          isShowColumn: showcol.includes("预留数量"),
          isShowColumn: true,
          default: true,
          unit:""
        },
        {
          label: "单位",
          prop: "unit",
          isShowColumn: true,
          default: true,
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
        },
        {
          label: "价值",
          prop: "toStore",
          prop: "value",
          width: 120,
          default: false,
          // status: true,
          // isCallMethod: true,
          // getCallMethod: this.getStatus,
          isShowColumn: showcol.includes("价值"),
          unit:"￥"
        },
      ];
      return tableColumn;
@@ -212,26 +202,19 @@
      this.tableList.tableColumn = this.setTableColumn(val);
    },
    // 请求数据
    // async getData() {
    //   await getProductOperatonList({
    //     productId: this.productId,
    //     page: this.pagerOptions.currPage,
    //     pageSize: this.pagerOptions.pageSize,
    //   }).then((res) => {
    //     if (res.code === 200) {
    //       const list = res.data.map((item) => {
    //         return {
    //           ...item,
    //           from: item.fromLocation.name,
    //           to: item.toLocation.name,
    //           productName: this.productName,
    //         };
    //       });
    //       this.tableList.tableInfomation = list || [];
    //       this.pagerOptions.totalCount = res.total;
    //     }
    //   });
    // },
    async getData() {
      await getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
      }).then((res) => {
        if (res.code === 200) {
          console.log(res.data,"接口请求成功")
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      });
    },

    // 搜索
    getList(val) {
@@ -240,7 +223,7 @@
    // 行点击
    tableRowClick(row) {
      console.log(row);
      this.editConfig.visible = true;
      // this.editConfig.visible = true;
      this.editConfig.title = "查看";
      this.editConfig.infomation = { ...row };
    },
@@ -248,19 +231,16 @@
    addBtnClick() {
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.getData()
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
    },
    // 历史
    handleHistoryClick(){

    },
    handleHistoryClick() {},
    // 补货
    handleAddGoods(){

    }
    handleAddGoods() {},
  },
};
</script>
@@ -271,12 +251,12 @@
  height: 100%;
  background: #e6ecf2;
  padding: 10px;
// .top {
//   margin-bottom: 20px;
//   height: 60px;
//   background: #fff;
//   border-radius: 8px;
// }
  // .top {
  //   margin-bottom: 20px;
  //   height: 60px;
  //   background: #fff;
  //   border-radius: 8px;
  // }
  .list-view {
    height: calc(100% - 150px);
  }