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

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

 <template>
   <div>
-    <div class="miantitle">
-      <span>客户管理</span>
-      <span> / 客户列表</span>
-      <span> / 跟进动态</span>
-    </div>
+    <!--<div class="miantitle">-->
+      <!--<span>客户管理</span>-->
+      <!--<span> / 客户列表</span>-->
+      <!--<span> / 跟进动态</span>-->
+    <!--</div>-->
 
     <div class="app-container">
     <gjjl types="gjdt" :data="datas" isDisabled=true></gjjl>

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

@@ -147,7 +147,8 @@
       //添加客户
       submitForm(formName) {
         this.queryParam.userId = this.$store.state.user.userId
-        this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
+        if(this.queryParam.investmentAmount!="")
+          this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
         this.$refs[formName].validate((valid) => {
           if (valid) {
             addProject(this.queryParam).then(result=>{