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

dsk-operate-ui/src/assets/styles/project.scss

@@ -1210,7 +1210,7 @@
 }
 
 .el-table__fixed {
-  height: auto !important;
+  // height: auto !important;
   bottom: 17px !important;
   //box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
   //-webkit-box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);

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

@@ -315,7 +315,7 @@ export default {
     },
     //认领客户
     async toRL(row){
-      this.RLcompanyName = row.companyName
+      this.RLcompanyName = row.companyName.replace(/<[^>]+>/g, '')
     },
     async RL(){
       let res = await historyClaim(this.RLcompanyName)

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -280,6 +280,7 @@ export default {
             }
           }
         }
+        this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
       }
     }
   },

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -66,7 +66,7 @@
         </div>
       </div>
       <div class="company-menu">
-        <el-button v-if="companyInfo.claimStatus==1"  @click="cancelClaimClick()" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
+        <el-button v-if="companyInfo.claimStatus==0"  @click="cancelClaimClick()" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
         <el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
       </div>
 
@@ -231,7 +231,7 @@ export default {
           this.claimLoading = false
           if(res.code==200){
             this.dialogVisible=true
-            this.companyInfo.claimStatus = 1
+            this.companyInfo.claimStatus = 0
             this.customerId = res.data.customerId
           }
         }else{
@@ -252,7 +252,7 @@ export default {
       let res = await api.historyClaim(this.companyInfo.companyName)
       if(res.code==200){
           this.dialogVisible2 = false;
-          this.companyInfo.claimStatus = 1
+          this.companyInfo.claimStatus = 0
         }else{
           this.$message.error(res.msg)
         }
@@ -261,7 +261,7 @@ export default {
       let res = await api.cancelClaim(this.companyInfo.companyName)
       if(res.code==200){
           this.dialogVisible1 = false;
-          this.companyInfo.claimStatus = 0
+          this.companyInfo.claimStatus = 1
         }else{
           this.$message.error(res.msg)
         }

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -145,7 +145,7 @@
 		<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
 	  	<div class=" table-item-jf" v-if="!isSkeleton&&tableData.length>0">
-	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"   class="table-item1 fixed-table"  border  highlight-current-row>
+	  	  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" max-height="640"  class="table-item1 fixed-table"  border  highlight-current-row>
 	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
@@ -156,13 +156,13 @@
 								 <div class="renling">
 									 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
 									 <div class="renling-btn" @click="claimbtn(scope.row)" >
-										 <p  v-if="scope.row.claimStatus"  class="renling-img-true">
+										 <p  v-if="scope.row.claimStatus==0"  class="renling-img-true">
 											 
 										 </p>
 										 <p v-else   class="renling-img-false">
 										 											 
 										 </p>
-									 	<span v-if="scope.row.claimStatus" @click="cancelClaim(scope.row.companyName)" class="renling-hui">
+									 	<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName)" class="renling-hui">
 											已认领
 										</span>	
 										<span v-else class="renling-hei">
@@ -480,6 +480,13 @@
 	      <span class="dialog-footer-btn2" @click="dialogVisible1 = false">关闭</span>
 	    </div>
 	  </el-dialog>
+	  <el-dialog :visible.sync="dialogVisible2" custom-class='dialog-renlin' title="重新认领" width="260px" :show-close="false">
+		<div>再次认领将会恢复客户数据</div>
+		<div slot="footer" class="dialog-footer">
+			<span class="dialog-footer-btn1" type="primary" @click="handleHistoryClaim()">确认</span>
+			<span class="dialog-footer-btn2" @click="dialogVisible2 = false">关闭</span>
+		</div>
+		</el-dialog>
   </div>
 </template>
 
@@ -504,6 +511,7 @@ export default {
         value: "id",
       },
       pageSize: 20,
+	  dialogVisible2:false,
       jskBidQueryDto: {
         provinceIds: [],
         cityIds: [],
@@ -796,9 +804,18 @@ export default {
 			this.pageFlag = true;
 		});
 	},
+	async handleHistoryClaim(){
+      let res = await api.historyClaim(this.companyName)
+      if(res.code==200){
+          this.dialogVisible2 = false;
+          this.search();
+        }else{
+          this.$message.error(res.msg)
+        }
+    },
 	claimbtn(item){
-		if(item.claimStatus){
-			return ;
+		if(item.claimStatus==1){
+			return this.dialogVisible2=true;
 		}
 		this.companyId=item.companyId;
 		var info={};

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -85,11 +85,11 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="office"
+            prop="companyName"
             label="关联企业">
             <template slot-scope="scope">
-              <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.uipId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="(scope.row.companyId||scope.row.uipId)&&scope.row.office" v-html="scope.row.office"></router-link>
-              <div v-else v-html="scope.row.office  || '--'"></div>
+              <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.uipId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="(scope.row.companyId||scope.row.uipId)&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+              <div v-else v-html="scope.row.companyName  || '--'"></div>
             </template>
           </el-table-column>
           <el-table-column
@@ -147,7 +147,7 @@
             <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">
-            <el-input type="text" v-model="queryParam.office" placeholder="请输入"></el-input>
+            <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="联系人职位：" class="row">
             <el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
@@ -340,7 +340,7 @@
         }
         if(this.thistype == 'project'){
           this.queryParam.projectId = this.searchParam.projectId
-          this.office = ""
+          this.companyName = ""
         }
         if(this.thistype == 'custom'){
           this.queryParam.customerId = this.searchParam.customerId