pengjun 2 years ago
parent
commit
cfd236290c
  1. 4
      src/components/doctorCheck/PatientRegisterBase.vue
  2. 1
      src/components/patientRegister/PatientRegisterList.vue
  3. 1
      src/components/patientRegister/PatientRegisterRecoverList.vue
  4. 1
      src/components/patientRegister/PatientRegisterSignList.vue
  5. 3
      src/components/patientRegister/patientRegisterQuery.vue
  6. 3
      src/views/charge/charge.vue
  7. 23
      src/views/common-settings/ItemType.vue
  8. 54
      src/views/customerOrg/customerOrg.vue
  9. 3
      src/views/customerOrg/customerOrgGroup.vue
  10. 3
      src/views/customerOrg/patientRegister.vue
  11. 3
      src/views/customerOrg/patientRegisterRecover.vue
  12. 5
      src/views/customerOrg/patientRegisterRefuse.vue
  13. 86
      src/views/fee-settings/SysParmSet.vue
  14. 16
      src/views/login/Login.vue
  15. 76
      src/views/user-list/OrganizationUnits.vue
  16. 46
      src/views/user-list/UserList.vue

4
src/components/doctorCheck/PatientRegisterBase.vue

@ -1,6 +1,7 @@
<template>
<div>
<div style="display: flex">
<div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;">
<div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;margin-top:20px">
<div>
<span class="query">条码号</span>
<el-input placeholder="条码号" v-model="doctorCheck.prBase.patientRegisterNo" size="small" style="width: 140px;"
@ -67,6 +68,7 @@
<el-input :value="doctorCheck.prBase.mobileTelephone" style="width: 120px;" size="small" disabled />
</div>
</div>
</div>
</div>
</template>
<script>

1
src/components/patientRegister/PatientRegisterList.vue

@ -4,7 +4,6 @@
<el-table :data="patientRegister.prList" border :height="patientRegister.prListHeight" highlight-current-row
@row-click="rowick" size="small" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick">
<el-table-column type="selection" width="40">
</el-table-column>
<el-table-column prop="completeFlag" label="体检进度">
<template slot-scope="scope">

1
src/components/patientRegister/PatientRegisterRecoverList.vue

@ -1,5 +1,6 @@
<template>
<div style="display: flex">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
<el-table :data="dataList" border width="100%"
:height="window.pageHeight < 600 ? 350:window.pageHeight-250"

1
src/components/patientRegister/PatientRegisterSignList.vue

@ -1,5 +1,6 @@
<template>
<div style="display: flex">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 70) + 'px;'">
<el-table :data="dataList" border
width="100%"

3
src/components/patientRegister/patientRegisterQuery.vue

@ -1,5 +1,7 @@
<template>
<div style="display: flex">
<div :style="'display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 120 - 70) + 'px;'">
<div class="query">
<span>登记日期</span>
@ -131,6 +133,7 @@ export default {
};
</script>
<style scoped>
.query {
margin-left: 10px;
}

3
src/views/charge/charge.vue

@ -1,7 +1,8 @@
<template>
<div>
<el-card>
<div style="display: flex; width: 100%;">
<div class="publiccss">体检收费</div>
<div style="display: flex; width: 100%;margin-top:20px">
<!-- 查询条件 与列表 -->
<div class="queryDivClass">
<!-- 查询条件 -->

23
src/views/common-settings/ItemType.vue

@ -7,7 +7,7 @@
class="el-icon-link"
v-if="tableData.length == '0' ? false : true"
></i
><span class="publiccss">项目类别</span>
><span class="publiccss">项目类别</span>
<div
v-if="tableData.length == '0' ? true : false"
@click="append(node, data)"
@ -29,26 +29,26 @@
<span>
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
style="padding: 5px; font-size: 15px; margin-left: 10%"
@click="append(node, data)"
></el-button>
>新增</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
style="padding: 5px; font-size: 15px"
@click="() => deleates(node, data)"
></el-button>
>删除</el-button
>
<el-button
type="primary"
icon="el-icon-edit"
size="small"
style="padding: 5px; font-size: 15px"
@click="() => rena(node, data)"
></el-button>
>编辑</el-button
>
</span>
</span>
</el-tree>
@ -294,11 +294,10 @@ export default {
type: "warning",
}).then(() => {
projecteditid(data.id).then((res) => {
if (res.code == 1) {
if (res.code == 0) {
this.$message.success("删除成功");
this.getlist();
}else{
} else {
}
});
});
@ -395,8 +394,8 @@ export default {
});
},
//
rowick(row) {
console.log(row);
rowick(row) {
console.log(row,'11111');
},
getlist() {
projectlist(this.pages).then((res) => {

54
src/views/customerOrg/customerOrg.vue

@ -1,22 +1,46 @@
<template>
<div>
<el-card style="display: block; ">
<el-card style="display: block">
<div class="publiccss">体检单位设置</div>
<!-- 标题高度 60px
<div slot="header">
<span>体检单位设置</span>
</div>
-->
<div style="display: flex">
-->
<div style="display: flex;margin-top:20px">
<!-- 单位树组件 -->
<div :style="'overflow: scroll;border: 1px solid;width:200px; height:' + (window.pageHeight < 600 ? 450:window.pageHeight - 150) + 'px;'">
<div
:style="
'overflow: scroll;border: 1px solid;width:200px; height:' +
(window.pageHeight < 600 ? 450 : window.pageHeight - 150) +
'px;'
"
>
<CustomerOrgTree />
</div>
<div :style="'display:block;width:'+ (window.pageWidth - 200 - 80) + 'px;height:'
+ (window.pageHeight < 600 ? 450:window.pageHeight - 150) + 'px;' + (window.pageHeight < 600 ? 'overflow-y: scroll;':'')">
<div
:style="
'display:block;width:' +
(window.pageWidth - 200 - 80) +
'px;height:' +
(window.pageHeight < 600 ? 450 : window.pageHeight - 150) +
'px;' +
(window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
"
>
<!-- 单位详情 录入与编辑 -->
<CustomerOrgEdit :id="customerOrg.customerOrgRd.id"/>
<CustomerOrgEdit :id="customerOrg.customerOrgRd.id" />
<!-- 体检次数 联系人 -->
<el-tabs :style="'margin-left: 10px;width:'+ (window.pageWidth - 200 - 90) + 'px;height:'+ (window.pageHeight < 600 ? 204:window.pageHeight - 396) + 'px;'" v-model="tabChoosed">
<el-tabs
:style="
'margin-left: 10px;width:' +
(window.pageWidth - 200 - 90) +
'px;height:' +
(window.pageHeight < 600 ? 204 : window.pageHeight - 396) +
'px;'
"
v-model="tabChoosed"
>
<!-- 体检次数 -->
<el-tab-pane label="体检次数" name="1">
<CustomerOrgRegister />
@ -50,23 +74,15 @@ export default {
};
},
created() {
},
created() {},
//
mounted() {
},
mounted() {},
computed: {
...mapState(["customerOrg", "window"]),
},
methods: {
},
methods: {},
};
</script>
<style scoped></style>

3
src/views/customerOrg/customerOrgGroup.vue

@ -2,11 +2,12 @@
<div style="display: flex">
<div class="box">
<el-card>
<div class="publiccss">单位分组</div>
<span>单位</span>
<el-select
v-model="value"
placeholder="请选择"
style="margin-left: 20px"
style="margin-left: 20px;margin-top:20px"
@change="secltchang"
>
<el-option

3
src/views/customerOrg/patientRegister.vue

@ -1,7 +1,8 @@
<template>
<div>
<el-card>
<div style="display: flex">
<div class="publiccss">体检人员登记</div>
<div style="display: flex;margin-top:20px">
<!-- 单位树组件 -->
<div :style="CustomerOrgTreeStyle">
<CustomerOrgTreeAll />

3
src/views/customerOrg/patientRegisterRecover.vue

@ -1,7 +1,8 @@
<template>
<div>
<el-card>
<div style="display: flex">
<div class="publiccss">体检表回收</div>
<div style="display: flex;margin-top:20px">
<!-- 单位树组件 -->
<div :style="CustomerOrgTreeStyle">
<CustomerOrgTreeAll />

5
src/views/customerOrg/patientRegisterRefuse.vue

@ -1,7 +1,8 @@
<template>
<div>
<el-card>
<div style=" width: 100%">
<el-card>
<div class="publiccss">弃检登记</div>
<div style=" width: 100%;margin-top:20px">
<!-- 查询条件 -->
<PatientRegisterQuery orgEnable="Y"/>

86
src/views/fee-settings/SysParmSet.vue

@ -1,18 +1,33 @@
<template>
<div>
<el-card>
<div class="publiccss">系统参数</div>
<div style="display: flex;margin-top:20px">
<div class="publiccss">系统参数</div>
<div style="display: flex; margin-top: 20px">
<div class="leftTree">
<el-tree :data="sysParmTypesTree" :props="treeProps" @node-click="nodeClick" />
<el-tree
:data="sysParmTypesTree"
:props="treeProps"
@node-click="nodeClick"
/>
</div>
<div class="midBlock">
<div style="display: flex">
<div>
<span>体检中心</span>
<el-select v-model="organizationId" placeholder="请选择体检中心" style="margin-left: 15px" filterable size="small"
@change="changeOrganization">
<el-option v-for="item in organization" :key="item.id" :label="item.displayName" :value="item.id">
<el-select
v-model="organizationId"
placeholder="请选择体检中心"
style="margin-left: 15px"
filterable
size="small"
@change="changeOrganization"
>
<el-option
v-for="item in organization"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</div>
@ -25,28 +40,57 @@
</div>
</div>
<div style="margin-top: 2px">
<el-table :data="sysParms" border :height="window.pageHeight < 600 ? 420 : window.pageHeight - 190"
size="small" highlight-current-row>
<el-table
:data="sysParms"
border
:height="window.pageHeight < 600 ? 420 : window.pageHeight - 190"
size="small"
highlight-current-row
>
<el-table-column prop="id" label="参数ID" />
<el-table-column prop="displayName" label="参数名称" width="120" />
<el-table-column
prop="displayName"
label="参数名称"
width="120"
/>
<el-table-column prop="organizationUnitId" label="体检中心">
<template slot-scope="scope">
<el-select v-model="scope.row.organizationUnitId" placeholder="请选择体检中心" filterable size="small">
<el-option v-for="item in organization" :key="item.id" :label="item.displayName" :value="item.id">
<el-select
v-model="scope.row.organizationUnitId"
placeholder="请选择体检中心"
filterable
size="small"
>
<el-option
v-for="item in organization"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="sysParmValueName" label="参数值">
<template slot-scope="scope">
<el-input type="textarea" v-model="scope.row.sysParmValueName" :autosize="{ minRows: 1, maxRows: 100 }"
maxlength="100" size="small" />
<el-input
type="textarea"
v-model="scope.row.sysParmValueName"
:autosize="{ minRows: 1, maxRows: 100 }"
maxlength="100"
size="small"
/>
</template>
</el-table-column>
<el-table-column prop="valueRemark" label="备注">
<template slot-scope="scope">
<el-input type="textarea" v-model="scope.row.valueRemark" :autosize="{ minRows: 1, maxRows: 100 }"
maxlength="500" size="small" />
<el-input
type="textarea"
v-model="scope.row.valueRemark"
:autosize="{ minRows: 1, maxRows: 100 }"
maxlength="500"
size="small"
/>
</template>
</el-table-column>
<el-table-column prop="remark" label="参数说明" />
@ -81,7 +125,7 @@ export default {
};
},
created() { },
created() {},
//
mounted() {
@ -178,13 +222,15 @@ export default {
overflow: scroll;
border: 1px solid;
width: 200px;
height: v-bind("(window.pageHeight < 600 ? 450 : window.pageHeight - 150) + 'px'"
);
height: v-bind(
"(window.pageHeight < 600 ? 450 : window.pageHeight - 150) + 'px'"
);
}
.midBlock {
margin-left: 5px;
width: v-bind("(window.pageWidth < 500 ? 300 : window.pageWidth - 270) + 'px'"
);
width: v-bind(
"(window.pageWidth < 500 ? 300 : window.pageWidth - 270) + 'px'"
);
}
</style>

16
src/views/login/Login.vue

@ -71,13 +71,17 @@ export default {
// password: this.form.Password,11
// });
var msgs = "";
getapi("/api/identity/users/login", {
username: this.form.Username,
password: this.form.Password,
})
.then((ret) => {
postapi(`/api/identity/users/login?UserName=${this.form.Username}&PassWord=${this.form.Password}`,
// {
// UserName: this.form.Username,
// PassWord: this.form.Password,
// }
)
.then((ret) => {
msgs = ret.data.msg;
this.$message.success(msgs)
if (ret.code != -1 && ret.data.code == 1 && ret.code == 1) {
return this.$axios.post(
mm.apiurl + "/connect/token",
{
@ -106,7 +110,7 @@ export default {
);
window.localStorage.setItem("tokentype", res.data.token_type);
window.localStorage.setItem("user", this.form.Username);
// this.$message.success(msgs,+"");
// this.$message.success(ret.data.msg);
this.$router.push({ path: "home" });
this.$store.state.changepassword = this.form.Password;
})

76
src/views/user-list/OrganizationUnits.vue

@ -82,12 +82,13 @@
@close="closethiebox"
:close-on-click-modal="false"
>
<div v-if="title==2">
当前选中的科室<span style="margin-left: 20px; font-size: 18px">{{
departmentname
}}</span>
<div v-if="title == 2">
当前选中的科室<span
style="margin-left: 20px; font-size: 18px; margin-top: -20px"
>{{ departmentname }}</span
>
</div>
<div v-if="title==2" >
<div v-if="title == 2">
<span>上级部门</span>
<el-cascader
ref="depref"
@ -110,7 +111,7 @@
</el-tree> -->
</div>
<el-row>
<el-col :span="8" style="line-height:40px">
<el-col :span="8" style="line-height: 40px">
是否为体检中心
<el-radio v-model="form.isPeis" label="Y"></el-radio>
<el-radio v-model="form.isPeis" label="N"></el-radio>
@ -146,11 +147,12 @@ export default {
return {
showcheckbox: false,
defaultKeys: [],
selecttable: [],
selecttable: [], //
form: {
parentId: "",
displayName: "",
isPeis: "N",
departmentname: "",
},
title: 1,
dialogVisible: false,
@ -175,10 +177,12 @@ export default {
},
methods: {
cascaderchang(v) {
v.forEach(item => {
this.departmentname=item
});
console.log(this.departmentname);
this.departmentname = v[v.length - 1];
// console.log(v[v.length-1]);
// v.forEach((item) => {
// this.departmentname = item;
// });
// let a=this.depref.value.togglePoppervisible()
// console.log(a);
},
@ -188,7 +192,9 @@ export default {
console.log(data);
},
//close
closethiebox() {},
closethiebox() {
this.departmentname = "";
},
//
closethebulletbox() {
this.dialogVisible = false;
@ -225,7 +231,8 @@ export default {
}).then((res) => {
this.$message.success("新增成功");
this.dialogVisible = false;
this.form = {};
// this.form = {};
this.form.displayName = "";
this.form.isPeis = "N";
this.getonorganization();
});
@ -243,7 +250,7 @@ export default {
});
},
//
addorginiztiom() {
addorginiztiom(node, data) {
// this.$prompt("", "", {
// confirmButtonText: "",
// cancelButtonText: "",
@ -269,7 +276,6 @@ export default {
//
append(node, data) {
this.title = 3;
if (this.title == 3) {
this.dialogVisible = true;
this.form.parentId = data.id;
@ -312,25 +318,43 @@ export default {
},
//
deleates(data) {
deleteschema(data.data.id).then((res) => {
console.log(res);
this.$message.success("删除成功");
this.getonorganization();
this.$confirm("是否确定删除, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then((res) => {
deleteschema(data.data.id).then((res) => {
if (res.code == 0) {
console.log(res);
this.$message.success("删除成功");
this.getonorganization();
}
});
console.log(data);
});
console.log(data);
},
//
rena(node, data) {
console.log(data);
this.dialogVisible = true;
this.title = 2;
this.selecttable.push(data);
// this.selecttable.push(data);
this.showcheckbox = true;
console.log(this.selecttable, 5555);
getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => {
this.form = res.data;
// this.selecttable.push(res.data)
console.log(res);
this.form = data;
this.form.isPeis = "N";
// console.log(this.selecttable, 5555);
getapi(
`/api/app/organizationunit/getbycodeparent?OrganizationUnitId=${data.id}`
).then((res) => {
this.selecttable = res.data;
console.log(res, "res");
});
// getapi(`/api/app/organization-units?Id=${data.id}`).then((res) => {
// this.form = res.data;
// console.log(res);
// });
// this.form = data;
// console.log(this.form);
// console.log(data);

46
src/views/user-list/UserList.vue

@ -2,7 +2,9 @@
<div>
<el-card>
<div class="publiccss">用户管理</div>
<el-button type="primary" @click="newlyincreased" style="margin-top:20px">新增</el-button>
<el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
>新增</el-button
>
<el-row style="margin-top: 10px">
<el-form ref="form" :model="form">
<el-col :span="6">
@ -130,10 +132,10 @@
v-model="form.phoneNumber"
></el-input> </el-form-item
></el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<!-- <el-col :span="12">
<el-form-item label="邮箱" >
<el-input v-model="form.email"></el-input> </el-form-item
></el-col>
></el-col> -->
<el-col>
<el-form-item label="是否激活">
<el-checkbox v-model="form.isActive"></el-checkbox>
@ -184,7 +186,7 @@
<el-tab-pane label="组织架构">
<!-- :default-checked-keys="defaultKeys" -->
<el-tree
<!-- <el-tree
:props="{
label: 'displayName',
children: 'treeChildren',
@ -197,7 +199,17 @@
@check="iscrentd"
ref="trees"
>
</el-tree>
</el-tree> -->
<el-cascader
:options="organizationalstructure"
:show-all-levels="false"
:props="{
label: 'displayName',
children: 'treeChildren',
checkStrictly: true,
value: 'id',
}"
></el-cascader>
</el-tab-pane>
<el-tab-pane label="科室设置">
<!-- :default-checked-keys="defaultKeys" /api/app/abpuserdepartment/createmany-->
@ -255,10 +267,10 @@
v-model="form.phoneNumber"
></el-input> </el-form-item
></el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<!-- <el-col :span="12">
<el-form-item label="邮箱" >
<el-input v-model="form.email"></el-input> </el-form-item
></el-col>
></el-col> -->
<el-col :span="12">
<el-form-item
label="密码"
@ -314,7 +326,17 @@
</el-tab-pane>
<!-- 组织11 -->
<el-tab-pane label="组织">
<el-tree
<el-cascader
:options="organizationalstructure"
:show-all-levels="false"
:props="{
label: 'displayName',
children: 'treeChildren',
checkStrictly: true,
value: 'id',
}"
></el-cascader>
<!-- <el-tree
:data="newachitecture"
show-checkbox
:default-expand-all="true"
@ -325,7 +347,7 @@
:default-checked-keys="[5]"
:props="{ label: 'displayName', children: 'treeChildren' }"
>
</el-tree>
</el-tree> -->
</el-tab-pane>
<el-tab-pane label="科室设置">
<el-tree
@ -779,9 +801,11 @@ export default {
console.log(res, "====>>>>>res");
});
organizationtree().then((res) => {
this.newachitecture = res.data;
this.newdepartment = res.data;
this.organizationalstructure = res.data;
console.log(res, "1w");
});
console.log(this.title);

Loading…
Cancel
Save