用户管理单据类型,仓库关联货位信息,第三方产品信息搜索栏修改

prod
anthonywj 2 years ago
parent 640119fb52
commit 842ce7817c

@ -9,6 +9,13 @@ export function filterSelectInvUser(query) {
}); });
} }
export function filterUnSelectInvUser(query) {
return axios({
url: "/spms/bus/user/unselect/filter",
method: "get",
params: query
});
}
export function updateInvUser(query) { export function updateInvUser(query) {
return axios( return axios(
@ -20,6 +27,16 @@ export function updateInvUser(query) {
) )
} }
export function postInvUser(query) {
return axios(
{
url: "/spms/bus/user/warehouse/post",
method: "post",
data: query
}
)
}
export function filterUserBusTypeList(query) { export function filterUserBusTypeList(query) {
return axios( return axios(
{ {

@ -2,8 +2,8 @@
<div> <div>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item" label="货位号/名称">
<el-input v-model="filterQuery.key" placeholder="请输入查询内容" clearable></el-input> <el-input v-model="filterQuery.key" placeholder="请输入货位号/名称:" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
@ -40,13 +40,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small"
@click.native.stop="editSpace(scope.row)" @click.native.stop="editSpace(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)" @click.native.stop="deleteDialog(scope.row.id)"
>删除 >删除
</el-button> </el-button>
@ -64,64 +62,49 @@
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
:visible.sync="modifySpaceVisible" :visible.sync="modifySpaceVisible"
width="65%" width="60%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
append-to-body append-to-body
v-if="modifySpaceVisible" v-if="modifySpaceVisible"
> >
<el-form :model="formData" :rules="rules" ref="formData"> <el-form :model="formData" :rules="rules" ref="formData" label-width="80px">
<el-row :gutter="20"> <el-row>
<el-col :span="3"> <el-col :span="11">
<span>货位编码</span> <el-form-item prop="code" label="货位编码">
</el-col> <el-input v-model="formData.code" auto-complete="off" style="width: 90%"
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="formData.code" auto-complete="off"
placeholder="请输入货位编码"></el-input> placeholder="请输入货位编码"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="11">
<span>货位名称</span> <el-form-item prop="name" label="货位名称">
</el-col> <el-input v-model="formData.name" auto-complete="off" style="width: 90%"
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="formData.name" auto-complete="off"
placeholder="请输入货位名称"></el-input> placeholder="请输入货位名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row>
<el-col :span="3"> <el-col :span="11">
<span>货位分类</span> <el-form-item prop="remark" label="货位分类">
</el-col> <el-input v-model="formData.type" auto-complete="off" style="width: 90%"
<el-col :span="8">
<el-form-item prop="remark">
<el-input v-model="formData.type" auto-complete="off"
placeholder="请输入货位分类"></el-input> placeholder="请输入货位分类"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11">
<el-col :span="3"> <el-form-item prop="status" label="启用状态">
<span>启用状态</span>
</el-col>
<el-col :span="8">
<el-form-item prop="status">
<el-radio v-model="formData.status" :label="0"></el-radio> <el-radio v-model="formData.status" :label="0"></el-radio>
<el-radio v-model="formData.status" :label="1"></el-radio> <el-radio v-model="formData.status" :label="1"></el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row>
<el-col :span="3"> <el-col>
<span>备注</span> <el-form-item prop="remark" label="备注">
</el-col>
<el-col :span="8">
<el-form-item prop="remark">
<el-input v-model="formData.remark" auto-complete="off" <el-input v-model="formData.remark" auto-complete="off"
type="textarea" style="width: 90%"
placeholder="请输入备注内容"></el-input> placeholder="请输入备注内容"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -179,8 +162,8 @@ export default {
1: "启用" 1: "启用"
}, },
formMap: { formMap: {
add: "添加货位", add: "仓库信息-新增货位",
edit: "编辑货位" edit: "仓库信息-编辑货位"
}, },
formName: null, formName: null,
modifyWarehouseDisable: true, modifyWarehouseDisable: true,

@ -105,7 +105,6 @@
<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
size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row,scope.index)" @click="handleView(scope.row,scope.index)"

@ -0,0 +1,119 @@
<template>
<div style="margin-left: 15px">
<el-transfer v-model="value" :data="data"
:titles="['未选入单据类型', '已选入单据类型']"
:button-texts="['移除', '选入']"
></el-transfer>
<div style="text-align: center;margin-top: 20px">
<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>
</div>
</template>
<script>
import {
filterSelectInvUser, postInvUser
} from "@/api/basic/invRelBusTypes";
export default {
name: "invUserRelBusTypes",
props: {
inputQuery: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
filterQuery: {
subInvCode: null,
userId: null,
},
bussinessTypeData: null,
multipleSelection: [],
data: [],
value: [],
}
},
methods: {
getList() {
this.filterQuery = {
subInvCode: this.inputQuery.code,
userId: this.inputQuery.userid,
};
filterSelectInvUser(this.filterQuery).then((res) => {
if (res.code == 20000) {
this.bussinessTypeData = res.data;
this.$nextTick(() => {
for (let i = 0; i < this.bussinessTypeData.length; i++) {
// this.$refs.fileTable.toggleRowSelection(this.bussinessTypeData[i], this.bussinessTypeData[i].select)
this.data.push({
key: this.bussinessTypeData[i].action,
label: this.bussinessTypeData[i].name,
});
if (this.bussinessTypeData[i].select) {
this.value.push(
this.bussinessTypeData[i].action
);
}
}
});
} else {
this.$message.error(res.message);
}
}).catch((error) => {
});
},
checkSelectable(row) {
return !row.select;
},
cancelDialog() {
this.closeDialog();
},
onAddSubmit() {
let postRequesty = {
subInvCode: this.inputQuery.code,
userId: this.inputQuery.userid,
};
postRequesty.selectActions = this.value;
postInvUser(postRequesty).then((res) => {
if (res.code == 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
});
},
handleSelectionChange(val) {
this.multipleSelection = val;
}
},
created() {
this.getList();
},
}
</script>
<style scoped>
</style>

@ -32,26 +32,26 @@
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
prop="name" prop="name" align="center"
label="仓库名称" label="仓库名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
label="仓库编码" label="仓库编码" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentName" prop="parentName" align="center"
label="所属部门" label="所属部门"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentInvName" prop="parentInvName" align="center"
label="上级仓库" label="上级仓库"
> >
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -248,7 +248,6 @@
min-width="30%" min-width="30%"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
:disabled="!configParms.basicInv" :disabled="!configParms.basicInv"
@ -386,6 +385,7 @@
:reserve-selection="true" :reserve-selection="true"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据类型编码" prop="action"></el-table-column> <el-table-column label="单据类型编码" prop="action"></el-table-column>
<el-table-column label="单据类型名称" prop="name"></el-table-column> <el-table-column label="单据类型名称" prop="name"></el-table-column>
</el-table> </el-table>
@ -412,9 +412,9 @@
<!-- 用户业务单据类型关联--> <!-- 用户业务单据类型关联-->
<el-dialog <el-dialog
title="业务类型关联" title="仓库-用户单据类型管理"
:visible.sync="relBusUserVisile" :visible.sync="relBusUserVisile"
width="70%" width="45%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="relBusUserVisile" v-if="relBusUserVisile"
@ -422,17 +422,6 @@
<relBusUserDialog :inputQuery="curSeleUser" :closeDialog="cancelRelBusDiaolog"></relBusUserDialog> <relBusUserDialog :inputQuery="curSeleUser" :closeDialog="cancelRelBusDiaolog"></relBusUserDialog>
</el-dialog> </el-dialog>
<!--货位管理-->
<el-dialog
title="货位管理"
:visible.sync="invSpaceManageVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="invSpaceManageVisible"
>
<invSpaceManage :invInfo="currentInvInfo"></invSpaceManage>
</el-dialog>
</div> </div>
</template> </template>
@ -445,7 +434,7 @@ import {
import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser"; import {getHospitalUserList, selectNotSelectUser} from "@/api/auth/authUser";
import {getJoinBussinessType} from "@/api/basic/bussinessType"; import {getJoinBussinessType} from "@/api/basic/bussinessType";
import {findConfig} from "@/api/thrsys/spsSyncStatus"; import {findConfig} from "@/api/thrsys/spsSyncStatus";
import relBusUserDialog from "./invWarehouseRelBusTypes"; import relBusUserDialog from "./invUserRelBusTypes";
import {selectSysParamByKey} from "@/api/system/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/system/param/systemParamConfig";
import invSpaceManage from "@/views/inventory/InvSpaceManage"; import invSpaceManage from "@/views/inventory/InvSpaceManage";
import { import {
@ -512,12 +501,12 @@ export default {
selectUserList: [], selectUserList: [],
selectUserToatl: 0, selectUserToatl: 0,
selectAddUser: [], selectAddUser: [],
//------------------------------ //------------------------------
curSeleUser: null, curSeleUser: null,
relBusUserVisile: false, relBusUserVisile: false,
userBussinessTypeList: [], userBussinessTypeList: [],
bussinessTypeTotal: 0,
bussinessTypeQuery: { bussinessTypeQuery: {
enabled: true, enabled: true,
page: 1, page: 1,
@ -538,7 +527,6 @@ export default {
invStorageCode: null, invStorageCode: null,
invWarehouseCode: null invWarehouseCode: null
}, },
invSpaceManageVisible: false,
sysList: [], sysList: [],
sysSubList: [], sysSubList: [],
}; };
@ -843,7 +831,6 @@ export default {
var action = obj.toString(); var action = obj.toString();
this.bussinessTypeQuery.ids = action; this.bussinessTypeQuery.ids = action;
} }
this.bussinessTypeQuery.code = this.busQuery.code; this.bussinessTypeQuery.code = this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => { getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = []; this.selectBussinessTypeList = [];

@ -68,14 +68,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope" v-if="scope.row.roleId !== 1"> <template slot-scope="scope">
<el-button <el-button
:disabled="scope.row.roleId === 1"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.roleId === 1"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>

@ -1,40 +1,61 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-form-item class="query-form-item"> <el-row>
<el-col :span="6">
<el-form-item label="产品编码:">
<el-input <el-input
v-model="filterQuery.code" v-model="filterQuery.code"
style="width: 90%"
placeholder="请输入产品编码/商品条码/医保编码" clearable placeholder="请输入产品编码/商品条码/医保编码" clearable
@keyup.enter.native="keyupErp_submit($event)" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="产品名称:">
<el-input <el-input
v-model="filterQuery.name" clearable v-model="filterQuery.name" clearable
style="width: 90%"
placeholder="请输入产品名称" placeholder="请输入产品名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="规格型号:">
<el-input <el-input
v-model="filterQuery.spec" clearable v-model="filterQuery.spec" clearable
style="width: 90%"
placeholder="请输入规格型号" placeholder="请输入规格型号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="注册/备案凭证:">
<el-input <el-input
v-model="filterQuery.registerNo" clearable v-model="filterQuery.registerNo" clearable
style="width: 90%"
placeholder="请输入注册/备案凭证" placeholder="请输入注册/备案凭证"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-input <el-input
v-model="filterQuery.manufactory" clearable v-model="filterQuery.manufactory" clearable
style="width: 90%"
placeholder="请输入生产厂家" placeholder="请输入生产厂家"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> </el-col>
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"> <el-col :span="6">
<el-form-item label="外部系统:">
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"
style="width: 90%"
>
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.value" :key="item.value"
@ -45,15 +66,24 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </el-col>
</el-row>
</el-form>
<el-row>
<div class="top-right-btn" style="margin-bottom: 15px">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button> <el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增 <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
:disabled="!configParms.basicThirdProducts">新增
</el-button> </el-button>
</el-button-group> </el-button-group>
</el-form-item> </div>
</el-form> </el-row>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column label="序号" type="index" width="80"></el-table-column> <el-table-column label="序号" type="index" width="80"></el-table-column>
<el-table-column label="产品编码" prop="code"></el-table-column> <el-table-column label="产品编码" prop="code"></el-table-column>
@ -129,6 +159,7 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
export default { export default {
data() { data() {
return { return {
showSearch: true,
filterQuery: { filterQuery: {
code: null, code: null,
name: "", name: "",
@ -192,7 +223,9 @@ export default {
}; };
this.getList(); this.getList();
}, },
hideSearch() {
this.showSearch = !this.showSearch;
},
search() { search() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();

Loading…
Cancel
Save