Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 admin/src/views/stock/query.vue

@@ -2,16 +2,16 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <div class="mt20">
      <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
      <el-button @click="handleEx" v-permissions="['business:ywstock:exportExcel']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="资产编码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="platformGroupName" label="资产名称" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="条码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="品牌" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param1" label="规格型号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param2" label="所在仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="库存" min-width="80" show-overflow-tooltip />
      <el-table-column prop="materialCode" label="物料编码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialName" label="物料名称" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialQrcode" label="条码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialBrand" label="品牌" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialAttr" label="规格型号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="warehouseName" label="所在仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="stock" label="库存" min-width="80" show-overflow-tooltip />
    </el-table>
    <div class="mt20">
      <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -25,7 +25,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { platformLogPage, getPlatformGroupList } from '@/api'
import { ywStockPage,ywStockPageEx  } from '@/api/store/index'
export default {
  components: {
    Pagination,
@@ -45,77 +45,68 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'platformGroupId',
            filed: 'warehouseId',
            type: 'select',
            label: '所在仓库',
            options: []
          },
          {
            filed: 'carCodeFront',
            filed: 'materialCode',
            type: 'input',
            label: '资产信息',
            placeholder: '请输入资产名称/编码'
            label: '物料名称/编码',
            placeholder: '请输入物料名称/编码'
          },
          {
            filed: 'carCodeFront',
            filed: 'materialAttr',
            type: 'input',
            label: '型号',
          },
        ],
        online: true
        ]
      }
    }
  },
  created() {
    // this.getList()
    // this.getGroupList()
    this.getList()
  },
  methods: {
    handleSub() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
          alert('submit!')
        }
      })
    },
    handleEx() { },
    getGroupList() {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
        this.queryFormConfig.formItems[1].options = res.map(i => {
          return {
            value: i.id,
            label: i.name
          }
        })
        // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '全部月台组' })
      })
    },
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      platformLogPage({
      ywStockPage({
        model: {
          ...filters,
          queryStatus: '6,7,8',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          ...filters
        },
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.param3, 'seconds').format('H时m分s秒')
        })
        this.pagination.total = res.total || 0
      }, () => {
        this.loading = false
      })
    },
    handleEx() {
      this.$dialog.exportConfirm('确认导出吗？')
        .then(() => {
          this.loading = true
          ywStockPageEx({
            page: this.pagination.page,
            capacity: 1000000,
            model: this.filters
          })
            .then(response => {
              this.download(response)
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.loading = false
            })
        })
        .catch(() => { })
    },
    clear() {
      this.filters = {}
      this.pagination.pageSize = 10