refactor(wms): 优化多个页面的展示逻辑和数据结构

- 调整了多个页面的表单、按钮和表格列的显示逻辑 - 优化了部分字段的命名和数据结构 - 移除了不必要的注释代码 - 统一了操作按钮的样式和权限控制
3 months ago · 5c60930261
parent 3fee2722a4
commit 5c60930261
8 changed files with 70 additions and 36 deletions
--- a/src/api/wms/moveOrder/types.ts
+++ b/src/api/wms/moveOrder/types.ts
@ -8,6 +8,7 @@ export interface MoveOrderVO {
   * 物料ID
   */
  materialId: string | number;
+  materialname?: string;

  /**
   * 物料大类
@ -25,6 +26,7 @@ export interface MoveOrderVO {
   * 计划库位
   */
  planLocationCode: number;
+  planLocationName?: string;

  /**
   * 工单状态(0执行中，1完成，2关闭)
@ -35,6 +37,7 @@ export interface MoveOrderVO {
   * 目标库位
   */
  targetLocationCode: number;
+  targetLocationName ?: string;

  /**
   * 审核人
@ -68,6 +71,8 @@ export interface MoveOrderVO {

  batchCode: string;

+  warehouseName: string;
+
 }

 export interface MoveOrderForm extends BaseEntity {
@ -80,6 +85,7 @@ export interface MoveOrderForm extends BaseEntity {
   * 物料ID
   */
  materialId?: string | number;
+  materialname?: string;

  /**
   * 物料大类
@ -97,6 +103,7 @@ export interface MoveOrderForm extends BaseEntity {
   * 计划库位
   */
  planLocationCode?: string;
+  planLocationName?: string;

  /**
   * 工单状态(0执行中，1完成，2关闭)
@ -107,6 +114,7 @@ export interface MoveOrderForm extends BaseEntity {
   * 目标库位
   */
  targetLocationCode?: string;
+  targetLocationName ?: string;

  /**
   * 审核人
@ -140,6 +148,8 @@ export interface MoveOrderForm extends BaseEntity {

  batchCode: string;

+  warehouseName: string;
+
 }

 export interface MoveOrderQuery extends PageQuery {
@ -153,6 +163,7 @@ export interface MoveOrderQuery extends PageQuery {
   * 物料ID
   */
  materialId?: string | number;
+  materialname?: string;

  /**
   * 物料大类
@ -170,6 +181,7 @@ export interface MoveOrderQuery extends PageQuery {
   * 计划库位
   */
  planLocationCode?: number;
+  planLocationName?: string;

  /**
   * 工单状态(0执行中，1完成，2关闭)
@ -180,6 +192,7 @@ export interface MoveOrderQuery extends PageQuery {
   * 目标库位
   */
  targetLocationCode?: number;
+  targetLocationName ?: string;

  /**
   * 审核人
@ -213,6 +226,8 @@ export interface MoveOrderQuery extends PageQuery {

  batchCode: string;

+  warehouseName: string;
+
    /**
     * 日期范围参数
     */
--- a/src/api/wms/outstockRecord/types.ts
+++ b/src/api/wms/outstockRecord/types.ts
@ -68,6 +68,11 @@ export interface OutstockRecordVO {
   */
  specialType: string | number;

+  /**
+   * 创建人
+   */
+  userName: string;
+
 }

 export interface OutstockRecordForm extends BaseEntity {
@ -134,6 +139,11 @@ export interface OutstockRecordForm extends BaseEntity {
   */
  specialType?: string | number;

+  /**
+   * 创建人
+   */
+  userName: string;
+
 }

 export interface OutstockRecordQuery extends PageQuery {
@ -165,6 +175,11 @@ export interface OutstockRecordQuery extends PageQuery {
   */
  specialType?: string | number;

+  /**
+   * 创建人
+   */
+  userName: string;
+
    /**
     * 日期范围参数
     */
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@ -15,11 +15,11 @@
 <!--            <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
 <!--          </el-select>-->
 <!--        </el-form-item>-->
-        <el-form-item label="审核状态" prop="auditStatus">
+<!--        <el-form-item label="审核状态" prop="auditStatus">
          <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
            <el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
          </el-select>
-        </el-form-item>
+        </el-form-item>-->
        <el-form-item label="仓库" prop="warehouseId">
          <el-select v-model="queryForm.warehouseId" placeholder="请选择所属仓库" clearable>
            <el-option
@ -43,10 +43,10 @@
          <el-col :span="1.5">
            <el-button type="primary" plain icon="Plus" @click="parentTableAdd">新增</el-button>
          </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
            <el-button type="success" plain icon="Edit" :disabled="ids.length !== 1" @click="parentTableUpdate()">修改
            </el-button>
-          </el-col>
+          </el-col>-->
          <el-col :span="1.5">
            <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete()">删除
            </el-button>
@ -103,9 +103,9 @@
            <el-button size="small" @click.stop="parentTableApprove(scope.row)" v-if="scope.row.auditStatus==0&&scope.row.auditBy!=''">
              审批
            </el-button>
-            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
+<!--            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
              修改
-            </el-button>
+            </el-button>-->
            <el-button
              size="small"
              type="danger"
@ -440,7 +440,7 @@
        <!-- <el-form-item label="订单编号" prop="orderNo">
          <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
        </el-form-item> -->
-        <el-form-item label="审核人" prop="auditBy">
+<!--        <el-form-item label="审核人" prop="auditBy">
          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人" :disabled="true">
            <el-option
              v-for="item in userList"
@ -449,9 +449,9 @@
              :value="item.userName"
            />
          </el-select>
-        </el-form-item>
+        </el-form-item>-->
        <el-form-item label="仓库" prop="warehouseId">
-          <el-select v-model="parentTableInfoForm.warehouseCode" placeholder="请选择所属仓库" :disabled="true">
+          <el-select v-model="parentTableInfoForm.warehouseId" placeholder="请选择所属仓库" :disabled="true">
            <el-option
              v-for="item in baseStoreList"
              :key="item.warehouseId"
--- a/src/views/wms/instockPrint/index.vue
+++ b/src/views/wms/instockPrint/index.vue
@ -119,9 +119,9 @@
        <el-table-column label="入库状态(0-待入库,1-已入库,2-入库中)" align="center" prop="inboundStatus" v-if="inboundStatusdVisble.value">
          <template #default="scope">
            <dict-tag :options="wms_inbound_status" :value="scope.row.inboundStatus"/>
-          </template>
+          </template>w
        </el-table-column> -->
-        <el-table-column label="实际入库时间" align="center" prop="actualInboundTime"  width="120px" v-if="inboundStatusdVisble">
+        <el-table-column label="实际入库时间" align="center" prop="actualInboundTime"  width="120px" v-if="!inboundStatusdVisble">
          <template #default="scope">
            <span>{{ parseTime(scope.row.actualInboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
          </template>
--- a/src/views/wms/moveOrder/index.vue
+++ b/src/views/wms/moveOrder/index.vue
@ -19,7 +19,7 @@
                />
              </el-select>
            </el-form-item>-->
-            <el-form-item label="仓库" prop="warehouseId">
+<!--            <el-form-item label="仓库" prop="warehouseId">
              <el-select v-model="form.warehouseId" placeholder="请选择所属仓库" clearable>
            <el-option
              v-for="item in baseStoreList"
@ -28,7 +28,7 @@
              :value="item.warehouseId"
            ></el-option>
          </el-select>
-            </el-form-item>
+            </el-form-item>-->
 <!--            <el-form-item label="原库位" prop="planLocationCode">
              <el-input v-model="queryParams.planLocationCode" placeholder="请输入计划库位" clearable @keyup.enter="handleQuery" />
            </el-form-item>-->
@ -68,8 +68,8 @@
              <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />
            </el-form-item> -->
            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery">刷新</el-button>
+<!--              <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
            </el-form-item>
          </el-form>
        </el-card>
@ -99,10 +99,10 @@
        <el-table-column type="selection" width="55" align="center" />
        <!-- <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/> -->
        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[6].visible"/>
-        <el-table-column label="物料" align="center" prop="materialCode" v-if="columns[0].visible"/>
+        <el-table-column label="物料" align="center" prop="materialName" v-if="columns[0].visible"/>
 <!--        <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[3].visible">
        </el-table-column>-->
-        <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
+        <el-table-column label="仓库" align="center" prop="warehouseName" v-if="columns[1].visible"/>
        <el-table-column label="原库位" align="center" prop="planLocationCode" v-if="columns[2].visible"/>
 <!--        <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[6].visible">
          <template #default="scope">
@ -318,6 +318,8 @@ const initFormData: MoveOrderForm = {
  erpSynchronousStatus: undefined,
  erpSynchronousQty: undefined,
  batchCode: undefined,
+  warehouseName:  undefined,
+  materialName: undefined,
 }
 const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
  form: {...initFormData},
@ -339,6 +341,8 @@ const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
    erpSynchronousStatus: undefined,
    erpSynchronousQty: undefined,
    batchCode: undefined,
+    warehouseName:  undefined,
+    materialName: undefined,
    params: {
    }
  },
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@ -28,10 +28,10 @@
          <el-col :span="1.5">
            <el-button type="primary" plain icon="Plus" @click="parentTableAdd">新增</el-button>
          </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
            <el-button type="success" plain icon="Edit" :disabled="ids.length !== 1" @click="parentTableUpdate()">修改
            </el-button>
-          </el-col>
+          </el-col>-->
          <el-col :span="1.5">
            <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete()">删除
            </el-button>
@ -97,9 +97,9 @@
              v-if="scope.row.needApprove &amp;&amp; (scope.row.auditStatus === null || scope.row.auditStatus === undefined || scope.row.auditStatus === '' || scope.row.auditStatus === '0' )"
              @click.stop="openApprove(scope.row)"
            >审批</el-button>
-            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
+<!--            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
              修改
-            </el-button>
+            </el-button>-->
            <el-button
              size="small"
              type="danger"
--- a/src/views/wms/outstockRecord/index.vue
+++ b/src/views/wms/outstockRecord/index.vue
@ -10,7 +10,7 @@
            <el-form-item label="库位编码" prop="locationCode">
              <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
            </el-form-item>
-            <el-form-item label="物料大类" prop="materialCategoryId">
+<!--            <el-form-item label="物料大类" prop="materialCategoryId">
              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
                                   <el-option v-for="item in mategoryOptions"
                           :key="item.materialCategoryId"
@ -18,7 +18,7 @@
                           :value="item.materialCategoryId"
                />
              </el-select>
-            </el-form-item>
+            </el-form-item>-->
 <!--            <el-form-item label="erp同步状态" prop="erpSynchronousStatus">-->
 <!--              <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >-->
 <!--                <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
@ -36,7 +36,7 @@
    <el-card shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:outstockRecord:add']">新增</el-button>
          </el-col>
          <el-col :span="1.5">
@ -44,7 +44,7 @@
          </el-col>
          <el-col :span="1.5">
            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outstockRecord:remove']">删除</el-button>
-          </el-col>
+          </el-col>-->
          <el-col :span="1.5">
            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:outstockRecord:export']">导出</el-button>
          </el-col>
@ -67,7 +67,7 @@
        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[7].visible">

        </el-table-column>
-        <el-table-column label="出库人" align="center" prop="createBy" v-if="columns[8].visible"/>
+        <el-table-column label="出库人" align="center" prop="userName" v-if="columns[8].visible"/>
        <el-table-column label="提交时间" align="center" prop="createTime" width="180" v-if="columns[9].visible">
          <template #default="scope">
            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -89,23 +89,23 @@
            <dict-tag :options="wms_special_type" :value="scope.row.specialType"/>
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+&lt;!&ndash;            <el-tooltip content="修改" placement="top">
              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:outstockRecord:edit']"></el-button>
            </el-tooltip>
            <el-tooltip content="删除" placement="top">
              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:outstockRecord:remove']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="退货" placement="top" v-if="scope.row.returnFlag!=1">
+            </el-tooltip>&ndash;&gt;
+&lt;!&ndash;            <el-tooltip content="退货" placement="top" v-if="scope.row.returnFlag!=1">
              <el-button link type="primary" @click="handleReturn(scope.row)" v-hasPermi="['wms:outstockRecord:remove']">
                <el-icon>
                  <DocumentAdd/>
                </el-icon>
              </el-button>
-            </el-tooltip>
+            </el-tooltip>&ndash;&gt;
          </template>
-        </el-table-column>
+        </el-table-column>-->
      </el-table>

      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
--- a/src/views/wms/wmsAllocateTask/index.vue
+++ b/src/views/wms/wmsAllocateTask/index.vue
@ -113,16 +113,16 @@
          </template>
        </el-table-column>
        <el-table-column label="子表id" align="center" prop="aoDId" v-if="columns[20].visible"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
-<!--            <el-tooltip content="修改" placement="top">
+&lt;!&ndash;            <el-tooltip content="修改" placement="top">
              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsAllocateTask:edit']"></el-button>
            </el-tooltip>
            <el-tooltip content="删除" placement="top">
              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsAllocateTask:remove']"></el-button>
-            </el-tooltip>-->
+            </el-tooltip>&ndash;&gt;
          </template>
-        </el-table-column>
+        </el-table-column>-->
      </el-table>

      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />