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

src/api/ecw/customer.js

@@ -117,9 +117,11 @@ export function getPublicList(query) {
 }
 
 //捞取
-export function setFishing(query){
+export function setFishing(data){
   return request({
-    url:'',
+    url:'/ecw/customer/catch-open-sea-customer',
+    method:'put',
+    data:data
 
   })
 }

src/views/ecw/oceanCustomer/index.vue

@@ -90,7 +90,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-folder-add" @click="distribution(scope.row)">移交</el-button>
-          <el-button size="mini" type="text" icon="el-icon-crop">捞取</el-button>
+          <el-button size="mini" type="text" icon="el-icon-crop" @click="fishingFn(scope.row)">捞取</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -120,7 +120,7 @@
 </template>
 
 <script>
-import { createCustomer, updateCustomer, deleteCustomer,handOverCustomer,getPublicList,exportCustomerExcel } from "@/api/ecw/customer";
+import { createCustomer, updateCustomer, deleteCustomer,handOverCustomer,getPublicList,exportCustomerExcel, setFishing } from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import upload from '@/components/ImageUpload'
 import {listServiceUser} from "@/api/system/user";
@@ -365,6 +365,28 @@ export default {
         }
       })
     },
+    fishingFn(row){
+      this.$confirm(`是否要捞取${row.name}的客户`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        setFishing({id:row.id}  ).then(r=>{
+          if(r.code === 0){
+            this.getList()
+            this.$message({
+              type: 'success',
+              message: '捞取成功!'
+            });
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消捞取'
+        });
+      });
+    }
   }
 };
 </script>

src/views/member/user/index.vue

@@ -504,6 +504,7 @@ export default {
             img2:this.IdDetails.img2,
             name:this.IdDetails.name,
             userCardAuthId:this.IdDetails.id,
+            auditPass:this.IdDetails.status === 3 ? true : false,
           } ;
           memberUserUpdateIdCard(p).then(r => {
             if(r.code === 0){
@@ -526,7 +527,8 @@ export default {
             img2:this.enterpriseFrom.img2,
             legalName:this.enterpriseFrom.legalName,
             name:this.enterpriseFrom.name,
-            userEnterpriseAuthId:this.enterpriseFrom.id
+            userEnterpriseAuthId:this.enterpriseFrom.id,
+            auditPass:this.enterpriseFrom.status === 3 ? true : false,
           }
           memberUserUpdateEnterprise(p).then(r =>{
             if(r.code === 0){