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

opt:优化前端界面及后端功能；

Browse Source
This commit is contained in:
gongbaoxiong
2025-08-22 14:29:32 +08:00
parent 43f2bef51c
commit f7512364cd
45 changed files with 491 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"

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

@@ -170,9 +170,9 @@
style="width: 100%;"
max-height="300"
highlight-current-row
@row-click="clcikDisRow"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@row-click="clcikDisRow"
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具编码" align="center" />
@@ -183,7 +183,7 @@
show-overflow-tooltip
prop="plan_qty"
:formatter="crud.formatNum3"
label="重量"
label="数量"
align="center"
/>
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />

4
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="pcsn" label="批次号" width="150" align="center" />
<!-- <el-table-column prop="sap_pcsn" label="SAP批次号" width="150" align="center" />-->
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" 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" :formatter="invtypeFormat" />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
@@ -139,7 +139,7 @@
<el-table-column prop="pcsn" label="批次号" align="center" width="150" />
<!-- <el-table-column prop="sap_pcsn" label="SAP批次号" align="center" />-->
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="point_code" label="起始位置" align="center" />
<el-table-column prop="struct_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />

11
nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -103,6 +103,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="源单编号">
<el-input
v-model="query.source_bill_code"
size="mini"
clearable
placeholder="源单编号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号">
<el-input
v-model="query.pcsn"
@@ -181,7 +190,7 @@
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
<el-table-column label="明细数" align="center" prop="detail_count" />
<el-table-column label="总重量" align="center" prop="total_qty">
<el-table-column label="总数量" align="center" prop="total_qty">
<template slot-scope="scope">
{{ fun(scope.row.total_qty) }}
</template>

8
nladmin-ui/src/views/wms/st/movebill/AddDialog.vue
View File

@@ -176,7 +176,7 @@
<span v-show="scope.row.edit">{{ scope.row.turnin_struct_code }}</span>
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" width="160" label="操作" fixed="right">
<el-table-column v-if="crud.status.cu > 0" align="center" width="180" label="操作" fixed="right">
<template scope="scope">
<el-button
type="danger"
@@ -192,7 +192,7 @@
size="mini"
icon="el-icon-edit"
@click="handleEdit(scope.$index, scope.row)"
>编辑
>点击确认
</el-button>
<el-button
v-show="scope.row.edit"
@@ -201,7 +201,7 @@
size="mini"
icon="el-icon-check"
@click="handleEdit(scope.$index, scope.row)"
>完成
>已确认
</el-button>
</template>
</el-table-column>
@@ -227,7 +227,7 @@ const defaultForm = {
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '29',
bill_type: '99',
remark: '',
biz_date: new Date(),
create_mode: '',

20
nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -84,7 +84,7 @@
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
@@ -110,14 +110,14 @@
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="addFormDtl()"
>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="addFormDtl()"
>
添加单据
</el-button>
<el-button
@@ -157,7 +157,7 @@
<span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
</template>
</el-table-column>
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<el-table-column prop="plan_qty" label="出库数量" width="150" align="center">
<template scope="scope">
<el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
<span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>

4
nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
View File

@@ -76,9 +76,9 @@
<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="qty" label="重量" :formatter="crud.formatNum3" :min-width="flexWidth('qty',crud.data,'重量')" />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" :min-width="flexWidth('qty',crud.data,'数量')" />
<el-table-column prop="frozen_qty" label="冻结数量" :formatter="crud.formatNum3" :min-width="flexWidth('frozen_qty',crud.data,'冻结数量')" />
<el-table-column prop="qty_unit_name" label="重量单位" :min-width="flexWidth('qty_unit_name',crud.data,'重量单位')" />
<el-table-column prop="qty_unit_name" label="数量单位" :min-width="flexWidth('qty_unit_name',crud.data,'数量单位')" />
</el-table>
<!--分页组件-->
<pagination />

1
nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -322,6 +322,7 @@ export default {
methods: {
open() {
crudSectattr.getSectCode({ 'stor_id': this.storId }).then(res => {
debugger
this.sects = res.content
})
crudRegion.getRegionList(this.mstrow).then(res => {

4
nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -93,7 +93,7 @@
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘编码" align="center" width="250px" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip sortable prop="pcsn" label="批次号" align="center" width="150px" />
<el-table-column show-overflow-tooltip prop="qty" label="可出重量" :formatter="crud.formatNum3" align="center">
<el-table-column show-overflow-tooltip prop="qty" label="可出数量" :formatter="crud.formatNum3" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.qty" clearable style="width: 120px" />
</template>
@@ -249,7 +249,7 @@ export default {
this.fullscreenLoading = false
})
} else {
this.$confirm('未分配重量不为0,是否继续提交？')
this.$confirm('未分配数量不为0,是否继续提交？')
.then(_ => {
const rows = []
this.tableDtl.forEach((item) => {

10
nladmin-ui/src/views/wms/statement/structivt/index.vue
View File

@@ -52,6 +52,16 @@
class="filter-item"
/>
</el-form-item>
<el-form-item label="载具搜索">
<el-input
v-model="query.vehicle_code"
clearable
size="small"
placeholder="载具搜索"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>