*

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

@@ -721,6 +721,29 @@ ul, li {
     }
   }
 }
+//无边框搜索框
+.newSearch{
+  width: 238px;
+  height: 32px;
+  border-radius: 4px;
+  .el_input{
+    height: 32px !important;
+  }
+  .el-input__prefix{
+    left: 12px;
+    .el-input__icon{
+      img{
+        float: left;
+        margin-top: 7px;
+      }
+    }
+  }
+  .el-input__inner{
+    padding-left: 36px;
+    border-color: #fff !important;
+    height: 32px !important;
+  }
+}
 //导出EXCEL
 .btn-export{
   display: inline-block;
@@ -766,3 +789,17 @@ ul, li {
   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);
 }
+//下拉选项样式
+.el-select-dropdown {
+  box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
+  border: 0;
+
+  .el-select-dropdown__list {
+    padding: 0;
+
+    .el-select-dropdown__item {
+      padding: 0 16px;
+    }
+  }
+
+}

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

@@ -836,19 +836,27 @@
 }
 //资料文档、相关企业
 .searchbtns{
-  display: flex;
   position: absolute;
-  right: 16px;
+  left: 100px;
   top: 17px;
+  width: calc(100% - 116px);
+
+  .searchInput, .el-select {
+    float: left;
+  }
+  .btn{
+    float: right;
+  }
   .searchInput{
+    position: relative;
     &.small{
-      border: 1px solid #d9d9d9;
+      border: 1px solid #fff;
       width: 240px;
       .el-input{
-        width: 180px;
+        //width: 180px;
       }
       .el-input__inner{
-        padding-right: 32px;
+        //padding-right: 32px;
       }
       .el-input__prefix{
         left: 8px;
@@ -868,19 +876,25 @@
     border-radius: 2px;
   }
   .select{
-    width: 110px;
+    width: 94px;
     .el-input__inner{
-      width: 110px;
+      //width: 110px;
       height: 32px;
       background: #FFFFFF;
-      border-radius: 2px;
-      border: 1px solid #D9D9D9;
-
+      border-radius: 4px;
+      border: 0;
+      padding:5px 28px 5px 8px;
     }
     .el-input--medium .el-input__icon{
       line-height: 32px;
     }
     margin-right: 10px;
+
+    .is-focus{
+      .el-input__inner{
+        background: #F4F6F9;
+      }
+    }
   }
 }
 .document{
@@ -1273,3 +1287,6 @@
     }
   }
 }
+.top12{
+  margin-top: 12px;
+}

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

@@ -18,9 +18,10 @@
             <div>
               <el-form ref="queryForm" :model="searchParam" :inline="true" size="small">
                 <el-form-item prop="companyName">
-                  <div class="searchInput">
-                    <el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
-                    <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+                  <div class="newSearch">
+                    <el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询"  @change="clearname" >
+                      <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
+                    </el-input>
                  </div>
                 </el-form-item>
                 <el-form-item>
@@ -839,8 +840,5 @@
   }
   .searchInput{
     width: 240px;
-    .el-input{
-      /*width: 260px;*/
-    }
   }
 </style>

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

@@ -9,9 +9,10 @@
             <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
           </div>
           <div class="table_search">
-            <div class="searchInput">
-              <el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
-              <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+            <div class="newSearch">
+              <el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询"  @change="clearname" >
+                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
+              </el-input>
             </div>
             <div class="dc">
               <div class="total">共{{tableData.total}}条</div>

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

@@ -48,8 +48,9 @@
               <!-- 输入框 -->
               <template v-if="form.type==3">
                 <div class="cooperate-name" :id="'focus'+i">
-                  <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
-                  <span @click="changeSelect">搜索</span>
+                  <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:200px'">
+                    <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="changeSelect"></i>
+                  </el-input>
                 </div>
               </template>
               <!-- 多选 -->
@@ -300,8 +301,8 @@ export default {
   }
   ::v-deep .el-input__inner{
     border: 1px solid #D9D9D9;
-    height: 34px;
-    line-height: 34px;
+    height: 32px;
+    line-height: 32px;
     padding-right: 27px;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -343,10 +344,18 @@ export default {
       }
       .cooperate-name {
         display: flex;
-        border-radius: 2px;
-        border: 1px solid #D9D9D9;
-        line-height: 34px;
-        height: 34px;
+        border-radius: 4px;
+        border: 0;
+        line-height: 32px;
+        height: 32px;
+        width: 238px;
+        .el-input__icon{
+          >img{
+            position: absolute;
+            top: 7px;
+            left: 5px;
+          }
+        }
         span {
           width: 60px;
           height: 32px;
@@ -360,7 +369,7 @@ export default {
           cursor: pointer;
         }
         &.span-ba{
-          border: 1px solid #0081FF;
+          border-color: #0081FF;
           span{
             color: #ffffff;
             background: #0081FF;
@@ -368,7 +377,7 @@ export default {
           }
         }
         ::v-deep .el-input{
-          flex: 1;
+          width: 100%;
         }
         ::v-deep .el-input__inner {
           border: 0;
@@ -376,9 +385,7 @@ export default {
           height: 32px;
           position: absolute;
           top: 0;
-          padding-right: 22px;
-          font-size: 12px;
-          padding-left: 8px;
+          padding-left: 36px;
         }
       }
       .fromTime{
@@ -401,6 +408,25 @@ export default {
     }
     ::v-deep .form-content-width{
       width: 170px;
+      .el_input{
+        background: #fff;
+      }
+      .el-input__inner{
+        border-color: #fff;
+        padding:5px 28px 5px 8px;
+        border-radius: 4px !important;
+      }
+      .el-input__suffix{
+        height: 32px;
+        .el-input__icon{
+          line-height: 32px;
+        }
+      }
+      .is-focus{
+        .el-input__inner{
+          background: #F4F6F9;
+        }
+      }
     }
     ::v-deep .selectTag{
       .el-select__tags{

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

@@ -158,9 +158,9 @@ export default {
         {label: '项目状态', prop: 'status', width: '90', slot: true}
       ],
       formData: [
-        { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
-        { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
-        { type: 3, fieldName: 'projectName', width:'200', value: '', placeholder: '输入项目名称关键字搜索'},
+        { type: 1, fieldName: 'projectStage',width:'94', value: '', placeholder: '项目阶段', options: []},
+        { type: 1, fieldName: 'status', width:'94',value: '', placeholder: '项目状态', options: []},
+        { type: 3, fieldName: 'projectName', width:'240', value: '', placeholder: '输入项目名称关键字搜索'},
       ],
       stageOptions:[],
       statusOptions:[],

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

 <template>
 
   <div>
-    <el-card class="box-card noborder">
+    <el-card class="box-card noborder" >
       <div class="cardtitles">相关企业</div>
       <div class="searchbtns">
         <el-select class="select"  placeholder="企业类型" clearable v-model="searchParam.companyRole" @change="handleCurrentChange(1)">
@@ -9,8 +9,8 @@
         </el-select>
         <div class="searchInput small">
           <el-input type="text" placeholder="输入关键词查询" clearable  v-model="searchParam.companyName">
-            <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png"></i></el-input>
-          <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+            <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" @click="handleCurrentChange(1)"></i></el-input>
+          <!--<div class="btn" @click="handleCurrentChange(1)">搜索</div>-->
         </div>
         <div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisableds == false"><div class="img img1"></div>添加相关企业</div>
       </div>

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

@@ -7,9 +7,9 @@
       <!--<div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">-->
         <div class="searchInput small">
           <el-input type="text" v-model="param.keyword" clearable placeholder="输入关键词查询">
-            <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png"></i>
+            <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" @click="handleCurrentChange(1)"></i>
           </el-input>
-          <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+          <!--<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>-->
 

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

@@ -105,7 +105,7 @@
         </div>
       </el-card>
 
-      <el-card class="box-card noborder">
+      <el-card class="box-card noborder top12" style="margin-bottom: 12px">
         <div class="tabslist">
           <div class="tab" v-for="(item,index) in tabslist" :class="{'on':thistag == item.tag}" @click="getCom(item.tag)">
             <span>{{item.name}}</span>

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

@@ -110,8 +110,8 @@
       </el-tabs>
     </el-card>
 
-    <el-card class="box-card noborder overflows">
-      <div class="titles">项目明细
+    <el-card class="box-card noborder overflows top12">
+      <div class="titles"><!--项目明细-->
         <div class="dc">
           <div class="total">共{{total}}条</div>
           <!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
@@ -573,8 +573,9 @@ export default {
     height: 60px;
     line-height: 64px;
     border-bottom: 1px solid #EFEFEF;
-    padding-left: 26px;
-    &::after{
+    padding-left: 2px;
+    padding-right: 24px;
+    /*&::after{
       content: " ";
       width: 2px;
       height: 14px;
@@ -582,13 +583,13 @@ export default {
       float: left;
       margin-left: -10px;
       margin-top: 24px;
-    }
+    }*/
     .dc{
+      width: 100%;
       float: right;
       font-size: 12px;
       color: #3D3D3D;
       font-weight: 400;
-      padding-right: 24px;
       position: relative;
       &::after{
         content: ' ';
@@ -604,6 +605,10 @@ export default {
         display: inline-block;
         margin-left: 20px;
       }
+      .btn-export{
+        float: right;
+        margin-top: 18px;
+      }
     }
   }
   .datalist{
@@ -641,6 +646,9 @@ export default {
       .delform{
         right: 16px;
         top: -94px;
+        .btnsmall{
+          margin-top: 0;
+        }
       }
       &:hover{
         background-color: #F6F9FC;