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

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -83,7 +83,7 @@ public class CustomerController extends BaseController {
         return AjaxResult.success(baseService.add(customer));
     }
 
-    private void dealWithcustomerData(Customer customer){
+    private void dealWithcustomerData(Customer customer) {
         if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
         if (ObjectUtils.isEmpty(customer.getCompanyId())) {
             try {
@@ -131,6 +131,7 @@ public class CustomerController extends BaseController {
     public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
         List<Customer> customerList = new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 2);
         List<String> resultList = new ArrayList<>();
+        int successCount = 0;
         for (Customer customer : customerList) {
             if (ObjectUtils.isEmpty(customer.getCompanyName())) {
                 continue;
@@ -152,10 +153,13 @@ public class CustomerController extends BaseController {
                     customer.setCreditCode(MapUtil.getStr(obj, "creditCode"));
                 }
                 baseService.add(customer);
+                successCount++;
             } catch (Exception e) {
                 resultList.add(customer.getCompanyName().concat(":").concat(e.getMessage()));
             }
         }
-        return AjaxResult.success(resultList);
+        AjaxResult success = AjaxResult.success(resultList);
+        success.put("successCount", successCount);
+        return success;
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -95,7 +95,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "工商股东信息（openApi）")
     @PostMapping(value = "bestStockPage")
-    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseBestStockPageBody vo) throws Exception {
         return enterpriseService.bestStockPage(vo);
     }
 

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -73,19 +73,19 @@ public class EnterpriseProjectController {
 
     @ApiOperation(value = "专项债项目列表")
     @RequestMapping(value = "/specialDebtProjectPage", method = RequestMethod.POST)
-    public TableDataInfo specialDebtProjectPage(@RequestBody @Valid Object  body) throws Exception {
+    public TableDataInfo specialDebtProjectPage(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectPageBody  body) throws Exception {
         return enterpriseProjectService.specialDebtProjectPage(body);
     }
 
     @ApiOperation(value = "专项债项目详情")
     @RequestMapping(value = "/specialDebtProjectDetail", method = RequestMethod.POST)
-    public R specialDebtProjectDetail(@RequestBody @Valid Object body) throws Exception {
+    public R specialDebtProjectDetail(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectDetailBody body) throws Exception {
         return enterpriseProjectService.specialDebtProjectDetail(body);
     }
 
     @ApiOperation(value = "专项债列表")
     @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
-    public TableDataInfo specialDebtPage(@RequestBody @Valid Object  body) throws Exception {
+    public TableDataInfo specialDebtPage(@RequestBody @Valid EnterpriseProjectSpecialDebtPageBody body) throws Exception {
         return enterpriseProjectService.specialDebtPage(body);
     }
 

dsk-admin/src/main/resources/logback.xml

@@ -20,14 +20,14 @@
             <!-- 日志文件名格式 -->
 			<fileNamePattern>${log.path}/operate-sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>INFO</level>
+            <level>DEBUG</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->
@@ -42,7 +42,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/operate-sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+			<maxHistory>10</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -64,7 +64,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/operate-sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>10</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseAffiliatesBody.java

@@ -17,6 +17,8 @@ public class EnterpriseAffiliatesBody extends BasePage {
     //企业Id
     @NotNull(message = "企业id不能为空")
     private Integer cid;
-    
+
+    private Integer hasBid;
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseInvestmentBody.java

@@ -17,6 +17,9 @@ public class EnterpriseInvestmentBody extends BasePage {
     //企业Id
     @NotNull(message = "企业id不能为空")
     private Integer cid;
-    
+    private Integer hasBid;
+    private double stockPercentageMin;
+    private double stockPercentageMax;
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectSpecialDebtPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectSpecialDebtPageBody extends BasePage {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectSpecialDebtProjectDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectSpecialDebtProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectSpecialDebtProjectPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 排序字段：1总投资金额倒序，2总投资金额正序，17项目资本金倒序，18项目资本金正序，19专项债用作资本金倒序，20专项债用作资本金正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+}

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

@@ -42,6 +42,15 @@ let uipSerach= function uipSerach(param) {
 	data: param
   })
 }
+// 认领用户
+let claim= function claim(param) {
+  return request({
+    url: '/customer/claim',
+    method: 'post',
+	data: param
+  })
+}
+
 
 
-export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach}
\ No newline at end of file
+export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim}
\ No newline at end of file

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

@@ -174,6 +174,31 @@ export function enterprise(param) {
   })
 }
 
+//城投平台-企业查询选项
+export function uipGroupData() {
+  return request({
+    url: '/enterprise/uipGroupData',
+    method: 'POST'
+  })
+}
+
+//城投平台-分页列表
+export function urbanInvestmentPage(param) {
+  return request({
+    url: '/urbanInvestment/page',
+    method: 'POST',
+    data: param
+  })
+}
+//城投平台-城投平台统计
+export function urbanInvestmentStatistics(param) {
+  return request({
+    url: '/urbanInvestment/statistics',
+    method: 'POST',
+    data: param
+  })
+}
+
 
 
 

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

@@ -244,6 +244,7 @@
     >img{
       float: left;
       margin-right: 8px;
+      width: 56px;
     }
     .i{
       font-size: 18px;
@@ -337,6 +338,7 @@
     >img{
       float:left;
       margin: 2px 4px 0 0;
+      width: 16px;
     }
   }
   .bottems{
@@ -572,6 +574,16 @@
         position: relative;
         padding-top: 25px;
         display: flex;
+        .sels{
+          position: relative;
+          >img{
+            position: absolute;
+            left: 10px;
+            z-index: 1;
+            top: 8px;
+            width: 16px;
+          }
+        }
         .el-input{
           display: inline-block;
           margin-right: 12px;
@@ -610,6 +622,7 @@
             position: absolute;
             left: 8px;
             top: 8px;
+            width: 16px;
             z-index: 1;
           }
           .el-input{
@@ -960,6 +973,7 @@
       }
       .up_img{
         margin: 56px auto 13px;
+        width: 50px;
       }
       .up_text{
         color: #666;

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

@@ -492,6 +492,7 @@ export default {
   .img.img1{
     margin-right: 2px;
     background: url('../../../../src/assets/images/project/add_2.png')no-repeat center center;
+    background-size: 100%;
   }
   .w88{
     width: 88px;
@@ -528,7 +529,8 @@ export default {
         }
         >img{
           float: right;
-          margin: 3px 0 0 4px
+          margin: 3px 0 0 4px;
+          width: 14px;
         }
       }
     }

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

@@ -43,6 +43,7 @@
             <template  v-if="form.type==4">
               <el-select
                 class="form-content-width"
+                :class="form.value.length > 1 ? 'selectTag' : ''"
                 v-model="form.value"
                 multiple
                 collapse-tags
@@ -247,6 +248,22 @@ export default {
     ::v-deep .form-content-width{
       width: 170px;
     }
+    ::v-deep .selectTag{
+      .el-select__tags{
+        .el-tag{
+          &:first-child{
+            width: 90px;
+          }
+        }
+      }
+    }
+    ::v-deep .el-select__tags{
+      .el-tag{
+        &:first-child{
+          width: 100%;
+        }
+      }
+    }
   }
   .ability-total{
     font-size: 12px;

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -143,12 +143,7 @@ export default {
   components: {
     Detail
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       ifEmpty:false,
@@ -522,7 +517,7 @@ export default {
 
 ::v-deep .cooperate-detail{
   .miantitle, .app-container{
-    margin: 12px 0;
+    //margin: 12px 0;
   }
 }
 

dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue

@@ -81,12 +81,7 @@ export default {
   components: {
     Tables
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       ifEmpty:false,

dsk-operate-ui/src/views/detail/party-a/preference/index.vue

@@ -160,12 +160,7 @@ export default {
   components: {
 
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       autosize: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -33,12 +33,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/courtNotice.vue

@@ -35,12 +35,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue

@@ -33,12 +33,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/ifThePerson.vue

@@ -32,12 +32,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue

@@ -37,12 +37,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -35,16 +35,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    },
-    companyInfo: {
-      type: Object,
-      default: {}
-    }
-  },
+  props: ['companyId','companyInfo'],
   data() {
     return {
       addressList:'',

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -118,16 +118,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    },
-    companyInfo: {
-      type: Object,
-      default: {}
-    }
-  },
+  props: ['companyId', 'companyInfo'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -24,7 +24,11 @@
           highlight-current-row
           @sort-change="sortChange"
         >
-          <el-table-column prop="province" label="下辖区" width="100" :formatter="formatStatus"/>
+          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus">
+            <template slot-scope="scope">
+              {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
+            </template>
+          </el-table-column>
           <el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="gdpGrowth" label="GDP增速" sortable width="100" :formatter="formatStatus"/>
           <el-table-column prop="gdpPerCapita" label="人均GDP（元）" sortable width="130" :formatter="formatStatus"/>

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -182,10 +182,11 @@ export default {
       var year = date.getFullYear()
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
       var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-      var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-      var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-      return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+      // var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+      // var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+      // var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
     }
   }
 }

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

@@ -139,6 +139,7 @@ export default {
         let arr=this.tableData.sort((old,New)=>{
           return  New.value - old.value
         })
+        console.log(arr)
         let data=[]
         for(let i=0; i<10; i++){
           data.push(arr[i])
@@ -215,13 +216,12 @@ export default {
         for(var i=0;i<res.data.length;i++){
           var obj={};
           obj.name=res.data[i].projectType;
-          obj.value=res.data[i].count;
-          obj.totalInvestment=res.data[i].totalInvestment;
+          obj.value=res.data[i].totalInvestment;
+          obj.number=res.data[i].count;
           obj.proportion=res.data[i].proportion;
           list.push(obj)
         }
         this.tableData=list;
-
       })
     },
 

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -41,9 +41,9 @@
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="地区" min-width="70" align="left" fixed>
+          <el-table-column label="地区" min-width="150" align="left" fixed>
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}</router-link>
+              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
             </template>
           </el-table-column>
           <el-table-column label="年度明细" prop="id" width="90" align="center" fixed>

dsk-operate-ui/src/views/project/overview/index.vue

@@ -18,7 +18,7 @@
             </div>
             <div class="top-icons">
               <img class="top-img" src="@/assets/images/project/icon_8.png">
-              <div class="name">即将开始项目</div>
+              <div class="name">即将开标项目</div>
               <div class="number">39</div>
               <div class="compare">较上月<span class="ss">+3 <img src="@/assets/images/project/ss.png"></span></div>
             </div>
@@ -504,10 +504,18 @@ export default {
       .ss{
         color: #0CBC6D;
         padding-left: 3px;
+        >img{
+          width: 8px;
+          margin-top: -3px;
+        }
       }
       .xj{
         color: #FF3C3C;
         padding-left: 3px;
+        >img{
+          width: 8px;
+          margin-top: -3px;
+        }
       }
     }
   }
@@ -642,6 +650,9 @@ export default {
     text-align: center;
     font-size: 12px;
     padding-top: 16px;
+    >img{
+      height: 48px;
+    }
     >div{
       line-height: 14px;
     }

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

@@ -42,7 +42,7 @@
         <div class="p3">
           <img src="@/assets/images/project/success.png">查询成功
         </div>
-        <div class="p2">成功导入{{titletext}}信息</div>
+        <div class="p2">成功导入{{successCount}}条{{titletext}}信息</div>
         <div class="btns">
           <div class="btn btn_primary h32" @click="getmsg">查看</div>
         </div>
@@ -73,10 +73,10 @@
         },
         downloadhref:'',//样例地址
         titletext:'',
+        successCount:0,//成功条数
       }
     },
     created(){
-      console.log(this.importtype )
       if(this.importtype == 'project'){//项目管理
         this.downloadhref = '/file/projectTemplate.xlsx'
         this.titletext = '商机'
@@ -93,15 +93,35 @@
         this.$emit('getdatas')
       },
       handleFileListChange(file, fileList) {
+        var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+        const extension = testmsg === "xlsx";
+        const extension1 = testmsg === "xls";
+        if (!extension && !extension1 ) {
+          this.$message({
+            message: "上传文件只能是.xls,.xlsx格式!",
+            type: "warning",
+          });
+          return false;
+        }
+        const isLt2M = file.size / 1024 / 1024 < 2
+        if (!isLt2M) {
+          this.$refs.upload.clearFiles()
+          this.$message({
+            message: '上传文件大小不能超过 2MB!',
+            type: 'warning'
+          })
+          return false
+        }
         if (fileList.length > 0) {
           this.fileList = [fileList[fileList.length - 1]];
           this.isUpload = true
         }
       },
       onSuccess(res, file, fileList) {
-        if(res.code == 200 )
+        if (res.code == 200) {
+          this.successCount = res.successCount
           this.addsuccess = true
-        else {
+        }else {
           this.importCancel()
           this.$message.error({ message: res.msg, showClose: true })
         }

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

@@ -15,26 +15,34 @@
               <el-input v-model="addParam.content" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
             </div>
             <div class="wr_bot">
-              <el-select v-model="addParam.visitMode" class="w128" placeholder="拜访方式">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
+              <div class="sels" v-model="addParam.visitMode">
+                <img src="@/assets/images/project/ico_1.png">
+                <el-select class="w128" placeholder="拜访方式">
                   <el-option v-for="(item,index) in bffslist" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
-              </el-select>
-              <template v-if="!customerIds">
-                <el-select v-if="showtype == 'gjdt'" v-model="addParam.customerId" class="w128" placeholder="关联企业">
-                  <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
-                    <el-option v-for="(item,index) in glqylist" :key="index" :label="item.companyName" :value="item.customerId"></el-option>
                 </el-select>
-              </template>
-              <el-select v-if="showtype == 'projectgjdt'" v-model="projectId" class="w128" placeholder="关联项目">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_1.png"></i>
-                <el-option v-for="(item,index) in projectList" :key="index" :label="item.projectName" :value="item.id"></el-option>
-              </el-select>
-              <el-input v-model="addParam.name" placeholder="拜访对象" style="width: 100px;">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_2.png"></i>
-              </el-input>
-              <el-input v-model="addParam.position" placeholder="客户职位" style="width: 100px;">
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/ico_3.png"></i>
-              </el-input>
+              </div>
+              <div class="sels" v-if="!customerIds && showtype == 'gjdt'">
+                <img src="@/assets/images/project/ico_1.png">
+                <el-select v-model="addParam.customerId" class="w128" placeholder="关联企业">
+                  <el-option v-for="(item,index) in glqylist" :key="index" :label="item.companyName" :value="item.customerId"></el-option>
+                </el-select>
+              </div>
+              <div class="sels" v-if="showtype == 'projectgjdt'">
+                <img src="@/assets/images/project/ico_1.png">
+                <el-select v-model="projectId" class="w128" placeholder="关联项目">
+                  <el-option v-for="(item,index) in projectList" :key="index" :label="item.projectName" :value="item.id"></el-option>
+                </el-select>
+              </div>
+              <div class="sels">
+                <img src="@/assets/images/project/ico_2.png">
+                <el-input v-model="addParam.name" placeholder="拜访对象" style="width: 100px;">
+                </el-input>
+              </div>
+              <div class="sels">
+                <img src="@/assets/images/project/ico_3.png">
+                <el-input v-model="addParam.position" placeholder="客户职位" style="width: 100px;">
+                </el-input>
+              </div>
               <div class="times"><img src="@/assets/images/project/ico_4.png">
                 <el-date-picker class="w128"
                     v-model="addParam.nextVisitTime"

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

@@ -209,5 +209,6 @@
 .img.img1{
   margin-right: 8px;
   background: url('../../../../../src/assets/images/project/add_2.png')no-repeat center center;
+  background-size: 100%;
 }
 </style>

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

@@ -286,10 +286,12 @@
   .img.img1{
     margin-right: 4px;
     background: url('../../../../../src/assets/images/project/add_2.png')no-repeat center center;
+    background-size: 100%;
   }
   .img.img2{
     margin-right: 4px;
     background: url('../../../../../src/assets/images/upload.png')no-repeat center center;
+    background-size: 100%;
   }
   .box-card{
     position: relative;

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

@@ -276,6 +276,8 @@
   }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.select-popper{
+  top: 3px;
+}
 </style>

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

@@ -301,6 +301,7 @@
     margin-right: 4px;
     transform: rotateX(180deg);
     background: url('../../../../../src/assets/images/import.png')no-repeat center center;
+    background-size: 100%;
   }
   .box-card{
     position: relative;

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -178,7 +178,7 @@
       }
     },
     created(){
-      this.thistag = this.$route.query.tag
+      this.thistag = this.$route.query.tag ? this.$route.query.tag : this.thistag
       this.prvinceTree()
       this.id = this.detailId ? this.detailId : this.$route.query.id
       //项目阶段
@@ -347,6 +347,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .select-popper{
+    top: 0;
+  }
   .head{
     .titles{
       line-height: 31px;
@@ -376,7 +379,7 @@
         &:hover{
           background-color: #DFE0E2;
         }
-        >img{
+        img{
           float: left;
           width: 16px;
           margin-top: 3px;
@@ -417,6 +420,7 @@
           width: 10px;
           height: 32px;
           background: url("../../../assets/images/project/icol1.png") no-repeat top center #fff;
+          background-size: 100%;
           position: absolute;
           left: 0;
           top: 0;
@@ -428,14 +432,17 @@
           width: 10px;
           height: 32px;
           background: url("../../../assets/images/project/icor1.png") no-repeat top center #fff;
+          background-size: 100%;
         }
         &:hover{
           background: #E3E6EA;
           .left{
             background: url("../../../assets/images/project/icol2.png") no-repeat top center #fff;
+            background-size: 100%;
           }
           .right{
             background: url("../../../assets/images/project/icor2.png") no-repeat top center #fff;
+            background-size: 100%;
           }
         }
 
@@ -444,9 +451,11 @@
           color: #fff;
           .left{
             background: url("../../../assets/images/project/icol3.png") no-repeat top center #fff;
+            background-size: 100%;
           }
           .right{
             background: url("../../../assets/images/project/icor3.png") no-repeat top center #fff;
+            background-size: 100%;
           }
         }
       }

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -136,7 +136,7 @@
           <el-divider v-if="index != datalist.length-1"></el-divider>
           <div class="operates"  v-if="activeName=='first'">
             <div class="i1"><img src="@/assets/images/follow.png" @click="toDetail(item.id,'gjjl')">跟进</div>
-            <div class="i2"><img src="@/assets/images/edit.png" @click="toDetail(item.id,'xmsl')">编辑</div>
+            <div class="i2"><img src="@/assets/images/edit1.png" @click="toDetail(item.id,'xmsl')">编辑</div>
             <div class="i3" @click="deldetail(index)"><img src="@/assets/images/delete.png">删除</div>
           </div>
           <div class="delform" v-if="activeName=='first' && ondel == index">
@@ -447,14 +447,17 @@ export default {
     z-index: 2;
     .img.img1{
       background: url('../../../../src/assets/images/add.png')no-repeat center center;
+      background-size: 100%;
     }
     .btn_default:hover{
       .img1{
         background: url('../../../../src/assets/images/add_1.png')no-repeat center center;
+        background-size: 100%;
       }
     }
     .img.img2{
       background: url('../../../../src/assets/images/import.png')no-repeat center center;
+      background-size: 100%;
     }
   }
   .scbtns{
@@ -536,6 +539,7 @@ export default {
           >img{
             float: left;
             margin-right: 5px;
+            width: 16px;
           }
         }
         .i1:hover{

dsk-system/src/main/java/com/dsk/system/domain/BusinessAddDto.java

@@ -61,6 +61,6 @@ public class BusinessAddDto {
     private String customerId;
 
     public Double getInvestmentAmount() {
-        return StringUtils.isEmpty(investmentAmount) ? 0 :Double.parseDouble(investmentAmount);
+        return StringUtils.isEmpty(investmentAmount) ? null :Double.parseDouble(investmentAmount);
     }
 }