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

入库管理下4个页面，出库管理下3个页面，国际化

Browse Source
This commit is contained in:
猫猫guowen
2025-06-05 10:08:01 +08:00
parent 9e43e81df0
commit 6b94fe43e2
10 changed files with 796 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务ID" prop="jobId">
<el-form-item :label="$t('inJob.jobId')" prop="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
:placeholder="$t('inJob.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-form-item :label="$t('inJob.status')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('inJob.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -29,10 +29,10 @@
/>
</el-select>
</el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('inJob.taskNo')" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('inJob.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -61,10 +61,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('inJob.trayCode')" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
:placeholder="$t('inJob.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -93,10 +93,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="目标货位" prop="targetCargoSpaceId">
<el-form-item :label="$t('inJob.targetCargoSpaceId')" prop="targetCargoSpaceId">
<el-input
v-model="queryParams.targetCargoSpaceId"
placeholder="请输入目标货位ID"
:placeholder="$t('inJob.inputTargetCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -125,8 +125,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-form-item :label="$t('inJob.executionPhase')" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" :placeholder="$t('inJob.selectExecutionPhase')" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
@@ -135,8 +135,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-form-item :label="$t('inJob.inOrOut')" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" :placeholder="$t('inJob.selectInOrOut')" clearable>
<el-option
v-for="dict in dict.type.in_job_type"
:key="dict.value"
@@ -145,34 +145,34 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('inJob.startTime')" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('inJob.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('inJob.finishTime')" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('inJob.selectFinishTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-form-item :label="$t('inJob.entranceId')" prop="entranceId">
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
:placeholder="$t('inJob.inputEntranceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-form-item :label="$t('inJob.exitId')" prop="exitId">
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口ID"
:placeholder="$t('inJob.inputExitId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -185,10 +185,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('inReceiveStockin.selectWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -202,8 +202,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('outJobManagement.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('outJobManagement.reset') }}</el-button>
</el-form-item>
</el-form>
@@ -216,7 +216,7 @@
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
>{{ $t('outJobManagement.manualInvalidate') }}</el-button><!--手动作废-->
</el-col>
<el-col :span="1.5">
<el-button
@@ -226,7 +226,7 @@
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:manualCompleted']"
>手动完成</el-button>
>{{ $t('outJobManagement.manualComplete') }}</el-button><!--手动完成-->
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -244,55 +244,52 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="300">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="jobId" fixed />
<el-table-column label="任务状态" align="center" prop="status">
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" fixed /> // 任务ID
<el-table-column :label="$t('inJob.status')" align="center" prop="status"> // 任务状态
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="上线类型" align="center" prop="onLineType">
<el-table-column :label="$t('inJob.onLineType')" align="center" prop="onLineType"> // 上线类型
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column label="任务类型" align="center" prop="inOrOut">
<el-table-column :label="$t('inJob.inOrOut')" align="center" prop="inOrOut"> // 任务类型
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="部门" align="center" prop="departmentName" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位" align="center" prop="cargoSpaceName" />
<el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
<el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
<el-table-column label="产线ID" align="center" prop="lineId" />
<el-table-column label="车间ID" align="center" prop="workshopId" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<el-table-column :label="$t('inJob.taskNo')" align="center" prop="taskNo" /> // 任务号
<el-table-column :label="$t('inJob.supplierName')" align="center" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
<el-table-column :label="$t('inJob.departmentName')" align="center" prop="departmentName" /> // 部门
<el-table-column :label="$t('inJob.trayCode')" align="center" prop="trayCode" /> // 托盘码
<el-table-column :label="$t('inJob.roadwayId')" align="center" prop="roadwayId" /> // 巷道ID
<el-table-column :label="$t('inJob.cargoSpaceName')" align="center" prop="cargoSpaceName" /> // 货位
<el-table-column :label="$t('inJob.targetRoadwayId')" align="center" prop="targetRoadwayId" /> // 目标巷道
<el-table-column :label="$t('inJob.targetCargoSpaceName')" align="center" prop="targetCargoSpaceName" /> // 目标货位
<el-table-column :label="$t('inJob.lineId')" align="center" prop="lineId" /> // 产线ID
<el-table-column :label="$t('inJob.workshopId')" align="center" prop="workshopId" /> // 车间ID
<el-table-column :label="$t('inJob.priority')" align="center" prop="priority" /> // 优先级
<el-table-column :label="$t('inJob.executionPhase')" align="center" prop="executionPhase"> // 执行阶段
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('inJob.startTime')" align="center" prop="startTime" width="180"> // 开始时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="finishTime" width="180">
<el-table-column :label="$t('inJob.finishTime')" align="center" prop="finishTime" width="180"> // 结束时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="入口ID" align="center" prop="entranceId" />
<!-- <el-table-column label="出口ID" align="center" prop="exitId" />-->
<el-table-column label="班组ID" align="center" prop="classId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="重分标记" align="center" prop="faultFlag" />
<el-table-column :label="$t('inJob.entranceId')" align="center" prop="entranceId" /> // 入口ID
<el-table-column :label="$t('inJob.classId')" align="center" prop="classId" /> // 班组ID
<el-table-column :label="$t('inJob.warehouseId')" align="center" prop="warehouseId" /> // 仓库ID
<el-table-column :label="$t('inJob.faultFlag')" align="center" prop="faultFlag" /> // 重分标记
</el-table>
<pagination
@@ -307,32 +304,23 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="center" prop="jobDetailId" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" width="180">
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据ID" align="center" prop="inOrOutId" />
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column label="物料GUID" align="center" prop="productGuid" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="库存状态" align="center" prop="stockStatus" />
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />-->
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
<el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />

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

@@ -62,22 +62,22 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" :label="$t('receiveStockinAdd.serialNumber')" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed label="物料编码" align="center" prop="productId" />
<el-table-column fixed label="物料名称" align="center" prop="productName" />
<el-table-column fixed label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="总净重" align="center" prop="totalNetWeight" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
<el-table-column label="体积m³" align="center" prop="spare8" />
<el-table-column label="净重KG" align="center" prop="netWeight" />
<el-table-column label="毛重KG" align="center" prop="grossWeight" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column fixed :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column fixed :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column fixed :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.totalNetWeight')" align="center" prop="totalNetWeight" /><!--总净重-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<el-table-column :label="$t('receiveStockinAdd.netWeight')" align="center" prop="netWeight" /><!--净重KG-->
<el-table-column :label="$t('receiveStockinAdd.grossWeight')" align="center" prop="grossWeight" /><!--毛重KG-->
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" 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
@@ -143,21 +143,21 @@
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
<el-table-column label="体积m³" align="center" prop="spare8" />
<el-table-column :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<!-- <el-table-column label="净重KG" align="center" prop="spare8" />
<el-table-column label="毛重KG" align="center" prop="spare9" />-->
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
</el-table>
<pagination
v-show="productTotal>0"

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

@@ -100,34 +100,34 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="入库订单ID" prop="stockinId">
<el-form-item :label="$t('inReceiveStockin.stockinId')" prop="stockinId"><!--入库订单ID-->
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库订单ID"
:placeholder="$t('inReceiveStockin.inputstockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="supplierNo">
<el-form-item :label="$t('inReceiveStockin.supplierNo')" prop="supplierNo"><!--供应商编码-->
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
:placeholder="$t('inReceiveStockin.inputSupplierNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据来源" prop="stockSource">
<el-form-item :label="$t('inReceiveStockin.stockSource')" prop="stockSource"><!--单据来源-->
<el-input
v-model="queryParams.stockSource"
placeholder="请输入单据来源"
:placeholder="$t('inReceiveStockin.inputStockSource')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
:placeholder="$t('inReceiveStockin.selectWarehouseId')"
clearable
@change="handleQuery"
>
@@ -139,10 +139,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-form-item :label="$t('inReceiveStockin.status')" prop="status"><!--单据状态-->
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
:placeholder="$t('inReceiveStockin.selectStatus')"
clearable
@change="handleQuery"
>
@@ -155,8 +155,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<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><!--重置-->
</el-form-item>
</el-form>
@@ -180,7 +180,7 @@
:disabled="single"
@click="handleCreateInStockIn"
v-hasPermi="['receive:stockin:edit']"
>生成入库单据
>{{$t('inReceiveStockin.generateStockin')}}<!--生成入库单据-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -192,7 +192,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['receive:stockin:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</el-col>
<!-- <el-col :span="1.5">
@@ -213,16 +213,16 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
<el-table-column label="入库类型" align="center" prop="inType"/>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段3" align="center" prop="spare3" />-->
@@ -230,11 +230,11 @@
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段1" align="center" prop="spare1" />-->
<!-- <el-table-column label="erp单号" align="center" prop="erpBill"/>-->
<el-table-column label="单据来源" align="center" prop="stockSource"/>
<el-table-column label="部门" align="center" prop="departmentName"/>
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"/><!--单据来源-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" 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="supplierName"/>
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -272,7 +272,7 @@
:detailDisabled="single"
@click="handleQualityInspection"
v-hasPermi="['receive:stockInDetail:qualityInspection']"
>质检
>{{$t('inReceiveStockin.testing')}}<!--质检-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -284,23 +284,23 @@
:detailDisabled="multiple"
@click="handleStockinDetailDelete"
v-hasPermi="['receive:stockInDetail:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</el-col>
</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="子单ID" align="center" prop="stockinDetailId"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
<el-table-column label="主单ID" align="center" prop="stockinId"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
<el-table-column label="箱号" align="center" prop="extraField.cartonNo"/>
<el-table-column label="包装方式" align="center" prop="extraField.packingMethod"/>
<el-table-column label="计划数量" width="120" align="center">
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
@@ -319,7 +319,7 @@
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column label="单据状态" align="center" prop="stockStatus">
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
</template>
@@ -334,7 +334,7 @@
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('inReceiveStockin.operate')" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope">
<el-button
size="mini"
@@ -342,7 +342,7 @@
icon="el-icon-edit"
@click="handleQualityInspection(scope.row)"
v-hasPermi="['receive:stockInDetail:qualityInspection']"
>质检
>{{$t('inReceiveStockin.testing')}}<!--质检-->
</el-button>
<el-button
size="mini"
@@ -350,7 +350,7 @@
icon="el-icon-delete"
@click="handleStockinDetailDelete(scope.row)"
v-hasPermi="['receive:stockInDetail:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</template>
</el-table-column>
@@ -582,7 +582,7 @@ export default {
//质检功能
handleQualityInspection(row) {
const stockinDetailIds = row.stockinDetailId || this.detailIds
if (!stockinDetailIds || (Array.isArray(stockinDetailIds) && stockinDetailIds.length === 0)) {
this.$modal.msgError("请选择需要质检的记录");
return;
@@ -607,7 +607,7 @@ export default {
list: selectedDetails,
stockinId: selectedDetails[0].stockinId
};
qualityInspection(data).then(response => {
this.getDetailList(data.stockinId)
this.$modal.msgSuccess("质检成功");

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

@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="入库订单ID" prop="stockinId">
<el-form-item :label="$t('inReceiveStockin.stockinId')" prop="stockinId"><!--入库订单ID-->
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库订单ID"
:placeholder="$t('inReceiveStockin.inputstockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-form-item :label="$t('inReceiveStockin.inType')" prop="inType"><!--入库类型-->
<el-select v-model="queryParams.inType" :placeholder="$t('inReceiveStockin.selecInType')" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -19,8 +19,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-form-item :label="$t('inReceiveStockin.status')" prop="status"><!--单据状态-->
<el-select v-model="queryParams.status" :placeholder="$t('inReceiveStockin.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
@@ -37,10 +37,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="供应商编码" prop="supplierNo">
<el-form-item :label="$t('inReceiveStockin.supplierNo')" prop="supplierNo"><!--供应商编码-->
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
:placeholder="$t('inReceiveStockin.inputSupplierNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -164,8 +164,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<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><!--重置-->
</el-form-item>
</el-form>
@@ -179,7 +179,7 @@
:disabled="single"
@click="handleInvalidated"
v-hasPermi="['in:stockIn:edit']"
>单据作废
>{{$t('inStockin.cancel')}}<!--单据作废-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -191,7 +191,7 @@
:disabled="single"
@click="handleReview"
v-hasPermi="['in:stockIn:edit']"
>单据审核
>{{$t('inStockin.examine')}}<!--单据审核-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -203,7 +203,7 @@
:disabled="single"
@click="handleConfirmation"
v-hasPermi="['in:stockIn:edit']"
>单据确认
>{{$t('inStockin.confirm')}}<!--单据确认-->
</el-button>
</el-col>
<!-- <el-col :span="1.5">
@@ -226,7 +226,7 @@
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码
>{{$t('inStockin.printBarcode')}}<!--打印条码-->
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -236,28 +236,28 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
<el-table-column label="入库类型" align="center" prop="inType">
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" 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="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" 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="仓库" align="center" prop="warehouseName"/>
<el-table-column label="完成日期" align="center" prop="finishDate"/>
<el-table-column label="单据来源" align="center" prop="stockSource">
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="部门" align="center" prop="departmentName"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
</el-table>
<pagination
@@ -270,17 +270,17 @@
<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="主单ID" align="center" prop="stockinId"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
<el-table-column label="箱号" align="center" prop="extraField.cartonNo"/>
<el-table-column label="包装方式" align="center" prop="extraField.packingMethod"/>
<el-table-column label="计划数量" align="center" prop="quantity"/>
<el-table-column label="扫码数量" align="center" prop="scanNum"/>
<el-table-column label="实际数量" align="center" prop="assignNum"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->
</el-table>
<pagination
v-show="detailTotal>0"