yangfeng
2023-09-28 3f27fa724a2704c4bb01db6b5932265f505cfc11
报表样式修改
2个文件已修改
385 ■■■■■ 已修改文件
src/views/reportForm/inventoryReport/index.vue 221 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/locationReport/index.vue 164 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/inventoryReport/index.vue
@@ -30,16 +30,11 @@
        </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 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"
@@ -59,17 +54,11 @@
                    <span>补货</span>
                  </span>
                  <template>
                    <span
                      @click="handleLocation(scope)"
                      class="margin_left_5px"
                    >
                    <span @click="handleLocation(scope)" class="margin_left_5px">
                      <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">
                      <i class="el-icon-s-data"></i>
                      <span>预测</span>
                    </span>
@@ -78,35 +67,22 @@
              </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",
@@ -130,7 +106,7 @@
          inStorage: "100.00", // 入库
          toStore: "20.00", // 出库
          forecast: "0.00", //预测
          unit: "件", //单位
          unit: "件" //单位
        },
        {
          product: "南方丝巢12306xxx",
@@ -142,8 +118,8 @@
          inStorage: "0.00",
          toStore: "0.00",
          forecast: "0.00",
          unit: "件",
        },
          unit: "件"
        }
      ],
      tableList: {},
      showcol: ["产品类别", "单位成本", "总价值", "入库", "出库"],
@@ -152,12 +128,12 @@
      commonDetail: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      productId: this.$route.params.id,
      productName: this.$route.params.name,
@@ -167,28 +143,28 @@
      warehouseListName: "", // 仓库名称
      stashRadio: "1",
      pageSizes: [15, 30],
      oldRadioBtn:"",
    };
      oldRadioBtn: ""
    }
  },
  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.categoryListId = e
      this.getData()
      console.log(this.categoryListId, e, " 选中的产品id");
      console.log(this.categoryListId, e, " 选中的产品id")
    },
    radioHandleChange(e) {
      this.warehouseListName=e
      this.warehouseListName = e
      this.getData()
      console.log(e, "单选");
      console.log(e, "单选")
    },
    setTable() {
      if (this.isIconIndex === "1") {
@@ -201,17 +177,17 @@
        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 = [
@@ -220,109 +196,108 @@
          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("单位成本"),
          isShowColumn: showcol.includes("单位成本")
        },
        {
          label: "总价值",
          prop: "value",
          default: false,
          isShowColumn: showcol.includes("总价值"),
          unit: "¥",
          unit: "¥"
        },
        {
          label: "在库",
          prop: "amount",
          default: true,
          isShowColumn: true,
          unit: "",
          unit: ""
        },
        {
          label: "可用库存",
          prop: "availableNumber",
          default: true,
          isShowColumn: true,
          unit: "",
          unit: ""
        },
        {
          label: "入库",
          prop: "in",
          default: false,
          isShowColumn: showcol.includes("入库"),
          unit: "",
          unit: ""
        },
        {
          label: "出库",
          prop: "out",
          isShowColumn: showcol.includes("出库"),
          default: false,
          unit: "",
          unit: ""
        },
        {
          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);
      console.log(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) {
      console.log(row)
      this.$router.push("/operate/allot");
      this.$router.push("/operate/allot")
    },
    // 补货
    handleAddGoods(row) {
      console.log(row)
    },
    // 位置
    handleLocation() {
      this.$router.push("/reportForm/locationReport");
      this.$router.push("/reportForm/locationReport")
    },
    // 预测
    handleForecast() {},
@@ -339,11 +314,11 @@
          inStorage: item.inStorage, // 入库
          toStore: item.toStore, // 出库
          forecast: item.forecast, //预测
          unit: item.unit, //单位
        };
        this.testArr.push(obj);
        console.log(this.testArr, "this");
      });
          unit: item.unit //单位
        }
        this.testArr.push(obj)
        console.log(this.testArr, "this")
      })
    },
    //接口请求-----------------------------------------------------------------------------------------------
@@ -353,16 +328,16 @@
        categoryIds: this.categoryListId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        warehouseCode: this.warehouseListName,
      };
        warehouseCode: this.warehouseListName
      }
      await getInventoryData(params).then((res) => {
        if (res.code === 200) {
          console.log(res.data, "接口请求成功");
          console.log(res.data, "接口请求成功")
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      });
      })
    },
    // 获取产品类型列表数据
    async getProductCategoryList() {
@@ -372,9 +347,9 @@
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          this.categoryList = res.data;
          this.categoryList = res.data
        }
      });
      })
    },
    // 请求仓库列表数据
    async getStashData() {
@@ -384,48 +359,34 @@
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          this.warehouseList = res.data.data;
          console.log(this.warehouseList, "warehouseList");
          this.warehouseList = res.data.data
          console.log(this.warehouseList, "warehouseList")
        }
      });
    },
  },
};
      })
    }
  }
}
</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 {
      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;
  }
}
// }
</style>
src/views/reportForm/locationReport/index.vue
@@ -15,49 +15,42 @@
      </div>
    </div>
    <div class="list-view">
      <TableCommonView
        ref="tableListRef"
        :table-list="tableList"
        @selTableCol="selTableCol"
        @tableRowClick="tableRowClick"
        :showSummary="true"
      >
        <template slot="tableButton">
          <el-table-column label="操作" width="210" align="center">
            <template slot-scope="scope">
              <span @click="handleHistoryClick(scope.row)">
                <i class="el-icon-refresh-left"></i>
                <span>历史</span>
              </span>
              <span @click="handleAddGoods(scope)" class="margin_left_5px">
                <i class="el-icon-refresh"></i>
                <span>补货</span>
              </span>
            </template>
          </el-table-column>
        </template>
      </TableCommonView>
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="210" align="center">
              <template slot-scope="scope">
                <span @click="handleHistoryClick(scope.row)">
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <span @click="handleAddGoods(scope)" class="margin_left_5px">
                  <i class="el-icon-refresh"></i>
                  <span>补货</span>
                </span>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView
          class="page"
          :pager-options="pagerOptions"
          v-on="pagerEvents"
        />
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
    </div>
    <!-- 编辑 -->
    <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 { getLocationData,} from "@/api/locationApi/locationApi";
import AddOverviewDialog from "@/views/overview/AddOverviewDialog";
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getLocationData } from "@/api/locationApi/locationApi"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
export default {
  name: "InventoryReport",
@@ -74,7 +67,7 @@
      //   { label: "预留数量", unit: "" },
      //   { label: "价值", unit: "¥" },
      // ],
      countcol:["在库数量","预留数量","价值"],
      countcol: ["在库数量", "预留数量", "价值"],
      testArr: [
        {
          product: "HC/销售区/b区",
@@ -86,7 +79,7 @@
          inStorage: "00.00",
          toStore: 65432.0,
          forecast: "0.00",
          unit: "件",
          unit: "件"
        },
        {
          product: "HC销售区/A区",
@@ -98,27 +91,27 @@
          inStorage: "0.00",
          toStore: 32618.0,
          forecast: "0.00",
          unit: "件",
        },
          unit: "件"
        }
      ],
      searchOptions: [],
      commonDetail: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      productId: this.$route.params.id,
      productName: this.$route.params.name,
    };
      productName: this.$route.params.name
    }
  },
  created() {
    this.setTable();
    this.getData();
    this.setTable()
    this.getData()
  },
  methods: {
    setTable() {
@@ -128,16 +121,16 @@
        showcol: this.showcol,
        countcol: this.countcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol),
      };
      let allcol = [];
        tableColumn: this.setTableColumn(this.showcol)
      }
      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 = [
@@ -145,47 +138,47 @@
          label: "位置",
          prop: "locationName",
          default: true,
          isShowColumn: true,
          isShowColumn: true
        },
        {
          label: "存储类别",
          prop: "category",
          default: false,
          isShowColumn: showcol.includes("存储类别"),
          isShowColumn: showcol.includes("存储类别")
        },
        {
          label: "产品",
          prop: "productName",
          default: true,
          isShowColumn: true,
          isShowColumn: true
        },
        {
          label: "产品类别",
          prop: "productTypeName",
          default: false,
          isShowColumn: showcol.includes("产品类别"),
          isShowColumn: showcol.includes("产品类别")
        },
        {
          label: "在库数量",
          prop: "amount",
          isShowColumn: true,
          default: true,
          unit:""
          unit: ""
        },
        {
          label: "预留数量",
          prop: "availableStore",
          isShowColumn: true,
          default: true,
          unit:""
          unit: ""
        },
        {
          label: "单位",
          prop: "unit",
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          isShowColumn: showcol.includes("价值")
        },
        {
          label: "价值",
@@ -193,73 +186,58 @@
          width: 120,
          default: false,
          isShowColumn: showcol.includes("价值"),
          unit:"¥"
        },
      ];
      return tableColumn;
          unit: "¥"
        }
      ]
      return tableColumn
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setTableColumn(val);
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData() {
      await getLocationData({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          console.log(res.data,"接口请求成功")
          console.log(res.data, "接口请求成功")
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      });
      })
    },
    // 搜索
    getList(val) {
      console.log(val);
      console.log(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.editConfig.visible = true
      this.editConfig.title = "新建"
      this.getData()
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成"
    },
    // 历史
    handleHistoryClick() {},
    // 补货
    handleAddGoods() {},
  },
};
    handleAddGoods() {}
  }
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.rightContent {
  height: 100%;
  background: #e6ecf2;
  padding: 10px;
  // .top {
  //   margin-bottom: 20px;
  //   height: 60px;
  //   background: #fff;
  //   border-radius: 8px;
  // }
  .list-view {
    height: calc(100% - 150px);
  }
}
</style>
<style lang="scss" scoped></style>