*

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

@@ -459,10 +459,10 @@
         opacity: 0.8;
         padding: 0;
       }
-      .el-input{
+      .el-input,.el-textarea{
         display: inline-block;
         width: 240px;
-        .el-input__inner{
+        .el-input__inner,.el-textarea__inner{
           width: 100%;
           height: 32px;
           border-radius: 0px;
@@ -471,6 +471,11 @@
             border-color: #0081FF;
           }
         }
+        .el-textarea__inner{
+          height: 90px;
+          font-family: inherit;
+          color: #000;
+        }
         .el-input__suffix{
           height: 32px;
         }
@@ -508,7 +513,7 @@
     }
   }
   .popform.i{
-    .el-input{
+    .el-input,.el-textarea{
       width: 335px;
     }
   }

dsk-operate-ui/src/layout/components/Sidebar/index.vue

@@ -13,8 +13,8 @@
                 mode="vertical"
             >
                 <sidebar-item
-                    v-for="(route, index) in sidebarRouters"
-					
+                    v-for="(route, index) in hidechildren"
+
                     :key="route.path  + index"
 					:is-collapse="isCollapse"
 					:active-menu="activeMenu"
@@ -22,7 +22,7 @@
                     :base-path="route.path"
 					:class="route.fixed&&route.fixed.isFixed?'sideFoot':''"
 					:style="route.fixed&&route.fixed.isFixed?{'bottom': route.fixed.number*50+'px'}: bottomMenu&&index==routes.length-bottomMenu-2?{'padding-bottom': bottomMenu*50+'px'}:''"
-					
+
                 />
             </el-menu>
         </el-scrollbar>
@@ -39,7 +39,7 @@ import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
-	
+
     components: { SidebarItem, Logo },
 	data() {
 	  return {
@@ -49,6 +49,18 @@ export default {
     computed: {
         ...mapState(["settings"]),
         ...mapGetters(["sidebarRouters", "sidebar"]),
+        hidechildren(){
+          return this.sidebarRouters.map(item=>{
+            if(item.children?.length){
+             item.children = item.children.filter(i=>{
+                if (typeof (i.hidden) == 'boolean' && i.hidden == false || i.path == "index"){
+                  return i
+                }
+              })
+            }
+            return item
+          })
+        },
         activeMenu() {
             const route = this.$route;
             const { meta, path } = route;

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

@@ -22,7 +22,7 @@
           <img class="icon_img" src="@/assets/images/project/icon_3.png">
         </div>
         <div class="icons">
-          <div class="name">今日紧进客户</div>
+          <div class="name">今日跟进客户</div>
           <div class="count">30</div>
           <img class="icon_img" src="@/assets/images/project/icon_4.png">
         </div>

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

@@ -18,7 +18,7 @@
         </div>
       </el-form-item>
       <el-form-item label="业主单位：" class="row"  prop="ownerCompany">
-        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany"></el-input>
+        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany" :οnkeyup="queryParam.ownerCompany=queryParam.ownerCompany.replace(/^\s+|\s+$/g,'')"></el-input>
         <div class="resultlist" v-if="showlist" id="box">
           <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
         </div>
@@ -115,6 +115,7 @@
     },
     methods:{
       toradar(){
+        this.resetForm()
         this.$router.push({path:'/radar'})
       },
       handleALL(event){
@@ -178,11 +179,12 @@
       //添加客户
       submitForm(formName) {
         this.queryParam.userId = this.$store.state.user.userId
-        if(this.queryParam.investmentAmount!="")
-          this.queryParam.investmentAmount = parseFloat(this.queryParam.investmentAmount)
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            addProject(this.queryParam).then(result=>{
+            let param = JSON.parse(JSON.stringify(this.queryParam))
+            if(param.investmentAmount!="")
+              param.investmentAmount = parseFloat(param.investmentAmount)
+            addProject(param).then(result=>{
               if(result.code == 200){
                 this.$message.success('添加成功！')
                 this.resetForm('ruleForm')

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

@@ -106,8 +106,8 @@
           <img src="@/assets/images/economies/icon.png">
           <span>{{projectname}}</span>
         </div>
-        <el-form class="popform" label-width="137px">
-          <el-form-item label="联系人姓名：" class="row">
+        <el-form class="popform" :model="queryParam" ref="ruleForm" label-width="137px" :rules="rules" >
+          <el-form-item label="联系人姓名：" class="row" prop="name">
             <el-input type="text" v-model="queryParam.name" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="联系人性别：" class="row">
@@ -157,6 +157,9 @@
     },
     data(){
       return{
+        rules:{
+          name:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+        },
         dialogVisible:false,
         isnew:true,//是否新增
         textarea:"",
@@ -200,36 +203,40 @@
         })
       },
       save(){
-        let param = JSON.parse(JSON.stringify(this.queryParam))
-        param.sex = parseInt(param.sex)
-        if(!this.queryParam.phone){
-          this.$message.error('请输入电话号码')
-          return false
-        }
-        var regPartton = /1[3-9]+\d{9}/;
-        var regPartton1 = /0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}/;
-        if (!regPartton.test(this.queryParam.phone) && !regPartton1.test(this.queryParam.phone)) {
-          this.$message.error("请输入正确的电话");
-          return false
-        }
-        if(this.isnew == false){
-          editLXR(param).then(result=>{
-            if(result.code == 200){
-              this.$message.success('保存成功！')
-              this.getList()
-              this.dialogVisible = false
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            let param = JSON.parse(JSON.stringify(this.queryParam))
+            param.sex = parseInt(param.sex)
+            if (!this.queryParam.phone) {
+              this.$message.error('请输入电话号码')
+              return false
             }
-          })
-        }
-        if(this.isnew == true){
-          addLXR(param).then(result=>{
-            if(result.code == 200){
-              this.$message.success('新增成功！')
-              this.getList()
-              this.dialogVisible = false
+            var regPartton = /1[3-9]+\d{9}/;
+            var regPartton1 = /0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}/;
+            if (!regPartton.test(this.queryParam.phone) && !regPartton1.test(this.queryParam.phone)) {
+              this.$message.error("请输入正确的电话");
+              return false
             }
-          })
-        }
+            if (this.isnew == false) {
+              editLXR(param).then(result => {
+                if (result.code == 200) {
+                  this.$message.success('保存成功！')
+                  this.getList()
+                  this.dialogVisible = false
+                }
+              })
+            }
+            if (this.isnew == true) {
+              addLXR(param).then(result => {
+                if (result.code == 200) {
+                  this.$message.success('新增成功！')
+                  this.getList()
+                  this.dialogVisible = false
+                }
+              })
+            }
+          }
+        })
       },
       //翻页
       handleCurrentChange(val) {

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

@@ -73,8 +73,8 @@
             label="备注"
             width="">
             <template slot-scope="scope">
-              <el-tooltip v-if="scope.row.responsiblePerson" class="item" effect="dark" :content="scope.row.responsiblePerson" placement="top">
-                <div class="showremark">{{scope.row.responsiblePerson}}</div>
+              <el-tooltip v-if="scope.row.remark" class="item" effect="dark" :content="scope.row.remark" placement="top">
+                <div class="showremark">{{scope.row.remark}}</div>
               </el-tooltip>
               <div v-else>--</div>
             </template>
@@ -162,7 +162,14 @@
             <el-input type="text" v-model="queryParam.phonenumber" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="备注说明：" class="row">
-            <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
+            <el-input
+              type="textarea"
+              placeholder="请输入"
+              v-model="queryParam.remark"
+              maxlength="200"
+              show-word-limit
+            >
+            </el-input>
           </el-form-item>
           <div class="popbot">
             <div class="btn btn_cancel h32" @click="cancel()">返回</div>
@@ -218,6 +225,7 @@
           companyType:'',
           responsiblePerson:'',
           depth:'',
+          remark:'',
         },
         searchParam:{
           pageSize:20,
@@ -339,6 +347,7 @@
           companyType:'',
           responsiblePerson:'',
           depth:'',
+          remark:'',
         }
       },
     }

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

@@ -191,6 +191,7 @@ export default {
   components:{addproject,batchimport,skeleton},
   data() {
     return {
+      encodeStr,
       types:'project',
       props:{multiple: true},
       activeName:'first',