Merge remote-tracking branch 'origin/master'

k94314517

2025-07-18 f93f455134ff234be9d257c0f432c8052f1c32cd

 admin/src/views/business/receiveWeight.vue

@@ -1,51 +1,5 @@
<template>
  <TableLayout :permissions="['business:receiveweight:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="主键" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入主键" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="是否已删除 0未删除 1已删除" prop="deleted">
        <el-input v-model="searchForm.deleted" placeholder="请输入是否已删除 0未删除 1已删除" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态:0=启用；1=禁用；" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态:0=启用；1=禁用；" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建人编码" prop="createUser">
        <el-input v-model="searchForm.createUser" placeholder="请输入创建人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建时间" prop="createTime">
        <el-date-picker v-model="searchForm.createTime" value-format="yyyy-MM-dd" placeholder="请输入创建时间" @change="search"/>
      </el-form-item>
      <el-form-item label="更新人编码" prop="updateUser">
        <el-input v-model="searchForm.updateUser" placeholder="请输入更新人编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="更新时间" prop="updateTime">
        <el-date-picker v-model="searchForm.updateTime" value-format="yyyy-MM-dd" placeholder="请输入更新时间" @change="search"/>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="searchForm.remark" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最大接单量" prop="receiveMax">
        <el-input v-model="searchForm.receiveMax" placeholder="请输入最大接单量" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最小接单量" prop="receiveMin">
        <el-input v-model="searchForm.receiveMin" placeholder="请输入最小接单量" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="优先级" prop="level">
        <el-input v-model="searchForm.level" placeholder="请输入优先级" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="订单查看延迟时间" prop="delayTime">
        <el-input v-model="searchForm.delayTime" placeholder="请输入订单查看延迟时间" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="排序码" prop="sortnum">
        <el-input v-model="searchForm.sortnum" placeholder="请输入排序码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:receiveweight:create', 'business:receiveweight:delete']">
@@ -53,25 +7,30 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:receiveweight:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="id" label="主键" min-width="100px"></el-table-column>
        <el-table-column prop="deleted" label="是否已删除 0未删除 1已删除" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态:0=启用；1=禁用；" min-width="100px"></el-table-column>
        <el-table-column prop="createUser" label="创建人编码" min-width="100px"></el-table-column>
        <el-table-column prop="createTime" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="updateUser" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="updateTime" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="receiveMax" label="最大接单量" min-width="100px"></el-table-column>
        <el-table-column prop="receiveMin" label="最小接单量" min-width="100px"></el-table-column>
        <el-table-column prop="receiveMax" label="最大接单量" min-width="100px">
          <template slot-scope="{row}">
            {{row.receiveMin||0}}{{' - '}}{{row.receiveMax||0}}
          </template>
        </el-table-column>
<!--        <el-table-column label="状态">
          <template slot-scope="{row}">
            <el-switch :disabled="row.isFixed ==1" @change="changeStatus($event, row)" v-model="row.status" active-color="#13ce66"
                       inactive-color="#ff4949" :active-value="0" :inactive-value="1">
            </el-switch>
          </template>
        </el-table-column>-->
        <el-table-column prop="level" label="优先级" min-width="100px"></el-table-column>
        <el-table-column prop="delayTime" label="订单查看延迟时间" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="updateUserName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="updateTime" label="最近操作时间" min-width="150px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:receiveweight:update', 'business:receiveweight:delete'])"
          label="操作"