1.修复部分已知问题

ywj_dev
x_z 2 years ago
parent d8762fd89b
commit b365358972

@ -12,9 +12,10 @@
<span style="font-weight: bold;color: #303133;">平潭协和医院</span>
<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>
<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"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<el-tooltip content="布局大小" effect="dark" placement="bottom">

@ -98,7 +98,7 @@
<el-divider style="margin: 15px"></el-divider>
<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 label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
@ -438,7 +438,6 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
cancelDialog() {
this.editDialogVisible = false;
},

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

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

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

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

Loading…
Cancel
Save