new

src/assets/changeElementStyle.css

@@ -164,10 +164,6 @@
     font-family: 'Regular';
 }
 
-/*滚动条*/
-.el-scrollbar__wrap {
-    overflow-x: hidden;
-}
 /*checkbox选择款*/
 .el-checkbox__input.is-disabled .el-checkbox__inner,.el-checkbox__input.is-checked .el-checkbox__inner{
     width: 21px;

src/components/complaint/complaintManagement/addComplaintManagement.vue

@@ -7,11 +7,11 @@
                     <el-form :model="form" :rules="rules" ref="form" label-width="105px">
                         <p class="rowForm">
                             <el-form-item label="单位类型:" class="inline" prop="objectVal">
-                                <el-select v-model="form.objectVal" placeholder="请选择" clearable>
+                                <el-select v-model="form.objectVal" placeholder="请选择" clearable @change="findUnit">
                                     <el-option v-for="item in object" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="投诉单位:" class="inline" prop="unitVal">
+                            <el-form-item label="投诉单位:" class="inline" prop="unitVal" @change="findProject">
                                 <el-select v-model="form.unitVal" placeholder="请选择" clearable>
                                     <el-option v-for="item in unit" :key="item.id" :label="item.name" :value="item.id" ></el-option>
                                 </el-select>
@@ -139,26 +139,8 @@ export default {
             }
         }
     },
-    created() {
-    },
-    mounted(){
-        this.$server.getUnitFindAll().then(res => {
-            this.unit = res.data.data;
-            this.$server.getProduceFindAll().then(res => {
-                this.product = res.data.data;
-                this.$server.getProjectFindAll().then(res => {
-                    console.log(res.data.data)
-                    this.project = res.data.data;
-                }).catch(err => {
-                    this.$message.error('数据请求失败！');
-                })
-            }).catch(err => {
-                this.$message.error('数据请求失败！');
-            })
-        }).catch(err => {
-            this.$message.error('数据请求失败！');
-        })
-    },
+    created() {},
+    mounted(){},
     methods: {
         // 表单提交
         submitForm(formName) {
@@ -216,6 +198,28 @@ export default {
             } else {
                 this.anonymous = 1
             }
+        },
+        // 获取单位名称
+        findUnit() {
+            this.$server.getUnitFindByType(this.form.objectVal).then(res => {
+                console.log(res.data)
+                if (res.data.code === 200) {
+                    this.unit = res.data.data;
+                }
+            }).catch(err => {
+                this.$message.error('数据请求失败！');
+            })
+        },
+        // 获取项目名称
+        findProject() {
+            this.$server.getUnitFindByType(this.form.unitVal).then(res => {
+                console.log(res.data)
+                if (res.data.code === 200) {
+                    this.project = res.data.data;
+                }
+            }).catch(err => {
+                this.$message.error('数据请求失败！');
+            })
         }
     },
     components: {

src/components/projectManagement/hardware/hardware.vue

@@ -6,9 +6,9 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
             </span>
-            <span class="button buttonSave">搜索</span>
+            <span class="button buttonSave" @click="search">搜索</span>
           </p>
           <div class="common-table">
             <el-table
@@ -84,7 +84,8 @@ export default {
                     'page': this.currentPage,
                     'pageSize': this.pagesize,
                     't': {
-                        'projectId': this.value.id
+                        'projectId': this.value.id,
+                        'name': this.searchVal
                     }
                 }
             }
@@ -101,6 +102,10 @@ export default {
                 this.$message.error('数据请求失败！');
             })
         },
+        // 搜索
+        search() {
+            this.init()
+        },
         // 点击分页
         handleSizeChange(val) {
             console.log(`每页 ${val} 条`);

src/components/projectManagement/journal/journal.vue

@@ -6,9 +6,9 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
             </span>
-            <span class="button buttonSave">搜索</span>
+            <span class="button buttonSave" @click="search">搜索</span>
           </p>
           <div class="common-table">
             <el-table
@@ -84,7 +84,8 @@ export default {
                     'page': this.currentPage,
                     'pageSize': this.pagesize,
                     't': {
-                        'projectId': this.value.id
+                        'projectId': this.value.id,
+                        'name': this.searchVal
                     }
                 }
             }
@@ -101,6 +102,10 @@ export default {
                 this.$message.error('数据请求失败！');
             })
         },
+        // 搜索
+        search() {
+            this.init();
+        },
         // 点击分页
         handleSizeChange(val) {
             console.log(`每页 ${val} 条`);

src/components/projectManagement/project/projectAdd.vue

@@ -655,5 +655,9 @@ export default {
     display: flex;
     justify-content: space-evenly;
     margin-top: 8px;
+    margin-bottom: 30px;
+  }
+  .projectAdd .content>>>.el-scrollbar__wrap {
+    overflow-x: hidden;
   }
 </style>

src/components/projectManagement/project/projectManagement.vue

@@ -7,9 +7,9 @@
           <p class="title">{{pageName}}</p>
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
             </span>
-            <span class="button buttonSave">搜索</span>
+            <span class="button buttonSave" @click="search">搜索</span>
             <span class="button add" @click="addProject">新增</span>
           </p>
           <div class="common-table">
@@ -111,7 +111,10 @@ export default {
             } else {
                 val = {
                     'page': this.currentPage,
-                    'pageSize': this.pagesize
+                    'pageSize': this.pagesize,
+                    't': {
+                        'name': this.searchVal
+                    }
                 }
             }
             this.$server.PostProjectSearch(val).then((res) => { // 数据请求

src/components/projectManagement/software/software.vue

@@ -6,9 +6,9 @@
         <div class="content">
           <p class="search">
             <span class="searchVal">
-                <el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input>
+                <el-input v-model="searchVal" size="medium" placeholder="请输入" @change="search"></el-input>
             </span>
-            <span class="button buttonSave">搜索</span>
+            <span class="button buttonSave" @click="search">搜索</span>
           </p>
           <div class="common-table">
             <el-table
@@ -89,7 +89,8 @@ export default {
                     'page': this.currentPage,
                     'pageSize': this.pagesize,
                     't': {
-                        'projectId': this.value.id
+                        'projectId': this.value.id,
+                        'name': this.searchVal
                     }
                 }
             }
@@ -108,6 +109,10 @@ export default {
                 this.$message.error('数据请求失败！');
             })
         },
+        // 搜索
+        search() {
+            this.init()
+        },
         // 点击分页
         handleSizeChange(val) {
             console.log(`每页 ${val} 条`);

src/services/server.js

@@ -195,7 +195,7 @@ const server = {
             data: data
         })
     },
-    getUnitFindByType(data) { // 修改产品信息
+    getUnitFindByType(data) { // 根据单位类别获取单位
         return axios('/unit/findByType/' + data, {
             method: 'get'
         })