#

src/views/activityManage/makerActvity.vue

@@ -8,54 +8,60 @@
     <hr>
 
 <!-- 搜索框开始 -->
-    <div class="selects">
-      <div class="selectsBlock">
-        <div class="selectLabel">项目筛选</div>
-        <el-select v-model="pavalues.value" @change="getData" placeholder="请选择">
-          <el-option label="所有项目" value=""/>
-          <el-option
-            v-for="item in options"
-            :key="item.courseId"
-            :label="item.title"
-            :value="item.courseId">
-          </el-option>
-        </el-select>
+    <div class="selectInp">
+      <div class="manageSelects">
+        <div class="selectsBlock">
+          <div class="selectLabel">项目筛选</div>
+          <el-select v-model="pavalues.value" @change="getData" placeholder="请选择">
+            <el-option label="所有项目" value=""/>
+            <el-option
+              v-for="item in options"
+              :key="item.courseId"
+              :label="item.title"
+              :value="item.courseId">
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="selectsBlock">
+          <div class="selectLabel">所在部门</div>
+          <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
+            <el-option label="所有部门" value=""/>
+            <el-option
+              v-for="item in options1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="selectsBlock">
+          <div class="selectLabel">负责人</div>
+          <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
+            <el-option label="所有负责人" value=""></el-option>
+            <el-option
+              v-for="item in options2"
+              :key="item.pro_leader"
+              :label="item.pro_leader"
+              :value="item.pro_leader">
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="selectsBlock">
+          <div class="selectLabel">状态</div>
+          <el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
+            <el-option label="所有状态" value=""/>
+            <el-option label="未审核" :value="0"/>
+            <el-option label="未报销" :value="1"/> 
+            <el-option label="已报销" :value="2"/>
+          </el-select>
+        </div>
       </div>
-
-      <div class="selectsBlock">
-        <div class="selectLabel">所在部门</div>
-        <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" value=""/>
-          <el-option
-            v-for="item in options1"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-
-      <div class="selectsBlock">
-        <div class="selectLabel">负责人</div>
-        <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
-          <el-option label="所有负责人" value=""></el-option>
-          <el-option
-            v-for="item in options2"
-            :key="item.pro_leader"
-            :label="item.pro_leader"
-            :value="item.pro_leader">
-          </el-option>
-        </el-select>
-      </div>
-
-      <div class="selectsBlock">
-        <div class="selectLabel">状态</div>
-        <el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
-          <el-option label="所有状态" value=""/>
-          <el-option label="未审核" :value="0"/>
-          <el-option label="未报销" :value="1"/> 
-          <el-option label="已报销" :value="2"/>
-        </el-select>
+      <div class="ProjectManagementQuery">
+        <el-input v-model="input" placeholder="请输入项目名称/编号"></el-input>
+        <el-button type="primary" class="btn" size="mini" @click="getData">查询</el-button>
       </div>
 
     </div>
@@ -559,6 +565,7 @@ import { ActivityWord } from '@/components/tool/getWord';
             cid:this.pavalues.value1,
             leader:this.pavalues.value2,
             state:this.pavalues.value3,
+            inp:this.input,
             page:this.Page.nowPage,
             lim:this.Page.lim,
           }).then(res=>{

src/views/projectApply/projectApplication.vue

@@ -8,74 +8,80 @@
     <hr>
 
 <!-- 搜索框开始 -->
-    <div class="selects">
-      <div class="selectsBlock">
-        <div class="selectLabel">项目筛选</div>
-        <el-select v-model="selectInp.filter" @change="getData" placeholder="我的项目">
-          <el-option label="所有项目"  value=""></el-option>
-          <el-option
-            v-for="item in options.projectFilter"
-            :key="item.courseId"
-            :label="item.title"
-            :value="item.courseId">
-          </el-option>
-        </el-select>
-      </div>
+    <div class="selectInp">
+      <div class="manageSelects">
+        <div class="selectsBlock">
+          <div class="selectLabel">项目筛选</div>
+          <el-select v-model="selectInp.filter" @change="getData" placeholder="我的项目">
+            <el-option label="所有项目"  value=""></el-option>
+            <el-option
+              v-for="item in options.projectFilter"
+              :key="item.courseId"
+              :label="item.title"
+              :value="item.courseId">
+            </el-option>
+          </el-select>
+        </div>
 
-      <div class="selectsBlock">
-        <div class="selectLabel">部门</div>
-        <el-select v-model="selectInp.department" @change="getData" placeholder="请选择">
-          <el-option label="所有部门" value=""></el-option>
-          <el-option
-            v-for="item in options.department"
-            :key="item.classid"
-            :label="item.name"
-            :value="item.classid">
-          </el-option>
-        </el-select>
-      </div>
+        <div class="selectsBlock">
+          <div class="selectLabel">部门</div>
+          <el-select v-model="selectInp.department" @change="getData" placeholder="请选择">
+            <el-option label="所有部门" value=""></el-option>
+            <el-option
+              v-for="item in options.department"
+              :key="item.classid"
+              :label="item.name"
+              :value="item.classid">
+            </el-option>
+          </el-select>
+        </div>
 
-      <div class="selectsBlock">
-        <div class="selectLabel">分类</div>
-        <el-select v-model="selectInp.sort" @change="getData" placeholder="请选择">
-          <el-option label="所有分类" value=""></el-option>
-          <el-option
-            v-for="item in options.sort"
-            :key="item.typeid"
-            :label="item.name"
-            :value="item.typeid">
-          </el-option>
-        </el-select>
-      </div>
-      <!-- <div class="selectInp">
-        <div class="ProjectManagementQuery">
-          <el-input v-model="selectText" @change="getData" placeholder="请输入项目名称"></el-input>
-          <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
+        <div class="selectsBlock">
+          <div class="selectLabel">分类</div>
+          <el-select v-model="selectInp.sort" @change="getData" placeholder="请选择">
+            <el-option label="所有分类" value=""></el-option>
+            <el-option
+              v-for="item in options.sort"
+              :key="item.typeid"
+              :label="item.name"
+              :value="item.typeid">
+            </el-option>
+          </el-select>
+        </div>
+        <!-- <div class="selectInp">
+          <div class="ProjectManagementQuery">
+            <el-input v-model="selectText" @change="getData" placeholder="请输入项目名称"></el-input>
+            <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
+          </div>
+        </div> -->
+        <div class="selectsBlock">
+          <div class="selectLabel">负责人</div>
+          <el-select v-model="selectInp.person" @change="getData" placeholder="请选择">
+            <el-option label="所有负责人" value=""></el-option>
+            <el-option
+              v-for="(item,index) in options.person"
+              :key="index"
+              :label="item.pro_leader"
+              :value="item.pro_leader">
+            </el-option>
+          </el-select>
         </div>
-      </div> -->
-      <div class="selectsBlock">
-        <div class="selectLabel">负责人</div>
-        <el-select v-model="selectInp.person" @change="getData" placeholder="请选择">
-          <el-option label="所有负责人" value=""></el-option>
-          <el-option
-            v-for="(item,index) in options.person"
-            :key="index"
-            :label="item.pro_leader"
-            :value="item.pro_leader">
-          </el-option>
-        </el-select>
-      </div>
 
-      <div class="selectsBlock">
-        <div class="selectLabel">状态</div>
-        <el-select v-model="selectInp.state" @change="getData" placeholder="请选择">
-          <el-option
-            v-for="item in options.state"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
+        <div class="selectsBlock">
+          <div class="selectLabel">状态</div>
+          <el-select v-model="selectInp.state" @change="getData" placeholder="请选择">
+            <el-option
+              v-for="item in options.state"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="ProjectManagementQuery">
+        <el-input v-model="input" placeholder="请输入项目名称/编号"></el-input>
+        <el-button type="primary" class="btn" size="mini" @click="getData">查询</el-button>
       </div>
     </div>
     
@@ -521,7 +527,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
             year:"",
-            textInp:'',
+            textInp:this.input,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize  //限制获取几条数据
           }
@@ -531,6 +537,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             .get(this.$store.state.api+'/SelectAllProject',param)
               .then(res=>{
                 let data=res.data;
+                console.log(data)
                 if (data[0].length==0 && data[5][0]['total'] != 0) {
                   this.table.currentPage=1
                   return this.getData()

src/views/projectManage/ProjectManagement.vue

@@ -190,7 +190,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="500"
+          width="350"
           align="center"
           label="操作"
           >

src/views/projectManage/components/ProjectManagement3.vue

@@ -128,6 +128,7 @@
               cid:"",
               leader:'',
               state:"",
+              input:"",
               page:this.table.currentPage,
               lim:this.table.packageSize
             }
@@ -135,6 +136,7 @@
             this.ajax
                   .get(this.$store.state.api+'/GetAllActivity',param)
                   .then(res=>{
+                    console.log(res)
                     this.tableData=res.data[0]
                     this.table.total=res.data[4][0].total
                     this.loading = false;

src/views/projectSettlement/projectSettlement.vue

@@ -6,7 +6,8 @@
     </div>
     <hr>
     <!-- 搜索栏开始 -->
-    <div class="selects">
+    <div class="selectInp">
+      <div class="manageSelects">
       <div class="selectsBlock">
         <span class="selectLabel">项目筛选</span>
         <el-select v-model="selectInp.filter" @change="getData" placeholder="我的项目">
@@ -72,6 +73,11 @@
           </el-option>
         </el-select>
       </div>
+      </div>
+      <div class="ProjectManagementQuery">
+        <el-input v-model="input" placeholder="请输入项目名称/编号"></el-input>
+        <el-button type="primary" class="btn" size="mini" @click="getData">查询</el-button>
+      </div>
     </div>
 <!-- 搜索栏结束 -->
 
@@ -88,6 +94,12 @@
           type="selection"
           >
         </el-table-column> -->
+        <el-table-column
+        prop="ProjectNo"
+        label="项目编号"
+        align="center"
+        min-width="7%">
+        </el-table-column>
         <el-table-column
           prop="title"
           label="项目名称"
@@ -114,9 +126,9 @@
         </el-table-column>
         <el-table-column
           prop="time"
-          label="时间"
+          label="结项时间"
           align="center"
-          min-width="10%">
+          min-width="12%">
         </el-table-column>
         <el-table-column
           prop="phone"
@@ -201,6 +213,7 @@
         return {
           submitHint:false,
           loading:false,
+          input:"",//查询输入框
           iid:'',
           tit:'',
           options:{    //头部搜索框下拉框数据
@@ -276,6 +289,7 @@
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
+            inp:this.input,
             page:this.table.currentPage,  //当前页
             lim:this.table.packageSize  //限制获取几条数据
           }