pengjun 2 years ago
parent
commit
7beafc4045
  1. 4
      src/components/doctorCheck/PatientRegisterBase.vue
  2. 1
      src/components/doctorCheck/PatientRegisterList.vue
  3. 63
      src/components/patientRegister/PatientRegisterEdit.vue
  4. 1
      src/components/patientRegister/PatientRegisterItem.vue
  5. 8
      src/components/sumDoctorCheck/SumAsbItemStatus.vue
  6. 4
      src/components/sumDoctorCheck/SumPREdit.vue

4
src/components/doctorCheck/PatientRegisterBase.vue

@ -140,7 +140,7 @@ export default {
if (res.code != -1) {
this.doctorCheckPrBaseInit()
this.doctorCheck.prBase.patientRegisterNo = val
this.doctorCheck.prBase.patientRegisterNo = patientRegisterNo
objCopy(res.data,this.doctorCheck.prBase)
this.sumPREditInit()
@ -162,7 +162,7 @@ export default {
if (res.code != -1) {
console.log('按条码号查个人数据',res.data)
this.doctorCheckPrBaseInit()
this.doctorCheck.prBase.patientNo = val
this.doctorCheck.prBase.patientNo = patientNo
objCopy(res.data,this.doctorCheck.prBase)
this.sumPREditInit()

1
src/components/doctorCheck/PatientRegisterList.vue

@ -39,7 +39,6 @@
<!-- 人员列表 -->
<el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
:height="window.pageHeight - 80 - 120"
highlight-current-row @row-click="rowick" ref="dataList">
<el-table-column prop="customerOrgParentName" label="单位" width="150">

63
src/components/patientRegister/PatientRegisterEdit.vue

@ -739,17 +739,12 @@ export default {
},
created() {
this.initFormData()
},
//
mounted() {
// objCopy(this.formInitData, this.form);
// this.initBox();
// this.getCustomerOrgRegisterList()
// this.getPeoplePhoto(this.patientRegister.photo)
this.initFormData()
},
computed: {
@ -905,28 +900,28 @@ export default {
},
//
async getCustomerOrgRegisterList() {
this.customerOrgRegisterList = []
if (this.form.customerOrgId == this.dict.personOrgId) {
this.form.customerOrgRegisterId = null
return
}
try {
let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
// ()
// if (this.customerOrgRegisterList.length > 0) {
// this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
// //this.changeCustomerOrgGroupId()
// this.changeMedicalTimes()
// }
} catch (error) {
console.log(error)
}
},
// async getCustomerOrgRegisterList() {
// this.customerOrgRegisterList = []
// if (this.form.customerOrgId == this.dict.personOrgId) {
// this.form.customerOrgRegisterId = null
// return
// }
// try {
// let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
// let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
// this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
// // ()
// // if (this.customerOrgRegisterList.length > 0) {
// // this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
// // //this.changeCustomerOrgGroupId()
// // this.changeMedicalTimes()
// // }
// } catch (error) {
// console.log(error)
// }
// },
//
changeMedicalTimes() {
@ -1638,12 +1633,12 @@ export default {
//
watch: {
"form.customerOrgId"(newVal, oldVal) {
//console.log('editTimes newVal',newVal,' oldVal',oldVal)
if (newVal != oldVal) {
this.getCustomerOrgRegisterList()
}
},
// "form.customerOrgId"(newVal, oldVal) {
// //console.log('editTimes newVal',newVal,' oldVal',oldVal)
// if (newVal != oldVal) {
// this.getCustomerOrgRegisterList()
// }
// },
//
"editTimes"(newVal, oldVal) {

1
src/components/patientRegister/PatientRegisterItem.vue

@ -519,6 +519,7 @@ export default {
chargePrice: asbItemChoosed[i].price,
payTypeFlag,
isCharge: "N",
discount:100,
amount: 1,
total: asbItemChoosed[i].price,
}

8
src/components/sumDoctorCheck/SumAsbItemStatus.vue

@ -1,27 +1,27 @@
<template>
<div style="display: flex;height:90px;">
<div class="asbitemListClass">
<div style="margin-top:2px;font-size:7px;color: #F56C6C;">未检组合项目</div>
<div style="margin-top:2px;font-size:9px;color: #F56C6C;">未检组合项目</div>
<div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
<el-tag type="danger" style="margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{ item }}</el-tag>
</div>
</div>
<div class="asbitemListClass">
<div style="margin-top:2px;font-size:7px;color: #909399;">弃检组合项目</div>
<div style="margin-top:2px;font-size:9px;color: #909399;">弃检组合项目</div>
<div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
<el-tag type="info" style="margin-left: 5px;" v-for="item in data.giveUpAsbitem" :key="item"
size="mini">{{ item }}</el-tag>
</div>
</div>
<div class="asbitemListClass">
<div style="margin-top:2px;font-size:7px;color: #409EFF;">组合项目已检但无值的明细项目</div>
<div style="margin-top:2px;font-size:9px;color: #409EFF;">组合项目已检但无值的明细项目</div>
<div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
<el-tag style="margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item"
size="mini">{{ item }}</el-tag>
</div>
</div>
<div class="asbitemListClass">
<div style="margin-top:2px;font-size:7px;color: #E6A23C;">组合项目已检但弃检的明细项目</div>
<div style="margin-top:2px;font-size:9px;color: #E6A23C;">组合项目已检但弃检的明细项目</div>
<div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
<el-tag type="warning" style="margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item"
size="mini">{{ item }}</el-tag>

4
src/components/sumDoctorCheck/SumPREdit.vue

@ -10,7 +10,7 @@
<el-date-picker v-model="sumDoctorCheck.sumPREdit.summaryDate" value-format="yyyy-MM-dd"
type="date" style="width: 90px" size="small" />
</div>
<div class="query" style="margin-top: 10px;">
<div class="query" style="margin-top: 5px;">
<span>总检</span>
<el-checkbox :value="sumDoctorCheck.sumPREdit.completeFlag == '3'" disabled></el-checkbox>
</div>
@ -22,7 +22,7 @@
<span>审核日期</span>
<el-input :value="sumDoctorCheck.sumPREdit.auditDate ? lmoment(sumDoctorCheck.sumPREdit.auditDate, 'yyyy-MM-DD') :''" style="width: 90px" size="small" disabled></el-input>
</div>
<div class="query" style="margin-top: 10px;">
<div class="query" style="margin-top: 5px;">
<span>审核</span>
<el-checkbox :value="sumDoctorCheck.sumPREdit.isAudit == 'Y'" disabled></el-checkbox>
</div>

Loading…
Cancel
Save