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

手持机

Browse Source
This commit is contained in:
张怡蓉
2025-09-10 15:03:51 +08:00
parent 94e3a9d000
commit 0e82934fc3
38 changed files with 905 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-ui/src/lang/en.js
View File

@@ -170,6 +170,8 @@ export default {
stockinId: '收货订单ID',
inputstockinId: '请输入收货订单ID',
supplierNo: '供应商编码',
supplierName: '供应商名称',
inputSupplierName: '请输入供应商名称',
selecInType: "请选择入库类型",
inputSupplierNo: '请输入供应商编码',
stockSource: '单据来源',
@@ -186,10 +188,12 @@ export default {
delet: '删除',
inType: '入库类型',
createDate: '建立时间',
startDate:'开始时间',
endDate:'结束时间',
createManName: '创建人',
warehouseName: '仓库',
departmentName: '部门',
supplierName: '供应商',
testing: '质检',
stockinDetailId: '子单ID',
lotNo: '批次号',
@@ -296,6 +300,8 @@ export default {
cartonNo: '箱号',
packingMethod: '包装方式',
createTime: "创建时间",
beginCreateTime: "开始时间",
endCreateTime: "结束时间",
selectPrintData: "请选择要操作的数据",
selectOnePrintData: "请选择一条任务",
operaSuccess: "操作成功",
@@ -343,6 +349,7 @@ export default {
createDate: '创建时间',
startDate: '开始时间',
finishDate: '确认时间',
endDate: '结束时间',
warehouseId: '仓库编号',
warehouseName: '仓库名称',
stockoutDetailId: '出库子单编号',

9
ruoyi-ui/src/lang/hu.js
View File

@@ -170,6 +170,8 @@ export default {
stockinId: '收货订单ID',
inputstockinId: '请输入收货订单ID',
supplierNo: '供应商编码',
supplierName: '供应商名称',
inputSupplierName: '请输入供应商名称',
selecInType: "请选择入库类型",
inputSupplierNo: '请输入供应商编码',
stockSource: '单据来源',
@@ -186,10 +188,12 @@ export default {
delet: '删除',
inType: '入库类型',
createDate: '建立时间',
startDate:'开始时间',
endDate:'结束时间',
createManName: '创建人',
warehouseName: '仓库',
departmentName: '部门',
supplierName: '供应商',
testing: '质检',
stockinDetailId: '子单ID',
lotNo: '批次号',
@@ -296,6 +300,8 @@ export default {
cartonNo: '箱号',
packingMethod: '包装方式',
createTime: "创建时间",
beginCreateTime: "开始时间",
endCreateTime: "结束时间",
selectPrintData: "请选择要操作的数据",
selectOnePrintData: "请选择一条任务",
operaSuccess: "操作成功",
@@ -343,6 +349,7 @@ export default {
createDate: '创建时间',
startDate: '开始时间',
finishDate: '确认时间',
endDate: '结束时间',
warehouseId: '仓库编号',
warehouseName: '仓库名称',
stockoutDetailId: '出库子单编号',

13
ruoyi-ui/src/lang/zh.js
View File

@@ -170,6 +170,8 @@ export default {
stockinId: '收货订单ID',
inputstockinId: '请输入收货订单ID',
supplierNo: '供应商编码',
supplierName: '供应商名称',
inputSupplierName: '请输入供应商名称',
selecInType: "请选择入库类型",
inputSupplierNo: '请输入供应商编码',
stockSource: '单据来源',
@@ -186,10 +188,13 @@ export default {
delet: '删除',
inType: '入库类型',
createDate: '建立时间',
startDate:'开始时间',
endDate:'结束时间',
createManName: '创建人',
warehouseName: '仓库',
departmentName: '部门',
supplierName: '供应商',
testing: '质检',
stockinDetailId: '子单ID',
lotNo: '批次号',
@@ -296,6 +301,10 @@ export default {
cartonNo: '箱号',
packingMethod: '包装方式',
createTime: "创建时间",
beginCreateTime: "开始时间",
endCreateTime: "结束时间",
selectPrintData: "请选择要操作的数据",
selectOnePrintData: "请选择一条任务",
operaSuccess: "操作成功",
@@ -343,6 +352,8 @@ export default {
createDate: '创建时间',
startDate: '开始时间',
finishDate: '确认时间',
endDate: '结束时间',
warehouseId: '仓库编号',
warehouseName: '仓库名称',
stockoutDetailId: '出库子单编号',

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

@@ -56,7 +56,7 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('inJob.startTime')" prop="startTime">
<!-- <el-form-item :label="$t('inJob.startTime')" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
@@ -71,6 +71,17 @@
value-format="yyyy-MM-dd"
:placeholder="$t('inJob.selectFinishTime')">
</el-date-picker>
</el-form-item> -->
<el-form-item :label="$t('inJob.createTime')" prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"
range-separator="---"
:start-placeholder="$t('inJob.beginCreateTime')"
:end-placeholder="$t('inJob.endCreateTime')"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item>
<el-form-item :label="$t('inJob.entranceId')" prop="entranceId">
<el-input
@@ -234,6 +245,8 @@ export default {
loading: true,
detailLoading:false,
warehouseOptions:[],
// 日期范围
dateRange: [],
// 选中数组
ids: [],
// 非单个禁用
@@ -284,7 +297,9 @@ export default {
classId: null,
warehouseId: null,
faultFlag: null,
inOut:"1"
inOut:"1",
beginCreateTime: null,
endCreateTime: null
},
queryDetailParams:{
pageNum: 1,
@@ -370,6 +385,14 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
// 处理日期范围
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.beginCreateTime = this.dateRange[0]
this.queryParams.endCreateTime = this.dateRange[1]
} else {
this.queryParams.beginCreateTime = null
this.queryParams.endCreateTime = null
}
// 清空子表数据和当前选中行
this.mydoJobDetailList = []
this.detailTotal = 0
@@ -379,6 +402,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
// 清空子表数据
this.mydoJobDetailList = [];

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

@@ -20,8 +20,8 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('receiveStockinAdd.supplier')" prop="supplierId">
<el-input
v-model="form.supplierName"
<el-input
v-model="form.supplierName"
:placeholder="$t('receiveStockinAdd.selectSupplier')"
@click.native="openSupplierSelector"
readonly
@@ -63,6 +63,17 @@
<el-table-column fixed :label="$t('receiveStockinAdd.productId')" align="left" prop="productId" /><!--物料编码-->
<el-table-column fixed :label="$t('receiveStockinAdd.productName')" align="left" prop="productName" /><!--物料名称-->
<el-table-column fixed :label="$t('receiveStockinAdd.spare1')" align="left" prop="spare1"/><!--英文描述-->
<el-table-column fixed :label="$t('receiveStockinAdd.quantity')" width="240" align="right">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
:min="1"
controls-position="right"
required="required"
@change="calculateTotal"
/>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.unit')" align="left" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="right" prop="spare2" width="120px"/><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.totalNetWeight')" width="120" align="right">
@@ -89,7 +100,7 @@
</template>
</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">
<template slot-scope="scope">
<el-input
@@ -99,17 +110,7 @@
/>
</template>
</el-table-column>-->
<el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="right">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
:min="1"
controls-position="right"
required="required"
@change="calculateTotal"
/>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.unitPrice')" width="120" align="left">
<template slot-scope="scope">
<el-input-number
@@ -126,6 +127,7 @@
<span>{{ (scope.row.quantity * scope.row.price).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
<el-table-column :label="$t('receiveStockinAdd.operation')" width="100" align="center">
<template slot-scope="scope">
<el-button
@@ -200,7 +202,7 @@
<el-button @click="upload.open = false">{{ $t('receiveStockinAdd.cancel') }}</el-button>
</div>
</el-dialog>
<!-- 供应商选择对话框 -->
<el-dialog title="选择供应商" :visible.sync="supplierDialog" width="800px" append-to-body>
<el-form :model="supplierQueryParams" ref="supplierQueryForm" :inline="true">
@@ -227,7 +229,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
ref="supplierTable"
v-loading="supplierLoading"
@@ -247,7 +249,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="supplierTotal > 0"
:total="supplierTotal"
@@ -255,7 +257,7 @@
:limit.sync="supplierQueryParams.pageSize"
@pagination="getSupplierList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
<el-button @click="cancelSelectSupplier">取消</el-button>
@@ -321,7 +323,7 @@ export default {
pageSize: 10,
supplierNo: null,
supplierName: null
},
// 物料列表
productList: [],
@@ -395,13 +397,13 @@ export default {
this.supplierOptions = response.rows;
});
},
/** 打开供应商选择对话框 */
openSupplierSelector() {
this.getSupplierListForDialog();
this.supplierDialog = true;
},
/** 获取供应商列表（对话框数据） */
getSupplierListForDialog() {
this.supplierLoading = true;
@@ -411,26 +413,26 @@ export default {
this.supplierLoading = false;
});
},
/** 供应商查询 */
handleSupplierQuery() {
this.supplierQueryParams.pageNum = 1;
this.getSupplierListForDialog();
},
/** 重置供应商查询 */
resetSupplierQuery() {
this.resetForm("supplierQueryForm");
// this.supplierQueryParams.useable = "0";
this.handleSupplierQuery();
},
/** 供应商行点击事件 */
handleSupplierRowClick(row) {
this.selectedSupplier = row;
this.$refs.supplierTable.setCurrentRow(row);
},
/** 确认选择供应商 */
confirmSelectSupplier() {
if (!this.selectedSupplier) {
@@ -441,7 +443,7 @@ export default {
this.form.supplierName = this.selectedSupplier.supplierName;
this.supplierDialog = false;
},
/** 取消选择供应商 */
cancelSelectSupplier() {
this.selectedSupplier = null;

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

@@ -46,6 +46,18 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.createDate')" prop="dateRange">
<el-date-picker
v-model="dateRange"
size="small"
type="datetimerange"
range-separator="---"
:start-placeholder="$t('inReceiveStockin.startDate')"
:end-placeholder="$t('inReceiveStockin.endDate')"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('inReceiveStockin.search')}}</el-button><!--搜索-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('inReceiveStockin.reset')}}</el-button><!--重置-->
@@ -187,21 +199,15 @@
</el-row>
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/>
<!-- <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"/>&lt;!&ndash;批次号&ndash;&gt;-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/>
<!-- <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>-->
<!-- <el-table-column :label="$t('inReceiveStockin.productGuid')" 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"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120" prop="extraField.netWeight"/><!--净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="right"><!--计划数量-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="240" align="right"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
@@ -211,6 +217,13 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120" prop="extraField.netWeight"/><!--净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<!-- <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
<el-table-column label="计划数量(件)" align="center" prop="quantityJ" />-->
<!-- <el-table-column label="参考单价" align="center" prop="price"/>-->
@@ -306,6 +319,7 @@ export default {
// 是否显示弹出层
open: false,
// 查询参数
dateRange: [],
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -327,7 +341,9 @@ export default {
customerNo: null,
classNo: null,
supplierNo: null,
materialDesc: null
materialDesc: null,
beginTime: null,
endTime: null
},
queryDetailParams: {
pageNum: 1,
@@ -399,10 +415,18 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
if (this.dateRange && this.dateRange.length === 2) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm("queryForm")
this.handleQuery()
},

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

@@ -61,6 +61,27 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.supplierName')" prop="supplierName"><!--供应商名称-->
<el-input
v-model="queryParams.supplierName"
:placeholder="$t('inReceiveStockin.inputSupplierName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.createDate')" prop="dateRange">
<el-date-picker
v-model="dateRange"
size="small"
type="datetimerange"
range-separator="---"
:start-placeholder="$t('inReceiveStockin.startDate')"
:end-placeholder="$t('inReceiveStockin.endDate')"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('inReceiveStockin.search')}}</el-button><!--搜索-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('inReceiveStockin.reset')}}</el-button><!--重置-->
@@ -243,6 +264,7 @@ export default {
// 是否显示弹出层
open: false,
// 查询参数
dateRange: [],
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -259,6 +281,9 @@ export default {
customerNo: null,
classNo: null,
supplierNo: null,
supplierName:null,
beginTime: null,
endTime: null,
spare1: null,
spare2: null,
spare4: null,
@@ -344,10 +369,18 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.beginTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
} else {
this.queryParams.beginTime = null
this.queryParams.endTime = null
}
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm("queryForm")
this.handleQuery()
},

44
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -41,21 +41,17 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('outJobManagement.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outJobManagement.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('outJobManagement.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outJobManagement.selectFinishTime')">
<el-form-item :label="$t('outJobManagement.createTime')" prop="dateRange"> <!-- 创建时间 -->
<el-date-picker
v-model="dateRange"
type="datetimerange"
range-separator="---"
:start-placeholder="$t('outJobManagement.startTime')"
:end-placeholder="$t('outJobManagement.finishTime')"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
clearable
>
</el-date-picker>
</el-form-item>
@@ -156,7 +152,7 @@
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
<el-table-column :label="$t('outJobManagement.materialCode')" align="left" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="left" prop="outQuantity" /> <!-- 出库数量 -->
</el-table>
<pagination
@@ -205,6 +201,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -226,9 +224,8 @@ export default {
priority: null,
executionPhase: null,
inOrOut: null,
createTime: null,
startTime: null,
finishTime: null,
beginCreateTime: null,
endCreateTime: null,
entranceId: null,
exitId: null,
classId: null,
@@ -324,6 +321,14 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
// 处理日期范围
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.beginCreateTime = this.dateRange[0]
this.queryParams.endCreateTime = this.dateRange[1]
} else {
this.queryParams.beginCreateTime = null
this.queryParams.endCreateTime = null
}
// 清空子表数据和当前选中行
this.mydoJobDetailList = []
this.detailTotal = 0
@@ -335,6 +340,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.dateRange = []
this.handleQuery()
},
// 多选框选中数据

51
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -32,7 +32,7 @@
</el-form-item>
<el-form-item :label="$t('outStockoutManage.customerName')" prop="customerName">
<el-input
v-model="queryParams.inputCustomerName"
v-model="queryParams.customerName"
:placeholder="$t('outStockoutManage.inputCustomerName')"
clearable
@keyup.enter.native="handleQuery"
@@ -40,27 +40,22 @@
</el-form-item>
<el-form-item :label="$t('outStockoutManage.productName')" prop="productName">
<el-input
v-model="queryParams.customerNo"
v-model="queryParams.productName"
:placeholder="$t('outStockoutManage.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('outStockoutManage.startDate')" prop="startDate">
<el-date-picker clearable
v-model="queryParams.startDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outStockoutManage.selectStartDate')">
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('outStockoutManage.finishDate')" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.finishDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('outStockoutManage.selectFinishDate')">
</el-date-picker>
<el-form-item :label="$t('outStockoutManage.createDate')" prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"
range-separator="---"
:start-placeholder="$t('outStockoutManage.startDate')"
:end-placeholder="$t('outStockoutManage.endDate')"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
<el-select
@@ -125,16 +120,7 @@
v-hasPermi="['out:outStockout:autoAllot']"
>{{$t('outStockoutManage.autoAllot')}}</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-s-tools"
size="mini"
@click="handleManualAllot"
v-hasPermi="['out:outStockout:manualAllot']"
>{{$t('outStockoutManage.manualAllot')}}</el-button> <!-- 手动分配 -->
</el-col>
</el-row>
<!-- 主表数据 -->
@@ -271,6 +257,8 @@ export default {
},
// 当前审核状态
currentAuditStatus: null,
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -346,6 +334,14 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
// 处理日期范围
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.startDate = this.dateRange[0]
this.queryParams.finishDate = this.dateRange[1]
} else {
this.queryParams.startDate = null
this.queryParams.finishDate = null
}
// 清空子表数据
this.outStockDetailList = []
this.detailTotal = 0
@@ -355,6 +351,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm("queryForm")
this.handleQuery()
},

16
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -47,14 +47,14 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockManagement.inDate')" prop="startDate"><!-- 入库时间 -->
<el-date-picker clearable
v-model="queryParams.inDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('stockManagement.inputInDate')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="startDate">&lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.inDate"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- :placeholder="$t('stockManagement.inputInDate')">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"><!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"