root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:富佳项目优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-09-28 14:02:43 +08:00
parent ffcecbde64
commit 52a72d9b91
23 changed files with 583 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-ui/src/views/wms/basedata/group/ViewDialog.vue
View File

@@ -26,9 +26,9 @@
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="批次" prop="pcsn">
<!-- <el-form-item label="批次" prop="pcsn">
<el-input v-model="form.pcsn" disabled style="width: 210px" />
</el-form-item>
</el-form-item>-->
<el-form-item label="状态" prop="status">
<el-input v-model="dict.label.GROUP_STATUS[form.status]" disabled style="width: 210px" />
</el-form-item>

28
nladmin-ui/src/views/wms/basedata/group/index.vue
View File

@@ -94,18 +94,16 @@
<el-input v-model="form.storagevehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="物料批号" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 200px;" />
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="8">
<el-form-item label="物料数量" prop="qty">
<el-input v-model="form.qty" disabled style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单位" prop="qty_unit_name">
<el-select
@@ -123,6 +121,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="源单号" prop="ext_code">
<el-input v-model="form.ext_code" style="width: 200px;" />
@@ -130,7 +130,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="源单类型" prop="ext_type">
<el-input v-model="form.ext_type" style="width: 200px;" />
<el-select
v-model="form.ext_type"
clearable
filterable
size="mini"
placeholder="源单类型"
class="filter-item"
>
<el-option
v-for="item in dict.EXT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -189,7 +203,9 @@
</el-table-column>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<!--
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
-->
<el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
<el-table-column prop="qty" label="组盘数量" :formatter="crud.formatNum3" :min-width="100" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -255,7 +271,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
tableEnums: ['md_pb_measureunit#unit_name#measure_unit_id'],
// 数据字典
dicts: ['is_used', 'GROUP_STATUS'],
dicts: ['is_used', 'GROUP_STATUS', 'EXT_TYPE'],
cruds() {
return CRUD({
title: '组盘记录',

7
nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -137,7 +137,7 @@
<el-table-column show-overflow-tooltip min-width="170" prop="plan_qty" label="数量" />
<el-table-column show-overflow-tooltip min-width="170" prop="qty_unit_name" label="计量单位名称" />
<el-table-column show-overflow-tooltip min-width="150" prop="source_bill_code" label="源单号" />
<el-table-column show-overflow-tooltip min-width="150" prop="source_bill_type" label="源单类型" />
<el-table-column prop="source_bill_type" label="源单类型" :formatter="source_bill_typeFormat" align="center" />
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" min-width="120" fixed="right">
<template scope="scope">
<el-button
@@ -179,7 +179,7 @@ export default {
name: 'AddDialog',
components: { AddDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE'],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE','EXT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -313,6 +313,9 @@ export default {
})
this.form.detail_count = this.form.tableData.length
},
source_bill_typeFormat(row) {
return this.dict.label.EXT_TYPE[row.source_bill_type]
},
async insertEvent(row) {
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)

7
nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -73,7 +73,7 @@
/>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
<el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" :formatter="source_bill_typeFormat" align="center" />
</el-table>
</el-card>
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
@@ -194,7 +194,7 @@ export default {
name: 'DivDialog',
components: { StructDiv },
mixins: [crud()],
dicts: ['io_bill_status'],
dicts: ['io_bill_status','EXT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -304,6 +304,9 @@ export default {
this.sect_code = val[1]
}
},
source_bill_typeFormat(row) {
return this.dict.label.EXT_TYPE[row.source_bill_type]
},
tableChanged(row) {
// 新增一行物料时，给行进行赋值
for (let i = 0; i < this.form.tableMater.length; i++) {

7
nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -111,7 +111,7 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" />
<el-table-column prop="source_bill_type" label="源单类型" :formatter="source_bill_typeFormat" align="center" width="130px" />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
@@ -156,7 +156,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'INANDOUT_BILL_TYPE'],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'INANDOUT_BILL_TYPE','EXT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -209,6 +209,9 @@ export default {
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
},
source_bill_typeFormat(row) {
return this.dict.label.EXT_TYPE[row.source_bill_type]
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},