From b4208943c5d2b963e27a15e4140605557fefa87f Mon Sep 17 00:00:00 2001
From: wutinghui <wutinghui@ssish.com>
Date: Mon, 7 Mar 2022 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charge-query/lpjManageDetail.vue     | 12 +++++++-----
 src/views/info/components/infoDoctor.vue       | 11 ++++++++---
 .../welfare/edit/components/benefits/index.vue | 18 ++++++++++++++----
 .../edit/components/coverages/index.vue        |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/views/charge-query/lpjManageDetail.vue b/src/views/charge-query/lpjManageDetail.vue
index 50c3da0..ae58c35 100644
--- a/src/views/charge-query/lpjManageDetail.vue
+++ b/src/views/charge-query/lpjManageDetail.vue
@@ -157,14 +157,16 @@ import moment from 'moment'
 export default {
   data() {
     const columns = [
-      { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
+      { title: "就诊日期", dataIndex: "visitTimeStart", width: 150,scopedSlots: { customRender: "visitTimeStart" } },
       { title: "病历号", dataIndex: "patientNo", key:"patientNo",align:'center', width: 136},
       { title: "客户姓名", dataIndex: "patientName", width: 98 },
-      { title: "保险公司", dataIndex: "payorName", width: 110 },
-      { title: "就诊日期", dataIndex: "visitTimeStart", width: 200,scopedSlots: { customRender: "visitTimeStart" } },
-      { title: "账单金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
+      { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
+      { title: "保险公司", dataIndex: "payorName", width: 150 },
+      { title: "应收金额", dataIndex: "receiptAmount", width: 100, align: 'center' },
       { title: "折后金额", dataIndex: "discountAmount", width: 100, align: 'center' },
-      { title: "客户自负", dataIndex: "paidAmount", width: 100, align: 'center' },
+      { title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
+      // { title: "账单金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
+      { title: "客户自付", dataIndex: "paidAmount", width: 100, align: 'center' },
       { title: "理赔金额", dataIndex: "paidamount", width: 100, align: 'center' },
       // { title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }},
     ];
diff --git a/src/views/info/components/infoDoctor.vue b/src/views/info/components/infoDoctor.vue
index f624be7..5b7014a 100644
--- a/src/views/info/components/infoDoctor.vue
+++ b/src/views/info/components/infoDoctor.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="info-doctor">
+    <div class="mar-bottom10">
+      <a-button type="primary" @click="editEvt({})">
+        <Icon name="ssiadd" :size="14" />新建医生
+      </a-button>
+    </div>
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 'max-content' }" :pagination="false">
       <template slot="specialtyList" slot-scope="text, record">
         <span>{{ filterSpecialty(record.specialtyList) }}</span>
@@ -180,7 +185,7 @@ export default{
     },
     editEvt(record) {
       this.editFormObj = {
-        id: record.id || "",
+        id: record.id || undefined,
         doctorCode: record.doctorCode || "",
         doctorDesc: record.doctorDesc || "",
         doctorDescLang1: record.doctorDescLang1 || "",
@@ -194,8 +199,8 @@ export default{
     handleEditOK() {
       this.$refs.editForm.validate((valid) => {
         if (valid) {
-          this.$apis
-            .DOCTORUPDATE({
+          const fn = this.editFormObj.id ?  this.$apis.DOCTORUPDATE : this.$apis.DOCTORCREATE
+          fn({
               ...this.editFormObj,
               language: this.editFormObj.language.join(','),
               specialtyList: this.editFormObj.specialtyList.map((item) => {
diff --git a/src/views/welfare/edit/components/benefits/index.vue b/src/views/welfare/edit/components/benefits/index.vue
index 240ddae..cab60aa 100644
--- a/src/views/welfare/edit/components/benefits/index.vue
+++ b/src/views/welfare/edit/components/benefits/index.vue
@@ -85,7 +85,7 @@
               </a-input-number>
             </a-form-model-item>
           </a-col>
-          <a-col :md="12">
+          <!-- <a-col :md="12">
             <a-form-model-item label="英文描述">
               <a-input v-model="editForm.englishDesc"></a-input>
             </a-form-model-item>
@@ -94,7 +94,7 @@
             <a-form-model-item label="描述">
               <a-input v-model="editForm.loaDesc"> </a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <!-- <a-col :md="12">
             <a-form-model-item label="状态">
               <a-select
@@ -167,7 +167,9 @@ export default {
       isBenefitEditShow: false,
       benefitData: [],
       benefitCode: [],
-      editForm: {},
+      editForm: {
+        benefitCode: []
+      },
       editRule: {
         benefitCode: [{ required: true, message: "请选择福利项" }],
         startDate: [{ required: true, message: "请选择开始时间" }],
@@ -194,12 +196,15 @@ export default {
         corpCode: this.formData.corpCode,
         planCode: this.formData.planCode,
         coverageCode: this.formData.coverageCode,
+        benefitCode: '',
         isDirect: "N",
         status: "1",
       };
       this._getBenefitCode();
       this.editForm = this.$lodash.cloneDeep(data);
+      // this.editForm.benefitCode = this.editForm.benefitCode ? this.editForm.benefitCode.split(',') : []
       this.isBenefitEditShow = true;
+      console.log(this.editForm)
     },
     cancel() {
       this.$refs.editForm.resetFields();
@@ -216,7 +221,12 @@ export default {
         if (!valid) {
           return false;
         }
-        this._editBenefitData(this.editForm);
+        const data = {
+          ...this.editForm,
+          // benefitCode: this.editForm.benefitCode.join(',')
+
+        }
+        this._editBenefitData(data);
       });
     },
     _editBenefitData(data) {
diff --git a/src/views/welfare/edit/components/coverages/index.vue b/src/views/welfare/edit/components/coverages/index.vue
index c5fa70a..74bca68 100644
--- a/src/views/welfare/edit/components/coverages/index.vue
+++ b/src/views/welfare/edit/components/coverages/index.vue
@@ -126,7 +126,7 @@ export default {
         }
         return val;
       } },
-      { title: "备注", dataIndex: "remark" },
+      { title: "备注", dataIndex: "remarks" },
       {
         title: "操作",
         key: "operation",
-- 
2.22.0