业务单据类型,扫码单据类型bug修复,新增用户bug修复,

单据打印bug修复;
仓库,添加用户,添加单据类型界面优化;
master
anthonywj 3 years ago
parent 9f795c9661
commit 4e7a6ae099

@ -87,7 +87,7 @@
</el-table>
<el-dialog
title="新增业务类型关联"
title="新增扫码单据类型"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
@ -210,6 +210,7 @@ export default {
path: "",
});
this.filterQuery = {
enable: null,
udiwmsType: "",
thirdType: "",
page: 1,

@ -1,125 +1,125 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.action"
placeholder="业务类型"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.enabled" placeholder="状态">
<el-option label="全部" value=""></el-option>
<el-option label="已启用" value=1></el-option>
<el-option label="未启用" value=0></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
>新增
</el-button
>
</el-button-group>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.action"
placeholder="业务类型"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.enabled" placeholder="状态">
<el-option label="全部" value=""></el-option>
<el-option label="已启用" value=1></el-option>
<el-option label="未启用" value=0></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
>新增
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="120" fixed></el-table-column>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="120" fixed></el-table-column>
<el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
<el-table-column label="单据是否启用" prop="enable" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.enable] }}</span>
</template>
</el-table-column>
<el-table-column label="是否寄售" prop="advanceType" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<el-table-column label="是否自动补单" prop="advanceType" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.changeEnable] }}</span>
</template>
</el-table-column>
<el-table-column label="是否供应商使用" prop="spUse" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.spUse] }}</span>
</template>
</el-table-column>
<el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
<el-table-column label="单据是否启用" prop="enable" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.enable] }}</span>
</template>
</el-table-column>
<el-table-column label="是否寄售" prop="advanceType" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<el-table-column label="是否自动补单" prop="advanceType" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.changeEnable] }}</span>
</template>
</el-table-column>
<el-table-column label="是否供应商使用" prop="spUse" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.spUse] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
title="新增业务类型关联"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-dialog
title="新增业务类型关联"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-dialog
title="编辑业务类型关联"
:visible.sync="modifyDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="modifyDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
</el-card>
</div>
<el-dialog
title="编辑业务类型关联"
:visible.sync="modifyDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="modifyDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
</el-card>
</div>
</template>
<script>
@ -127,178 +127,182 @@ import {getLocalBusType, addLocalBusType, updateLocalBusType, deleteLocalBusType
import modifyDialog from "./BussinessTypeLoclModify";
export default {
data() {
return {
filterQuery: {
enabled: "1",
udiwmsType: "",
thirdType: "",
page: 1,
limit: 20,
},
addDialogVisible: false,
modifyDialogVisible: false,
list: [],
inputQuery: {
action: "",
name: "",
enable: "",
remark: "",
mainAction: "",
thirdSysFk: "",
id: "",
originAction: null,
localAction: null,
advanceType: null,
changeEnable: null,
spUse: null,
},
enableMap: {
true: "是",
false: "否",
},
total: 0,
multipleSelection: [],
};
},
data() {
return {
filterQuery: {
enabled: "1",
udiwmsType: "",
thirdType: "",
page: 1,
limit: 20,
},
addDialogVisible: false,
modifyDialogVisible: false,
list: [],
inputQuery: {
action: "",
name: "",
enable: "",
remark: "",
mainAction: "",
thirdSysFk: "",
id: "",
originAction: null,
localAction: null,
advanceType: null,
changeEnable: null,
spUse: null,
},
enableMap: {
true: "是",
false: "否",
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
udiwmsType: "",
thirdType: "",
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
total: 0,
multipleSelection: [],
};
},
getList() {
this.loading = true;
getLocalBusType(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 = {
udiwmsType: "",
thirdType: "",
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.modifyDialogVisible = false;
this.addDialogVisible = false;
},
getList() {
this.loading = true;
getLocalBusType(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() {
addLocalBusType(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
onModifySubmit() {
updateLocalBusType(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
onAddSubmit() {
addLocalBusType(this.inputQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.cancelDialog();
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleModifyClick(row) {
this.modifyDialogVisible = true;
this.inputQuery = {
id: row.id,
remark: row.remark,
action: row.action,
name: row.name,
enable: row.enable,
mainAction: row.mainAction,
localAction: row.localAction,
thirdSysFk: row.thirdSysFk,
originAction: row.originAction,
advanceType: row.advanceType,
changeEnable: row.changeEnable,
spUse: row.spUse,
};
},
onModifySubmit() {
updateLocalBusType(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
},
handleAddClick() {
this.addDialogVisible = true;
this.inputQuery = {
action: "",
name: "",
enable: "",
remark: "",
mainAction: "",
thirdSysFk: "",
id: "",
advanceType: null,
localAction: null,
changeEnable: null,
};
},
handleModifyClick(row) {
this.modifyDialogVisible = true;
this.inputQuery = {
id: row.id,
remark: row.remark,
action: row.action,
name: row.name,
enable: row.enable,
mainAction: row.mainAction,
localAction: row.localAction,
thirdSysFk: row.thirdSysFk,
originAction: row.originAction,
advanceType: row.advanceType,
changeEnable: row.changeEnable,
spUse: row.spUse,
};
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
handleAddClick() {
this.addDialogVisible = true;
this.inputQuery = {
action: "",
name: "",
enable: "",
remark: "",
mainAction: "",
thirdSysFk: "",
id: "",
advanceType: null,
localAction: null,
changeEnable: null,
};
},
deleteOrders(data) {
this.loading = true;
let tquery = {
id: data.id + "",
};
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
deleteLocalBusType(tquery)
.then((response) => {
this.getList();
if (response.code == 20000) {
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
deleteOrders(data) {
this.loading = true;
let tquery = {
id: data.id + "",
};
deleteLocalBusType(tquery)
.then((response) => {
this.getList();
if (response.code == 20000) {
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.getList();
},
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.getList();
},
};
</script>

@ -84,7 +84,7 @@
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
:disabled="!changeEnable || inputQuery.mainAction">
:disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'">
缺量自动补单
</el-checkbox>
</div>
@ -98,7 +98,6 @@
<div v-if="visibleChange">
<!-- <div style="float:right;margin-bottom: 10px">-->
<!-- <el-button-->
<!-- type="primary"-->
@ -266,10 +265,12 @@ export default {
if (this.inputQuery.changeEnable) {
this.visibleChange = true;
}
if (this.changeList.length == 0)
this.changeEnable = false;
else
this.changeEnable = true;
this.changeEnable = true;
// if (this.changeList.length == 0)
// this.changeEnable = false;
// else
// this.changeEnable = true;
} else {
// this.$message.error(response.message);
@ -289,8 +290,7 @@ export default {
})
.catch(() => {
});
this.getBusTypes(null);
this.getBusTypes();
},
getBusTypes() {

@ -36,7 +36,6 @@
<div class="itemTag">
<span>出入库类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType">
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
@ -268,13 +267,13 @@
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">
<el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">
<el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">
</el-checkbox>
</div>
</el-col>
@ -309,10 +308,9 @@ import {
} from "../../api/basic/basicThirdSys";
import {
getLocalBusType, getLocalJoinNoUse
getLocalJoinNoUse
} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getJoinBussinessType} from "../../api/basic/bussinessType";
import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
export default {
@ -329,6 +327,7 @@ export default {
filterQuery: {
enabled: true,
isBuType: true,
isFilterBind: true,
},
storageList: [],
orderTypeList: [],

@ -116,73 +116,6 @@
</el-table-column>
</el-table>
<div>
<el-card style="width: 49%; float: left; margin-right: 0px;">
<div slot="header" class="clearfix" style="margin-bottom: 20px;">
<el-button style="float: right;" type="primary" @click="addUser()"></el-button>
</div>
<el-table
:data="userData"
stripe
style="width: 100%">
<el-table-column
prop="userid"
label="用户ID"
min-width="20%">
</el-table-column>
<el-table-column
prop="username"
label="用户名"
min-width="40%">
</el-table-column>
<el-table-column
prop="isDirector"
label="主管"
min-width="30%">
<template slot-scope="scope">
<span>{{ isDirectorMap[scope.row.director] }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
min-width="10%"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="updateDirector(scope.row)">
设为主管
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card style="width: 49%; float: right; margin-left: 0px;">
<div slot="header" class="clearfix" style="margin-bottom: 20px;">
<el-button style="float: right;" @click="addBussinessType()" type="primary">添加单据类型</el-button>
</div>
<el-table
:data="bussinessTypeData"
stripe
style="width: 100%">
<el-table-column
prop="action"
label="单据类型编码"
min-width="50%">
</el-table-column>
<el-table-column
prop="name"
label="单据类型名称"
min-width="50%">
</el-table-column>
</el-table>
</el-card>
</div>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
@ -194,7 +127,70 @@
<!-- >-->
<!-- </el-tree>-->
</el-card>
<div>
<el-card style="width: 49%; float: left; margin-right: 0px;">
<div slot="header" class="clearfix" style="margin-bottom: 20px;">
<el-button style="float: right;" type="primary" @click="addUser()"></el-button>
</div>
<el-table
:data="userData"
stripe
style="width: 100%">
<el-table-column
prop="username"
label="账号"
min-width="20%">
</el-table-column>
<el-table-column
prop="employeeName"
label="用户名"
min-width="30%">
</el-table-column>
<el-table-column
prop="isDirector"
label="主管"
min-width="30%">
<template slot-scope="scope">
<span>{{ isDirectorMap[scope.row.director] }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
min-width="10%"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="updateDirector(scope.row)">
设为主管
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card style="width: 49%; float: right; margin-left: 0px;">
<div slot="header" class="clearfix" style="margin-bottom: 20px;">
<el-button style="float: right;" @click="addBussinessType()" type="primary">添加单据类型</el-button>
</div>
<el-table
:data="bussinessTypeData"
stripe
style="width: 100%">
<el-table-column
prop="action"
label="单据类型编码"
min-width="50%">
</el-table-column>
<el-table-column
prop="name"
label="单据类型名称"
min-width="50%">
</el-table-column>
</el-table>
</el-card>
</div>
<!--添加用户弹窗-->
<el-dialog
@ -202,7 +198,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="userFormVisible"
class="dialog"
>
<el-table v-loading="loading" :data="userList" ref="checkUserList"
@selection-change="handleUserSelectionChange"
@ -212,8 +207,8 @@
:reserve-selection="false"
width="55">
</el-table-column>
<el-table-column label="用户ID" prop="id" fixed></el-table-column>
<el-table-column label="用户名" prop="userName" fixed></el-table-column>
<el-table-column label="账号" prop="userName" fixed></el-table-column>
<el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
@ -236,7 +231,6 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="bussinessTypeFormVisible"
class="dialog"
>
<el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
@selection-change="handleBussinessTypeSelectionChange"

@ -46,7 +46,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px"
>创建日期:</span
@ -473,6 +484,7 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder";
import selectRlDialog from "./DialogSelectRl";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = {
site_id: "",
@ -551,6 +563,7 @@ export default {
idQuery: {
id: "",
},
storageList: [],
curIndex: "",
adListNoDataText: "无数据",
queryAdIdAsyncLoading: false,
@ -1022,6 +1035,15 @@ export default {
}
}
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
getBusType() {
let query = {
enabled: true,
@ -1190,6 +1212,7 @@ export default {
},
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

@ -25,6 +25,17 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
@ -295,6 +306,7 @@ import addOrder from "./addOrder";
import addHosOrder from "./addHosOrder";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = {
site_id: "",
@ -334,6 +346,7 @@ export default {
idQuery: {
id: "",
},
storageList: [],
errOrderVisible: false,
list: [],
adId: [],
@ -431,6 +444,15 @@ export default {
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
addOrders(row) {
console.log(row)
this.idQuery.id = '';
@ -638,6 +660,7 @@ export default {
};
},
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

@ -35,6 +35,18 @@
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px;font-size: small"
>创建日期:</span
>
@ -401,6 +413,8 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {formatDate} from "../../utils/date";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = {
site_id: "",
site_name: "",
@ -448,6 +462,7 @@ export default {
unitlist: [],
list: [],
detailList: [],
storageList: [],
unitUpdateQuery: {
id: "",
fromCorpId: "",
@ -589,7 +604,15 @@ export default {
console.log(val);
this.multipleSelection = val;
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
handleErrorDetail(poistion) {
var mOrder = this.list[poistion];
this.errorDetail = mOrder.remark;
@ -670,8 +693,8 @@ export default {
// window.open(url);
this.loading = false;
const eleLink = document.createElement('a');
var timestamp=formatDate(new Date(),"yyyy-MM-dd_hh:mm")
eleLink.download = "已完成单据导出"+timestamp+".json";
var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
eleLink.download = "已完成单据导出" + timestamp + ".json";
eleLink.style.display = 'none';
eleLink.href = url;
document.body.appendChild(eleLink)
@ -924,6 +947,7 @@ export default {
,
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

@ -34,6 +34,18 @@
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px"
>创建日期:</span
>
@ -397,6 +409,7 @@ import successOrderExportPDFSetting from "./successOrderExportPDF";
import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = {
site_id: "",
@ -497,6 +510,7 @@ export default {
orderId: "",
},
busTypes: [],
storageList: [],
multipleSelection: [],
dialogTableVisible: false,
formLoading: false,
@ -932,6 +946,15 @@ export default {
}
}
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
},
filters: {
statusFilterType(status) {
@ -950,6 +973,7 @@ export default {
},
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

@ -71,7 +71,8 @@
<el-col :span="8">
<el-form-item class="query-form-item">
<el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange">
<el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
@ -98,7 +99,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
<el-option
v-for="item in storageList"
:key="item.name"
@ -435,12 +436,13 @@ export default {
this.$router.go(-1);
},
getStorage(event) {
// let query = {
// advanceType: this.getActionName(event),
// };
let query = {
// advanceType: this.getActionName(event),
isDefault: true,
};
this.storageList = [];
// this.formData.locStorageCode = null;
filterAllByUser()
filterAll(query)
.then((response) => {
this.storageList = response.data || [];
})

@ -64,18 +64,20 @@
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>业务类型</span>
<span>当前仓库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
clearable>
<el-option
v-for="item in busTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
@ -147,23 +149,25 @@
<el-col :span="3">
<div class="ao-text">
<span>当前仓库</span>
<span>业务类型</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange">
<el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
clearable>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
v-for="item in busTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span></span>
@ -248,44 +252,44 @@
>
</el-button-group>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- highlight-current-row-->
<!-- @current-change="rowChange"-->
@ -1198,9 +1202,10 @@ export default {
}
});
},
getBusType() {
getBusType(invCode) {
let query = {
enabled: true,
code: invCode,
};
getLocalJoinByUser(query)
.then((response) => {
@ -1248,6 +1253,7 @@ export default {
console.log(item);
this.formData.locStorageCode = item;
this.$forceUpdate();
this.getBusType(item);
}
},
filters: {},
@ -1258,7 +1264,7 @@ export default {
};
},
created() {
this.getBusType();
this.getBusType("NOCODE");
this.getStorage();
this.formData = {};
this.codeArray = [];

@ -74,7 +74,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
<el-option
v-for="item in busTypes"
:key="item.localName"
@ -129,7 +129,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
<el-option
v-for="item in storageList"
:key="item.name"
@ -158,44 +158,44 @@
>
</el-button-group>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- highlight-current-row-->
<!-- @current-change="rowChange"-->
@ -1082,6 +1082,7 @@ export default {
getBusType() {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
.then((response) => {
@ -1095,9 +1096,10 @@ export default {
console.log("-----" + event);
let query = {
advanceType: this.getActionName(event),
isDefault: true,
};
this.storageList = [];
filterAllByUser(query)
filterAll(query)
.then((response) => {
this.storageList = response.data || [];
})

Loading…
Cancel
Save