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

src/views/author/login.vue

@@ -118,11 +118,11 @@ export default {
       .bd-b(solid, 31, transparent);
     }
     &::before {
-      .l(-20);
+      .l(-18.8);
       .bd-r(solid, 20, #2b63ff);
     }
     &::after {
-      .r(-20);
+      .r(-18.8);
       .bd-l(solid, 20, #2b63ff);
     }
   }

src/views/charge-query/lpjManage.vue

@@ -90,7 +90,6 @@ export default {
       { title: "寄送状态", dataIndex: "sendSts", width: 90,scopedSlots: { customRender: "sendSts" } },
       { title: "寄送日期", dataIndex: "sendDate",width: 130,scopedSlots: { customRender: "sendDate" }},
       { title: "快递单号",dataIndex: "trackingNo",width: 180,},
-      { title: "客户自负", dataIndex: "paidAmount", width: 100, align: 'center' },
       { title: "寄送备注", dataIndex: "sendRemark", width: 100 },
       { title: "操作", key: "operation", width: "200px",fixed: "right",scopedSlots: { customRender: "operation" }},
     ];

src/views/info/company.vue

@@ -129,8 +129,12 @@ export default {
       .then((res) => {
         if (res.returnCode == "0000") {
           this.$message.success("新增成功");
-          this.pagination.pageNum = 1;
-          this.getData();
+          this.$router.push({
+            path: '/info/companyDetail',
+            query: {
+              id: res.content
+            }
+          })
         } else {
           this.$message.error(res.returnMsg);
         }

src/views/info/index.vue

@@ -3,22 +3,17 @@
     <div class="title-div">申请日期</div>
     <a-form-model ref="form" layout="vertical">
       <a-row :gutter="30">
-        <a-col :lg="6" :sm="12">
+        <a-col :lg="8" :sm="12">
           <a-form-model-item label="医疗机构名称">
             <a-input v-model="detailObj.longName" placeholder="医疗机构名称" />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="6" :sm="12">
+        <a-col :lg="8" :sm="12">
           <a-form-model-item label="医疗机构英文名">
             <a-input v-model="detailObj.englishName" placeholder="医疗机构英文名" />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="6" :sm="12">
-          <a-form-model-item label="营业时间">
-            <a-date-picker v-model="detailObj.businessHours" format="YYYY年MM月DD日" placeholder="选择日期"/>
-          </a-form-model-item>
-        </a-col>
-        <a-col :lg="6" :sm="12">
+        <a-col :lg="8" :sm="12">
           <a-form-model-item label="联系电话">
             <a-input v-model="detailObj.telNo1" placeholder="请输入联系电话" />
           </a-form-model-item>
@@ -33,6 +28,11 @@
             <a-input v-model="detailObj.englishAddr" placeholder="诊所地址（英文）" />
           </a-form-model-item>
         </a-col>
+        <a-col :sm="12">
+          <a-form-model-item label="营业时间">
+            <a-textarea v-model="detailObj.businessHours" placeholder="请输入营业时间" :auto-size="{ minRows: 3, maxRows: 5 }" />
+          </a-form-model-item>
+        </a-col>
       </a-row>
     </a-form-model>
     <div class="title-div">账户信息-人民币账户</div>
@@ -59,8 +59,8 @@
     <a-form-model layout="vertical">
       <a-row :gutter="30">
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="账户名称">
-            <a-input v-model="detailObj.accountNameEng" placeholder="账户名称" />
+          <a-form-model-item label="Beneficiary账户名称">
+            <a-input v-model="detailObj.accountNameEng" placeholder="Beneficiary账户名称" />
           </a-form-model-item>
         </a-col>
         <a-col :lg="6" :sm="12">
@@ -107,6 +107,9 @@
       okText="确定" cancelText="取消"
       @ok="handleEditOK" @cancel="dialogShow = false">
       <a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
+        <a-form-model-item label="医生英文名" prop="doctorDescLang1">
+          <a-input v-model.trim="editFormObj.doctorDescLang1" placeholder="医生英文名" />
+        </a-form-model-item>
         <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>
@@ -145,6 +148,7 @@ export default {
       specialtyObj: {}, //科室对象
       editFormObj: {
         id: "",
+        doctorDescLang1: '',
         specialtyList: [],
       },
       editRules: {
@@ -231,6 +235,7 @@ export default {
     editEvt(record) {
       this.editFormObj = {
         id: record.id || "",
+        doctorDescLang1: record.doctorDescLang1 || "",
         specialtyList: record.specialtyList || [],
       };
       this.dialogShow = true;
@@ -242,6 +247,7 @@ export default {
           this.$apis
             .DOCTORUPDATE({
               id: this.editFormObj.id,
+              doctorDescLang1: this.editFormObj.doctorDescLang1,
               specialtyList: this.editFormObj.specialtyList.map((item) => {
                 return {
                   specialtyId: item,

src/views/verification/collection.vue

@@ -52,9 +52,8 @@ import moment from "moment";
 const columns = [
   { title: "回款编号", dataIndex: "backMoneyNo", ellipsis: true, width: 150 },
   { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 110 },
-  { title: "EOB状态", dataIndex: "eobSts", ellipsis: true, width: 110, scopedSlots: { customRender: "eobSts" } },
-  { title: "EOB赔付金额(人民币)", dataIndex: "eobAmountCny", ellipsis: true, width: 190,},
-  { title: "EOB赔付金额(美元)", dataIndex: "eobAmountUsd", ellipsis: true, width: 190,},
+  { title: "回款金额(人民币)", dataIndex: "backAmountCny", ellipsis: true, width: 190,},
+  { title: "回款金额(美元)", dataIndex: "backAmountUsd", ellipsis: true, width: 190,},
   { title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
   { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "200px"},
 ];

src/views/verification/collectionDetail.vue

@@ -114,6 +114,8 @@ const columns = [
   { title: "EOB状态", dataIndex: "eobSts", ellipsis: true, width: 110, scopedSlots: { customRender: "eobSts" } },
   { title: "EOB赔付金额(人民币)", dataIndex: "eobAmountCny", ellipsis: true, width: 190,},
   { title: "EOB赔付金额(美元)", dataIndex: "eobAmountUsd", ellipsis: true, width: 190,},
+  { title: "EOB回款金额(人民币)", dataIndex: "eobBackMoneyCny", ellipsis: true, width: 190,},
+  { title: "EOB回款金额(美元)", dataIndex: "eobBackMoneyUsd", ellipsis: true, width: 190,},
   { title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
   { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px"},
 ];

src/views/verification/index.vue

@@ -54,8 +54,8 @@ const columns = [
   { title: "EOB编号", dataIndex: "eobNo", ellipsis: true, width: 100 },
   { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 },
   { title: "理赔状态", dataIndex: "sendSts", ellipsis: true, width: 90, scopedSlots: { customRender: "sendSts" } },
-  { title: "理赔金额", dataIndex: "eobPaidAmount", ellipsis: true, width: 85 },
-  { title: "未清金额", dataIndex: "eobRefuseAmount", ellipsis: true, width: 85 },
+  { title: "EOB赔付金额(人民币)", dataIndex: "eobAmountCny", ellipsis: true, width: 85 },
+  { title: "EOB赔付金额(美元)", dataIndex: "eobAmountUsd", ellipsis: true, width: 85 },
   { title: "备注", dataIndex: "sendRemark", ellipsis: true, width: 120 },
   { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "200px"},
 ];