Merge remote-tracking branch 'origin/ysy_company' into ysy_company

src/api/company/importMember.js

@@ -6,4 +6,12 @@ export function syncKdzlMember() {
     url: '/company/importMember/syncKdzlMember',
     method: 'post',
   })
+}
+
+
+export function syncKdzlHighSeaMemberInfo() {
+  return request({
+    url: '/company/importMember/syncKdzlHighSeaMemberInfo',
+    method: 'post',
+  })
 }

src/views/qw/companyCustomer/index.vue

@@ -220,6 +220,11 @@
           >同步</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain size="mini" @click="handleHighSeaSync"
+          >同步公海会员</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -1470,7 +1475,7 @@ import { addCollectionAndUpdateOrderStatus } from "@/api/member/handwriteCollect
 // 药品标志API
 import { getProductMedicineFlagByOrderCode } from "@/api/store/storeProduct";
 import ImageUpload from "@/components/ImageUpload";
-import { syncKdzlMember } from "@/api/company/importMember";
+import { syncKdzlMember, syncKdzlHighSeaMemberInfo} from "@/api/company/importMember";
 import { questionOptions } from "@/api/hisStore/answer";
 import { generatePrescribeData } from "@/api/his/prescribeData";
 
@@ -1883,6 +1888,12 @@ export default {
         this.getList();
       });
     },
+    handleHighSeaSync() {
+      syncKdzlHighSeaMemberInfo().then((res) => {
+        this.msgSuccess("正在同步中...");
+        this.getList();
+      });
+    },
 
     handleKdnCityChange(value) {
       const nodes = this.$refs.citySelect.getCheckedNodes();