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

src/views/charge-query/lpjManage.vue

@@ -47,14 +47,14 @@
           <div class="btn-div flex">
             <span></span>
             <a-form-model-item label="button">
-              <a-button class="mar-left10" type="primary" @click="addNewCharge">
-                <Icon name="ssiadd" :size="14" />新建寄送</a-button>
-              <a-button class="mar-left10" type="primary" @click="handlerReset">
-                <Icon name="ssireset" :size="14" />重置
-              </a-button>
               <a-button class="mar-left10" type="primary" @click="handlerSearch">
                 <Icon name="ssisearch_active" :size="14" />查询
               </a-button>
+              <a-button class="mar-left10" type="primary" @click="handlerReset">
+                <Icon name="ssireset" :size="14" />重置
+              </a-button>
+              <a-button class="mar-left10" type="primary" @click="addNewCharge">
+                <Icon name="ssiadd" :size="14" />新建寄送</a-button>
             </a-form-model-item>
           </div>
         </a-col>

src/views/info/company.vue

 <template>
   <div class="white_bg burt-container">
-    <div class="title-div">保险公司信息</div>
+    <div class="flex title-div">
+      <span>保险公司信息</span>
+      <a-button type="primary" @click.stop="addCompany">新建保险公司</a-button>
+    </div>
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 'max-content' }" :pagination="false">
       <div v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index" :key="col.dataIndex" >
         <template v-if="col.dataIndex == 'operation'">
           <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
-          <a-button type="link" @click.stop="detailEvt(record)">查看</a-button>
+          <a-button type="link" class="success" @click.stop="detailEvt(record)">查看</a-button>
           <a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
         </template>
         <template v-else>
@@ -118,6 +121,21 @@ export default {
           }
         });
     },
+    //新增保险公司
+    addCompany(){
+      this.$apis.CREATEPAY({
+        ...this.detailObj
+      })
+      .then((res) => {
+        if (res.returnCode == "0000") {
+          this.$message.success("新增成功");
+          this.pagination.pageNum = 1;
+          this.getData();
+        } else {
+          this.$message.error(res.returnMsg);
+        }
+      });
+    },
     //编辑
     editEvt(record) {
       this.editFormObj = {
@@ -206,5 +224,6 @@ export default {
   line-height: 52px;
   color: #252631;
   font-weight: bold;
+  justify-content: space-between;
 }
 </style>

src/views/info/components/companyInfo.vue

@@ -111,7 +111,7 @@
         <a-col :sm="24" class="none-label">
           <a-form-model-item label="button">
             <a-button type="primary" @click="handlerSava">
-              <Icon name="ssiadd" :size="14" />新建
+              <Icon name="ssibaocun" :size="14" />保存
             </a-button>
           </a-form-model-item>
         </a-col>
@@ -133,12 +133,12 @@ export default {
   methods: {
     //新建保存
     handlerSava(){
-      this.$apis.CREATEPAY({
+      this.$apis.PAYORUPDATE({
         ...this.detailObj
       })
       .then((res) => {
         if (res.returnCode == "0000") {
-          this.$message.success("新建成功");
+          this.$message.success("保存成功");
         } else {
           this.$message.error(res.returnMsg);
         }

src/views/info/index.vue

@@ -123,34 +123,11 @@ const columns = [
   { title: "序号", dataIndex: "id", ellipsis: true, width: 150 },
   { title: "工号", dataIndex: "doctorCode", ellipsis: true, width: 95 },
   { title: "医生姓名", dataIndex: "doctorDesc", ellipsis: true, width: 125 },
-  {
-    title: "医生英文名",
-    dataIndex: "doctorDescLang1",
-    ellipsis: true,
-    width: 135,
-  },
-  {
-    title: "科室",
-    dataIndex: "specialtyList",
-    ellipsis: true,
-    scopedSlots: { customRender: "specialtyList" },
-    width: 155,
-  },
-  {
-    title: "国籍",
-    dataIndex: "country",
-    ellipsis: true,
-    width: 110,
-  },
+  { title: "医生英文名", dataIndex: "doctorDescLang1", ellipsis: true, width: 135,},
+  { title: "科室", dataIndex: "specialtyList", ellipsis: true, scopedSlots: { customRender: "specialtyList" }, width: 155,},
+  { title: "国籍", dataIndex: "country", ellipsis: true, width: 110, },
   { title: "语言", dataIndex: "language", ellipsis: true, width: 120 },
-  {
-    title: "操作",
-    dataIndex: "operation",
-    scopedSlots: { customRender: "operation" },
-    fixed: "right",
-    width: "120px",
-    align: "center",
-  },
+  { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "200px", align: "center", },
 ];
 export default {
   data() {

src/views/verification/collection.vue

@@ -19,14 +19,14 @@
         </a-col>
         <a-col :md="12" class="none-label">
           <a-form-model-item label="button">
-            <a-button class="mar-left10" type="primary" @click="addNewEvt">
-              <Icon name="ssiadd" :size="14" />新建回款
+            <a-button class="mar-left10" type="primary" @click="handlerSearch">
+              <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
             <a-button class="mar-left10" type="primary" @click.stop="handlerReset">
               <Icon name="ssireset" :size="14" />重置
             </a-button>
-            <a-button class="mar-left10" type="primary" @click="handlerSearch">
-              <Icon name="ssisearch_active" :size="14" />查询
+            <a-button class="mar-left10" type="primary" @click="addNewEvt">
+              <Icon name="ssiadd" :size="14" />新建回款
             </a-button>
           </a-form-model-item>
         </a-col>

src/views/verification/index.vue

@@ -19,15 +19,15 @@
         </a-col>
         <a-col :lg="12" :sm="24" class="none-label">
           <a-form-model-item label="button">
-            <!-- <a-button type="primary">导出</a-button> -->
-            <a-button class="mar-left10" type="primary" @click="addNewEvt">
-              <Icon name="ssiadd" :size="14" />新建EOB
+            <a-button class="mar-left10" type="primary" @click="handlerSearch">
+              <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
             <a-button class="mar-left10" type="primary" @click.stop="handlerReset">
               <Icon name="ssireset" :size="14" />重置
             </a-button>
-            <a-button class="mar-left10" type="primary" @click="handlerSearch">
-              <Icon name="ssisearch_active" :size="14" />查询
+            <!-- <a-button type="primary">导出</a-button> -->
+            <a-button class="mar-left10" type="primary" @click="addNewEvt">
+              <Icon name="ssiadd" :size="14" />新建EOB
             </a-button>
           </a-form-model-item>
         </a-col>