装箱单功能

This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-10-11 00:33:56 +08:00
parent ce71db7a67
commit 042af26e29
4 changed files with 583 additions and 1 deletions

View File

@ -42,3 +42,10 @@ export function delFeedback(recordId) {
method: 'delete' method: 'delete'
}) })
} }
export function execute(recordId){
return request({
url: '/mes/pro/feedback/'+recordId,
method: 'put'
})
}

44
src/api/mes/wm/package.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询装箱单列表
export function listPackage(query) {
return request({
url: '/mes/wm/package/list',
method: 'get',
params: query
})
}
// 查询装箱单详细
export function getPackage(packageId) {
return request({
url: '/mes/wm/package/' + packageId,
method: 'get'
})
}
// 新增装箱单
export function addPackage(data) {
return request({
url: '/mes/wm/package',
method: 'post',
data: data
})
}
// 修改装箱单
export function updatePackage(data) {
return request({
url: '/mes/wm/package',
method: 'put',
data: data
})
}
// 删除装箱单
export function delPackage(packageId) {
return request({
url: '/mes/wm/package/' + packageId,
method: 'delete'
})
}

View File

@ -136,6 +136,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.status =='PREPARE'"
@click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:feedback:edit']"
>执行入库</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -285,7 +293,7 @@
</template> </template>
<script> <script>
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } from "@/api/mes/pro/feedback"; import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute } from "@/api/mes/pro/feedback";
import WorkorderSelect from "@/components/workorderSelect/single.vue" import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue" import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue" import UserSingleSelect from "@/components/userSelect/single.vue"
@ -499,6 +507,16 @@ export default {
} }
}); });
}, },
//
handleExecute(row){
const recordIds = row.recordId || this.ids;
this.$modal.confirm('确认执行报工?').then(function() {
return execute(recordIds)//
}).then(() => {
this.getList();
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const recordIds = row.recordId || this.ids; const recordIds = row.recordId || this.ids;

View File

@ -0,0 +1,513 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="装箱单编号" prop="packageCode">
<el-input
v-model="queryParams.packageCode"
placeholder="请输入装箱单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="条码内容" prop="barcodeContent">
<el-input
v-model="queryParams.barcodeContent"
placeholder="请输入条码内容"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="销售订单编号" prop="soCode">
<el-input
v-model="queryParams.soCode"
placeholder="请输入销售订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="queryParams.clientName"
placeholder="请输入客户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检查员名称" prop="inspectorName">
<el-input
v-model="queryParams.inspectorName"
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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:wm:package:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:wm:package:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:wm:package:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="packageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="装箱单编号" width="100px" align="center" prop="packageCode" />
<el-table-column label="装箱日期" align="center" prop="packageDate" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.packageDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="销售订单编号" width="100px" align="center" prop="soCode" />
<el-table-column label="发票编号" align="center" prop="invoiceCode" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="箱长度" align="center" prop="packageLength" />
<el-table-column label="箱宽度" align="center" prop="packageWidth" />
<el-table-column label="箱高度" align="center" prop="packageHeight" />
<el-table-column label="尺寸单位" align="center" prop="sizeUnit" />
<el-table-column label="净重" align="center" prop="netWeight" />
<el-table-column label="毛重" align="center" prop="crossWeight" />
<el-table-column label="重量单位" align="center" prop="weightUnit" />
<el-table-column label="检查员" align="center" prop="inspectorName" />
<el-table-column label="是否启用" align="center" prop="enableFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:package:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:wm:package:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改装箱单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-row>
<el-col :span="16">
<el-form-item label="装箱单编号" prop="packageCode">
<el-input v-model="form.packageCode" placeholder="请输入装箱单编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<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-row>
<el-row>
<el-col :span="24">
<el-form-item label="装箱日期" prop="packageDate">
<el-date-picker clearable
v-model="form.packageDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择装箱日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="17">
<el-form-item label="销售订单编号" prop="soCode">
<el-input v-model="form.soCode" placeholder="请输入销售订单编号" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-image @click="handleUpdate(scope.row)" class="barcodeClass" fit="scale-down" :src="form.barcodeUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请输入客户编码" >
<el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票编号" prop="invoiceCode">
<el-input v-model="form.invoiceCode" placeholder="请输入发票编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="箱长度" prop="packageLength">
<el-input v-model="form.packageLength" placeholder="请输入箱长度" class="input-with-select">
<el-select slot="append" class="width" v-model="form.sizeUnit">
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
:label="item.measureName"
:value="item.measureCode"
></el-option>
</el-select>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="箱宽度" prop="packageWidth">
<el-input v-model="form.packageWidth" placeholder="请输入箱宽度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="箱高度" prop="packageHeight">
<el-input v-model="form.packageHeight" placeholder="请输入箱高度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="净重" prop="netWeight">
<el-input v-model="form.netWeight" placeholder="请输入净重" >
<el-select slot="append" v-model="form.weightUnit">
<el-option
v-for="item in measureOptions"
:key="item.measureCode"
:label="item.measureName"
:value="item.measureCode"
></el-option>
</el-select>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="毛重" prop="crossWeight">
<el-input v-model="form.crossWeight" placeholder="请输入毛重" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查员名称" prop="inspectorName">
<el-input v-model="form.inspectorName" placeholder="请输入检查员名称" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPackage, getPackage, delPackage, addPackage, updatePackage } from "@/api/mes/wm/package";
import ClientSelect from "@/components/clientSelect/single.vue";
import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Package",
dicts: ['sys_yes_no'],
components: {
ClientSelect
},
data() {
return {
//
autoGenFlag:false,
optType: undefined,
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
packageList: [],
//
measureOptions: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
parentId: null,
ancestors: null,
packageCode: null,
barcodeId: null,
barcodeContent: null,
barcodeUrl: null,
packageDate: null,
soCode: null,
invoiceCode: null,
clientId: null,
clientCode: null,
clientName: null,
clientNick: null,
packageLength: null,
packageWidth: null,
packageHeight: null,
sizeUnit: null,
netWeight: null,
crossWeight: null,
weightUnit: null,
inspector: null,
inspectorName: null,
enableFlag: null,
},
//
form: {},
//
rules: {
parentId: [
{ required: true, message: "父箱ID不能为空", trigger: "blur" }
],
ancestors: [
{ required: true, message: "所有父节点ID不能为空", trigger: "blur" }
],
packageDate: [
{ required: true, message: "装箱日期不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getUnits();
},
methods: {
/** 查询装箱单列表 */
getList() {
this.loading = true;
listPackage(this.queryParams).then(response => {
this.packageList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
getUnits(){
listAllUnitmeasure().then(response =>{
this.measureOptions = response.data;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
packageId: null,
parentId: null,
ancestors: null,
packageCode: null,
barcodeId: null,
barcodeContent: null,
barcodeUrl: null,
packageDate: null,
soCode: null,
invoiceCode: null,
clientId: null,
clientCode: null,
clientName: null,
clientNick: null,
packageLength: null,
packageWidth: null,
packageHeight: null,
sizeUnit: null,
netWeight: null,
crossWeight: null,
weightUnit: null,
inspector: null,
inspectorName: null,
enableFlag: "Y",
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");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.packageId)
this.single = selection.length!==1
this.multiple = !selection.length
},
//
handleSelectClient(){
this.$refs.clientSelect.showFlag = true;
},
//
onClientSelected(obj){
if(obj != undefined && obj != null){
this.form.clientId = obj.clientId;
this.form.clientCode = obj.clientCode;
this.form.clientName = obj.clientName;
}
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加装箱单";
this.optType="add";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const packageId = row.packageId || this.ids
getPackage(packageId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改装箱单";
this.optType="edit";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.packageId != null) {
updatePackage(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPackage(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const packageIds = row.packageId || this.ids;
this.$modal.confirm('是否确认删除装箱单编号为"' + packageIds + '"的数据项?').then(function() {
return delPackage(packageIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wm/package/export', {
...this.queryParams
}, `package_${new Date().getTime()}.xlsx`)
},
//
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){
genCode('PACKAGE_CODE').then(response =>{
this.form.packageCode = response;
});
}else{
this.form.packageCode = null;
}
}
}
};
</script>