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

prod
anthonywj 2 years ago
parent 640119fb52
commit 842ce7817c

@ -2,31 +2,48 @@ import axios from "../../utils/request";
export function filterSelectInvUser(query) {
return axios({
url: "/spms/bus/user/select/filter",
method: "get",
params: query
});
return axios({
url: "/spms/bus/user/select/filter",
method: "get",
params: query
});
}
export function filterUnSelectInvUser(query) {
return axios({
url: "/spms/bus/user/unselect/filter",
method: "get",
params: query
});
}
export function updateInvUser(query) {
return axios(
{
url: "/spms/bus/user/warehouse/update",
method: "post",
data: query
}
)
return axios(
{
url: "/spms/bus/user/warehouse/update",
method: "post",
data: query
}
)
}
export function postInvUser(query) {
return axios(
{
url: "/spms/bus/user/warehouse/post",
method: "post",
data: query
}
)
}
export function filterUserBusTypeList(query) {
return axios(
{
url: "spms/bus/user/filterUserBusList",
method: "get",
params: query
}
)
return axios(
{
url: "spms/bus/user/filterUserBusList",
method: "get",
params: query
}
)
}

@ -2,15 +2,15 @@
<div>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.key" placeholder="请输入查询内容" clearable></el-input>
<el-form-item class="query-form-item" label="货位号/名称">
<el-input v-model="filterQuery.key" placeholder="请输入货位号/名称:" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addSpace"></el-button>
@ -39,89 +39,72 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="editSpace(scope.row)"
type="text"
@click.native.stop="editSpace(scope.row)"
>编辑
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
type="text"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="filterQuery.page"
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
></el-pagination>
<el-dialog
:title="formMap[formName]"
:visible.sync="modifySpaceVisible"
width="65%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="modifySpaceVisible"
:title="formMap[formName]"
:visible.sync="modifySpaceVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="modifySpaceVisible"
>
<el-form :model="formData" :rules="rules" ref="formData">
<el-row :gutter="20">
<el-col :span="3">
<span>货位编码</span>
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="formData.code" auto-complete="off"
<el-form :model="formData" :rules="rules" ref="formData" label-width="80px">
<el-row>
<el-col :span="11">
<el-form-item prop="code" label="货位编码">
<el-input v-model="formData.code" auto-complete="off" style="width: 90%"
placeholder="请输入货位编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<span>货位名称</span>
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="formData.name" auto-complete="off"
<el-col :span="11">
<el-form-item prop="name" label="货位名称">
<el-input v-model="formData.name" auto-complete="off" style="width: 90%"
placeholder="请输入货位名称"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<span>货位分类</span>
</el-col>
<el-col :span="8">
<el-form-item prop="remark">
<el-input v-model="formData.type" auto-complete="off"
<el-row>
<el-col :span="11">
<el-form-item prop="remark" label="货位分类">
<el-input v-model="formData.type" auto-complete="off" style="width: 90%"
placeholder="请输入货位分类"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<span>启用状态</span>
</el-col>
<el-col :span="8">
<el-form-item prop="status">
<el-col :span="11">
<el-form-item prop="status" label="启用状态">
<el-radio v-model="formData.status" :label="0"></el-radio>
<el-radio v-model="formData.status" :label="1"></el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="3">
<span>备注</span>
</el-col>
<el-col :span="8">
<el-form-item prop="remark">
<el-row>
<el-col>
<el-form-item prop="remark" label="备注">
<el-input v-model="formData.remark" auto-complete="off"
type="textarea" style="width: 90%"
placeholder="请输入备注内容"></el-input>
</el-form-item>
</el-col>
@ -179,8 +162,8 @@ export default {
1: "启用"
},
formMap: {
add: "添加货位",
edit: "编辑货位"
add: "仓库信息-新增货位",
edit: "仓库信息-编辑货位"
},
formName: null,
modifyWarehouseDisable: true,
@ -256,19 +239,19 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let params = {id: rowId};
deleteSpace(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
.then(() => {
let params = {id: rowId};
deleteSpace(params).then((res) => {
if (res.code === 20000) {
this.$message.success("删除成功!");
this.getList();
} else {
this.$message.error(res.message);
}
})
})
})
.catch(() => {
});
.catch(() => {
});
},
cancelDialog() {
this.modifySpaceVisible = false
@ -277,11 +260,11 @@ export default {
getStorage() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
resetForm() {
if (this.$refs["formData"]) {

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

@ -67,15 +67,17 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" >
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button
:disabled="scope.row.roleId === 1"
type="text"
@click="handleUpdate(scope.row)"
>编辑
</el-button>
<el-button
type="text"
:disabled="scope.row.roleId === 1"
@click="handleDelete(scope.row)"
>删除
</el-button>

@ -1,59 +1,89 @@
<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.code"
placeholder="请输入产品编码/商品条码/医保编码" clearable
@keyup.enter.native="keyupErp_submit($event)"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.name" clearable
placeholder="请输入产品名称"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.spec" clearable
placeholder="请输入规格型号"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.registerNo" clearable
placeholder="请输入注册/备案凭证"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.manufactory" clearable
placeholder="请输入生产厂家"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-card>
<el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item label="产品编码:">
<el-input
v-model="filterQuery.code"
style="width: 90%"
placeholder="请输入产品编码/商品条码/医保编码" clearable
@keyup.enter.native="keyupErp_submit($event)"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称:">
<el-input
v-model="filterQuery.name" clearable
style="width: 90%"
placeholder="请输入产品名称"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格型号:">
<el-input
v-model="filterQuery.spec" clearable
style="width: 90%"
placeholder="请输入规格型号"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="注册/备案凭证:">
<el-input
v-model="filterQuery.registerNo" clearable
style="width: 90%"
placeholder="请输入注册/备案凭证"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产厂家:">
<el-input
v-model="filterQuery.manufactory" clearable
style="width: 90%"
placeholder="请输入生产厂家"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="外部系统:">
<el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"
style="width: 90%"
>
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</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 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-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-group>
</el-form-item>
</el-form>
</div>
</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-column label="序号" type="index" width="80"></el-table-column>
<el-table-column label="产品编码" prop="code"></el-table-column>
@ -62,7 +92,7 @@
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="200">
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="detailDialog(scope.row)"
>详情
@ -129,6 +159,7 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
export default {
data() {
return {
showSearch: true,
filterQuery: {
code: null,
name: "",
@ -192,7 +223,9 @@ export default {
};
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
search() {
this.filterQuery.page = 1;
this.getList();

Loading…
Cancel
Save