入库管理下4个页面,出库管理下3个页面,国际化
This commit is contained in:
@@ -1,16 +1,8 @@
|
||||
<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-input-->
|
||||
<!-- v-model="queryParams.jobId"-->
|
||||
<!-- placeholder="请输入任务ID"-->
|
||||
<!-- 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('outJobManagement.status')" prop="status"> <!-- 状态 -->
|
||||
<el-select v-model="queryParams.status" :placeholder="$t('outJobManagement.selectStatus')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.mydo_job_status"
|
||||
:key="dict.value"
|
||||
@@ -20,68 +12,26 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="任务号" prop="taskNo">
|
||||
<el-form-item :label="$t('outJobManagement.taskNo')" prop="taskNo"> <!-- 任务号 -->
|
||||
<el-input
|
||||
v-model="queryParams.taskNo"
|
||||
placeholder="请输入任务号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="供应商ID" prop="supplierId">
|
||||
<el-input
|
||||
v-model="queryParams.supplierId"
|
||||
placeholder="请输入供应商ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户ID" prop="customerId">
|
||||
<el-input
|
||||
v-model="queryParams.customerId"
|
||||
placeholder="请输入客户ID"
|
||||
:placeholder="$t('outJobManagement.inputTaskNo')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
-->
|
||||
<el-form-item label="托盘条码" prop="trayCode">
|
||||
<el-form-item :label="$t('outJobManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
|
||||
<el-input
|
||||
v-model="queryParams.trayCode"
|
||||
placeholder="请输入托盘条码"
|
||||
:placeholder="$t('outJobManagement.inputTrayCode')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="巷道ID" prop="roadwayId">
|
||||
<el-input
|
||||
v-model="queryParams.roadwayId"
|
||||
placeholder="请输入巷道ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="货位ID" prop="cargoSpaceId">
|
||||
<el-input
|
||||
v-model="queryParams.cargoSpaceId"
|
||||
placeholder="请输入货位ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="执行阶段" prop="executionPhase">-->
|
||||
<!-- <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="dict in dict.type.execution_phase_type"-->
|
||||
<!-- :key="dict.value"-->
|
||||
<!-- :label="dict.label"-->
|
||||
<!-- :value="dict.value"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="作业类型" prop="inOrOut">
|
||||
<el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
|
||||
|
||||
<el-form-item :label="$t('outJobManagement.jobType')" prop="inOrOut"> <!-- 作业类型 -->
|
||||
<el-select v-model="queryParams.inOrOut" :placeholder="$t('outJobManagement.selectJobType')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.out_job_type"
|
||||
:key="dict.value"
|
||||
@@ -90,43 +40,29 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime">
|
||||
|
||||
<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="请选择开始时间">
|
||||
:placeholder="$t('outJobManagement.selectStartTime')">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="finishTime">
|
||||
|
||||
<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="请选择结束时间">
|
||||
:placeholder="$t('outJobManagement.selectFinishTime')">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="入口" prop="entranceId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.entranceId"-->
|
||||
<!-- placeholder="请输入入口ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="出口" prop="exitId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.exitId"-->
|
||||
<!-- placeholder="请输入出口ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<el-form-item :label="$t('outJobManagement.warehouse')" prop="warehouseId"> <!-- 仓库 -->
|
||||
<el-select
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请选择仓库"
|
||||
:placeholder="$t('outJobManagement.selectWarehouse')"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
@@ -137,17 +73,10 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="重分标记" prop="faultFlag">
|
||||
<el-input
|
||||
v-model="queryParams.faultFlag"
|
||||
placeholder="请输入重分标记"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</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>
|
||||
|
||||
@@ -160,7 +89,7 @@
|
||||
size="mini"
|
||||
@click="OuthandFinish"
|
||||
v-hasPermi="['job:outmydoJob:OuthandFinish']"
|
||||
>手动完成</el-button>
|
||||
>{{$t('outJobManagement.manualComplete')}}</el-button> <!-- 手动完成 -->
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
@@ -170,54 +99,52 @@
|
||||
size="mini"
|
||||
@click="OuthandInvalidation"
|
||||
v-hasPermi="['job:outmydoJob:OuthandInvalidation']"
|
||||
>手动作废</el-button>
|
||||
>{{$t('outJobManagement.manualInvalidate')}}</el-button> <!-- 手动作废 -->
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="任务ID" align="center" prop="jobId" />
|
||||
<el-table-column label="任务状态" align="center" prop="status">
|
||||
<el-table-column :label="$t('outJobManagement.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
|
||||
<el-table-column :label="$t('outJobManagement.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('outJobManagement.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('outJobManagement.jobType')" 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="供应商ID" align="center" prop="supplierId" />-->
|
||||
<el-table-column label="客户ID" align="center" prop="customerId" />
|
||||
<el-table-column label="托盘码" align="center" prop="trayCode" />
|
||||
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
|
||||
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
|
||||
<el-table-column label="优先级" align="center" prop="priority" />
|
||||
<el-table-column label="执行阶段" align="center" prop="executionPhase">
|
||||
<el-table-column :label="$t('outJobManagement.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
|
||||
<el-table-column :label="$t('outJobManagement.customerId')" align="center" prop="customerId" /> <!-- 客户ID -->
|
||||
<el-table-column :label="$t('outJobManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘码 -->
|
||||
<el-table-column :label="$t('outJobManagement.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
|
||||
<el-table-column :label="$t('outJobManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
|
||||
<el-table-column :label="$t('outJobManagement.priority')" align="center" prop="priority" /> <!-- 优先级 -->
|
||||
<el-table-column :label="$t('outJobManagement.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('outJobManagement.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('outJobManagement.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="exitId" />
|
||||
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
|
||||
|
||||
<el-table-column :label="$t('outJobManagement.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
|
||||
<el-table-column :label="$t('outJobManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
@@ -230,36 +157,12 @@
|
||||
|
||||
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
|
||||
<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">-->
|
||||
<!-- <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="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />-->
|
||||
<el-table-column :label="$t('outJobManagement.subTaskId')" align="center" prop="jobDetailId" /> <!-- 子任务ID -->
|
||||
<el-table-column :label="$t('outJobManagement.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
|
||||
<el-table-column :label="$t('outJobManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
|
||||
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="center" prop="inOrOutDId" /> <!-- 子单据ID -->
|
||||
<el-table-column :label="$t('outJobManagement.materialCode')" align="center" prop="productId" /> <!-- 物料编码 -->
|
||||
<el-table-column :label="$t('outJobManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
@@ -269,8 +172,6 @@
|
||||
:limit.sync="queryDetailParams.pageSize"
|
||||
@pagination="getDetailList"
|
||||
/>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user