xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shidongli 2024-04-09 16:20:14 +08:00
commit 37d2eeda88
9 changed files with 123 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/manage/project/index.vue
View File

@ -324,7 +324,11 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="项目编码" prop="projectCode"> <el-form-item label="项目编码" prop="projectCode">
<el-input v-model="form.projectCode" placeholder="请输入项目编码" /> <el-input
v-model="form.projectCode"
placeholder="请输入项目编码"
onKeyUp="value=value.replace(/[\W]/g,'')"
/>
</el-form-item> </el-form-item>
<el-form-item label="项目别名" prop="projectAlias"> <el-form-item label="项目别名" prop="projectAlias">
<el-input <el-input

4
src/views/manage/projectdevice/index.vue
View File

@ -244,7 +244,9 @@
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item> </el-form-item>
<el-form-item label="设备编码" prop="deviceCode"> <el-form-item label="设备编码" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备编码" /> <el-input v-model="form.deviceCode" placeholder="请输入设备编码"
onKeyUp="value=value.replace(/[\W]/g,'')"
/>
</el-form-item> </el-form-item>
<el-form-item label="设备类型" prop="deviceType"> <el-form-item label="设备类型" prop="deviceType">
<el-select <el-select

1
src/views/manage/projectgroup/index.vue
View File

@ -180,6 +180,7 @@
:prop="`list.${index}.groupCode`" :prop="`list.${index}.groupCode`"
> >
<el-input <el-input
onKeyUp="value=value.replace(/[\W]/g,'')"
maxlength="100" maxlength="100"
v-model="aitem.groupCode" v-model="aitem.groupCode"
placeholder="请输入分组编码" placeholder="请输入分组编码"

50
src/views/system/agency/index.vue
View File

@ -83,13 +83,11 @@
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
highlight-current highlight-current
node-key="id" node-key="id"
@node-click="handleNodeClick" @node-click="handleNodeClick"
:render-content="renderContent" :render-content="renderContent"
/> />
</div> </div>
<!-- :default-expanded-keys="checkDefault" -->
</el-col> </el-col>
<el-col :span="18" :xs="24"> <el-col :span="18" :xs="24">
<el-descriptions title="机构信息"> <el-descriptions title="机构信息">
@ -154,14 +152,12 @@
: "" : ""
}}</el-descriptions-item }}</el-descriptions-item
> >
<el-descriptions-item label="行政区划" <el-descriptions-item label="行政区划" v-if="agencyList.provinceName"
v-if="agencyList.provinceName" >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{ >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{
agencyList.regionName agencyList.regionName
}}-{{ agencyList.streetName }}-{{ agencyList.communityName }} }}-{{ agencyList.streetName }}-{{ agencyList.communityName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="行政区划" <el-descriptions-item label="行政区划" v-else> </el-descriptions-item>
v-else >
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- <div class="information">机构信息</div> <!-- <div class="information">机构信息</div>
<div style="width: 1000px; height: 200px"> <div style="width: 1000px; height: 200px">
@ -444,6 +440,7 @@
<el-form-item label="组织机构编码" prop="orgAgencyCode"> <el-form-item label="组织机构编码" prop="orgAgencyCode">
<el-input <el-input
maxlength="30" maxlength="30"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.orgAgencyCode" v-model="form.orgAgencyCode"
placeholder="请输入组织机构编码" placeholder="请输入组织机构编码"
style="width: 205px" style="width: 205px"
@ -478,6 +475,8 @@
</el-form-item> </el-form-item>
<el-form-item label="机构联系电话" prop="agencyPhone"> <el-form-item label="机构联系电话" prop="agencyPhone">
<el-input <el-input
onkeyup="value=value.replace(/[^\-?\d.]/g,'')"
maxlength="11" maxlength="11"
v-model="form.agencyPhone" v-model="form.agencyPhone"
placeholder="请输入机构联系电话" placeholder="请输入机构联系电话"
@ -498,10 +497,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构排序" prop="agencySort"> <el-form-item label="机构排序" prop="agencySort">
<el-input <el-input-number
v-model="form.agencySort" v-model="form.agencySort"
maxlength="8" controls-position="right"
:min="0"
placeholder="请输入机构排序" placeholder="请输入机构排序"
style="width: 208px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构状态" prop="agencyStatus"> <el-form-item label="机构状态" prop="agencyStatus">
@ -583,7 +584,6 @@ export default {
name: "Agency", name: "Agency",
data() { data() {
return { return {
checkDefault: [],
arealist: [], arealist: [],
citylist: [], citylist: [],
arealists: [], arealists: [],
@ -714,7 +714,7 @@ export default {
agencyPhone: null, agencyPhone: null,
agencyAddress: null, agencyAddress: null,
agencyRemark: null, agencyRemark: null,
agencySort: null, agencySort: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -734,7 +734,7 @@ export default {
agencyPhone: [ agencyPhone: [
{ {
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机码", message: "请输入正确的手机号码",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -743,19 +743,19 @@ export default {
treeOptions: [], treeOptions: [],
}; };
}, },
// 默认选中第一行 // 默认选中第一行
watch: { watch: {
deptOptions: { deptOptions: {
handler(val) { handler(val) {
if(val) { if (val) {
this.$nextTick(() => { this.$nextTick(() => {
document.querySelector('.el-tree-node__content').click() document.querySelector(".el-tree-node__content").click();
}) });
} }
}, },
immediate: true immediate: true,
}, },
}, },
created() { created() {
this.getaddress(); this.getaddress();
// this.getTreeselect(); // this.getTreeselect();
@ -1054,10 +1054,10 @@ watch: {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
cityName:null, cityName: null,
regionName:null, regionName: null,
provinceName:null, provinceName: null,
streetCode:null, streetCode: null,
id: null, id: null,
parentId: null, parentId: null,
communityCode: null, communityCode: null,
@ -1076,7 +1076,7 @@ watch: {
agencyPhone: null, agencyPhone: null,
agencyAddress: null, agencyAddress: null,
agencyRemark: null, agencyRemark: null,
agencySort: null, agencySort: undefined,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,

13
src/views/system/agencyCategory/index.vue
View File

@ -27,6 +27,7 @@
<el-form-item label="类别编码" prop="categoryCode"> <el-form-item label="类别编码" prop="categoryCode">
<el-input <el-input
v-model="queryParams.categoryCode" v-model="queryParams.categoryCode"
onKeyUp="value=value.replace(/[\W]/g,'')"
placeholder="请输入类别编码" placeholder="请输入类别编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -201,6 +202,7 @@
<el-form-item label="类别编码" prop="categoryCode"> <el-form-item label="类别编码" prop="categoryCode">
<el-input <el-input
maxlength="50" maxlength="50"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.categoryCode" v-model="form.categoryCode"
style="width: 250px" style="width: 250px"
placeholder="请输入类别编码" placeholder="请输入类别编码"
@ -222,11 +224,12 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="类别排序" prop="categorySort"> <el-form-item label="类别排序" prop="categorySort">
<el-input <el-input-number
maxlength="8"
v-model="form.categorySort" v-model="form.categorySort"
style="width: 250px" controls-position="right"
:min="0"
placeholder="请输入类别排序" placeholder="请输入类别排序"
style="width: 250px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="类别概述" prop="categoryRemark"> <el-form-item label="类别概述" prop="categoryRemark">
@ -358,7 +361,7 @@ export default {
categoryName: null, categoryName: null,
categoryCode: null, categoryCode: null,
categoryLevel: null, categoryLevel: null,
categorySort: null, categorySort: undefined,
categoryRemark: null, categoryRemark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
@ -452,6 +455,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-cascader .el-input input::-webkit-input-placeholder { .el-cascader .el-input input::-webkit-input-placeholder {
color: #CCCFD6; color: #cccfd6;
} }
</style> </style>

12
src/views/system/compare/index.vue
View File

@ -179,10 +179,16 @@
<el-input v-model="form.normCompareName" maxlength="100" placeholder="请输入标准对照名称" /> <el-input v-model="form.normCompareName" maxlength="100" placeholder="请输入标准对照名称" />
</el-form-item> </el-form-item>
<el-form-item label="标准对照编码" prop="normCompareCode"> <el-form-item label="标准对照编码" prop="normCompareCode">
<el-input v-model="form.normCompareCode" maxlength="20" placeholder="请输入标准对照编码" /> <el-input v-model="form.normCompareCode" maxlength="20" placeholder="请输入标准对照编码" onKeyUp="value=value.replace(/[\W]/g,'')" />
</el-form-item> </el-form-item>
<el-form-item label="标准对照排序" prop="normCompareSort"> <el-form-item label="标准对照排序" prop="normCompareSort">
<el-input v-model="form.normCompareSort" maxlength="8" placeholder="请输入标准对照排序" /> <el-input-number
v-model="form.normCompareSort"
controls-position="right"
:min="0"
placeholder="请输入标准对照排序"
/>
<!-- <el-input v-model="form.normCompareSort" maxlength="8" placeholder="请输入标准对照排序" /> -->
</el-form-item> </el-form-item>
<el-form-item label="标准对照概述" prop="normCompareRemark"> <el-form-item label="标准对照概述" prop="normCompareRemark">
<el-input v-model="form.normCompareRemark" maxlength="100" placeholder="请输入标准对照概述" /> <el-input v-model="form.normCompareRemark" maxlength="100" placeholder="请输入标准对照概述" />
@ -398,7 +404,7 @@ export default {
departmentName: null, departmentName: null,
normCompareName: null, normCompareName: null,
normCompareCode: null, normCompareCode: null,
normCompareSort: null, normCompareSort: undefined,
normCompareRemark: null, normCompareRemark: null,
createBy: null, createBy: null,
createTime: null, createTime: null,

71
src/views/system/department/index.vue
View File

@ -19,7 +19,6 @@
:expand-on-click-node="false" :expand-on-click-node="false"
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
default-expand-all
highlight-current highlight-current
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
@ -418,7 +417,7 @@
v-model="form.agencyId" v-model="form.agencyId"
:show-all-levels="false" :show-all-levels="false"
:placeholder=" :placeholder="
form.agencyName ? form.agencyName : '请选择上级机构' form.agencyName ? form.agencyName : '请选择所属机构'
" "
ref="cascader" ref="cascader"
:key="isResouceShow" :key="isResouceShow"
@ -477,10 +476,11 @@
</el-form-item> </el-form-item>
<el-form-item label="细分类别" prop="subdivisionCategoryId"> <el-form-item label="细分类别" prop="subdivisionCategoryId">
<el-select <el-select
v-model="form.subdivisionCategoryId" v-model="form.subdivisionCategoryName"
placeholder="请选择" placeholder="请选择"
style="width: 205px" style="width: 205px"
clearable clearable
@change="optionsubdivision"
> >
<el-option <el-option
v-for="item in optionsubdivisionCategory" v-for="item in optionsubdivisionCategory"
@ -526,6 +526,7 @@
<el-form-item label="编制床位数" prop="prepareBedsCount"> <el-form-item label="编制床位数" prop="prepareBedsCount">
<el-input <el-input
maxlength="8" maxlength="8"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.prepareBedsCount" v-model="form.prepareBedsCount"
placeholder="请输入编制床位数" placeholder="请输入编制床位数"
/> />
@ -533,6 +534,7 @@
<el-form-item label="科室电话" prop="departmentPhone"> <el-form-item label="科室电话" prop="departmentPhone">
<el-input <el-input
maxlength="12" maxlength="12"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.departmentPhone" v-model="form.departmentPhone"
placeholder="请输入科室电话" placeholder="请输入科室电话"
/> />
@ -721,6 +723,9 @@ export default {
id: "", id: "",
// 表单校验 // 表单校验
rules: { rules: {
agencyName: [
{ required: true, message: "所属机构不能为空", trigger: "blur" },
],
departmentName: [ departmentName: [
{ required: true, message: "科室名称不能为空", trigger: "blur" }, { required: true, message: "科室名称不能为空", trigger: "blur" },
], ],
@ -744,6 +749,19 @@ export default {
}, },
}; };
}, },
// 默认选中第一行
watch: {
deptOptions: {
handler(val) {
if (val) {
this.$nextTick(() => {
document.querySelector(".el-tree-node__content").click();
});
}
},
immediate: true,
},
},
created() { created() {
this.getList(); this.getList();
this.gettreelist(); this.gettreelist();
@ -755,6 +773,14 @@ export default {
this.infocompare(); this.infocompare();
}, },
methods: { methods: {
optionsubdivision(e) {
console.log(e);
// this.form.subdivisionCategoryId = this.optionsubdivisionCategory.find(
// (e) => e.id == this.form.subdivisionCategoryId
// ).subdivisionCategoryName;
// console.log(this.form.subdivisionCategoryName)
},
// 上级科室 // 上级科室
changeparentDepartment(e) { changeparentDepartment(e) {
this.form.parentDepartmentId = e; this.form.parentDepartmentId = e;
@ -968,23 +994,30 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { let reg = new RegExp("-", "g");
if (valid) { if (this.form.establishDate && this.form.revokeDate && new Date(this.form.establishDate.replace(reg, "/")) >
if (this.form.id != null) { new Date(this.form.revokeDate.replace(reg, "/"))) {
updateDepartment(this.form).then((response) => { this.$message.error("撤销日期要大于成立日期");
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDepartment(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); else {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateDepartment(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDepartment(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
}
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {

1
src/views/system/subdivision/index.vue
View File

@ -171,6 +171,7 @@
<el-form-item label="细分类别编码" prop="subdivisionCategoryCode"> <el-form-item label="细分类别编码" prop="subdivisionCategoryCode">
<el-input <el-input
maxlength="20" maxlength="20"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.subdivisionCategoryCode" v-model="form.subdivisionCategoryCode"
placeholder="请输入细分类别编码" placeholder="请输入细分类别编码"
/> />

37
src/views/system/user/index.vue
View File

@ -398,6 +398,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="账号类型" prop="email"> <el-form-item label="账号类型" prop="email">
<el-input <el-input
style="width: 220px" style="width: 220px"
@ -406,7 +423,7 @@
maxlength="50" maxlength="50"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
</div> </div>
<el-row> <el-row>
@ -464,23 +481,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>