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

src/views/info/company.vue

@@ -30,7 +30,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :lg="12" :xs="24">
-            <a-form-model-item label="医生英文名" prop="englishName">
+            <a-form-model-item label="公司英文名" prop="englishName">
               <a-input v-model.trim="editFormObj.englishName" placeholder="保险医生英文名" />
             </a-form-model-item>
           </a-col>
@@ -65,7 +65,7 @@ import BurtPagination from "@/components/CUSTOMER/pagation";
 const columns = [
   { title: "序号", dataIndex: "id",width: 120},
   { title: "保险公司名称",dataIndex: "longName", ellipsis: true, scopedSlots: { customRender: "longName" },width: 130},
-  { title: "医生英文名", dataIndex: "englishName",ellipsis: true,scopedSlots: { customRender: "englishName" },width: 105},
+  { title: "保险公司英文名", dataIndex: "englishName",ellipsis: true,scopedSlots: { customRender: "englishName" },width: 105},
   { title: "联系电话", dataIndex: "contactPhone", scopedSlots: { customRender: "contactPhone" }, width: 125},
   { title: "联系地址", dataIndex: "address", ellipsis: true, scopedSlots: { customRender: "address" }, width: 180},
   { title: "Protal链接", dataIndex: "portalUrl", ellipsis: true, scopedSlots: { customRender: "portalUrl" }, width: 155 },

src/views/verification/index.vue

@@ -56,7 +56,7 @@ const columns = [
   { title: "EOB状态", dataIndex: "eobSts", ellipsis: true, width: 90, scopedSlots: { customRender: "eobSts" } },
   { 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: "eobRemark", ellipsis: true, width: 120 },
   { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "200px", align: 'center'},
 ];
 export default {

src/views/verification/indexDetail.vue

@@ -41,7 +41,12 @@
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :md="24" :lg="12" class="none-label">
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="备注">
+            <a-input v-model="form.eobRemark" placeholder="请输入备注"/>
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12" class="none-label">
           <a-form-model-item label="button">
             <!-- <a-button type="primary">导出</a-button> -->
             <a-button class="mar-left10" type="primary" @click="addNewEvt">
@@ -58,7 +63,7 @@
             </a-button> -->
             <a-button class="mar-left10" type="primary" @click="addNewBill">
               <Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}</a-button>
-        </a-form-model-item>
+          </a-form-model-item>
         </a-col>
       </a-row>
     </a-form-model>
@@ -145,7 +150,8 @@ export default {
         eobName: '',
         eobAmountCny: '',
         eobAmountUsd: '',
-        eobSts: ''
+        eobSts: '',
+        eobRemark: ''
       },
       dataList: [],
       isEditNewEob: false, //是否在新建EOB