转移单

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-11-30 22:21:59 +08:00
parent eddf6925bf
commit e203102079

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="转移单编号" prop="transferCode"> <el-form-item label="转移单编号" prop="transferCode">
<el-input <el-input
v-model="queryParams.transferCode" v-model="queryParams.transferCode"
@ -27,47 +27,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的地" prop="destination"> <el-form-item label="移出仓库" prop="fromWarehouseName">
<el-input
v-model="queryParams.destination"
placeholder="请输入目的地"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="承运商" prop="carrier">
<el-input
v-model="queryParams.carrier"
placeholder="请输入承运商"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托运单号" prop="bookingNote">
<el-input
v-model="queryParams.bookingNote"
placeholder="请输入托运单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="移出仓库ID" prop="fromWarehouseId">
<el-input
v-model="queryParams.fromWarehouseId"
placeholder="请输入移出仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="移出仓库编码" prop="fromWarehouseCode">
<el-input
v-model="queryParams.fromWarehouseCode"
placeholder="请输入移出仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="移出仓库名称" prop="fromWarehouseName">
<el-input <el-input
v-model="queryParams.fromWarehouseName" v-model="queryParams.fromWarehouseName"
placeholder="请输入移出仓库名称" placeholder="请输入移出仓库名称"
@ -75,23 +35,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="移入仓库ID" prop="toWarehouseId"> <el-form-item label="移入仓库" prop="toWarehouseName">
<el-input
v-model="queryParams.toWarehouseId"
placeholder="请输入移入仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="移入仓库编码" prop="toWarehouseCode">
<el-input
v-model="queryParams.toWarehouseCode"
placeholder="请输入移入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="移入仓库名称" prop="toWarehouseName">
<el-input <el-input
v-model="queryParams.toWarehouseName" v-model="queryParams.toWarehouseName"
placeholder="请输入移入仓库名称" placeholder="请输入移入仓库名称"
@ -99,19 +43,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="转移日期" prop="transferDate">
<el-date-picker clearable
v-model="queryParams.transferDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择转移日期">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -126,7 +57,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['wm:transfer:add']" v-hasPermi="['mes:wm:transfer:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -137,7 +68,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['wm:transfer:edit']" v-hasPermi="['mes:wm:transfer:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -148,48 +79,41 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['wm:transfer:remove']" v-hasPermi="['mes:wm:transfer:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wm:transfer:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="转移单ID" align="center" prop="transferId" /> <el-table-column label="转移单编号" align="center" prop="transferCode" >
<el-table-column label="转移单编号" align="center" prop="transferCode" /> <template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:wm:transfer:query']"
>{{scope.row.transferCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="转移单名称" align="center" prop="transferName" /> <el-table-column label="转移单名称" align="center" prop="transferName" />
<el-table-column label="转移单类型" align="center" prop="transferType"> <el-table-column label="转移单类型" align="center" prop="transferType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_transfer_type" :value="scope.row.transferType"/> <dict-tag :options="dict.type.mes_transfer_type" :value="scope.row.transferType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="目的地" align="center" prop="destination" /> <el-table-column label="移出仓库" align="center" prop="fromWarehouseName" />
<el-table-column label="承运商" align="center" prop="carrier" /> <el-table-column label="移入仓库" align="center" prop="toWarehouseName" />
<el-table-column label="托运单号" align="center" prop="bookingNote" />
<el-table-column label="移出仓库ID" align="center" prop="fromWarehouseId" />
<el-table-column label="移出仓库编码" align="center" prop="fromWarehouseCode" />
<el-table-column label="移出仓库名称" align="center" prop="fromWarehouseName" />
<el-table-column label="移入仓库ID" align="center" prop="toWarehouseId" />
<el-table-column label="移入仓库编码" align="center" prop="toWarehouseCode" />
<el-table-column label="移入仓库名称" align="center" prop="toWarehouseName" />
<el-table-column label="转移日期" align="center" prop="transferDate" width="180"> <el-table-column label="转移日期" align="center" prop="transferDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.transferDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.transferDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status" /> <el-table-column label="单据状态" align="center" prop="status">
<el-table-column label="备注" align="center" prop="remark" /> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -197,14 +121,16 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['wm:transfer:edit']" v-if="scope.row.status == 'PREPARE'"
v-hasPermi="['mes:wm:transfer:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['wm:transfer:remove']" v-if="scope.row.status == 'PREPARE'"
v-hasPermi="['mes:wm:transfer:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -219,14 +145,31 @@
/> />
<!-- 添加或修改转移单对话框 --> <!-- 添加或修改转移单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="转移单编号" prop="transferCode"> <el-form-item label="转移单编号" prop="transferCode">
<el-input v-model="form.transferCode" placeholder="请输入转移单编号" /> <el-input v-model="form.transferCode" placeholder="请输入转移单编号" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="80">
<el-switch v-model="autoGenFlag"
active-color="#13ce66"
active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="转移单名称" prop="transferName"> <el-form-item label="转移单名称" prop="transferName">
<el-input v-model="form.transferName" placeholder="请输入转移单名称" /> <el-input v-model="form.transferName" placeholder="请输入转移单名称" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="转移单类型"> <el-form-item label="转移单类型">
<el-radio-group v-model="form.transferType"> <el-radio-group v-model="form.transferType">
<el-radio <el-radio
@ -236,33 +179,56 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="16" v-if="form.transferType == 'OUTER'">
<el-form-item label="目的地" prop="destination"> <el-form-item label="目的地" prop="destination">
<el-input v-model="form.destination" placeholder="请输入目的地" /> <el-input v-model="form.destination" placeholder="请输入目的地" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row v-if="form.transferType == 'OUTER'">
<el-col :span="8">
<el-form-item label="承运商" prop="carrier"> <el-form-item label="承运商" prop="carrier">
<el-input v-model="form.carrier" placeholder="请输入承运商" /> <el-input v-model="form.carrier" placeholder="请输入承运商" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="托运单号" prop="bookingNote"> <el-form-item label="托运单号" prop="bookingNote">
<el-input v-model="form.bookingNote" placeholder="请输入托运单号" /> <el-input v-model="form.bookingNote" placeholder="请输入托运单号" />
</el-form-item> </el-form-item>
<el-form-item label="移出仓库ID" prop="fromWarehouseId"> </el-col>
<el-input v-model="form.fromWarehouseId" placeholder="请输入移出仓库ID" /> <el-col :span="8">
<el-form-item label="收货人" prop="receiver">
<el-input v-model="form.receiver" placeholder="收货人" />
</el-form-item> </el-form-item>
<el-form-item label="移出仓库编码" prop="fromWarehouseCode"> </el-col>
<el-input v-model="form.fromWarehouseCode" placeholder="请输入移出仓库编码" /> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="移出仓库" prop="fromWarehouseId">
<el-select v-model="form.fromWarehouseId" placeholder="请选择移出仓库" clearable>
<el-option
v-for="dict in warehouseList"
:key="dict.warehosueId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="移出仓库名称" prop="fromWarehouseName"> </el-col>
<el-input v-model="form.fromWarehouseName" placeholder="请输入移出仓库名称" /> <el-col :span="8">
</el-form-item> <el-form-item label="移入仓库" prop="toWarehouseId">
<el-form-item label="移入仓库ID" prop="toWarehouseId"> <el-select v-model="form.toWarehouseId" placeholder="请选择移入仓库" clearable>
<el-input v-model="form.toWarehouseId" placeholder="请输入移入仓库ID" /> <el-option
</el-form-item> v-for="dict in warehouseList"
<el-form-item label="移入仓库编码" prop="toWarehouseCode"> :key="dict.warehosueId"
<el-input v-model="form.toWarehouseCode" placeholder="请输入移入仓库编码" /> :label="dict.warehouseName"
</el-form-item> :value="dict.warehouseId"
<el-form-item label="移入仓库名称" prop="toWarehouseName"> />
<el-input v-model="form.toWarehouseName" placeholder="请输入移入仓库名称" /> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="转移日期" prop="transferDate"> <el-form-item label="转移日期" prop="transferDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.transferDate" v-model="form.transferDate"
@ -271,17 +237,20 @@
placeholder="请选择转移日期"> placeholder="请选择转移日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="单据状态"> </el-col>
<el-radio-group v-model="form.status"> </el-row>
<el-radio label="1">请选择字典生成</el-radio> <el-row>
</el-radio-group> <el-col :span="24">
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' "> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -290,12 +259,16 @@
<script> <script>
import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/mes/wm/transfer"; import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/mes/wm/transfer";
import {listWarehouse} from "@/api/mes/wm/warehouse";
import {genCode} from "@/api/system/autocode/rule"
export default { export default {
name: "Transfer", name: "Transfer",
dicts: ['mes_transfer_type'], dicts: ['mes_transfer_type','mes_order_status'],
data() { data() {
return { return {
//
autoGenFlag:false,
optType: undefined,
// //
loading: true, loading: true,
// //
@ -310,6 +283,7 @@ export default {
total: 0, total: 0,
// //
transferList: [], transferList: [],
warehouseList: [],
// //
title: "", title: "",
// //
@ -325,15 +299,28 @@ export default {
rules: { rules: {
transferCode: [ transferCode: [
{ required: true, message: "转移单编号不能为空", trigger: "blur" } { required: true, message: "转移单编号不能为空", trigger: "blur" }
], transferName: [ ],
transferName: [
{ required: true, message: "转移单名称不能为空", trigger: "blur" } { required: true, message: "转移单名称不能为空", trigger: "blur" }
], transferType: [ ],
transferType: [
{ required: true, message: "转移单类型不能为空", trigger: "blur" } { required: true, message: "转移单类型不能为空", trigger: "blur" }
], } ],
transferDate: [
{ required: true, message: "请选择转移时间", trigger: "blur" }
],
fromWarehouseId: [
{ required: true, message: "请选择转出仓库", trigger: "blur" }
],
toWarehouseId: [
{ required: true, message: "请选择转入仓库", trigger: "blur" }
]
}
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getWarehouseList();
}, },
methods: { methods: {
/** 查询转移单列表 */ /** 查询转移单列表 */
@ -345,6 +332,12 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
//
getWarehouseList(){
listWarehouse().then(response => {
this.warehouseList = response.rows;
});
},
// //
cancel() { cancel() {
this.open = false; this.open = false;
@ -353,7 +346,32 @@ export default {
// //
reset() { reset() {
this.form = { this.form = {
transferId: null, transferCode: null, transferName: null, transferType: "0", destination: null, carrier: null, bookingNote: null, fromWarehouseId: null, fromWarehouseCode: null, fromWarehouseName: null, toWarehouseId: null, toWarehouseCode: null, toWarehouseName: null, transferDate: null, status: "0", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; transferId: null,
transferCode: null,
transferName: null,
transferType: "INNER",
destination: null,
carrier: null,
bookingNote: null,
fromWarehouseId: null,
fromWarehouseCode: null,
fromWarehouseName: null,
toWarehouseId: null,
toWarehouseCode: null,
toWarehouseName: null,
transferDate: null,
status: "PREPARE",
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -377,6 +395,18 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加转移单"; this.title = "添加转移单";
this.optType = "add";
},
//
handleView(row){
this.reset();
const transferId = row.transferId
getTransfer(transferId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看转移单信息";
this.optType = "view";
});
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -386,6 +416,7 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改转移单"; this.title = "修改转移单";
this.optType = "edit";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -423,6 +454,16 @@ export default {
this.download('wm/transfer/export', { this.download('wm/transfer/export', {
...this.queryParams ...this.queryParams
}, `transfer_${new Date().getTime()}.xlsx`) }, `transfer_${new Date().getTime()}.xlsx`)
},
//
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('TRANSFER_CODE').then(response =>{
this.form.transferCode = response;
});
}else{
this.form.transferCode = null;
}
} }
} }
}; };