xinyilu/NurseStationUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/system/station/index.vue
This commit is contained in:
纪寒 2022-11-01 09:26:25 +08:00
commit 18ef1a9188
6 changed files with 71 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/StationDepartment/index.vue
View File

@ -245,6 +245,7 @@
v-model="item.departmentName" v-model="item.departmentName"
placeholder="请输入科室名称" placeholder="请输入科室名称"
style="width: 250px" style="width: 250px"
maxlength="15"
/> />
</el-form-item> </el-form-item>
@ -325,6 +326,7 @@
v-model="form.departmentName" v-model="form.departmentName"
placeholder="请输入科室名称" placeholder="请输入科室名称"
style="width: 250px" style="width: 250px"
maxlength="15"
/> />
</el-form-item> </el-form-item>
<el-form-item label="科室负责人" prop="departmentPerson"> <el-form-item label="科室负责人" prop="departmentPerson">

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

@ -88,7 +88,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品分类名称" prop="goodsCategoryName"> <el-form-item label="商品分类名称" prop="goodsCategoryName" >
<el-input <el-input
v-model="queryParams.goodsCategoryName" v-model="queryParams.goodsCategoryName"
placeholder="请输入商品分类名称" placeholder="请输入商品分类名称"
@ -294,12 +294,12 @@
<el-input <el-input
v-model="form.goodsName" v-model="form.goodsName"
placeholder="请输入商品名称" placeholder="请输入商品名称"
style="width: 210px" style="width: 210px; margin-left:10px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="护理站名称" prop="nurseStationName"> <el-form-item label="护理站名称" prop="nurseStationName" label-width="100">
<el-select <el-select
style="width: 210px" style="width: 210px;margin-left:10px"
v-model="form.nurseStationId" v-model="form.nurseStationId"
clearable clearable
placeholder="请选择护理站" placeholder="请选择护理站"
@ -313,7 +313,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品分类名称" prop="goodsCategoryName"> <el-form-item label="商品分类名称" prop="goodsCategoryName" label-width="100">
<el-select <el-select
style="width: 210px" style="width: 210px"
v-model="form.goodsCategoryId" v-model="form.goodsCategoryId"
@ -338,7 +338,7 @@
<el-select <el-select
v-model="form.goodsPurpose" v-model="form.goodsPurpose"
placeholder="请选择" placeholder="请选择"
style="width: 210px" style="width: 210px;margin-left:10px"
> >
<el-option <el-option
v-for="item in goods" v-for="item in goods"
@ -349,7 +349,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品度量单位" prop="goodsUnit"> <el-form-item label="商品度量单位" prop="goodsUnit" label-width="100">
<el-input <el-input
v-model="form.goodsUnit" v-model="form.goodsUnit"
placeholder="请输入商品度量单位" placeholder="请输入商品度量单位"
@ -523,7 +523,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品度量单位" prop="goodsUnit"> <el-form-item label="商品度量单位" prop="goodsUnit" >
<el-input <el-input
v-model="form.goodsUnit" v-model="form.goodsUnit"
placeholder="请输入商品度量单位" placeholder="请输入商品度量单位"
@ -703,7 +703,26 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {
goodsName: [
{ required: true, message: "请输入商品名称", trigger: "blur" },
],
goodsCategoryName:[
{ required: true, message: "请选择商品分类名称", trigger: "blur" },
],
nurseStationName:[
{ required: true, message: "请选择护理站名称", trigger: "blur" },
],
goodsPurpose:[
{ required: true, message: "请选择商品用途", trigger: "blur" },
],
goodsUnit:[
{ required: true, message: "请输入商品度量单位", trigger: "blur" },
],
goodsPictureUrl:[
{ required: true, message: "请输入选择图片", trigger: "blur" },
],
},
}; };
}, },
created() { created() {

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

@ -159,6 +159,7 @@
label="护理站名称" label="护理站名称"
align="center" align="center"
prop="nurseStationName" prop="nurseStationName"
:show-overflow-tooltip="true"
/> />
<el-table-column label="科室名称" align="center" prop="departmentName" /> <el-table-column label="科室名称" align="center" prop="departmentName" />
<el-table-column label="编码" align="center" prop="departmentCode" /> <el-table-column label="编码" align="center" prop="departmentCode" />
@ -178,7 +179,7 @@
</el-table-column> </el-table-column>
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="居住地址" align="center" prop="address" /> <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true"/>
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
@ -242,6 +243,7 @@
:prop="`nurseStationPersonList.${index}.nurseStationId`" :prop="`nurseStationPersonList.${index}.nurseStationId`"
> >
<el-button <el-button
type="" type=""
@click="clickinnerVisible(item, index)" @click="clickinnerVisible(item, index)"
v-if="item.nurseStationName == '请选择护理站名称'" v-if="item.nurseStationName == '请选择护理站名称'"
@ -250,10 +252,12 @@
text-align: left; text-align: left;
height: 36px; height: 36px;
color: #c0c4cc; color: #c0c4cc;
overflow: hidden;
" "
>{{ item.nurseStationName }}</el-button >{{ item.nurseStationName }}</el-button
> >
<el-button <el-button
type="" type=""
@click="clickinnerVisible(item, index)" @click="clickinnerVisible(item, index)"
v-else v-else
@ -262,6 +266,7 @@
text-align: left; text-align: left;
height: 36px; height: 36px;
padding-left: -10px; padding-left: -10px;
overflow: hidden;
" "
>{{ item.nurseStationName }}</el-button >{{ item.nurseStationName }}</el-button
> >
@ -492,6 +497,7 @@
label="护理站名称" label="护理站名称"
width="150" width="150"
align="center" align="center"
:show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -521,6 +527,7 @@
label="护理地址" label="护理地址"
width="150" width="150"
align="center" align="center"
:show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -720,14 +727,14 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
style="width: 15px; height: 15px" style="width: 15px; height: 15px;overflow: hidden;"
v-if="departid == scope.row.departmentCode" v-if="departid == scope.row.departmentCode"
circle circle
@click="StationDepartmentclick(scope.row)" @click="StationDepartmentclick(scope.row)"
></el-button> ></el-button>
<el-button <el-button
v-else v-else
style="width: 15px; height: 15px" style="width: 15px; height: 15px;overflow: hidden;"
circle circle
@click="StationDepartmentclick(scope.row)" @click="StationDepartmentclick(scope.row)"
></el-button> ></el-button>

22
src/views/system/station/index.vue
View File

@ -201,6 +201,7 @@
label="护理站名称" label="护理站名称"
align="center" align="center"
prop="nurseStationName" prop="nurseStationName"
:show-overflow-tooltip="true"
/> />
<el-table-column label="护理站类型" align="center" prop="nurseTypeName"> <el-table-column label="护理站类型" align="center" prop="nurseTypeName">
<template slot-scope="scope"> <template slot-scope="scope">
@ -214,7 +215,7 @@
<span>{{ scope.row.sysAreaVOList[0].cityName }}-</span> <span>{{ scope.row.sysAreaVOList[0].cityName }}-</span>
<span>{{ scope.row.sysAreaVOList[0].streetName }}</span> --> <span>{{ scope.row.sysAreaVOList[0].streetName }}</span> -->
</el-table-column> </el-table-column>
<el-table-column label="护理站地址" align="center" prop="address" /> <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
<!-- <el-table-column <!-- <el-table-column
label="护理站简介" label="护理站简介"
align="center" align="center"
@ -477,7 +478,7 @@
placeholder="排序不可输入小数点" placeholder="排序不可输入小数点"
type="number" type="number"
min="0" min="0"
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}" oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>8){value=value.slice(0,8)}"
/> />
</el-form-item> </el-form-item>
<el-form-item label="护理站总概述" prop="nurseStationDescription"> <el-form-item label="护理站总概述" prop="nurseStationDescription">
@ -818,6 +819,8 @@ export default {
console.log(imgUrl); console.log(imgUrl);
this.form.stationIntroducePcitureUrl = imgUrl; this.form.stationIntroducePcitureUrl = imgUrl;
}, },
delnurseStationLabelList(item) { delnurseStationLabelList(item) {
console.log(item); console.log(item);
if (item.ids && !item.id) { if (item.ids && !item.id) {
@ -839,6 +842,7 @@ export default {
} }
console.log(this.form.nurseStationLabelList); console.log(this.form.nurseStationLabelList);
}, },
addnurseStationLabelList() { addnurseStationLabelList() {
if (this.looknurseStationLabel.length == 5) { if (this.looknurseStationLabel.length == 5) {
this.$message.error("最多只能5条"); this.$message.error("最多只能5条");
@ -1066,7 +1070,7 @@ export default {
console.log(typeof this.value); console.log(typeof this.value);
} }
} }
); });
}) })
.then(() => { .then(() => {
this.looknurseStationLabel = []; this.looknurseStationLabel = [];
@ -1230,3 +1234,15 @@ export default {
}, },
}; };
</script> </script>
<style>
::v-deep .el-table_1_column_6 is-center is-leaf el-table__cell {
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
line-clamp: 4;
-webkit-box-orient: vertical;
}
</style>

4
src/views/system/stationAvatar/index.vue
View File

@ -3,13 +3,13 @@
<div <div
class="user-info-head" class="user-info-head"
@click="editCropper()" @click="editCropper()"
style="width: 208px; height: 200px" style="width: 100px; height: 100px"
> >
<img <img
v-if="options.img" v-if="options.img"
v-bind:src="options.img" v-bind:src="options.img"
title="点击上传头像" title="点击上传头像"
style="width: 208px; height: 200px; line-height: 200px" style="width: 100px; height: 100px; line-height: 200px"
/> />
<i <i
v-else v-else

15
src/views/system/stationConsumable/index.vue
View File

@ -29,7 +29,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属护理站" prop="" v-else> <el-form-item label="护理站名称" prop="" v-else>
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
@ -163,6 +163,7 @@
label="护理站名称" label="护理站名称"
align="center" align="center"
prop="nurseStationName" prop="nurseStationName"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="耗材包编号" label="耗材包编号"
@ -310,6 +311,7 @@
text-align: left; text-align: left;
height: 36px; height: 36px;
color: #c0c4cc; color: #c0c4cc;
overflow: hidden;
" "
@click="choicenurseStation(item, index)" @click="choicenurseStation(item, index)"
v-if="item.nurseStationName == '请选择所属护理站'" v-if="item.nurseStationName == '请选择所属护理站'"
@ -317,7 +319,7 @@
{{ item.nurseStationName }} {{ item.nurseStationName }}
</el-button> </el-button>
<el-button <el-button
style="width: 208px; text-align: left; height: 36px" style="width: 208px; text-align: left; height: 36px;overflow: hidden;"
@click="choicenurseStation(item, index)" @click="choicenurseStation(item, index)"
v-else v-else
> >
@ -332,6 +334,7 @@
<el-input <el-input
v-model="item.consumableDetail" v-model="item.consumableDetail"
placeholder="请输入服务项目耗材包详情" placeholder="请输入服务项目耗材包详情"
maxlength="50"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -355,7 +358,7 @@
placeholder="保留小数点后两位" placeholder="保留小数点后两位"
type="number" type="number"
min="0" min="0"
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>10){value=value.slice(0,10)}" oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>5){value=value.slice(0,5)}"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -513,6 +516,7 @@
label="护理站名称" label="护理站名称"
align="center" align="center"
prop="nurseStationName" prop="nurseStationName"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="护理站编号" label="护理站编号"
@ -522,7 +526,7 @@
<el-table-column label="护理站经度" align="center" prop="longitude" /> <el-table-column label="护理站经度" align="center" prop="longitude" />
<el-table-column label="护理站纬度" align="center" prop="latitude" /> <el-table-column label="护理站纬度" align="center" prop="latitude" />
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="护理站地址" align="center" prop="address" /> <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
<el-table-column label="负责人" align="center" prop="dutyPerson" /> <el-table-column label="负责人" align="center" prop="dutyPerson" />
<el-table-column label="负责人电话" align="center" prop="dutyPhone" /> <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
</el-table> </el-table>
@ -611,6 +615,7 @@
label="护理站名称" label="护理站名称"
align="center" align="center"
prop="nurseStationName" prop="nurseStationName"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="护理站编号" label="护理站编号"
@ -620,7 +625,7 @@
<el-table-column label="护理站经度" align="center" prop="longitude" /> <el-table-column label="护理站经度" align="center" prop="longitude" />
<el-table-column label="护理站纬度" align="center" prop="latitude" /> <el-table-column label="护理站纬度" align="center" prop="latitude" />
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="护理站地址" align="center" prop="address" /> <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
<el-table-column label="负责人" align="center" prop="dutyPerson" /> <el-table-column label="负责人" align="center" prop="dutyPerson" />
<el-table-column label="负责人电话" align="center" prop="dutyPhone" /> <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
</el-table> </el-table>