Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

# Conflicts:
#	dsk-operate-ui/vue.config.js

dsk-operate-ui/src/api/common.js

@@ -17,3 +17,10 @@ export const claim= function claim(param) {
     data: param
   })
 }
+// 历史客户认领
+export const historyClaim= function historyClaim(name) {
+  return request({
+    url: '/customer/historyClaim/'+name,
+    method: 'Put',
+  })
+}

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

@@ -40,7 +40,13 @@
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
                   <div  @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div>
-
+                </div>
+              </div>
+              <div class="delform" v-if="scope.row.companyName == '重庆市永川区惠通建设发展有限公司'">
+                <div class="words">再次认领将会恢复默认客户数据</div>
+                <div>
+                  <div class="btnsmall btn_primary h28" >确定</div>
+                  <div class="btnsmall btn_cancel h28" >取消</div>
                 </div>
               </div>
             </template>
@@ -194,7 +200,7 @@
   import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
   import {encodeStr} from "@/assets/js/common"
-  import { claim } from "@/api/common" //认领
+  import { historyClaim } from "@/api/common" //认领
 export default {
   name: 'CustomList',
   data() {
@@ -289,7 +295,13 @@ export default {
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
     //认领客户
-    toRL(row){
+    async toRL(row){
+      let param = row.companyName
+      let res = await historyClaim(param)
+      if(res.code==200){
+        this.$message.success('认领成功！')
+        this.handleCurrentChange(1)
+      }
 
     },
     clearname(value){
@@ -299,8 +311,6 @@ export default {
     },
     //翻页
     handleCurrentChange(val) {
-      this.pldr=false
-      // this.isNew = false
       this.searchParam.pageNum=val
       this.getCustomerList()
     },
@@ -309,6 +319,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .delform{
+    right: 5px;
+    top: 40px;
+    width: 228px;
+  }
   .app-container{
     height: calc(100vh - 134px)
   }