Skip to content

P
pica.cloud.web-education-admin
提交 883d98ee 编写于 作者: chengxiang.li's avatar chengxiang.li
浏览文件
操作

merge code

上级 15e2a878 b8ddbfcb
显示空白字符变更
内嵌 并排
正在显示 包含 130 行增加 和 61 行删除
src/views/patients/labels-manage/dialog/select-patitents.vue
浏览文件 @ 883d98ee
......@@ -228,6 +228,14 @@
isShowSelectPatient: Boolean, //是否显示model,
patientIdList: Array,// 确定已经选过的居民
oldPatientIdList: Array,// 确定已经选过的居民
selectPatientType: Number, //获取居民列表所需字段，随访是1,分组是2，患教是3
fuPlanIdList: {
required: false,
type: Array,
default: function () {
return [];
}
}, //获取居民列表所需字段，若是随访，则需要传值
},
watch: {
isShowSelectPatient(val){
......@@ -284,8 +292,8 @@
sex: this.searchData.sex,
searchCondition:this.searchData.searchCondition,
srvPackageId:this.srvPackageId,
addType: 1,
fuPlanIdList: [],
addType: this.selectPatientType, //随访是1,分组是2，患教是3
fuPlanIdList: this.fuPlanIdList,
}
getPatientInfoList(data).then(res=>{
if(res.data.patientList){
......
src/views/patients/labels-manage/labels-detail.vue
浏览文件 @ 883d98ee
......@@ -140,6 +140,7 @@
:isShowSelectPatient="isShowSelectPatient"
:patientIdList="patientIdList"
@closeSelectPatient="closeSelectPatient"
:selectPatientType="selectPatientType"
@sureSelectPatient="sureSelectPatient(arguments)"
/>
</div>
......@@ -183,6 +184,7 @@
newLabelName: '', // 修改后的分组名
},
multipleSelection: [],
selectPatientType: 2, //选择居民时需要的type类型
}
},
components: {
......
src/views/patients/mypatients-manage/components/edit-information.vue
浏览文件 @ 883d98ee
......@@ -32,7 +32,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="text-align: center;margin-top:15px;" v-if="!patientId"> <el-button plain size="small" @click="toggleClick">{{tipsText}}</el-button></el-col>
<el-col :span="24" style="text-align: center;margin-top:15px;" v-show="!patientId"> <el-button plain size="small" @click="toggleClick">{{tipsText}}</el-button></el-col>
</el-row>
<div v-show="isShowAll || patientId">
<div class="has-header">数据记录</div>
......@@ -102,7 +102,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="年龄" prop="age">
<span>{{(patientInfoForm.age || patientInfoForm.age == 0) ? `${patientInfoForm.age}岁` : '-'}}</span>
<span>{{(patientInfoForm.age || patientInfoForm.age == 0 ) ? `${patientInfoForm.age}岁` : '-'}}</span>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -329,7 +329,13 @@
props: {
patientInfoObj: Object,
checkForm: Boolean,
patientId: String,
patientId: {
required: false,
type: String,
default: function () {
return '';
}
},
},
watch: {
async patientInfoObj(val) {
......@@ -372,6 +378,37 @@
this.addressList = [];
}
}else { // 新增
this.initForm();
}
},
checkForm(val){
if(val){// 触发校验
this.saveInfoData();
}
},
},
created() {
this.initConstant();
},
mounted(){
if(!this.patientId){//新建计划
this.initForm();
}
},
computed: {
...mapGetters([
'_token',
]),
currentCount(){
if(this.patientInfoForm.remark) {
return this.patientInfoForm.remark.length
}else {
return 0;
}
},
},
methods: {
initForm() {
this.patientInfoForm = {
nickname: '',
mobilePhone: '',
......@@ -398,32 +435,7 @@
countyId: null,
townId: null,
}
}
},
checkForm(val){
if(val){// 触发校验
this.saveInfoData();
}
},
},
created() {
this.initConstant();
},
mounted(){
},
computed: {
...mapGetters([
'_token',
]),
currentCount(){
if(this.patientInfoForm.remark) {
return this.patientInfoForm.remark.length
}else {
return 0;
}
},
},
methods: {
initConstant(){
getDiseasesList().then((data) => {
if(data.code == '000000') {
......@@ -527,6 +539,9 @@
})
this.patientInfoForm.patientAddress = `${this.patientInfoForm.provinceName}${this.patientInfoForm.cityName}${this.patientInfoForm.countyName}${this.patientInfoForm.townName}`
}
if(!this.patientInfoForm.idNo) {
this.patientInfoForm.idNo = null;
}
if (valid) {
// console.log('提交表单',this.patientInfoForm);
this.$emit('addListenSave',{
......
src/views/patients/mypatients-manage/patient-detail.vue
浏览文件 @ 883d98ee
......@@ -9,7 +9,7 @@
<div class="f-main-content screenSet">
<div>
<div class="right-btn-group" v-if="activeName == 'first'">
<el-button plain size="small" @click="deletePatient">删除</el-button>
<el-button plain size="small" @click="deleteCurrentPatient">删除</el-button>
<el-button type="primary" size="small" @click="editPatient">编辑</el-button>
</div>
<el-tabs v-model="activeName" @tab-click="tabChangeHandler">
......@@ -259,7 +259,7 @@
})
},
tabChangeHandler(tab) {},
deletePatient() {
deleteCurrentPatient() {
// 把写的提示信息需要换行的地方分成数组 confirmText
const confirmText = ['您确定要删除此居民吗?', '删除后，您将无法对该居民发送患教和进行随访，重新添加该居民依旧可查看历史发送记录及随访记录'];
const newDatas = [];
......
src/views/patients/mypatients-manage/patients-list.vue
浏览文件 @ 883d98ee
......@@ -8,7 +8,7 @@
<h1 class="page-title">我的居民：共{{pagination.totalRows}}人</h1>
<div class="search-div">
<div class="search-input">
<el-form :model="searchData" ref="searchData" :inline="true">
<el-form :model="searchData" ref="searchData" :inline="true" label-width="100px">
<el-form-item label="性别：" prop="patientName">
<el-select v-model="searchData.sex" size="small" clearable :popper-append-to-body="false">
<el-option
......@@ -323,8 +323,12 @@
justify-content: space-between;
padding: 30px 0 10px 0;
border-bottom: 1px solid #efefef;
.search-input{
flex: 1;
}
.search-btn {
min-width: 127px;
text-align: right;
width: 150px;
}
}
.blank-wrap {
......
src/views/patients/new-manage/new-patient.vue
浏览文件 @ 883d98ee
......@@ -5,8 +5,15 @@
<el-tabs v-model="activeName2" @tab-click="handleTabClick" class="tab-list">
<el-tab-pane label="单个录入" name="first" class="single-input">
<el-row class="save-and-add">
<el-button type="primary">保存并新增</el-button>
<el-button type="primary" @click="saveEdit">保存并新增</el-button>
</el-row>
<edit-information
ref="newForm"
:patientInfoObj="patientInfo"
:checkForm="checkForm"
@addListenSave="addListenSave"
:patientId="patientId">
</edit-information>
</el-tab-pane>
<el-tab-pane label="二维码录入" name="second">
<div class="qr-code-wrap">
......@@ -252,12 +259,15 @@
<script>
import BreadCrumb from "@/components/breadcrumb.vue";
import EditInformation from '../mypatients-manage/components/edit-information'
import * as commonUtil from "@/utils/utils";
import {
getQRCode,
getUploadHistory,
getLabelList,
refreshCode,
// getUploadHistory,
savePatientInfo
} from "@/utils/patients/patientsapi";
import { getSaasDomain } from '@/utils/index';
import QRCode from 'qrcode';
......@@ -267,7 +277,10 @@
return {
curmbFirst: "居民管理",
curmbSecond: "新增居民",
activeName2: 'second',
activeName2: 'first',
patientInfo: {},
checkForm: false,
patientId: '',
searchData: {
pageNo: 1, // 第几页
pageSize: 10, // 每页条数
......@@ -314,6 +327,7 @@
},
components: {
BreadCrumb,
EditInformation,
},
created() {
this.goToGetQRCode({
......@@ -510,7 +524,31 @@
handleReloadLabel() {
this.showReloadLabelModal = false;
this.goToGetGroupList();
},
saveEdit() {
this.checkForm = true;
},
addListenSave(val) {
this.checkForm = false;
if(val.status) {
// this.patientInfo = val.patientInfoForm
console.log('填写内容',val.patientInfoForm);
savePatientInfo(val.patientInfoForm).then(data => {
if(data.code == '000000'){
this.$message.success('新增成功')
setTimeout(() => {
this.$refs.newForm.$refs.patientInfoForm.resetFields()
// this.$router.go(0);//体验不好
},500)
}else {
this.$message.error(data.message);
}
})
// 调用保存接口
}else {
this.$message.error('请正确填写信息');
}
},
}
}
......@@ -541,6 +579,7 @@
border-bottom: 1px solid #efefef;
}
.single-input{
background-color: #ffffff!important;
.save-and-add{
text-align: right;
}
......@@ -841,6 +880,7 @@
border: 0;
display: block;
}
border: 0;
.qr-download-btn{
color: #fff;
background: #449284;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或