shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

home

master
pengjun 2 years ago
parent
21344d14b1
commit
cdecf0b69c
6 changed files with 95 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      src/components/patientRegister/AsbChargeRequest.vue
  2. 38
      src/components/patientRegister/PatientRegisterEdit.vue
  3. 10
      src/views/Home.vue
  4. 6
      src/views/charge/charge.vue
  5. 2
      src/views/customerOrg/patientLis.vue
  6. 1
      src/views/customerOrg/patientRegister.vue

104
src/components/patientRegister/AsbChargeRequest.vue
View File

@ -3,8 +3,8 @@
<div>
<el-tabs v-model="tabChoosed" style="margin-top: 0px;">
<el-tab-pane label="待收费项目" name="1">
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
height="450" highlight-current-row size="small" @selection-change="handleSelectionChange"
<el-table :data="tableData" border style="width: 100%" row-key="id"
height="450" highlight-current-row size="small" @selection-change="handleSelectionChange"
:row-style="{ height: '25px' }">
<el-table-column type="selection" align="center" width="40" />
<el-table-column type="index" label="序号" align="center" width="40" />
@ -17,43 +17,42 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="已收费项目" name="2">
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
height="160" highlight-current-row size="small" @selection-change="handleSelectionChange"
:row-style="{ height: '25px' }">
<el-table-column type="index" label="序号" align="center" width="40" />
<el-table-column label="申请单号" min-width="150" prop="asbitemName"></el-table-column>
<el-table-column prop="total" label="金额" min-width="60" align="center" />
<el-table-column prop="ch" label="收费人员" min-width="80" align="center" />
<el-table-column prop="ch" label="收费时间" min-width="150" align="center" />
<el-table-column label="操作" width="150" align="center">
<template slot-scope="scope">
<div style="display: flex;justify-content: space-between;">
<div>
<el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false"
style="width:80px;">撤消申请</el-button>
</div>
<div>
<el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false"
style="width:50px;">退费</el-button>
</div>
</div>
</template>
</el-table-column>
</el-table>
<div style="padding: 10px 0 5px 0;">申请单包含项目</div>
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
height="256" highlight-current-row size="small" @selection-change="handleSelectionChange"
:row-style="{ height: '25px' }">
<el-table-column type="index" label="序号" align="center" width="40" />
<el-table-column label="组合项目" min-width="150" prop="asbitemName"></el-table-column>
<el-table-column label="标准价格" prop="standardPrice" min-width="70" align="center" />
<el-table-column label="数量" prop="amount" min-width="50" align="center"></el-table-column>
<el-table-column label="实收价格" prop="chargePrice" min-width="70" align="center"></el-table-column>
<el-table-column prop="total" label="金额" min-width="70" align="center" />
<el-table-column prop="standardPrice" label="标准金额" min-width="70" align="center" />
</el-table>
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
height="160" highlight-current-row size="small"
:row-style="{ height: '25px' }">
<el-table-column type="index" label="序号" align="center" width="40" />
<el-table-column label="申请单号" min-width="150" prop="asbitemName"></el-table-column>
<el-table-column prop="total" label="金额" min-width="60" align="center" />
<el-table-column prop="ch" label="收费人员" min-width="80" align="center" />
<el-table-column prop="ch" label="收费时间" min-width="150" align="center" />
<el-table-column label="操作" width="150" align="center">
<template slot-scope="scope">
<div style="display: flex;justify-content: space-between;">
<div>
<el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false"
style="width:80px;">撤消申请</el-button>
</div>
<div>
<el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false"
style="width:50px;">退费</el-button>
</div>
</div>
</template>
</el-table-column>
</el-table>
<div style="padding: 10px 0 5px 0;">申请单包含项目</div>
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
height="256" highlight-current-row size="small"
:row-style="{ height: '25px' }">
<el-table-column type="index" label="序号" align="center" width="40" />
<el-table-column label="组合项目" min-width="150" prop="asbitemName"></el-table-column>
<el-table-column label="标准价格" prop="standardPrice" min-width="70" align="center" />
<el-table-column label="数量" prop="amount" min-width="50" align="center"></el-table-column>
<el-table-column label="实收价格" prop="chargePrice" min-width="70" align="center"></el-table-column>
<el-table-column prop="total" label="金额" min-width="70" align="center" />
<el-table-column prop="standardPrice" label="标准金额" min-width="70" align="center" />
</el-table>
</el-tab-pane>
</el-tabs>
</div>
@ -83,15 +82,17 @@ export default {
data() {
return {
tabChoosed: '1',
tableData: [], //组合项目数据 过滤后显示的数据
spanRow: [], //{ startRow: 0, endRow: 0 } 合并行
tableDataAll: [], //组合项目数据（该客户所有数据）
tableData: [], //组合项目数据 过滤后显示的数据
selectedData: [], //选中的组合项目
finalSelected: [], //取消合并时与selectedData一致，合并时要追 其他未勾选合并的项目
hisRequestData:[], //收费申请单
hisRequestDataDetails:[], //收费申请单明细
};
},
created() { },
created() {
},
mounted() {
this.initData(this.patientRegister.id);
@ -101,8 +102,19 @@ export default {
},
methods: {
initData() {
//
initData(patientRegisterId) {
this.tableData=[]
if(!patientRegisterId) return
postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
.then(res => {
if(res.code > -1){
res.data.forEach(e => {
e.total = Number(e.chargePrice * e.amount)
this.tableData.push(e)
});
}
})
},
handleSelectionChange(v) {

38
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -213,19 +213,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="4">
<el-form-item label="单位体检次数" prop="isVip" label-width="110px">
<el-select :class="form.customerOrgId == dict.personOrgId ? '' : 'enterToTab'"
v-model="form.customerOrgRegisterId" placeholder="次数" size="small"
:disabled="form.customerOrgId == dict.personOrgId || form.completeFlag == '3' "
:style="'width:' + Math.floor((window.pageWidth - 654) / 4.8) + 'px;'" @change="changeMedicalTimes"
:style="'width:' + Math.floor((window.pageWidth - 654) / 6) + 'px;'" @change="changeMedicalTimes"
value-key="id">
<el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes"
:value="item.id" :disabled="item.isComplete == 'Y'" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="4">
<el-form-item label="hisId" prop="isPhoneFollow">
<el-input v-model="form.hisPatientId" size="small" disabled/>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="电话随访" prop="isPhoneFollow">
<!--
<el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
@ -243,7 +248,7 @@
<el-checkbox v-model="form.isVipBox" @change="changeBox('isVip')" />
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="2">
<el-form-item label="隐藏姓名" prop="isNameHide">
<!--
<el-radio v-model="form.isNameHide" label="Y">是</el-radio>
@ -252,7 +257,7 @@
<el-checkbox v-model="form.isNameHideBox" @change="changeBox('isNameHide')" />
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="2">
<el-form-item label="锁住" prop="isLock" label-width="50px">
<!--
<el-radio v-model="form.isLock" label="Y">是</el-radio>
@ -398,10 +403,10 @@
<el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('2')">全免费</el-button>
</div>
<div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
<el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>
<el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>d
</div>
<div v-show="checkPagePriv(pagePriv.privs, '收费申请')" class="btn">
<el-button type="success" class="commonbutton" @click="chargeRequest(form.id)" :disabled="!form.id">收费申请</el-button>
<el-button type="success" class="commonbutton" @click="chargeRequest(form)" :disabled="!form.id">收费申请</el-button>
</div>
<!--
<div class="btn">
@ -599,7 +604,8 @@ export default {
isPhoneFollowBox: false, //电话随访
isLockBox: false, //是否锁住
isMaxMedicalTimes: 'N',
medicalStartDate: null
medicalStartDate: null,
hisPatientId:'', //对接 hisid
}, //单位 记录 目前新增与更新是一致
formInit: {}, //表单初始化
customerOrgRegisterList: [], //单位体检次数列表
@ -1730,7 +1736,11 @@ export default {
this.$message.warning({ showClose: true, message: "请先保存人员信息！"})
return
}
if (form.completeFlag == '0') {
this.$message.warning({ showClose: true, message: "预登记的人员不可执行此操作！"})
return
}
let err = await this.getAsb(form.id)
if(err){
this.$message.error(err)
@ -1755,13 +1765,17 @@ export default {
},
// 收费申请
async chargeRequest(patientRegisterId){
if (!patientRegisterId) {
async chargeRequest(form){
if (!form.id) {
this.$message.warning({ showClose: true, message: "请先保存人员信息！"})
return
}
if (form.completeFlag == '0') {
this.$message.warning({ showClose: true, message: "预登记的人员不可执行此操作！"})
return
}
let err = await this.getAsb(patientRegisterId)
let err = await this.getAsb(form.id)
if(err){
this.$message.error(err)
return

10
src/views/Home.vue
View File

@ -340,7 +340,7 @@ export default {
//打开客户端调试工具
toggleDevTools() {
if (!this.$peisAPI) {
this.$message.info("此功能，需要在壳客户端才可运行！");
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
return;
}
this.$peisAPI.toggleDevTools();
@ -349,7 +349,7 @@ export default {
// 打开客户端设置
clientConfigShow() {
if (!this.$peisAPI) {
this.$message.info("此功能，需要在壳客户端才可运行！")
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"})
return
}
this.$peisAPI.clientConfigShow();
@ -357,7 +357,7 @@ export default {
// 最小化
windowMin() {
if (!this.$peisAPI) {
this.$message.info("此功能，需要在壳客户端才可运行！");
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
return;
}
this.$peisAPI.windowMin();
@ -365,14 +365,14 @@ export default {
// 最大化
windowMax() {
if (!this.$peisAPI) {
this.$message.info("此功能，需要在壳客户端才可运行！");
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
return;
}
this.$peisAPI.windowMax();
},
windowClose() {
if (!this.$peisAPI) {
this.$message.info("此功能，需要在壳客户端才可运行！");
this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！"});
return;
}
this.$peisAPI.windowClose();

6
src/views/charge/charge.vue
View File

@ -1169,9 +1169,9 @@ export default {
});
//分组，所有分组，不限单位，不限次数
getapi("/api/app/customer-org-group").then((res) => {
if (res.code == 1) {
this.dict.customerOrgGroupAll = res.data.items;
getapi("/api/app/customerorggroup/getlistinfilter").then((res) => {
if (res.code > -1) {
this.dict.customerOrgGroupAll = res.data;
}
});

2
src/views/customerOrg/patientLis.vue
View File

@ -49,6 +49,8 @@ export default {
} else {
this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
}
this.dataTransOpts.refresh.lis_request.M++
this.dataTransOpts.refresh.register_check_asbitem.M++
},
//页面挂载完成，一般页面渲染数据放在这里

1
src/views/customerOrg/patientRegister.vue
View File

@ -54,6 +54,7 @@ export default {
} else {
this.dataTransOpts.tableS.patient_register = { id: '', patientRegisterNo: '' }
}
this.dataTransOpts.refresh.register_check_asbitem.M++
},
//页面挂载完成，一般页面渲染数据放在这里

Write Preview
Loading…
Cancel
Save