Merge branch 'fengcang' into busUser
commit
3b3699c521
@ -1,334 +1,357 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-card>
|
<el-card>
|
||||||
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
|
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
|
||||||
<el-form-item class="query-form-item">
|
<el-form-item class="query-form-item">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="filterQuery.name"
|
v-model="filterQuery.name"
|
||||||
style="width: 250px"
|
style="width: 250px"
|
||||||
placeholder="单据类型名称"
|
placeholder="单据类型名称"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button-group style="margin-left: 10px;display:flex;">
|
<el-button-group style="margin-left: 10px;display:flex;">
|
||||||
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
|
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
|
||||||
<el-button type="primary" icon="search" @click="search">查询</el-button>
|
<el-button type="primary" icon="search" @click="search">查询</el-button>
|
||||||
<el-button type="primary" icon="search" @click="handleAddClick"
|
<el-button type="primary" icon="search" @click="handleAddClick"
|
||||||
:disabled="!configParms.entrustAction"
|
:disabled="!configParms.entrustAction"
|
||||||
>新增
|
>新增
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
</el-button-group>
|
</el-button-group>
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="list" style="width: 100%">
|
<el-table v-loading="loading" :data="list" style="width: 100%">
|
||||||
<el-table-column label="序号" type="index" width="60" fixed></el-table-column>
|
<el-table-column label="序号" type="index" width="60" fixed></el-table-column>
|
||||||
<el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
|
<el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
|
||||||
<el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
|
<el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
|
||||||
<el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
|
<el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
|
||||||
<el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
|
<el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
|
||||||
<el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
|
<el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
|
||||||
<el-table-column label="委托验收人" prop="employeeName" fixed>
|
<el-table-column label="委托验收人" prop="employeeName" fixed>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" fixed="right">
|
<el-table-column label="操作" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click.native.stop="handleModifyClick(scope.row)"
|
@click.native.stop="handleModifyClick(scope.row)"
|
||||||
:disabled="!configParms.entrustAction"
|
:disabled="!configParms.entrustAction"
|
||||||
>编辑
|
>编辑
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click.native.stop="deleteDialog(scope.row)"
|
@click.native.stop="deleteDialog(scope.row)"
|
||||||
:disabled="!configParms.entrustAction"
|
:disabled="!configParms.entrustAction"
|
||||||
>删除
|
>删除
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
title="新增委托验收"
|
title="新增委托验收"
|
||||||
:visible.sync="addDialogVisible"
|
:visible.sync="addDialogVisible"
|
||||||
width="70%"
|
width="70%"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:close-on-press-escape="false"
|
:close-on-press-escape="false"
|
||||||
v-if="addDialogVisible"
|
v-if="addDialogVisible"
|
||||||
>
|
>
|
||||||
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
|
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
|
||||||
<div style="text-align: center">
|
<div style="text-align: center">
|
||||||
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
|
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
|
||||||
>提交
|
>提交
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
|
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
|
||||||
>取消
|
>取消
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
title="编辑委托验收"
|
title="编辑委托验收"
|
||||||
:visible.sync="modifyDialogVisible"
|
:visible.sync="modifyDialogVisible"
|
||||||
width="70%"
|
width="70%"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:close-on-press-escape="false"
|
:close-on-press-escape="false"
|
||||||
v-if="modifyDialogVisible"
|
v-if="modifyDialogVisible"
|
||||||
>
|
>
|
||||||
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
|
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
|
||||||
<div style="text-align: center">
|
<div style="text-align: center">
|
||||||
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
|
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
|
||||||
>提交
|
>提交
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
|
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
|
||||||
>取消
|
>取消
|
||||||
</el-button
|
</el-button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
:page-size="filterQuery.limit"
|
:page-size="filterQuery.limit"
|
||||||
@current-change="handleCurrentChange"
|
@current-change="handleCurrentChange"
|
||||||
layout="prev, pager, next"
|
layout="prev, pager, next"
|
||||||
:total="total"
|
:total="total"
|
||||||
:current-page="filterQuery.page"
|
:current-page="filterQuery.page"
|
||||||
></el-pagination>
|
></el-pagination>
|
||||||
</el-card>
|
</el-card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
getEntrustRece,
|
getEntrustRece,
|
||||||
deleteEntrustRece,
|
deleteEntrustRece,
|
||||||
updateEntrustRece,
|
updateEntrustRece,
|
||||||
insertEntrustRece,
|
insertEntrustRece,
|
||||||
} from "../../api/basic/EntrustRece";
|
} from "../../api/basic/EntrustRece";
|
||||||
|
|
||||||
import modifyDialog from "./BasicEntrutsReceModify";
|
import modifyDialog from "./BasicEntrutsReceModify";
|
||||||
import {findConfig} from "@/api/thrsys/spsSyncStatus";
|
import {findConfig} from "@/api/thrsys/spsSyncStatus";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
filterQuery: {
|
filterQuery: {
|
||||||
name: "",
|
name: "",
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 20,
|
limit: 20,
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
addDialogVisible: false,
|
addDialogVisible: false,
|
||||||
modifyDialogVisible: false,
|
modifyDialogVisible: false,
|
||||||
list: [],
|
list: [],
|
||||||
inputQuery: {
|
inputQuery: {
|
||||||
action: "",
|
action: "",
|
||||||
name: "",
|
name: "",
|
||||||
entrustInv: "",
|
entrustInv: "",
|
||||||
entrustUser: "",
|
entrustUser: "",
|
||||||
entrustAction: null,
|
entrustAction: null,
|
||||||
finishRece: false,
|
finishRece: false,
|
||||||
curInv: "",
|
curInv: "",
|
||||||
entrustSubInv: "",
|
entrustSubInv: "",
|
||||||
invWarehouseCode: "",
|
invWarehouseCode: "",
|
||||||
},
|
},
|
||||||
enableMap: {
|
enableMap: {
|
||||||
true: "是",
|
true: "是",
|
||||||
false: "否",
|
false: "否",
|
||||||
},
|
},
|
||||||
mainActionMap: {
|
mainActionMap: {
|
||||||
WareHouseIn: "入库",
|
WareHouseIn: "入库",
|
||||||
WareHouseOut: "出库"
|
WareHouseOut: "出库"
|
||||||
},
|
},
|
||||||
fileList: [],
|
fileList: [],
|
||||||
total: 0,
|
total: 0,
|
||||||
multipleSelection: [],
|
multipleSelection: [],
|
||||||
uploadFileUrl: null,
|
uploadFileUrl: null,
|
||||||
headers: {},
|
headers: {},
|
||||||
configParms: {},
|
configParms: {},
|
||||||
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
methods: {
|
};
|
||||||
onReset() {
|
|
||||||
this.$router.push({
|
|
||||||
path: "",
|
|
||||||
});
|
|
||||||
this.filterQuery = {
|
|
||||||
name: "",
|
|
||||||
page: 1,
|
|
||||||
limit: 20,
|
|
||||||
};
|
|
||||||
this.getList();
|
|
||||||
},
|
|
||||||
cancelDialog() {
|
|
||||||
this.modifyDialogVisible = false;
|
|
||||||
this.addDialogVisible = false;
|
|
||||||
},
|
|
||||||
handleCurrentChange(val) {
|
|
||||||
this.filterQuery.page = val;
|
|
||||||
this.getList();
|
|
||||||
},
|
|
||||||
search() {
|
|
||||||
this.filterQuery.page = 1;
|
|
||||||
this.getList();
|
|
||||||
},
|
|
||||||
getList() {
|
|
||||||
this.loading = true;
|
|
||||||
getEntrustRece(this.filterQuery)
|
|
||||||
.then((response) => {
|
|
||||||
this.loading = false;
|
|
||||||
this.list = response.data.list || [];
|
|
||||||
this.total = response.data.total || 0;
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
this.loading = false;
|
|
||||||
this.list = [];
|
|
||||||
this.total = 0;
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
onReset() {
|
||||||
|
this.$router.push({
|
||||||
|
path: "",
|
||||||
|
});
|
||||||
|
this.filterQuery = {
|
||||||
|
name: "",
|
||||||
|
page: 1,
|
||||||
|
limit: 20,
|
||||||
|
};
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
cancelDialog() {
|
||||||
|
this.modifyDialogVisible = false;
|
||||||
|
this.addDialogVisible = false;
|
||||||
|
},
|
||||||
|
handleCurrentChange(val) {
|
||||||
|
this.filterQuery.page = val;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
search() {
|
||||||
|
this.filterQuery.page = 1;
|
||||||
|
this.getList();
|
||||||
|
},
|
||||||
|
getList() {
|
||||||
|
this.loading = true;
|
||||||
|
getEntrustRece(this.filterQuery)
|
||||||
|
.then((response) => {
|
||||||
|
this.loading = false;
|
||||||
|
this.list = response.data.list || [];
|
||||||
|
this.total = response.data.total || 0;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.loading = false;
|
||||||
|
this.list = [];
|
||||||
|
this.total = 0;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
onAddSubmit() {
|
|
||||||
|
|
||||||
if (this.$isBlank(this.inputQuery.action)) {
|
onAddSubmit() {
|
||||||
this.$message.error("单据类型不能为空！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.curInv)) {
|
|
||||||
this.$message.error("请输入委托仓库！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.entrustInv)) {
|
|
||||||
this.$message.error("请输入接受委托仓库！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.entrustUser)) {
|
|
||||||
this.$message.error("请输入接受委托人！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
|
if (this.$isBlank(this.inputQuery.action)) {
|
||||||
this.$message.error("当前分库不能为空！");
|
this.$message.error("单据类型不能为空！");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
|
if (this.$isBlank(this.inputQuery.curInv)) {
|
||||||
this.$message.error("请输入接受委托分库！");
|
this.$message.error("请输入委托仓库！");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (this.$isBlank(this.inputQuery.entrustInv)) {
|
||||||
|
this.$message.error("请输入接受委托仓库！");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.$isBlank(this.inputQuery.entrustUser)) {
|
||||||
|
this.$message.error("请输入接受委托人！");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
insertEntrustRece(this.inputQuery)
|
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
|
||||||
.then((response) => {
|
this.$message.error("当前分库不能为空！");
|
||||||
this.loading = false;
|
return;
|
||||||
this.cancelDialog();
|
}
|
||||||
this.getList();
|
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
|
||||||
})
|
this.$message.error("请输入接受委托分库！");
|
||||||
.catch(() => {
|
return;
|
||||||
this.loading = false;
|
}
|
||||||
this.cancelDialog();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
onModifySubmit() {
|
if (this.$isBlank(this.inputQuery.entrustAction)) {
|
||||||
if (this.$isBlank(this.inputQuery.action)) {
|
this.$message.error("请输入生成单据类型！");
|
||||||
this.$message.error("单据类型不能为空！");
|
return;
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.curInv)) {
|
|
||||||
this.$message.error("请输入委托仓库！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.entrustInv)) {
|
|
||||||
this.$message.error("请输入接受委托仓库！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (this.$isBlank(this.inputQuery.entrustInv)) {
|
|
||||||
this.$message.error("请输入接受委托人！");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
insertEntrustRece(this.inputQuery)
|
|
||||||
.then((response) => {
|
|
||||||
this.loading = false;
|
|
||||||
this.cancelDialog();
|
|
||||||
this.getList();
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
this.loading = false;
|
|
||||||
this.cancelDialog();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
handleAddClick() {
|
insertEntrustRece(this.inputQuery)
|
||||||
this.inputQuery = {enable: true, expireTip: true};
|
.then((response) => {
|
||||||
this.addDialogVisible = true;
|
if (response.code == 20000) {
|
||||||
},
|
this.loading = false;
|
||||||
|
this.cancelDialog();
|
||||||
|
this.getList();
|
||||||
|
} else {
|
||||||
|
this.$message.error(response.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.loading = false;
|
||||||
|
this.cancelDialog();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
handleModifyClick(row) {
|
onModifySubmit() {
|
||||||
this.inputQuery = row;
|
if (this.$isBlank(this.inputQuery.action)) {
|
||||||
this.modifyDialogVisible = true;
|
this.$message.error("单据类型不能为空！");
|
||||||
},
|
return;
|
||||||
|
}
|
||||||
|
if (this.$isBlank(this.inputQuery.curInv)) {
|
||||||
|
this.$message.error("请输入委托仓库！");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.$isBlank(this.inputQuery.entrustInv)) {
|
||||||
|
this.$message.error("请输入接受委托仓库！");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.$isBlank(this.inputQuery.entrustUser)) {
|
||||||
|
this.$message.error("请输入接受委托人！");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
deleteDialog(rowId) {
|
if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
|
||||||
this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
|
this.$message.error("当前分库不能为空！");
|
||||||
confirmButtonText: "确定",
|
return;
|
||||||
cancelButtonText: "取消",
|
}
|
||||||
type: "warning",
|
if (this.$isBlank(this.inputQuery.entrustSubInv)) {
|
||||||
})
|
this.$message.error("请输入接受委托分库！");
|
||||||
.then(() => {
|
return;
|
||||||
this.deleteOrders(rowId);
|
}
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
deleteOrders(data) {
|
if (this.$isBlank(this.inputQuery.entrustAction)) {
|
||||||
this.loading = true;
|
this.$message.error("请输入生成单据类型！");
|
||||||
let tquery = {
|
return;
|
||||||
id: data.id + "",
|
|
||||||
};
|
|
||||||
deleteEntrustRece(tquery)
|
|
||||||
.then((response) => {
|
|
||||||
this.getList();
|
|
||||||
if (response.code == 20000) {
|
|
||||||
this.$message({
|
|
||||||
type: "success",
|
|
||||||
message: "删除成功！",
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.$message.error(response.message);
|
|
||||||
}
|
}
|
||||||
|
updateEntrustRece(this.inputQuery)
|
||||||
|
.then((response) => {
|
||||||
|
this.loading = false;
|
||||||
|
this.cancelDialog();
|
||||||
|
this.getList();
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
this.loading = false;
|
||||||
|
this.cancelDialog();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
handleAddClick() {
|
||||||
|
this.inputQuery = {enable: true, expireTip: true};
|
||||||
|
this.addDialogVisible = true;
|
||||||
|
},
|
||||||
|
|
||||||
|
handleModifyClick(row) {
|
||||||
|
this.inputQuery = row;
|
||||||
|
this.modifyDialogVisible = true;
|
||||||
|
},
|
||||||
|
|
||||||
})
|
deleteDialog(rowId) {
|
||||||
.catch(() => {
|
this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
|
||||||
});
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
|
type: "warning",
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
this.deleteOrders(rowId);
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
deleteOrders(data) {
|
||||||
|
this.loading = true;
|
||||||
|
let tquery = {
|
||||||
|
id: data.id + "",
|
||||||
|
};
|
||||||
|
deleteEntrustRece(tquery)
|
||||||
|
.then((response) => {
|
||||||
|
this.getList();
|
||||||
|
if (response.code == 20000) {
|
||||||
|
this.$message({
|
||||||
|
type: "success",
|
||||||
|
message: "删除成功！",
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.error(response.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
});
|
||||||
|
},
|
||||||
|
getSyncConfig() {
|
||||||
|
findConfig()
|
||||||
|
.then((response) => {
|
||||||
|
if (response.code == 20000) {
|
||||||
|
this.configParms = response.data;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
});
|
||||||
|
},
|
||||||
},
|
},
|
||||||
getSyncConfig() {
|
components: {
|
||||||
findConfig()
|
modifyDialog,
|
||||||
.then((response) => {
|
},
|
||||||
if (response.code == 20000) {
|
mounted() {
|
||||||
this.configParms = response.data;
|
},
|
||||||
}
|
created() {
|
||||||
})
|
this.getList();
|
||||||
.catch(() => {
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
},
|
|
||||||
components: {
|
|
||||||
modifyDialog,
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
},
|
|
||||||
created() {
|
|
||||||
this.getList();
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue