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

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 admin/src/views/stock/asset.vue

@@ -5,16 +5,27 @@
      <el-button type="primary" @click="$refs.newWarehouse.open('新建仓库名称')">新增</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="仓库名称" min-width="120" 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="110" show-overflow-tooltip />
      <el-table-column prop="param1" label="备注" min-width="120" show-overflow-tooltip />
      <el-table-column prop="param2" label="状态" min-width="90" show-overflow-tooltip />
      <el-table-column prop="name" label="仓库名称" min-width="120" show-overflow-tooltip />
      <el-table-column prop="userName" label="负责人" min-width="100" show-overflow-tooltip />
      <el-table-column prop="position" label="仓库位置" min-width="100" show-overflow-tooltip />
      <el-table-column prop="sortnum" label="排序码" min-width="110" show-overflow-tooltip />
      <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
      <el-table-column label="状态" min-width="90">
        <template v-slot="{ row }">
          <el-switch
            v-model="row.status"
            active-color="#13ce66"
            inactive-color="#ff4949"
            @change="changeStatus($event, row)"
            :active-value="0"
            :inactive-value="1">
          </el-switch>
        </template>
      </el-table-column>
      <el-table-column prop="workTime" label="操作" min-width="100" show-overflow-tooltip>
        <template v-slot="{ row }">
          <span class="primaryColor pointer">查看详情</span>
          <span class="red pointer">删除</span>
          <el-button type="text" @click="$refs.newWarehouse.open('新建仓库名称', row)">编辑</el-button>
          <el-button type="text" @click="dele(row.id)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -32,7 +43,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { platformLogPage, getPlatformGroupList } from '@/api'
import { fetchList, deleteById, updateStatusById } from '@/api/ywWarehouse'
export default {
  components: {
    Pagination,
@@ -53,15 +64,18 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'carCodeFront',
            filed: 'name',
            type: 'input',
            label: '仓库名称',
          },
          {
            filed: 'platformGroupId',
            filed: 'status',
            type: 'select',
            label: '仓库状态',
            options: []
            options: [
              { value: 0, label: '启用' },
              { value: 1, label: '禁用' }
            ]
          }
        ],
        online: true
@@ -69,50 +83,21 @@
    }
  },
  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({
      fetchList({
        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
@@ -124,6 +109,26 @@
      this.pagination.page = 1
      this.getList()
    },
    changeStatus(e, row) {
      updateStatusById({ id: row.id, status: e })
        .then(res => {
          this.getList()
        })
    },
    dele(id) {
      this.$confirm('是否确认删除该仓库?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        deleteById(id)
          .then(res => {
            this.getList()
          })
      }).catch(() => {
      
      });
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
      this.getList()