Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -4,19 +4,21 @@
      <SearchCommonView
        :add-title="'新建'"
        :showAdd="false"
        :placeholder="'请输入参考'"
        :placeholder="'请根据单号、产品、业务类型进行搜索'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
      />
    </div>
    <div class="list-view">
      <TableCommonView
        ref="tableListRef"
        :table-list="tableList"
        @selTableCol="selTableCol"
        @tableRowClick="tableRowClick"
      ></TableCommonView>
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
@@ -28,7 +30,9 @@

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getProductOperatonList } from "@/api/product/product"
import { getHistory } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"

import AddOverviewDialog from "@/views/overview/AddOverviewDialog"

export default {
@@ -58,9 +62,9 @@
  created() {
    this.setTable()
    console.log(this.$route.params)
    var paramsData = sessionStorage.getItem("paramsList")
    var paramsList = sessionStorage.getItem("paramsList")
    let params = {}
    if (paramsData) {
    if (paramsList) {
      params = JSON.parse(sessionStorage.getItem("paramsList"))
    } else {
      params = this.$route.params
@@ -69,6 +73,10 @@
    this.params = params
    console.log(this.params)
    this.getData()
  },
  // 页面销毁之前
  beforeDestroy() {
    sessionStorage.removeItem("paramsList")
  },
  methods: {
    setTable() {
@@ -92,7 +100,7 @@
      let tableColumn = [
        {
          label: "日期",
          prop: "operationDate",
          prop: "date",
          isShowColumn: true,
          default: true,
          date: true
@@ -110,14 +118,20 @@
          default: true
        },
        {
          label: "业务类型",
          prop: "baseOperationType",
          isShowColumn: true,
          default: true
        },
        {
          label: "从",
          prop: "from",
          prop: "fromLocation",
          isShowColumn: true,
          default: true
        },
        {
          label: "至",
          prop: "to",
          prop: "toLocation",
          isShowColumn: true,
          default: true
        },
@@ -145,7 +159,7 @@
        },
        {
          label: "完成者",
          prop: "admin",
          prop: "contactedName",
          isShowColumn: showcol.includes("完成者"),
          default: false
        }
@@ -156,41 +170,91 @@
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    // 库存报表跳转请求数据
    async getData() {
      await getProductOperatonList({
        productId: this.params.id,
        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.params.name
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
      if (this.params.name === "报表") {
        await getHistory({
          keyWord:this.params.keyWord,
          produceId:this.params.produceId,
          unit:this.params.unit,
          productName:this.params.productName,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }).then((res) => {
          if (res.code === 200) {
            this.tableList.tableInfomation = res.data
            this.pagerOptions.totalCount = res.total
          }
        })
      } else {
        // await getProductOperatonList({
        //   productId: this.params.id,
        //   page: this.pagerOptions.currPage,
        //   pageSize: this.pagerOptions.pageSize
        // }).then((res) => {
        //   if (res.code === 200) {
        //     const list = res.data.map((item) => {
        //       return {
        //         ...item,
        //         fromLocation: item.fromLocation.name,
        //         toLocation: item.toLocation.name,
        //         productName: this.params.name,
        //         amount: item.details[0].product.amount,
        //         unit: item.details[0].product.unit
        //       }
        //     })
        //     this.tableList.tableInfomation = list || []
        //     this.pagerOptions.totalCount = res.total
        //   }
        // })
        await getHistory({
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }).then((res) => {
          if (res.code === 200) {
            // let arr=[]
            res.data.map((item)=>{
              if(item.baseOperationType===1){
                item.baseOperationType="收货"
              }else if(item.baseOperationType===2){
                item.baseOperationType="交货"
              }else if(item.baseOperationType===3){
                item.baseOperationType="内部调拨"
              }else if(item.baseOperationType===4){
                item.baseOperationType="报废"
              }else if(item.baseOperationType===5){
                item.baseOperationType="库存盘点"
              }
            })
            this.tableList.tableInfomation = res.data
            this.pagerOptions.totalCount = res.total
          }
        })
      }
    },
    // 搜索
    getList(val) {
      console.log(val)
      // getHistory({
      //     page: this.pagerOptions.currPage,
      //     pageSize: this.pagerOptions.pageSize
      // }).then((res) => {
      //   if (res.code === 200) {
      //     this.tableList.tableInfomation = res.data
      //     this.pagerOptions.totalCount = res.total
      //   }
      // })
    },
    // 行点击
    tableRowClick(row) {
      console.log(row)
      console.log(row, "行row")
      this.editConfig.visible = true
      this.editConfig.title = "查看"
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      // this.editConfig.visible = true
      this.editConfig.title = "新建"
    },
    // 状态
@@ -202,19 +266,4 @@
</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% - 120px);
//   }
// }
</style>
<style lang="scss" scoped></style>