Skip to content

B
bims
Commit 9a4e2c0b authored by yanglilong's avatar yanglilong
Browse files
Options

Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

parents 3bf757b3 fa0cb01e
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 300 deletions
src/api/state_code.js
View file @ 9a4e2c0b
......@@ -14,7 +14,7 @@ const TOKEN_INVLIDE_TO_LOGIN = (code) => {
});
}
// 清除个人数据
store.commit("user/setUserInfo", "");
store.commit("common/setUserInfo", "");
route.replace({
path: "/login",
query: {
......
src/router/modules/menu.js
View file @ 9a4e2c0b
......@@ -96,7 +96,7 @@ export default [
{
icon: "ssiscan",
path: "/bi",
title: "报销",
title: "报表",
children: [],
},
];
src/views/charge-query/detail.vue
View file @ 9a4e2c0b
<template>
<!-- -账单明细 -->
<div class="white_bg burt-container custom-info">
<!-- form -->
<a-form-model ref="form" layout="vertical" :model="form">
<a-row :gutter="30">
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="病历号">
<a-input
v-model="form.patientNo"
placeholder="请输入病历号"
allow-clear
></a-input>
<a-input v-model="form.patientNo" placeholder="请输入病历号" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户姓名">
<a-input
v-model="form.patientName"
placeholder="请输入客户姓名"
allow-clear
></a-input>
<a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户类型">
<a-select
v-model="form.patientType"
placeholder="请选择客户类型"
allowClear
>
<a-select-option
v-for="item in patientTypeOptions"
:key="item.code"
:value="item.code"
>
<a-select v-model="form.patientType" placeholder="请选择客户类型" allowClear>
<a-select-option v-for="item in patientTypeOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
......@@ -41,16 +24,8 @@
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select
v-model="form.payorId"
placeholder="请选择保险公司"
allowClear
>
<a-select-option
v-for="item in companyOptions"
:key="item.corpCode"
:value="item.id"
>
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
{{ item.longName }}
</a-select-option>
</a-select>
......@@ -58,16 +33,8 @@
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="看诊医生">
<a-select
v-model="form.doctorCode"
placeholder="请选择看诊医生"
allowClear
>
<a-select-option
v-for="item in doctorOptions"
:key="item.doctorCode"
:value="item.doctorCode"
>
<a-select v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
<a-select-option v-for="item in doctorOptions" :key="item.doctorCode" :value="item.doctorCode">
{{ item.doctorDesc }}
</a-select-option>
</a-select>
......@@ -75,38 +42,24 @@
</a-col>
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="就诊时间">
<a-range-picker
format="YYYY-MM-DD"
v-model="form.dateRange"
:placeholder="['开始时间', '结束时间']"
@change="onSelectVisitTime"
/>
<a-range-picker format="YYYY-MM-DD" v-model="form.dateRange" :placeholder="['开始时间', '结束时间']"
@change="onSelectVisitTime"/>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="支付方式">
<a-select
v-model="form.paymentCode"
placeholder="请选择支付方式"
allowClear
>
<a-select-option
v-for="item in paymentOptions"
:key="item.code"
:value="item.code"
allow-clear
>
<a-select v-model="form.paymentCode" placeholder="请选择支付方式" allowClear>
<a-select-option v-for="item in paymentOptions" :key="item.code" :value="item.code" allow-clear>
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="12" :lg="12" :sm="12" class="none-label">
<a-col :xl="16" :lg="12" :sm="12" class="none-label">
<a-form-model-item label="button">
<a-button>更新数据</a-button>
<a-button class="mar-left10" type="primary" @click="addNewCharge">
<Icon name="ssiadd" :size="14" />新建预授权</a-button
>
<Icon name="ssiadd" :size="14" />新建预授权</a-button>
<a-button class="mar-left10" type="primary" @click="handlerReset">
<Icon name="ssireset" :size="14" />重置
</a-button>
......@@ -118,52 +71,35 @@
</a-row>
</a-form-model>
<!-- table -->
<a-table
:columns="columns"
:data-source="dataList"
row-key="id"
:scroll="{ x: true }"
:customRow="handlerRowClick"
:pagination="true"
>
<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false">
<template slot="operation" slot-scope="record">
<a-button
v-if="record.isEdit"
type="link"
@click.stop="saveChange(record)"
>保存</a-button
>
<a-button v-else type="link" @click.stop="changeDataStatus(record)"
>修改</a-button
>
<!-- <a-button type="link" class="success">查看</a-button> -->
<a-popconfirm
title="你确定要关闭吗？"
ok-text="确定"
cancel-text="取消"
@confirm="deleteData"
>
<a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-popconfirm title="你确定要关闭吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData" >
<a-button type="link" class="danger">删除</a-button>
</a-popconfirm>
</template>
</a-table>
<!--分页-->
<BurtPagination :pagination="pager" @pageChange="_getChargeListDetail" />
<BurtPagination :pagination="pagination" @pageChange="_getChargeListDetail" />
<div class="title-div">费用支付明细</div>
<a-table
:columns="payColumns"
:data-source="payDataList"
row-key="id"
:scroll="{ x: true }"
:pagination="false"
class="payTable"
>
<a-table :columns="payColumns" :data-source="payDataList" :scroll="{ x: true }" :pagination="false" class="payTable">
<template slot="paymentType" slot-scope="text">
<a-button class="danger">{{ text | payStyleFilters }}</a-button>
</template>
</a-table>
<a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
okText="确定" cancelText="取消"
@ok="handleEditOK" @cancel="dialogShow = false">
<a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
<a-row :gutter="30">
<a-col :lg="12" :xs="24">
</a-col>
</a-row>
</a-form-model>
</a-modal>
</div>
</template>
......@@ -174,16 +110,8 @@ export default {
data() {
const columns = [
{ title: "项目", dataIndex: "itemcatDesc", width: 180 },
{
title: "项目明细",
dataIndex: "itemDesc",
width: 180,
},
{
title: "单价",
dataIndex: "itemPrice",
width: 120,
},
{ title: "项目明细", dataIndex: "itemDesc", width: 180},
{ title: "单价", dataIndex: "itemPrice", width: 120},
{ title: "数量", dataIndex: "itemQty", width: 180 },
{ title: "单位", dataIndex: "itemUnit", width: 180 },
{ title: "金额", dataIndex: "chargeAmount", width: 180 },
......@@ -191,18 +119,11 @@ export default {
{ title: "折后金额", dataIndex: "actualAmount", width: 180 },
{ title: "减免金额", dataIndex: "reduceAmount", width: 180 },
{ title: "实际金额", dataIndex: "paidAmount", width: 180 },
{ title: "免赔额", dataIndex: "deductible", width: 180 },
{ title: "自付额", dataIndex: "selfPaid", width: 180 },
{ title: "其他费用", dataIndex: "otherPaid", width: 180 },
{ title: "实际金额", dataIndex: "actualPaid", width: 180 },
{
title: "操作",
key: "operation",
width: "175px",
fixed: "right",
scopedSlots: { customRender: "operation" },
},
{ title: "操作", key: "operation", width: "175px", fixed: "right", scopedSlots: { customRender: "operation" },align: "center"},
];
const payColumns = [
{ title: "免赔额", dataIndex: "deductible", width: 180 },
......@@ -210,14 +131,10 @@ export default {
{ title: "其他费用", dataIndex: "otherPaid", width: 180 },
{ title: "个人支付", dataIndex: "personalPaid", width: 180 },
{ title: "商保支付", dataIndex: "ciPaid", width: 180 },
{
title: "支付方式",
dataIndex: "paymentType",
width: 180,
scopedSlots: { customRender: "paymentType" },
},
{ title: "支付方式", dataIndex: "paymentType", width: 180, scopedSlots: { customRender: "paymentType" }},
];
return {
dialogShow: false,
receiptNo: "",
columns,
payColumns,
......@@ -251,12 +168,20 @@ export default {
pageSize: 10,
},
payDataList: [],
payPager: [
{
pagination: {
pageNum: 1,
pageSize: 10,
total: 0,
},
editFormObj: {
id: "",
patientNo: '',
patientName: '',
},
editRules: {
patientNo: [{ required: true, message: "病历号", trigger: "blur" }],
patientName: [{ required: true, message: "客户姓名", trigger: "blur" }],
},
],
};
},
components: {
......@@ -350,46 +275,24 @@ export default {
handlerReset() {
this.form = {};
},
//设置行属性
handlerRowClick(record) {
const { receiptNo } = record;
console.log("receiptNo=", receiptNo);
return {
style: {
color: record.isEdit ? "#2B63FF" : "#252631",
editEvt(record) {
this.editFormObj = {
id: record.id || "",
};
this.dialogShow = true;
},
on: {
// 点击行
click: () => {
if (record.isEdit) {
return true;
//编辑保存
handleEditOK() {
this.$refs.editForm.validate((valid) => {
if (valid) {
console.log(11)
}
this.$router.push({
name: "chargeQueryDetail",
query: { receiptNo },
});
},
},
};
},
// 修改按钮
changeDataStatus(record) {
this.$set(record, "isEdit", true);
},
saveChange(record) {
record.isEdit = undefined;
record.isNew = undefined;
},
handlerSearch() {
this.$refs.form.validate((valid) => {
if (!valid) {
return false;
}
this.pager.pageNum = 1;
this.pagination.pageNum = 1;
this.pageForm = this.$lodash.cloneDeep(this.form);
this._getChargeListDetail();
});
},
deleteData() {
this.$message.success("删除成功");
......
src/views/charge-query/index.vue
View file @ 9a4e2c0b
......@@ -6,30 +6,18 @@
<a-row :gutter="30">
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="病历号">
<a-input
v-model="form.patientNo"
placeholder="请输入病历号"
allow-clear
></a-input>
<a-input v-model="form.patientNo" placeholder="请输入病历号" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户姓名">
<a-input
v-model="form.patientName"
placeholder="请输入客户姓名"
allow-clear
></a-input>
<a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户类型">
<a-select v-model="form.patientType" placeholder="请选择客户类型" allowClear>
<a-select-option
v-for="item in patientTypeOptions"
:key="item.code"
:value="item.code"
>
<a-select-option v-for="item in patientTypeOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
......@@ -38,11 +26,7 @@
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
<a-select-option
v-for="item in companyOptions"
:key="item.corpCode"
:value="item.id"
>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
{{ item.longName }}
</a-select-option>
</a-select>
......@@ -51,11 +35,7 @@
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="看诊医生">
<a-select v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
<a-select-option
v-for="item in doctorOptions"
:key="item.doctorCode"
:value="item.doctorCode"
>
<a-select-option v-for="item in doctorOptions" :key="item.doctorCode" :value="item.doctorCode">
{{ item.doctorDesc }}
</a-select-option>
</a-select>
......@@ -69,23 +49,17 @@
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="支付方式">
<a-select v-model="form.paymentCode" placeholder="请选择支付方式" allowClear>
<a-select-option
v-for="item in paymentOptions"
:key="item.code"
:value="item.code"
allow-clear
>
<a-select-option v-for="item in paymentOptions" :key="item.code" :value="item.code" allow-clear>
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="12" :lg="12" :sm="12" class="none-label">
<a-col :xl="16" :lg="12" :sm="12" class="none-label">
<a-form-model-item label="button">
<a-button>更新数据</a-button>
<a-button class="mar-left10" type="primary" @click="addNewCharge">
<Icon name="ssiadd" :size="14" />新建预授权</a-button
>
<Icon name="ssiadd" :size="14" />新建预授权</a-button>
<a-button class="mar-left10" type="primary" @click="handlerReset">
<Icon name="ssireset" :size="14" />重置
</a-button>
......@@ -98,37 +72,39 @@
</a-form-model>
<!-- table -->
<a-table
:columns="columns"
:data-source="dataList"
row-key="id"
:scroll="{ x: true }"
:customRow="handlerRowClick"
:pagination="true"
>
<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false">
<template slot="index" slot-scope="text, record, index">
{{ index + 1 }}
</template>
<template slot="operation" slot-scope="record">
<a-button
v-if="record.isEdit"
type="link"
@click.stop="saveChange(record)"
>保存</a-button
>
<a-button v-else type="link" @click.stop="changeDataStatus(record)"
>修改</a-button
>
<a-button type="link" class="success">查看</a-button>
<a-popconfirm
title="你确定要关闭吗？"
ok-text="确定"
cancel-text="取消"
@confirm="deleteData"
>
<a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-button type="link" class="success" @click.stop="detailEvt(record)">查看</a-button>
<a-popconfirm title="你确定要关闭吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData" >
<a-button type="link" class="danger">删除</a-button>
</a-popconfirm>
</template>
</a-table>
<!--分页-->
<BurtPagination :pagination="pager" @pageChange="_getChargeList" />
<BurtPagination :pagination="pagination" @pageChange="_getChargeList" />
<a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
okText="确定" cancelText="取消"
@ok="handleEditOK" @cancel="dialogShow = false">
<a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
<a-row :gutter="30">
<a-col :lg="12" :xs="24">
<a-form-model-item label="病历号" prop="patientNo">
<a-input v-model.trim="editFormObj.patientNo" placeholder="病历号" />
</a-form-model-item>
</a-col>
<a-col :lg="12" :xs="24">
<a-form-model-item label="客户姓名" prop="patientName">
<a-input v-model.trim="editFormObj.patientName" placeholder="客户姓名" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-modal>
</div>
</template>
......@@ -138,46 +114,16 @@ import { mapState } from "vuex"
export default {
data() {
const columns = [
{
title: "序号",
dataIndex: "index",
key:"index",
align:'center',
width: 80,
customRender: (text, record, index) => {
return `${index+1}`
},
},
{ title: "序号", dataIndex: "index", key:"index",align:'center', width: 80,scopedSlots: { customRender: "index" }},
{ title: "收费时间", dataIndex: "receiptDate", width: 180 },
{
title: "病历号",
dataIndex: "patientNo",
width: 180,
customRender: (val, row) => {
if (row.isEdit) {
return <a-input v-model={row.patientNo}></a-input>;
}
return val;
},
},
{
title: "客户姓名",
dataIndex: "patientName",
width: 120,
customRender: (val, row) => {
if (row.isEdit) {
return <a-input v-model={row.patientName}></a-input>;
}
return val;
},
},
{ title: "病历号", dataIndex: "patientNo",width: 180},
{ title: "客户姓名",dataIndex: "patientName",width: 120,},
{ title: "客户类型", dataIndex: "patientType", width: 180 },
{ title: "保险公司", dataIndex: "payorName", width: 180 },
{ title: "就诊时间", dataIndex: "visitTime", width: 180 },
{ title: "就诊医生", dataIndex: "doctorName", width: 180 },
{ title: "账单金额", dataIndex: "chargeAmount", width: 180 },
{ title: "折扣（%）", dataIndex: "discountAmount", width: 180 },
{ title: "折后金额", dataIndex: "actualAmount", width: 180 },
{ title: "客户自付", dataIndex: "paidAmount", width: 180 },
{ title: "减免金额", dataIndex: "reduceamount", width: 180 },
......@@ -187,15 +133,10 @@ export default {
{ title: "保险欠费", dataIndex: "insuranceArrearsAmount", width: 180 },
{ title: "个人欠费", dataIndex: "personalArrearsAmount", width: 180 },
{ title: "发票号码", dataIndex: "receiptNo", width: 180 },
{
title: "操作",
key: "operation",
width: "175px",
fixed: "right",
scopedSlots: { customRender: "operation" },
},
{ title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }},
];
return {
dialogShow: false,
columns,
form: {},
pageForm: {
......@@ -222,9 +163,19 @@ export default {
},
], //支付方式
dataList: [],
pager: {
pagination: {
pageNum: 1,
pageSize: 10,
total: 0,
},
editFormObj: {
id: "",
patientNo: '',
patientName: '',
},
editRules: {
patientNo: [{ required: true, message: "病历号", trigger: "blur" }],
patientName: [{ required: true, message: "客户姓名", trigger: "blur" }],
},
};
},
......@@ -246,11 +197,12 @@ export default {
_getChargeList() {
const data = {
...this.pageForm,
...this.pager,
...this.pagination,
};
this.$apis.GETCHARGELIST(data).then((res) => {
this.dataList = (res.content && res.content.list) || [];
// this.pager.total = (res.content && res.content.total) || 0;
let content = res.content || {};
this.dataList = content.list || [];
this.pagination.total = content.total || 0;
});
},
// 获取保险公司下拉选项
......@@ -278,42 +230,46 @@ export default {
handlerReset() {
this.form = {}
},
//设置行属性
handlerRowClick(record) {
//查看
detailEvt(record) {
const { receiptNo } = record;
return {
style: {
color: record.isEdit ? "#2B63FF" : "#252631",
},
on: {
// 点击行
click: () => {
if (record.isEdit) {
return true;
}
this.$router.push({
name: "chargeQueryDetail",
query: { receiptNo },
});
},
},
editEvt(record) {
this.editFormObj = {
id: record.id || "",
patientNo: record.patientNo || "",
patientName: record.patientName || "",
};
this.dialogShow = true;
},
// 修改按钮
changeDataStatus(record) {
this.$set(record, "isEdit", true);
},
saveChange(record) {
record.isEdit = undefined;
record.isNew = undefined;
//编辑保存
handleEditOK() {
this.$refs.editForm.validate((valid) => {
if (valid) {
//下面接口没有给到
this.$apis.DOCTORUPDATE(this.editFormObj)
.then((res) => {
if (res.returnCode == "0000") {
this.$message.success("编辑成功");
this.dialogShow = false;
this._getChargeList();
} else {
this.$message.error(res.returnMsg);
}
});
}
});
},
handlerSearch() {
this.$refs.form.validate((valid) => {
if (!valid) {
return false;
}
this.pager.pageNum = 1;
this.pagination.pageNum = 1;
this.pageForm = this.$lodash.cloneDeep(this.form);
this._getChargeList();
});
......
src/views/info/components/companyDiscount.vue
View file @ 9a4e2c0b
......@@ -30,7 +30,7 @@
</a-table>
<!--分页-->
<BurtPagination :pagination="pagination" @pageChange="getTableList" />
<a-modal title="编辑" :visible="dialogShow" width="60%" :maskClosable="false"
<a-modal :title="editFormObj.id?'编辑':'新增'" :visible="dialogShow" width="60%" :maskClosable="false"
okText="确定" cancelText="取消" @ok="handleEditOK" @cancel="dialogShow = false">
<a-form-model layout="vertical" ref="editForm" :model="editFormObj" :rules="editRules">
<a-row :gutter="30">
......
src/views/info/index.vue
View file @ 9a4e2c0b
......@@ -97,17 +97,16 @@
<span>{{ filterSpecialty(record.specialtyList) }}</span>
</template>
<template slot="operation" slot-scope="text, record, index">
<a-button type="link" @click.stop="editEvt(record)">{{ record.edit ? "保存" : "修改"}}</a-button>
<a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
</template>
</a-table>
<!--分页-->
<BurtPagination :pagination="pagination" @pageChange="getDoctorList" />
<a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
<a-modal title="编辑" :visible="dialogShow" width="60%" :maskClosable="false"
okText="确定" cancelText="取消"
@ok="handleEditOK" @cancel="dialogShow = false">
<a-form-model ref="editForm" :model="editFormObj"
:rules="editRules" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
<a-form-model-item label="科室" prop="specialtyList">
<a-select v-model="editFormObj.specialtyList" placeholder="请选择" mode="multiple">
<a-select-option :value="item.id" v-for="item in specialtyList" :key="item.id">{{ item.specialtyDesc }}</a-select-option>
......@@ -157,8 +156,6 @@ export default {
data() {
return {
dialogShow: false,
labelCol: { span: 4 },
wrapperCol: { span: 20 },
columns,
dataList: [],
detailObj: {}, //详细信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment