Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/overview/index.vue

@@ -23,21 +23,21 @@
            <el-dropdown class="set" placement="bottom" trigger="click" @command="handleCommand">
              <div @click.stop="moreClick()">...</div>
              <el-dropdown-menu slot="dropdown">
                <el-dropdown-item :command="{ command: '全部', item }">全部</el-dropdown-item>
                <el-dropdown-item :command="{ command: '就绪', item }">就绪</el-dropdown-item>
                <el-dropdown-item :command="{ command: '完成', item }">完成</el-dropdown-item>
                <el-dropdown-item :command="{ command: 0, item }">全部</el-dropdown-item>
                <el-dropdown-item :command="{ command: 3, item }">就绪</el-dropdown-item>
                <el-dropdown-item :command="{ command: 4, item }">完成</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
          </div>
          <div class="bottom">
            <div class="left">
              <div class="left_view" @click.stop="statusClick(item, '就绪')">
              <div class="left_view" @click.stop="statusClick(item, 3)">
                <span>{{ item.readyCount }}</span>
                <span style="margin-left: 5px">就绪</span>
              </div>
            </div>
            <div class="right">
              <div class="right_status" @click.stop="statusClick(item, '完成')">
              <div class="right_status" @click.stop="statusClick(item, 4)">
                <span style="cursor: pointer">{{ item.finishCount + " 完成" }}</span>
              </div>
              <!-- <div class="right_status" style="margin-top: 5px">
@@ -90,7 +90,7 @@
      console.log(item)
      this.$router.push({
        name: "overviewList",
        params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status }
        params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
      })
    },
    async getData() {
@@ -99,15 +99,15 @@
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        console.log(res.data.data)
        if (res.data.code === 200) {
          const list = res.data.data.map((item) => {
        console.log(res.data)
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              ...item
            }
          })
          this.tableList = list || []
          this.pagerOptions.totalCount = res.data.total
          this.pagerOptions.totalCount = res.total
        }
      })
    },