*

dsk-operate-ui/src/assets/json/provinceTree.json

@@ -15848,7 +15848,7 @@
         "label": "澳门特别行政区"
     },
     {
-        "value": "830100",
-        "lable": "钓鱼岛"
+      "id": 900000,
+      "label": "钓鱼岛"
     }
 ]

dsk-operate-ui/src/plugins/download.js

@@ -72,7 +72,6 @@ export default {
       data: params,
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(res => {
-      console.log(res)
       const blob = new Blob([res.data], { type: 'application/octet-stream/pdf/doc/xlsx/xls/docx' })
       this.saveAs(blob, decodeURI(res.headers['download-filename']))
     })

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

@@ -48,7 +48,7 @@
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
                   <div  @click="toDetail(scope.row,'gjjl')">写跟进<img src="@/assets/images/project/edit_1.png"></div>
-                  <div  @click="toDetail(scope.row,'preference')">编辑信息<img src="@/assets/images/project/edit_2.png"></div>
+                  <div  @click="toDetail(scope.row,'business')">编辑信息<img src="@/assets/images/project/edit_2.png"></div>
                 </div>
               </div>
             </template>
@@ -120,7 +120,7 @@
               prop="isMajor"
               label="局级大客户" width="88">
               <template slot-scope="scope">
-                <span v-if="scope.row.isMajor">
+                <span v-if="scope.row.isMajor != null">
                 {{scope.row.isMajor == 1?"是":"否"}}
                 </span>
                 <span v-else>--</span>
@@ -154,18 +154,22 @@
                 <div class="wordprimary">{{scope.row.superCompany || '--'}}</div>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column :key="keys"
               prop="mainBusiness"
-              label="主营业务" width="120">
+              label="主营业务" width="400">
               <template slot-scope="scope">
-                {{scope.row.mainBusiness || '--'}}
+                <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
+                <div class="box"  v-else-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
               </template>
             </el-table-column>
             <el-table-column
-              prop="companyAttribute"
-              label="发包属性" width="120">
+              prop="companyAttribute" :key="keys+2"
+              label="发包属性" width="400">
               <template slot-scope="scope">
-                {{scope.row.companyAttribute || '--'}}
+                <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
+                <div class="box"  v-else-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
               </template>
             </el-table-column>
             <el-table-column
@@ -292,6 +296,7 @@ export default {
       },
       // isNew:true,
       showlist:false,
+      keys:1,
     }
   },
   created() {
@@ -300,6 +305,18 @@ export default {
     this.prvinceTree()
   },
   methods:{
+    sq1(item,sq){
+      this.$nextTick(()=>{
+        item.sq1 = sq
+        this.keys++ ;
+      })
+    },
+    sq2(item,sq){
+      this.$nextTick(()=>{
+        item.sq2 = sq
+        this.keys++ ;
+      })
+    },
     handleALL(event){
       var one = document.getElementById("box");
       if(one){
@@ -327,6 +344,20 @@ export default {
     getCustomerList(){
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
+        this.tableData.rows.forEach(item=>{
+          if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
+            item.mainBusiness1 = item.mainBusiness.substring(0,81)
+            item.sq1 = true
+          }else{
+            item.sq1 = false
+          }
+          if(item.companyAttribute != "" && item.companyAttribute != null && item.companyAttribute.length>84){
+            item.companyAttribute1 = item.companyAttribute.substring(0,81)
+            item.sq2 = true
+          }else{
+            item.sq2 = false
+          }
+      })
       })
     },
     //跳转到客户详情
@@ -385,7 +416,6 @@ export default {
       }
     },
     selCompany(item){
-      console.log(item)
       this.queryParam.companyId = item.jskEid
       this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
       this.queryParam.legalPerson = item.legalPerson
@@ -507,7 +537,19 @@ export default {
   width: 100%;
   height: 100%;
 }
-
+.box{
+  position: relative;
+  >span{
+    position: absolute;
+    right: 10px;
+    bottom: 0;
+    color: #0081FF;
+    cursor: pointer;
+    &:hover{
+      color: #006AD1;
+    }
+  }
+}
   .dc{
     font-size: 12px;
     color: #3D3D3D;
@@ -539,6 +581,7 @@ export default {
   .tables{
     position: relative;
     height: calc(100vh - 134px);
+    overflow: auto;
     .empty{
       position: absolute;
       top: 50%;

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

@@ -325,8 +325,8 @@
       },
       deltip(item){
         let param={
-          businessId:this.id,
-          id:item.id
+          // businessId:this.id,
+          labelId:item.id
         }
         removeLabel(JSON.stringify(param)).then(res=>{
           if (res.code == 200){

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

@@ -10,7 +10,6 @@
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <!--<div class="btn btn_primary h32 b2" @click="getUP"  v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
-        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>
         <el-upload
           class="upload-demo"
           :action="action"
@@ -22,8 +21,8 @@
           :headers="headers"
           :show-file-list="false"
           :on-success="onSuccess">
-            上传
-          </el-upload></div>
+        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>
+          </el-upload>
       </div>
       <div class="filepath" v-if="filename"><font @click="getall">全部</font> / <span> <img class="img" src="@/assets/images/folder.png">{{filename}}</span></div>
       <div class="uploadbox" v-if="isupload">
@@ -259,6 +258,7 @@
           let _this = this
           setTimeout(function() {
             _this.getList()
+            _this.$message.success('上传成功！')
             _this.isupload = false
           },3000)
 
@@ -296,7 +296,9 @@
 </script>
 
 <style lang="scss" scoped>
-
+  v-deep.el-upload:focus{
+    color: #FFFFFF !important;
+  }
   .delform{
     position: fixed; left:50%; top:50%; transform:translate(-50%,-50%)
   }