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

修改权限 ，修改字段展示

Browse Source
This commit is contained in:
liuhanqing
2025-06-09 14:23:11 +08:00
parent 417e9a8dfa
commit a0569f17a5
22 changed files with 176 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -305,8 +305,8 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
<!-- <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID-->
<!-- <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
@@ -315,12 +315,20 @@
</el-table-column>
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
<!-- <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
<el-table-column :label="$t('inJob.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('inJob.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('inJob.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('inJob.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('inJob.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inJob.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inJob.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
<el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
<!-- <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
<!-- <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />

6
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -162,8 +162,8 @@
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" />&lt;!&ndash;箱号&ndash;&gt;-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" />&lt;!&ndash;包装方式&ndash;&gt;-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
@@ -436,7 +436,7 @@ export default {
addStockin(data).then(() => {
this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
// 重置表单数据
cancelPri()
this.cancelPri();
});
}
});

8
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -235,7 +235,7 @@
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
@@ -316,6 +316,10 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/><!--毛重-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/><!--总价格-->
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/><!--总净重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
@@ -337,7 +341,7 @@
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->

3
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -294,6 +294,9 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->