修改

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

@@ -215,11 +215,18 @@ export function claim(param) {
     data: param
   })
 }
-//城投平台-取消认领
-export function cancelClaim(name) {
+//客户状态
+export function customerStatus(name) {
   return request({
-    url:`/customer/cancelClaim/`+name,
-    method: 'PUT',
+    url:`/customer/status/`+name,
+    method: 'get',
+  })
+}
+//历史客户认领
+export function historyClaim(name) {
+  return request({
+    url:`/customer/historyClaim/`+name,
+    method: 'put',
   })
 }
 //批量获取城投企业id

dsk-operate-ui/src/views/login.vue

@@ -174,7 +174,7 @@ export default {
   .left{
     float: left;
     width: 730px;
-    margin-right: 170px;
+    /*margin-right: 170px;*/
   }
   .logo{
     width: 253px;

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -244,7 +244,7 @@
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
-    <el-dialog :visible.sync="claimVisible" width="244" :show-close="false">
+    <el-dialog :visible.sync="claimVisible" width="244" custom-class='dialog-claim' :show-close="false">
       <div>认领成功，是否完善客户信息？</div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="innerVisible = true">
@@ -255,6 +255,13 @@
         <el-button @click="claimVisible = false">稍后</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="claimVisible1" custom-class='historyClaim' title="重新认领" width="260" :show-close="false">
+      <div>再次认领将会恢复客户数据</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleHistoryClaim">确认</el-button>
+        <el-button @click="claimVisible1 = false">取消</el-button>
+      </div>
+    </el-dialog>
     <el-dialog
 	    title="取消认领"
 	    :visible.sync="dialogVisible1"
@@ -278,7 +285,7 @@
   import dataRegion from '@/assets/json/dataRegion'
   import api from '@/api/enterpriseData/enterpriseData.js';
   import elementResizeDetectorMaker from "element-resize-detector"
-  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim,location } from '@/api/macro/macro'
+  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim,location,customerStatus,historyClaim } from '@/api/macro/macro'
   import { infoHeader } from '@/api/detail/party-a/index'
   import Region from '../component/region'
 export default {
@@ -317,9 +324,11 @@ export default {
       typeList:[],
       statistics:{},
       claimVisible:false,
+      claimVisible1:false,
       dialogVisible1: false,
       customerId:'',
       companyId:'',
+      companyName:'',
       show_page:true,
       MaxPage:500,
       // 表格高度
@@ -346,7 +355,6 @@ export default {
   },
   mounted(){
     window.addEventListener("scroll",this.scrolling)
-    window.addEventListener('scroll', this.handleScroll);
     const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("content")
     erd.listenTo(partBox, element => {
       _this.$nextTick(() => {
@@ -354,9 +362,6 @@ export default {
       })
     })
   },
-  destroyed () {
-    window.removeEventListener('scroll', this.handleScroll)
-  },
   beforeDestroy() {
     window.removeEventListener("scroll", this.scrolling);
   },
@@ -416,21 +421,24 @@ export default {
   methods: {
     scrolling() {
       let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-      let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
-      if (scrollTop>368){
-        let top = scrollTop-368
-        el.style.top = top+'px'
-      }else{
-        el.style.top = 0
-      }
-    },
-    handleScroll () {
-      let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-      if (scrollTop > 300) {
-        this.fixed = true
-      } else {
-        this.fixed = false
-      }
+      // let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
+      // if (scrollTop>368){
+      //   let top = scrollTop-368
+      //   el.style.top = top+'px'
+      // }else{
+      //   el.style.top = 0
+      // }
+      let el1 = document.getElementsByClassName("el-table")[0].offsetTop
+      let el2 = document.getElementsByClassName("content")[1].offsetTop
+      let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
+      this.$nextTick(() => {
+        if (scrollTop>(el1+el2)){
+          let top = scrollTop-(el1+el2)-13
+          el.style.top = top+'px'
+        }else{
+          el.style.top = 0
+        }
+      })
     },
     getType(){
       uipGroupData({}).then(res => {
@@ -736,8 +744,17 @@ export default {
         }
       })
     },
+    handleHistoryClaim(){
+      historyClaim(this.companyName).then(res => {
+        if(res.code === 200){
+          this.claimVisible1=false;
+          this.querySubmit()
+        }
+      })
+    },
     handleClick(item){
       this.companyId=item.companyId;
+      this.companyName=item.companyName;
       infoHeader({companyId:this.companyId}).then(res => {
         if(res.code === 200){
           let registerAddress=res.data.provinceName
@@ -760,11 +777,18 @@ export default {
             registerAddress:registerAddress,
             creditCode:res.data.creditCode,
           }
-          claim(params).then(res => {
-            if(res.code === 200){
-              this.claimVisible=true;
-              this.customerId=res.data.customerId;
-              this.querySubmit()
+          customerStatus(item.companyName).then(res => {
+            if(res.data === 1){
+              this.claimVisible1=true;
+            }else {
+              claim(params).then(res => {
+                if(res.code === 200){
+                  this.claimVisible=true;
+                  this.customerId=res.data.customerId;
+                  this.querySubmit()
+                }
+              })
+
             }
           })
         }
@@ -1041,9 +1065,25 @@ export default {
         }
       }
     }
+    ::v-deep .historyClaim{
+      .el-dialog__header{
+        display: block;
+        padding: 12px;
+        text-align: center;
+        .el-dialog__title{
+          font-size: 16px;
+        }
+      }
+      .el-dialog__body{
+        padding: 0;
+        text-align: center;
+        padding-bottom: 24px;
+      }
+    }
     ::v-deep  .dialog-renlin{
       .el-dialog__header{
         display: block;
+        text-align: center;
       }
       .el-dialog__body{
         padding: 0;
@@ -1086,10 +1126,5 @@ export default {
         }
       }
     }
-    .fixed{
-      position: fixed;
-      z-index: 999;
-      top: 56px;
-    }
   }
 </style>

dsk-operate-ui/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://47.104.91.229:9099/prod-api`,
-        // target: `http://122.9.160.122:9011`,
+        // target: `http://47.104.91.229:9099/prod-api`,
+        target: `http://122.9.160.122:9011`,
         // target: `http://192.168.60.126:9011`,
         // target: `http://192.168.60.27:8766`,
         changeOrigin: true,