Merge remote-tracking branch 'origin/master'

ywj_dev
郑明梁 2 years ago
commit 3cb83ffcb6

@ -12,9 +12,10 @@
<span style="font-weight: bold;color: #303133;">平潭协和医院</span> <span style="font-weight: bold;color: #303133;">平潭协和医院</span>
<span <span
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span> style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
<span style="font-weight: 500;color:rgb(51 48 48); ">{{this.companyName}}</span>
<span style="font-weight: 500;color:rgb(51 48 48);">({{this.userName}})</span>
</div> </div>
<span style="font-weight: 500;color:rgb(51 48 48);">{{this.companyName}}</span>
<span style="font-weight: 500;color:rgb(51 48 48);">({{this.userName}})</span>
<search id="header-search" class="right-menu-item"/> <search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/> <screenfull id="screenfull" class="right-menu-item hover-effect"/>
<el-tooltip content="布局大小" effect="dark" placement="bottom"> <el-tooltip content="布局大小" effect="dark" placement="bottom">

@ -98,7 +98,7 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%" <el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%"
border highlight-current-row> border>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column> <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
@ -438,7 +438,6 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
cancelDialog() { cancelDialog() {
this.editDialogVisible = false; this.editDialogVisible = false;
}, },

@ -669,7 +669,7 @@ export default {
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData))); let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.billNo = this.orderFormData.billNo; tQuery.billNo = this.orderFormData.billNo;
if (this.orderFormData.billNo == null) { if (this.orderFormData.billNo == null) {
this.$message.error("请先添加业务详情"); this.$message.error("请先录入单据信息");
return; return;
} }
saveOrderWeb(tQuery).then((response) => { saveOrderWeb(tQuery).then((response) => {

@ -430,7 +430,7 @@ import {
} from "../../api/inout/order"; } from "../../api/inout/order";
import {filterAllByUser} from "@/api/system/invWarehouse"; import {filterAllByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {filterSubByInv} from "@/api/system/invSubWarehouse"; import {filterSubAll} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@ -732,7 +732,7 @@ export default {
let query = { let query = {
pcode: this.filterQuery.locStorageCode pcode: this.filterQuery.locStorageCode
}; };
filterSubByInv(query) filterSubAll(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
}) })
@ -743,7 +743,7 @@ export default {
let query = { let query = {
filter: 3, filter: 3,
}; };
filterSubByInv(query) filterSubAll(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList(); this.getList();

@ -373,6 +373,7 @@ export default {
}); });
}, },
addOrders(row) { addOrders(row) {
this.errView = 0;
this.idQuery = {}; this.idQuery = {};
this.idQuery = row; this.idQuery = row;
if (row.status === 4) { if (row.status === 4) {

@ -97,7 +97,7 @@
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="140" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

@ -57,7 +57,7 @@
width="80" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="240"> <el-table-column label="操作" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"

@ -343,20 +343,13 @@ import {
filterSubAll, saveSubWarehouse, deleteSubWarehouse, filterSubAll, saveSubWarehouse, deleteSubWarehouse,
getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse, getSubThrsysDetail, bindThrSubWarehouse, unbindSubThrWarehouse,
} from "@/api/system/invSubWarehouse"; } from "@/api/system/invSubWarehouse";
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 {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 {
addWarehouseUser,
deleteWarehouseBussinessType,
deleteWarehouseUser,
filterInvWarehouse,
filterList, filterList,
filterThridSubByInv, filterThridSubByInv,
warehouseBussinessTypeList,
warehouseUserList
} from "@/api/system/invWarehouse"; } from "@/api/system/invWarehouse";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -447,13 +440,12 @@ export default {
getList() { // getList() { //
this.loading = true; this.loading = true;
this.list = [];
filterSubAll(this.query) filterSubAll(this.query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
//this.total = response.data.total;
let invlist = response.data || []; let invlist = response.data || [];
this.list = this.handleTree(invlist, "code", "parentCode"); this.list = this.handleTree(invlist, "code", "parentCode");
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -502,19 +494,17 @@ export default {
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {
saveSubWarehouse(this.subData, this.formName).then((response) => { saveSubWarehouse(this.subData, this.formName).then((response) => {
this.subFormVisible = false;
if (response.code == 20000) { if (response.code == 20000) {
this.loadSubData(this.subData.parentId); this.getList();
this.subFormVisible = false;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
this.subFormVisible = false;
} }
}).catch(() => { }).catch(() => {
this.subFormVisible = false; this.subFormVisible = false;
}); });
} }
}); });
this.getList();
}, },
findDeptMethod() { //--- findDeptMethod() { //---
let query = { let query = {
@ -745,7 +735,6 @@ export default {
} }
this.getList(); this.getList();
this.$message.success("删除成功"); this.$message.success("删除成功");
this.loadSubData(row.parentId);
}) })
.catch(() => { .catch(() => {
this.deleteLoading = false; this.deleteLoading = false;

@ -121,7 +121,7 @@
<el-form-item label="角色顺序" prop="roleSort"> <el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0"/> <el-input-number v-model="form.roleSort" controls-position="right" :min="0"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
@ -131,15 +131,16 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="供应商角色" prop="isCustomer"> <el-form-item label="供应商角色" prop="isCustomer">
<el-radio-group v-model="form.isCustomer"> <el-radio-group v-model="form.isCustomer">
<el-radio :label="0"></el-radio> <el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio> <el-radio :label="1"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="菜单权限"> <el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">/</el-checkbox> <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">/</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">/</el-checkbox> <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">/
</el-checkbox>
<el-tree <el-tree
class="tree-border" class="tree-border"
:data="menuOptions" :data="menuOptions"
@ -182,7 +183,8 @@
</el-form-item> </el-form-item>
<el-form-item label="数据权限" v-show="form.dataScope == 2"> <el-form-item label="数据权限" v-show="form.dataScope == 2">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">/</el-checkbox> <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">/</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">/</el-checkbox> <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">/
</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')"> <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">
</el-checkbox> </el-checkbox>
<el-tree <el-tree
@ -419,7 +421,8 @@ export default {
deptIds: [], deptIds: [],
menuCheckStrictly: true, menuCheckStrictly: true,
deptCheckStrictly: true, deptCheckStrictly: true,
remark: undefined remark: undefined,
isCustomerId: 0
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -488,7 +491,6 @@ export default {
this.reset(); this.reset();
this.getMenuTreeselect(); this.getMenuTreeselect();
this.open = true; this.open = true;
this.form.isCustomer=0;
this.title = "角色管理-新增"; this.title = "角色管理-新增";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */

@ -4,7 +4,7 @@
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item > <el-form-item label="企业名称:">
<el-input <el-input
style="width: 400px" style="width: 400px"
v-model="filterQuery.companyName" v-model="filterQuery.companyName"
@ -88,21 +88,23 @@
<!-- <el-table-column label="当前用户数" prop="count" width="120">--> <!-- <el-table-column label="当前用户数" prop="count" width="120">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" > <el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button-group> <el-button-group>
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
@click.native.stop="customerkDialog(scope.row)" style="margin-right: 20px"
@click.native.stop="customerkDialog(scope.row)"
>查看用户 >查看用户
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
@click.native.stop="contractDialog(scope.row)" style="float: right"
@click.native.stop="contractDialog(scope.row)"
>查看联系人 >查看联系人
</el-button </el-button
> >
@ -110,7 +112,7 @@
</template> </template>
</el-table-column </el-table-column
> >
<el-table-column label="操作" > <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"

Loading…
Cancel
Save