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-07-16 08:51:26 +08:00
parent 1c444e5282
commit f7a79cdc7e
7 changed files with 55 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.price')" align="right" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
<el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
<!-- <el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.lotNo"
@@ -100,7 +100,7 @@
required="required"
/>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="right">
<template slot-scope="scope">
<el-input-number
@@ -266,6 +266,11 @@ export default {
queryProductParams: {
pageNum: 1,
pageSize: 5
},
//仓库查询参数
queryWarehouseParams: {
pageNum: 1,
pageSize: 99
},
//物料遮盖
productLoading: true,
@@ -294,7 +299,7 @@ export default {
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
listWarehouse(this.queryWarehouseParams).then(response => {
this.warehouseOptions = response.rows;
});
},
@@ -400,7 +405,7 @@ export default {
return;
}
//校验lotNo productGuid quantity 不能为空
if (this.productList.some(item => !item.lotNo || !item.productGuid || !item.quantity)) {
if (this.productList.some(item => !item.productGuid || !item.quantity)) {
this.$modal.msgError(this.$t('receiveStockinAdd.materialInfoRequired'));
return;
}

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

@@ -132,14 +132,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.lotNo')" prop="stockSource"><!--批号-->
<!-- <el-form-item :label="$t('inReceiveStockin.lotNo')" prop="stockSource">&lt;!&ndash;批号&ndash;&gt;
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('inReceiveStockin.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
@@ -230,7 +230,11 @@
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.status')" align="left" prop="status"><!--单据状态-->
<template slot-scope="scope">
@@ -310,7 +314,7 @@
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/><!--批次号-->
<!-- <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>&lt;!&ndash;批次号&ndash;&gt;-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="left" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="left" prop="extraField.materialDesc"/><!--物料描述-->
@@ -396,7 +400,7 @@ import { getDicts } from "@/api/system/dict/data"
export default {
name: "Stockin",
dicts: ['receive_bill_status'],
dicts: ['receive_bill_status','in_bill_type'],
data() {
return {
// 仓库选项列表
@@ -455,6 +459,10 @@ export default {
pageSize: 10,
stockinId: null
},
queryWarehouseParams: {
pageNum: 1,
pageSize: 99,
},
// 表单参数
form: {},
// 表单校验
@@ -658,7 +666,7 @@ export default {
},
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
listWarehouse(this.queryWarehouseParams).then(response => {
this.warehouseOptions = response.rows;
if (this.warehouseOptions.length > 0) {
this.queryParams.warehouseId = this.warehouseOptions[0].warehouseId;