合并分支 'zax' 到 'master'

src/components/admittance/company/company.vue

@@ -7,7 +7,7 @@
           <p class="search">
             <span class="searchVal">
                 <span>单位名称：</span>
-                <el-input v-model="searchName" size="medium"  @keyup-enter="search('search')" placeholder="请输入"></el-input>
+                <el-input v-model="searchName" size="medium"  @change="search('search')" placeholder="请输入"></el-input>
             </span>
             <span class="searchVal searchInput">
               <span>单位类别：</span>

src/components/admittance/product/product.vue

@@ -7,7 +7,7 @@
           <p class="search">
             <span class="searchVal">
                 <span>产品名称：</span>
-                <el-input v-model="name" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
+                <el-input v-model="name" size="medium" placeholder="请输入" @change="search('search')"></el-input>
             </span>
             <span class="searchVal searchInput">
               <span>产品类型：</span>

src/components/basicInformation/company/company.vue

@@ -7,7 +7,7 @@
           <p class="search">
             <span class="searchVal">
                 <span>单位名称：</span>
-                <el-input v-model="searchName" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
+                <el-input v-model="searchName" size="medium" placeholder="请输入" @change="search('search')"></el-input>
             </span>
             <span class="searchVal searchInput">
               <span>单位类别：</span>
@@ -191,7 +191,7 @@ export default {
         },
         // 单位准入状态转换
         statusCompany (row) {
-            return row.status === 1 ? '已准入': '未被准入'
+            return row.status === 1 ? '已准入': '未准入'
         },
         // 单位类别转换
         typeCompany (row) {

src/components/basicInformation/product/product.vue

@@ -7,7 +7,7 @@
           <p class="search">
             <span class="searchVal">
                 <span>产品名称：</span>
-                <el-input v-model="name" size="medium" placeholder="请输入" @keyup-enter="search('search')"></el-input>
+                <el-input v-model="name" size="medium" placeholder="请输入" @change="search('search')"></el-input>
             </span>
             <span class="searchVal searchInput">
               <span>产品类型：</span>
@@ -170,7 +170,7 @@ export default {
         },
         // 准入状态转换
         statusChange(row) {
-            return row.status === 1 ? '已准入': '未被准入'
+            return row.status === 1 ? '已准入': '未准入'
         },
         // 搜索
         search(val) {

src/components/projectManagement/project/projectAdd.vue

@@ -4,6 +4,97 @@
       <el-col :span="24">
         <div class="content">
           <p class="title">新增项目</p>
+          <el-col :span="24">
+            <div class="content-title">
+              <span class="title-icon"></span>
+              <span class="head">基础信息</span>
+            </div>
+            <p class="search">
+              <span class="search-input">
+                  <span>项目名称：</span>
+                  <el-input size="medium" placeholder="请输入"></el-input>
+              </span>
+              <span class="search-input">
+                  <span>开始时间：</span>
+                  <el-date-picker
+                    v-model="actionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+              </span>
+              <span class="search-input">
+                  <span>完成时间：</span>
+                  <el-date-picker
+                    v-model="actionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+              </span>
+            </p>
+            <p class="search">
+              <span class="search-input">
+                  <span>技术路线：</span>
+                  <el-select v-model="techVal" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in techList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </span>
+              <span class="search-input">
+                  <span>建设方：</span>
+                  <el-select v-model="techVal" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in techList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </span>
+              <span class="search-input">
+                  <span>集成商：</span>
+                  <el-select v-model="techVal" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in techList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </span>
+            </p>
+            <p class="search" style="width: 59.5%">
+              <span class="search-input">
+                  <span>开发商：</span>
+                  <el-select v-model="techVal" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in techList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </span>
+              <span class="search-input">
+                  <span>监理方：</span>
+                  <el-select v-model="techVal" placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in techList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </span>
+            </p>
+            <div class="content-title">
+              <span class="title-icon"></span>
+              <span class="head">软件信息</span>
+            </div>
+          </el-col>
         </div>
       </el-col>
     </el-row>
@@ -12,7 +103,14 @@
 
 <script>
 export default {
-    name: 'projectAdd'
+    name: 'projectAdd',
+    data() {
+        return {
+            actionTime: '',
+            techVal: '',
+            techList: []
+        }
+    }
 }
 </script>
 
@@ -33,4 +131,49 @@ export default {
     font-size: 20px;
     color: #233b6e;
   }
+  .projectAdd .content .content-title{
+    width: 89%;
+    height: 32px;
+    background-color: rgba(72,119,230,0.1);
+    margin: 30px auto;
+    font-size: 20px;
+  }
+  .projectAdd .content .title-icon{
+    width: 5px;
+    height: 32px;
+    border-radius: 2px 0 0 2px;
+    background-color: #4877e6;
+    position: absolute;
+  }
+  .projectAdd .content .head{
+    font-size: 18px;
+    color: #333333;
+    line-height: 32px;
+    margin-left: 12px;
+  }
+  .projectAdd .content .search{
+    position: relative;
+    margin-top: 36px;
+    padding: 0px 70px 0px 70px;
+    display: flex;
+  }
+  .projectAdd .content .search-input{
+    margin-right: 8px;
+    width: 410px;
+    display: flex;
+    font-size: 18px;
+    color: #666;
+  }
+  .projectAdd .content .search-input>span{
+    width: 150px;
+    display: inline-block;
+    line-height: 34px;
+    text-align: right;
+  }
+  .projectAdd .content .el-select{
+    width: 100%;
+  }
+  .projectAdd .content .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width: 100%;
+  }
 </style>
\ No newline at end of file

src/tools/element.js

 import Vue from 'vue'
 import { Row, Col, Carousel, CarouselItem, Scrollbar, Input, Button, Table, TableColumn, Pagination, Dialog,
-    Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload,} from 'element-ui'
+    Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload, DatePicker} from 'element-ui'
 import './element-variables.scss'
 Vue.use(Row);
 Vue.use(Col);
@@ -25,3 +25,4 @@ Vue.use(FormItem);
 Vue.use(Radio);
 Vue.use(RadioGroup);
 Vue.use(Upload);
+Vue.use(DatePicker);