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

盘点管理页面字段显示

Browse Source
This commit is contained in:
liuhanqing
2025-09-16 10:57:13 +08:00
parent f3637408cb
commit 5049b8e79f
20 changed files with 266 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-ui/src/views/bas/BasProductCode/index.vue
View File

@@ -89,11 +89,11 @@
<div class="preview-row">
<div class="preview-col">
<span class="preview-label">N.W.:</span>
<span class="preview-value">{{ previewData.nW }}kg</span>
<span class="preview-value">{{ previewData.nW }}</span>
</div>
<div class="preview-col">
<span class="preview-label">G.W.:</span>
<span class="preview-value">{{ previewData.gW }}kg</span>
<span class="preview-value">{{ previewData.gW }}</span>
</div>
</div>
</div>
@@ -235,13 +235,7 @@
<script>
import VueQr from 'vue-qr'
import VueEasyPrint from 'vue-easy-print'
import {
listBasProductCode,
getBasProductCode,
delBasProductCode,
addBasProductCode,
updateBasProductCode
} from "@/api/bas/BasProductCode"
import {addBasProductCode, delBasProductCode, listBasProductCode, updateBasProductCode} from "@/api/bas/BasProductCode"
// 常量配置
const FORM_FIELDS = [
@@ -347,7 +341,12 @@ export default {
qrCodeValue() {
console.log(this.previewData)
const text = `${this.previewData.spare1}@${this.previewData.model}@${this.previewData.spare2}@${this.previewData.spare3}@${this.previewData.serial}`
return this.procode(text)
var bm = this.procode(text)
return "MODEL:" + this.previewData.model + " COLOR:" + this.previewData.color
+ " SERIAL:" + this.previewData.serial + " V:" + this.previewData.v
+ " Hz:" + this.previewData.hz + " PH:" + this.previewData.ph
+ " N.W.:" + this.previewData.nW + " G.W.:" + this.previewData.gW
+ " @:" + bm + "@"
},
// 是否有选中项
hasSelection() {

4
ruoyi-ui/src/views/bas/basProduct/index.vue
View File

@@ -146,6 +146,7 @@
<el-table-column label="相位" align="center" prop="spare7" />
<el-table-column label="净重" align="center" prop="spare2" />
<el-table-column label="毛重" align="center" prop="spare8" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -208,6 +209,9 @@
<el-form-item label="毛重" prop="spare8">
<el-input v-model="form.spare8" placeholder="请输入毛重" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>

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

@@ -189,15 +189,19 @@
<el-table-column label="单据ID" align="left" prop="inOrOutId" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc" />
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
<el-table-column label="净重" align="right" prop="extraField.netWeight" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="入库时间" align="left" prop="inDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination

27
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -176,16 +176,23 @@
/>
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column label="任务ID" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column label="库存ID" align="left" prop="stockId" /> <!-- 库存ID -->
<el-table-column label="单据ID" align="left" prop="inOrOutId" /> <!-- 单据ID -->
<el-table-column label="单据ID" align="left" prop="inOrOutDId" /> <!-- 单据ID -->
<el-table-column label="物料id" align="left" prop="productId" /> <!-- 物料id -->
<el-table-column label="物料编码" align="left" prop="extraField.materialDesc" /> <!-- 物料编码 -->
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc" /> <!-- 英文描述 -->
<el-table-column label="净重" align="right" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column label="子任务ID" align="left" prop="jobDetailId" />
<el-table-column label="任务ID" align="left" prop="jobId" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column label="拣选数量" align="right" prop="pickQuantity" /> <!-- 拣选数量 -->
</el-table>

17
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -130,9 +130,20 @@
<el-table-column label="子单ID" align="left" prop="stockCheckDetailId" />
<el-table-column label="主单ID" align="left" prop="stockCheckId" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column label="物料编码" align="left" prop="productId"/>
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName"/><!--物料编码-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="计划数量" align="right" prop="quantity"/>
<el-table-column label="扫码数量" align="right" prop="scanNum"/>
<el-table-column label="实际数量" align="right" prop="assignNum"/>

39
ruoyi-ui/src/views/in/stockIn/add/index_new.vue
View File

@@ -6,19 +6,12 @@
</div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="仓库" prop="warehouseId">-->
<!-- <el-select v-model="form.warehouseId" placeholder="请选择仓库">-->
<!-- <el-option-->
<!-- v-for="item in warehouseOptions"-->
<!-- :key="item.warehouseId"-->
<!-- :label="item.warehouseName"-->
<!-- :value="item.warehouseId"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-col :span="4">
<el-form-item label="订单号" prop="erpBill">
<el-input v-model="form.erpBill" placeholder="请输入订单号"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="供应商" prop="supplierId">
<el-input
v-model="form.supplierName"
@@ -28,12 +21,20 @@
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单号" prop="erpBill">
<el-input v-model="form.erpBill" placeholder="请输入订单号"/>
<el-col :span="4">
<el-form-item label="单据类型" prop="inType"><!--单据类型-->
<el-select v-model="form.inType" placeholder="请选择单据类型" >
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
@@ -243,7 +244,7 @@ import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "InAdd",
dicts: ['sys_normal_disable', 'is_active', 'storage_cond', 'is_available'],
dicts: ['sys_normal_disable', 'is_active', 'storage_cond', 'is_available','in_bill_type'],
data() {
return {
// 表单参数
@@ -513,7 +514,7 @@ export default {
warehouseId: "01",
supplierId: this.form.supplierId,
remark: this.form.remark,
inType:"1",
inType:this.form.inType,
erpBill:this.form.erpBill,
productVoList: this.productList.map(item => ({
productId: item.productId,

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

@@ -38,6 +38,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" >
<el-option
v-for="dict in dict.type.bill_resource"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
@@ -135,6 +145,11 @@
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="单据来源" align="left" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column label="供应商" align="left" prop="supplierName"/><!--供应商-->
<el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
@@ -215,7 +230,7 @@ import VueQr from 'vue-qr'
export default {
name: "StockIn",
dicts: ['bill_resource', 'in_bill_status', 'in_bill_type'],
dicts: ['bill_resource', 'in_bill_status', 'in_bill_type','bill_resource'],
components: {
vueEasyPrint,
VueQr
@@ -260,7 +275,7 @@ export default {
inType: null,
createDate: null,
createManId: null,
status: '1',
status: null,
warehouseId: null,
finishDate: null,
erpBill: null,