lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给所有查询统计页面添加product表新加字段

Browse Source
This commit is contained in:
猫猫guowen
2025-06-13 16:06:30 +08:00
parent 740c917ba6
commit f794b3ded9
32 changed files with 1779 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -83,6 +83,14 @@
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
</el-table>
<pagination

22
ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
View File

@@ -160,20 +160,22 @@
</el-row>
<el-table v-loading="loading" :data="ViewFlatWarehouseInFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="入出库类型" align="center" prop="inOrOut" />-->
<!-- <el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />-->
<!-- <el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="入出库类型" align="center" prop="inOrOut" />
<el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />
<el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.createMan')" align="center" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.description')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库id -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.address')" align="center" prop="address" /> <!-- 仓库地址 -->

11
ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
View File

@@ -184,7 +184,7 @@
</el-row>
<el-table v-loading="loading" :data="ViewFlatWarehouseOutFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="入出库类型" align="center" prop="inOrOut" />-->
<!-- <el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />-->
<!-- <el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />-->
@@ -196,7 +196,6 @@
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.description')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
@@ -205,6 +204,14 @@
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.available')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->

13
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -356,9 +356,18 @@
<el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="center" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" align="center" prop="productName" />
<el-table-column :label="$t('searchViewInJobFlow.spec')" align="center" prop="spec" />
<el-table-column :label="$t('searchViewInJobFlow.cargoNo')" align="center" prop="cargoNo" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.cargoNo')" align="center" prop="cargoNo" />-->
<el-table-column :label="$t('searchViewInJobFlow.unit')" align="center" prop="unit" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->

8
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -360,6 +360,14 @@
<el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="center" prop="cargoNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="center" prop="unit"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="center" prop="customerName"/>
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

9
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -226,7 +226,14 @@
<el-table-column :label="$t('searchViewStockDetail.productName')" align="center" prop="productName" />
<el-table-column :label="$t('searchViewStockDetail.spec')" align="center" prop="spec" />
<el-table-column :label="$t('searchViewStockDetail.unit')" align="center" prop="unit" />
<el-table-column :label="$t('searchViewStockDetail.price')" align="center" prop="price" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

45
ruoyi-ui/src/views/search/ViewStockSecure/index.vue
View File

@@ -176,24 +176,33 @@
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['search:ViewStockSecure:edit']"
>{{$t('searchViewStockSecure.modify')}}</el-button> <!-- 修改 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['search:ViewStockSecure:remove']"
>{{$t('searchViewStockSecure.delete')}}</el-button> <!-- 删除 -->
</template>
</el-table-column>
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >{{$t('searchViewStockSecure.modify')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >{{$t('searchViewStockSecure.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination

9
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

@@ -184,7 +184,6 @@
<el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockWarning.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
<el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
@@ -192,6 +191,14 @@
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
</el-table>
<pagination

11
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

@@ -335,13 +335,18 @@
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockinHistory.price')" align="center" prop="price" />
<el-table-column :label="$t('searchViewStockinHistory.remark')" align="center" prop="remark" />
<el-table-column :label="$t('searchViewStockinHistory.productId')" align="center" prop="productId" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="center" prop="productName" />
<el-table-column :label="$t('searchViewStockinHistory.cargoNo')" align="center" prop="cargoNo" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="center" prop="unit" />
<el-table-column :label="$t('searchViewStockinHistory.spec')" align="center" prop="spec" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

9
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

@@ -249,8 +249,15 @@
<el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="center" prop="entryid" /> <!-- 客户编号 -->
<el-table-column :label="$t('searchViewStockoutHistory.customerName')" align="center" prop="customerName" /> <!-- 客户名称 -->
<el-table-column :label="$t('searchViewStockoutHistory.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewStockoutHistory.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockoutHistory.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->