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-05-29 08:41:12 +08:00
parent 91d042e4e5
commit 4e4c64439c
50 changed files with 2477 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,16 +9,43 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<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-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<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-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库ID" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="供应商编码" prop="supplierNo">
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!--
<el-form-item label="建立时间" prop="createDate">
<el-input
v-model="queryParams.createDate"
@@ -95,14 +122,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="supplierNo">
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
-->
<!-- <el-form-item label="备用字段1" prop="spare1">
<el-input
v-model="queryParams.spare1"
@@ -203,6 +223,7 @@
plain
icon="el-icon-download"
size="mini"
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码
@@ -222,13 +243,13 @@
</template>
</el-table-column>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManId"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库ID" align="center" prop="warehouseId"/>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column label=" 完成日期" align="center" prop="finishDate"/>
<el-table-column label="erp单号" align="center" prop="erpBill"/>
<el-table-column label="单据来源" align="center" prop="stockSource">
@@ -236,10 +257,10 @@
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="部门编码" align="center" prop="departmentNo"/>
<el-table-column label="部门" align="center" prop="departmentName"/>
<!-- <el-table-column label="客户编码" align="center" prop="customerNo" />-->
<el-table-column label="班组编码" align="center" prop="classNo"/>
<el-table-column label="供应商编码" align="center" prop="supplierNo"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
@@ -273,8 +294,8 @@
@pagination="getList"
/>
<el-table v-loading="detailLoading" :data="stockInDetailList">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
<el-table-column label="主单ID" align="center" prop="stockinId"/>
@@ -358,12 +379,16 @@ export default {
detailLoading: true,
// 选中数组
ids: [],
detailIds: [],
// 主表选中的数据
stockInListSelected: [],
stockInDetailListSelected: [],
// 非单个禁用
single: true,
detailSingle: true,
// 非多个禁用
multiple: true,
detailMultiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -385,7 +410,7 @@ export default {
inType: null,
createDate: null,
createManId: null,
status: null,
status: '1',
warehouseId: null,
finishDate: null,
erpBill: null,
@@ -493,6 +518,12 @@ export default {
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleDetailSelectionChange(selection){
this.detailIds = selection.map(item => item.stockinDetailId)
this.stockInDetailListSelected = selection
this.detailSingle = selection.length !== 1
this.detailMultiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
@@ -565,7 +596,12 @@ export default {
},
/** 打印条码按钮操作 */
handleBarcodePrinting(row){
barcodePrinting(row.stockinGuid).then(response => {
const stockInId = row.stockinDetailId ||this.detailIds;
//console.log(stockInId)
var data = {
"stockinIdList": stockInId
}
barcodePrinting(data).then(response => {
this.$modal.msgSuccess("打印成功")
this.getList()
})
@@ -611,6 +647,7 @@ export default {
getDetailList(stockinId) {
this.detailLoading = true;
this.queryDetailParams.stockinId = stockinId;
this.queryDetailParams.status = this.queryParams.status;
listStockInDetail(this.queryDetailParams).then(response => {
this.stockInDetailList = response.rows;
this.detailTotal = response.total;