pengjun 2 years ago
parent
commit
4ef7ce6a14
  1. 30
      src/components/patientRegister/PatientRegisterEdit.vue
  2. 33
      src/components/patientRegister/PatientRegisterItem.vue
  3. 4
      src/components/patientRegister/PatientRegisterList.vue
  4. 31
      src/components/patientRegister/customerOrgTreeAll.vue
  5. 4
      src/components/patientRegister/patientRegisterQuery.vue
  6. 2
      src/store/index.js
  7. 52
      src/views/fee-settings/SysParmSet.vue

30
src/components/patientRegister/PatientRegisterEdit.vue

@ -623,7 +623,7 @@ import { mapState, mapActions } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import mm from "../../utlis/mm";
import { objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
import { objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
import Camera from "./Camera.vue";
import PatientRegisterItem from "./PatientRegisterItem.vue";
import LisRequest from "./LisRequest.vue";
@ -957,11 +957,16 @@ export default {
//
this.addGroupPackageAsb(res.data, typeFlag,groupPackageId);
arrayReduce(this.dict.asbItem, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
arrayReduce(this.dict.asbItemQuick, [...this.patientRegister.patientRegisterAbs], "id=asbitemId");
//console.log('delBody', delBody,delBody['registerAsbitemIds'].length);
if (delBody['registerAsbitemIds'].length > 0) {
return postapi(`/api/app/registerasbitem/deletemany`, delBody)
} else {
this.onSubmit(msg);
} else {
typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;
if (this.form.id) this.btnSubmit('form', false);
}
}
})
@ -969,7 +974,9 @@ export default {
//console.log('res', res);
if (res && res.code != -1) {
//
this.onSubmit(msg);
typeFlag == 'group' ? this.patientRegister.customerOrgGroupChange++ : this.patientRegister.medicalPackageChange++;
if (this.form.id) this.btnSubmit('form', false);
}
});
},
@ -1081,16 +1088,19 @@ export default {
}
},
//
// //
changeCustomerOrgGroupId() {
this.patientRegister.customerOrgGroupChange++;
if (this.form.id) this.btnSubmit('form', false);
// this.patientRegister.customerOrgGroupChange++;
// if (this.form.id) this.btnSubmit('form', false);
this.getGroupPackageAsb('group',this.form.customerOrgGroupId)
},
//
// //
changeMedicalPackageId() {
this.patientRegister.medicalPackageChange++;
if (this.form.id) this.btnSubmit('form', false);
// this.patientRegister.medicalPackageChange++;
// if (this.form.id) this.btnSubmit('form', false);
this.getGroupPackageAsb('package',this.form.medicalPackageId)
},
//

33
src/components/patientRegister/PatientRegisterItem.vue

@ -529,6 +529,7 @@ export default {
lfind = arrayExistObj(this.dict.asbItemQuick, 'id', asbItemChoosed[i].id)
if (lfind > -1) this.dict.asbItemQuick.splice(lfind, 1)
this.quickAsb = deepCopy(this.dict.asbItemQuick)
}
@ -961,22 +962,24 @@ export default {
watch: {
//
// "patientRegister.customerOrgGroupChange"(newVal, oldVal) {
// console.log("watch patientRegister.customerOrgGroupChange newVal", newVal, " oldVal", oldVal);
// if (newVal != oldVal && newVal > 0) {
// //this.getCustomerOrgGroupAsb(this.patientRegisterForm.customerOrgGroupId);
// this.getGroupPackageAsb('group', this.patientRegisterForm.customerOrgGroupId);
// }
// },
"patientRegister.customerOrgGroupChange"(newVal, oldVal) {
console.log("watch patientRegister.customerOrgGroupChange newVal:", newVal, " oldVal:", oldVal);
if (newVal != oldVal && newVal > 0) {
//this.getCustomerOrgGroupAsb(this.patientRegisterForm.customerOrgGroupId);
//this.getGroupPackageAsb('group', this.patientRegisterForm.customerOrgGroupId);
this.onSubmit('更换分组')
}
},
// //
// "patientRegister.medicalPackageChange"(newVal, oldVal) {
// console.log("watch patientRegister.medicalPackageChange newVal", newVal, " oldVal", oldVal);
// if (newVal != oldVal && newVal > 0) {
// //this.getMedicalPackageAsb(this.patientRegisterForm.medicalPackageId);
// this.getGroupPackageAsb('medical', this.patientRegisterForm.medicalPackageId);
// }
// },
//
"patientRegister.medicalPackageChange"(newVal, oldVal) {
console.log("watch patientRegister.medicalPackageChange newVal:", newVal, " oldVal:", oldVal);
if (newVal != oldVal && newVal > 0) {
//this.getMedicalPackageAsb(this.patientRegisterForm.medicalPackageId);
//this.getGroupPackageAsb('medical', this.patientRegisterForm.medicalPackageId);
this.onSubmit('更换套餐')
}
},
//
"patientRegister.saveTimes"(newVal, oldVal) {

4
src/components/patientRegister/PatientRegisterList.vue

@ -916,7 +916,9 @@ export default {
// body.customerOrgId = this.patientRegister.query.customerOrgId;
// }
if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId;
if(this.patientRegister.query.customerOrgId && this.patientRegister.query.customerOrgId != this.dict.personOrgId){
if(this.patientRegister.query.customerOrgId
&& this.patientRegister.query.customerOrgId != this.dict.personOrgId
&& this.patientRegister.query.customerOrgRegister.id){
body.customerOrgRegisterId = this.patientRegister.query.customerOrgRegister.id
}

31
src/components/patientRegister/customerOrgTreeAll.vue

@ -45,18 +45,18 @@ export default {
},
//ID api/app/customer-org/parent/[CustomerOrgld
getCustomerOrgParentId(customerOrgld) {
if (customerOrgld == this.dict.personOrgId) {
this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId;
return;
}
getapi(`/api/app/customer-org/parent/${customerOrgld}`).then((res) => {
// console.log("res.data", res.data);
if (res.code == 1) {
this.patientRegister.query.CustomerOrgParentId = res.data;
}
});
},
// getCustomerOrgParentId(customerOrgld) {
// if (customerOrgld == this.dict.personOrgId) {
// this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId;
// return;
// }
// getapi(`/api/app/customer-org/parent/${customerOrgld}`).then((res) => {
// // console.log("res.data", res.data);
// if (res.code == 1) {
// this.patientRegister.query.CustomerOrgParentId = res.data;
// }
// });
// },
//
filterNode(value, data) {
@ -68,8 +68,11 @@ export default {
//
treeclick(data) {
this.patientRegister.query.customerOrgId = data.id;
this.getCustomerOrgParentId(data.id);
this.patientRegister.query.times++; //
//ID
// this.getCustomerOrgParentId(data.id);
// this.patientRegister.query.times++; //
},
},
watch: {

4
src/components/patientRegister/patientRegisterQuery.vue

@ -150,10 +150,12 @@ export default {
watch:{
'patientRegister.query.customerOrgId'(newVal,oldVal){
// console.log('patientRegister.query.customerOrgId',newVal,oldVal)
if(newVal != oldVal){
if(!newVal || newVal == this.dict.personOrgId){
this.patientRegister.query.customerOrgRegister = null
this.customerOrgRegisterList = []
this.patientRegister.query.times++
}else{
getapi(`/api/app/customer-org/parent/${newVal}
`).then(res => {
@ -166,6 +168,8 @@ export default {
if (res.data.length > 0) {
this.patientRegister.query.customerOrgRegister = res.data[res.data.length - 1];
}
this.patientRegister.query.times++
// console.log('this.patientRegister.query.customerOrgRegister',this.patientRegister.query.customerOrgRegister)
}
});
}

2
src/store/index.js

@ -127,7 +127,7 @@ export default new Vuex.Store({
customerOrgId: "", //体检单位ID
CustomerOrgParentId: "", //单位父级ID
customerOrgFlag: true, //单位作为查询条件
customerOrgRegister: {}, //单位体检次数
customerOrgRegister: {id:''}, //单位体检次数
checkAsbs: null,
patientName:'', //姓名
sex:'', //性别

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

@ -1,16 +1,16 @@
<template>
<div>
<el-card>
<div class="publiccss">系统参数</div>
<div style="display: flex; margin-top: 20px">
<div class="leftTree">
<div slot="header">系统参数</div>
<div style="display: flex; ">
<div :style="'overflow: scroll;border: 1px solid;width: 200px; height: '+ (window.pageHeight < 600 ? 450 : window.pageHeight - 150) + 'px;'">
<el-tree
:data="sysParmTypesTree"
:props="treeProps"
:props="treeProps" highlight-current
@node-click="nodeClick"
/>
</div>
<div class="midBlock">
<div :style="'margin-left: 5px;width:'+ (window.pageWidth < 600 ? 350 : window.pageWidth - 200 - 50) + 'px;'">
<div style="display: flex">
<div>
<span>体检中心</span>
@ -31,29 +31,31 @@
</el-option>
</el-select>
</div>
<!--
<div style="display: flex">
<el-color-picker v-model="color16" @change="chooseColor" />
<el-input v-model="color10" @input="inputColor" />
</div>
-->
<div style="margin-left: 30px">
<el-button type="success" @click="save">保存</el-button>
<el-button type="success" @click="save" size="small">保存</el-button>
</div>
</div>
<div style="margin-top: 2px">
<el-table
:data="sysParms"
border
:height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
:height="window.pageHeight < 600 ? 418 : window.pageHeight - 182"
size="small"
highlight-current-row
>
<el-table-column prop="id" label="参数ID" />
<el-table-column prop="id" label="参数ID" min-width="150"/>
<el-table-column
prop="displayName"
label="参数名称"
width="120"
min-width="150"
/>
<el-table-column prop="organizationUnitId" label="体检中心">
<el-table-column prop="organizationUnitId" label="体检中心" min-width="100">
<template slot-scope="scope">
<el-select
v-model="scope.row.organizationUnitId"
@ -71,7 +73,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="sysParmValueName" label="参数值">
<el-table-column prop="sysParmValueName" label="参数值" min-width="80">
<template slot-scope="scope">
<el-input
type="textarea"
@ -82,7 +84,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="valueRemark" label="备注">
<el-table-column prop="valueRemark" label="备注" min-width="150">
<template slot-scope="scope">
<el-input
type="textarea"
@ -93,7 +95,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="remark" label="参数说明" />
<el-table-column prop="remark" label="参数说明" min-width="150"/>
</el-table>
</div>
</div>
@ -217,24 +219,10 @@ export default {
};
</script>
<style scoped>
::v-deep .el-table__header th {
/* font-size: px; */
background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
color: rgb(113, 113, 113); /* 设置表头文字颜色 */
}
.leftTree {
overflow: scroll;
border: 1px solid;
width: 200px;
height: v-bind(
"(window.pageHeight < 600 ? 410 : window.pageHeight - 190) + 'px'"
);
}
@import '../../assets/css/global_card.css';
@import '../../assets/css/global_input.css';
@import '../../assets/css/global_table.css';
@import '../../assets/css/global.css';
.midBlock {
margin-left: 5px;
width: v-bind(
"(window.pageWidth < 500 ? 300 : window.pageWidth - 270) + 'px'"
);
}
</style>
Loading…
Cancel
Save