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

优化

Browse Source
This commit is contained in:
zj
2025-12-18 10:42:44 +08:00
parent e8434fa83c
commit 9c0a5c0d3e
96 changed files with 2254 additions and 1878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1242
ruoyi-ui/src/views/check/create/index.vue
View File

File diff suppressed because it is too large Load Diff

2
ruoyi-ui/src/views/check/difference/index.vue
View File

@@ -116,7 +116,7 @@
<el-table-column label="托盘编码" align="left" prop="trayCode" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" />
<el-table-column label="物料编号" align="left" prop="productId" />
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/>
<el-table-column label="品名" align="left" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/>
<el-table-column label="原值" align="right" prop="oldQuantity" />
<el-table-column label="新值" align="right" prop="newQuantity" />

14
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -44,10 +44,10 @@
/>
</el-form-item>
<el-form-item label="物料描述" prop="productName">
<el-form-item label="品名" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料描述"
placeholder="请输入品名"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -135,7 +135,7 @@
</template>
</el-table-column>
<el-table-column label="物料编号" align="left" prop="extraField.productId" />
<el-table-column label="物料描述" align="left" prop="extraField.materialDesc" />
<el-table-column label="品名" align="left" prop="extraField.materialDesc" />
<el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
<el-table-column label="净重" align="right" prop="extraField.netWeight" />
<el-table-column label="长" align="right" prop="extraField.length" />
@@ -188,8 +188,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="materialDesc">
<el-select v-model="addForm.extraField.productId" placeholder="请选择物料名称" clearable filterable>
<el-form-item label="品名" prop="materialDesc">
<el-select v-model="addForm.extraField.productId" placeholder="请选择品名" clearable filterable>
<el-option
v-for="item in productOptions"
:key="item.productId"
@@ -217,8 +217,8 @@
<el-form-item label="物料编号" prop="productId">
<el-input v-model="editForm.extraField.productId" placeholder="请输入物料编号" disabled />
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc">
<el-input v-model="editForm.extraField.materialDesc" placeholder="请输入物料描述" disabled />
<el-form-item label="品名" prop="materialDesc">
<el-input v-model="editForm.extraField.materialDesc" placeholder="请输入品名" disabled />
</el-form-item>
<el-form-item label="英文描述" prop="englishDesc">
<el-input v-model="editForm.extraField.englishDesc" placeholder="请输入英文描述" disabled />

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

@@ -10,7 +10,7 @@
/>
</el-form-item>-->
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" >
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,75 +27,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
placeholder="请输入序列号"
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 label="订单号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.check_in_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
v-model="queryParams.startTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
v-model="queryParams.finishTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
</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="warehouseId">
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</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>
@@ -103,17 +66,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -125,6 +77,17 @@
v-hasPermi="['job:mydoJob:manualCompleted']"
>手动完成</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -150,7 +113,7 @@
</el-table-column>
<!-- <el-table-column label="供应商" align="left" prop="supplierName" key="supplierId" value="supplierName" />-->
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" />-->
<el-table-column label="序列号" align="left" prop="trayCode" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160"/>
<el-table-column label="订单号" align="left" prop="lineId" />
<el-table-column label="入口" align="left" prop="entranceId" />
@@ -183,8 +146,8 @@
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" width="160"/>
<el-table-column label="品号" align="left" prop="productId" />
<el-table-column label="品名" align="left" prop="productName" width="160"/>
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -259,7 +222,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,

218
ruoyi-ui/src/views/check/job/out/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-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <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="请选择任务状态">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,74 +27,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="托盘码" prop="trayCode">
<el-form-item label="序列号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
placeholder="请输入序列号"
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 label="订单号" prop="lineId">
<el-input
v-model="queryParams.lineId"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.check_out_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
v-model="queryParams.startTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
v-model="queryParams.finishTime"
type="datetime" style="width: 206px"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</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>
@@ -102,33 +66,34 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
</el-col>-->
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
</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" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="left" prop="jobId" />
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange"
@row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="任务ID" align="left" prop="jobId"/>
<el-table-column label="任务状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -136,28 +101,27 @@
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="任务号" align="left" prop="taskNo"/>
<el-table-column label="任务类型" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" />-->
<el-table-column label="货位" align="left" prop="cargoSpaceName" />
<el-table-column label="订单号" align="right" prop="lineId" />
<!-- <el-table-column label="执行阶段" align="left" 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="left" prop="exitId" />
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
<el-table-column label="序列号" align="left" prop="trayCode"/>
<el-table-column label="货位" align="left" prop="cargoSpaceName"/>
<el-table-column label="订单号" align="right" prop="lineId"/>
<!-- <el-table-column label="执行阶段" align="left" 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="left" prop="exitId"/>
<el-table-column label="创建时间" align="left" prop="createTime" width="180">
</el-table-column>
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
</el-table>
@@ -170,14 +134,14 @@
/>
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
<el-table-column label="任务ID" align="left" prop="jobId" width="160" />
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160" />
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
<el-table-column label="库存ID" align="left" prop="stockId" width="160" />
<el-table-column label="物料编码" align="left" prop="productId" />
<el-table-column label="物料名称" align="left" prop="productName" width="160" />
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160"/>
<el-table-column label="任务ID" align="left" prop="jobId" width="160"/>
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160"/>
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160"/>
<el-table-column label="库存ID" align="left" prop="stockId" width="160"/>
<el-table-column label="品号" align="left" prop="productId"/>
<el-table-column label="品名" align="left" prop="productName" width="160"/>
<el-table-column label="出库数量" align="right" prop="outQuantity"/> <!-- 出库数量 -->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -204,8 +168,8 @@
</template>
<script>
import { listMydoJobOut } from "@/api/job/OutmydoJob"
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
import {listMydoJobOut} from "@/api/job/OutmydoJob"
import {listMydoJobDetail} from "@/api/job/mydoJobDetail"
import {listWarehouse} from "@/api/bas/warehouse";
export default {
@@ -213,10 +177,10 @@ export default {
dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
data() {
return {
warehouseOptions:[],
warehouseOptions: [],
// 遮罩层
loading: true,
detailLoading:false,
detailLoading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -231,9 +195,9 @@ export default {
// 任务表表格数据
mydoJobList: [],
// 子任务表表格数据
mydoJobDetailList:[],
mydoJobDetailList: [],
// 当前选中行
currentRow:null,
currentRow: null,
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -243,7 +207,7 @@ export default {
pageNum: 1,
pageSize: 10,
jobId: null,
status: '1',
status: null,
onLineType: null,
taskNo: null,
supplierId: null,
@@ -269,7 +233,7 @@ export default {
faultFlag: null,
inOut: '4'
},
queryDetailParams:{
queryDetailParams: {
pageNum: 1,
pageSize: 10,
jobId: null,
@@ -280,13 +244,13 @@ export default {
// 表单校验
rules: {
jobId: [
{ required: true, message: '请输入任务ID', trigger: 'blur' }
{required: true, message: '请输入任务ID', trigger: 'blur'}
],
status: [
{ required: true, message: '请选择任务状态', trigger: 'change' }
{required: true, message: '请选择任务状态', trigger: 'change'}
],
taskNo: [
{ required: true, message: '请输入任务号', trigger: 'blur' }
{required: true, message: '请输入任务号', trigger: 'blur'}
],
}
}
@@ -316,7 +280,7 @@ export default {
// 如果有数据，自动选中第一行
if (this.mydoJobList.length > 0) {
this.handleRowClick(this.mydoJobList[0]);
}else {
} else {
this.mydoJobDetailList = []
this.detailLoading = false
}
@@ -388,7 +352,7 @@ export default {
return;
}
this.ids = selection.map(item => item.jobId);
this.single = selection.length!==1;
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -399,9 +363,9 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
if (row.type === 'invalid'){
if (row.type === 'invalid') {
//手动作废
}else if (row.type === 'completed'){
} else if (row.type === 'completed') {
//手动完成
}
},
@@ -444,12 +408,13 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认完成任务编号为"' + jobIds + '"的数据项？').then(function () {
return manualFinish(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess('手动完成成功');
}).catch(() => {});
}).catch(() => {
});
},
/** 手动作废按钮操作 */
handleManualInvalid(row) {
@@ -458,12 +423,13 @@ export default {
this.$modal.msgError('请选择要操作的数据');
return;
}
this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认作废任务编号为"' + jobIds + '"的数据项？').then(function () {
return manualInvalid(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess('手动作废成功');
}).catch(() => {});
}).catch(() => {
});
},
}
}

78
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -4,13 +4,13 @@
<el-form-item label="盘点单据" prop="stockCheckId">
<el-input
v-model="queryParams.stockCheckId"
placeholder="请输入盘点单据"
placeholder="请输入盘点单据号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="盘库类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable>
<el-form-item label="盘点类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable>
<el-option
v-for="dict in dict.type.check_stock_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="请选择状态">
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.check_bill_status"
:key="dict.value"
@@ -46,17 +46,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']"
>作废</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -90,7 +79,17 @@
v-hasPermi="['check:stockCheck:edit']"
>确认</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']"
>作废</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,7 +98,7 @@
<el-table v-loading="loading" :data="stockCheckList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="盘点单据" align="left" prop="stockCheckId" />
<el-table-column label="盘库类型" align="left" prop="checkType">
<el-table-column label="盘点类型" align="left" prop="checkType">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_stock_type" :value="scope.row.checkType"/>
</template>
@@ -113,9 +112,9 @@
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
<el-table-column label="部门" align="left" prop="departmentName" />
<el-table-column label="创建人" align="left" prop="createManId" />
<el-table-column label="盘点位置" align="left" prop="spare1" />
<el-table-column label="建立时间" align="left" prop="createDate" />
<el-table-column label="完成日期" align="left" prop="finishDate" />
<!-- <el-table-column label="盘点位置" align="left" prop="spare1" />-->
<el-table-column label="创建时间" align="left" prop="createDate" />
<el-table-column label="完成时间" align="left" prop="finishDate" />
</el-table>
<pagination
@@ -130,8 +129,8 @@
<el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160" />
<el-table-column label="主单ID" align="left" prop="stockCheckId" width="160" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160"/>
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
<el-table-column label="品号" align="left" prop="productId"/><!--品号-->
<el-table-column label="品名" align="left" prop="productName" width="160"/><!--品号-->
<el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -236,8 +235,8 @@ export default {
// 所有出口数据（按仓库ID分组）
allExitOptions: {
'01': [
{ exitId: "L2013", exitName: 'L2013' },
{ exitId: 'L2012', exitName: 'L2012' },
{ exitId: "L2004", exitName: 'L2004' },
{ exitId: 'L2006', exitName: 'L2006' },
]
},
// 当前审核的单据
@@ -257,7 +256,7 @@ export default {
checkType: null,
createDate: null,
createManId: null,
status: '1',
status: null,
warehouseId: null,
finishDate: null,
erpBill: null,
@@ -280,7 +279,7 @@ export default {
{ required: true, message: "请输入盘点单据ID", trigger: "blur" }
],
checkType: [
{ required: true, message: "请选择盘库类型", trigger: "change" }
{ required: true, message: "请选择盘点类型", trigger: "change" }
],
createDate: [
{ required: true, message: "请选择创建日期", trigger: "blur" }
@@ -422,7 +421,7 @@ export default {
/** 作废按钮操作 */
handleInvalidated(row) {
let stockCheck = this.stockCheckList.find(item => item.stockGuid === (row.stockGuid || this.ids[0]));
if (stockCheck.status === "1") {
if (stockCheck.status === "1" || stockCheck.status === "2") {
let data = {
"stockGuid": stockCheck.stockGuid,
"status": "5"
@@ -432,7 +431,7 @@ export default {
this.getList()
})
} else {
this.$modal.msgError('只有未审核的单据可以作废')
this.$modal.msgError('只有未执行的单据可以作废')
}
},
/** 审核按钮操作 */
@@ -443,13 +442,14 @@ export default {
return
}
if (stockCheck.status === "1") {
// 保存当前审核的单据
this.currentAuditStock = stockCheck
// 根据单据的仓库ID设置出口选项
this.setExitOptionsByWarehouse(stockCheck.warehouseId)
// 显示审核弹窗
this.auditDialogVisible = true
this.auditForm.exitId = null
const data = {
"stockGuid": stockCheck.stockGuid,
"status": "2"
}
updateStockCheck(data).then(response => {
this.$modal.msgSuccess('审核成功')
this.getList()
})
} else {
this.$modal.msgError('只有未审核的单据可以审核')
}
@@ -480,7 +480,7 @@ export default {
"stockGuid": this.ids[0]
}
autoAllocation(stockCheckData).then(response => {
this.$modal.msgSuccess('自动分配成功')
this.$modal.msgSuccess(response.msg)
this.getList()
})
},
@@ -526,10 +526,8 @@ export default {
if (valid) {
const data = {
"stockGuid": this.currentAuditStock.stockGuid,
"status": "2",
"spare1": this.auditForm.exitId // 将选择的出口数据放入spare1字段
"status": "2"
}
console.log('审核数据（含出口信息）：', data)
updateStockCheck(data).then(response => {
this.$modal.msgSuccess('审核成功')