修改

src/views/assessingTarget/basicTarget.vue

@@ -33,7 +33,7 @@
           align="center"
           prop="points"
         ></el-table-column>
-        <el-table-column label="预计扣分" min-width="60" align="center">
+        <el-table-column label="预计扣分" min-width="60" align="center" v-if="type.type==1">
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
@@ -74,6 +74,7 @@
           align="center"
           min-width="150"
           prop="note"
+          v-if="type.type==1"
         ></el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="{ row }">

src/views/assessingTarget/constraint.vue

@@ -25,7 +25,7 @@
           align="center"
           prop="content"
         ></el-table-column>
-        <el-table-column label="预计扣分" width="80" align="center">
+        <el-table-column label="预计扣分" width="80" align="center" v-if="type.type==1">
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
@@ -66,6 +66,7 @@
           align="center"
           min-width="100"
           prop="note"
+          v-if="type.type==1"
         ></el-table-column>
         <el-table-column label="操作" min-width="80" align="center">
           <template slot-scope="{ row }">

src/views/assessingTarget/reward.vue

@@ -34,7 +34,7 @@
           align="center"
           prop="points"
         ></el-table-column>
-        <el-table-column label="预计加分" min-width="60" align="center">
+        <el-table-column label="预计加分" min-width="60" align="center" v-if="type.type==1">
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
@@ -75,6 +75,7 @@
           align="center"
           min-width="150"
           prop="note"
+          v-if="type.type==1"
         ></el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="{ row }">

src/views/summary/basicTarget.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="basic-target ele-body">
     <el-card>
-      <search></search>
+      <search :type="1" @search:task="updateParams($event)" />
       <el-table
         highlight-current-row
         :data="dataList"
@@ -16,23 +16,23 @@
           align="center"
           label="编号"
         ></el-table-column>
-         <el-table-column
-            label="一级指标"
-            min-width="80"
-            align="center"
-            prop="quota1"
-          ></el-table-column>
-          <el-table-column
-            label="二级指标"
-            min-width="120"
-            align="center"
-            prop="quota2"
-          ></el-table-column>
+        <el-table-column
+          label="一级指标"
+          min-width="80"
+          align="center"
+          prop="quota1"
+        ></el-table-column>
+        <el-table-column
+          label="二级指标"
+          min-width="120"
+          align="center"
+          prop="quota2"
+        ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
           min-width="300"
           align="center"
-          prop="content" 
+          prop="content"
         ></el-table-column>
         <el-table-column
           label="分值"
@@ -52,18 +52,20 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
+        <el-table-column label="牵头部门" min-width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
-          label="牵头部门"
-          min-width="80"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-          <el-table-column
           label="责任领导"
           min-width="80"
           align="center"
-          prop="leaderPrincipalList"
-        ></el-table-column>
+        >
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="得分说明"
           min-width="120"
@@ -86,60 +88,85 @@
 </template>
 
 <script>
-import search from '../assessingTarget/search'
-import api from '../../api/summary/basicTarget'
+import search from "../assessingTarget/search";
+import api from "../../api/summary/basicTarget";
 export default {
-  name: 'basic-target',
+  name: "basic-target",
   data() {
     return {
-      loading:false,
-      tableHeight: document.documentElement.clientHeight - 360,
+      loading: false,
+      tableHeight: document.documentElement.clientHeight - 300,
       dataList: [],
       count: 0,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 360 - 45) / 45
+          (document.documentElement.clientHeight - 300 - 45) / 45
         ),
       },
-    }
+      searchParams: {
+        quota1: "",
+        quota2: "",
+        leaderDept: undefined,
+        cooperateDept: undefined,
+        quota: "",
+        content: "",
+        leaderUnit: "",
+      },
+    };
   },
   components: {
     search,
   },
-  // mixins: [assessing],
   created() {
     this.getDataList();
-    this.$store.dispatch('base/getQuota1List',1)
+    this.$store.dispatch("base/getQuota1List", 1);
+  },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
   },
   methods: {
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
     selectionChange(rows) {
       this.multipleSelection = rows;
     },
     getDataList(params) {
-      this.loading=true
+      this.loading = true;
       api
-        .getList(params ? Object.assign(this.page, params) : this.page)
+        .getList(Object.assign({}, this.searchParams, this.page, params))
         .then((res) => {
-          this.loading=false
+          this.loading = false;
           let data = res.data.data.records;
           data = data.map((item) => {
             item.year = item.year + "";
             return item;
           });
           this.dataList = data;
+          console.log(this.dataList);
           this.count = res.data.data.total;
         })
         .catch(() => {
-          this.loading=false
+          this.loading = false;
           this.dataList = [];
           this.count = 0;
         });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>

src/views/summary/constraint.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="constraint ele-body">
     <el-card>
-      <search :type="3" /></search>
+      <search :type="3" @search:task="updateParams($event)" />
       <el-table
         highlight-current-row
         :data="dataList"
@@ -16,7 +16,7 @@
           align="center"
           label="编号"
         ></el-table-column>
-          <el-table-column
+        <el-table-column
           label="考核指标"
           min-width="80"
           align="center"
@@ -26,7 +26,7 @@
           label="考核内容和计分规则"
           min-width="400"
           align="center"
-          prop="content" 
+          prop="content"
         ></el-table-column>
         <el-table-column
           label="预计扣分"
@@ -40,18 +40,16 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column
-          label="牵头部门"
-          min-width="80"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-          <el-table-column
-          label="责任领导"
-          min-width="100"
-          align="center"
-          prop="leaderPrincipalList"
-        ></el-table-column>
+        <el-table-column label="牵头部门" min-width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" min-width="100" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="扣分说明"
           min-width="80"
@@ -74,41 +72,67 @@
 </template>
 
 <script>
-import search from '../assessingTarget/search'
-import api from '../../api/summary/constraint'
+import search from "../assessingTarget/search";
+import api from "../../api/summary/constraint";
 export default {
-  name: 'constraint',
+  name: "constraint",
   data() {
     return {
-      loading:false,
-      tableHeight: document.documentElement.clientHeight - 360,
+      loading: false,
+      tableHeight: document.documentElement.clientHeight - 300,
       dataList: [],
       count: 0,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 360 - 45) / 45
+          (document.documentElement.clientHeight - 300 - 45) / 45
         ),
       },
-    }
+      searchParams: {
+        quota1: "",
+        quota2: "",
+        leaderDept: undefined,
+        cooperateDept: undefined,
+        quota: "",
+        content: "",
+        leaderUnit: "",
+      },
+    };
   },
   components: {
     search,
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
+  },
   created() {
     this.getDataList();
-    this.$store.dispatch('base/getQuota1List',1)
+    this.$store.dispatch("base/getQuota1List", 1);
   },
   methods: {
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
     selectionChange(rows) {
       this.multipleSelection = rows;
     },
     getDataList(params) {
-      this.loading=true
+      this.loading = true;
       api
-        .getList(params ? Object.assign(this.page, params) : this.page)
+        .getList(Object.assign({}, this.searchParams, this.page, params))
         .then((res) => {
-          this.loading=false
+          this.loading = false;
           let data = res.data.data.records;
           data = data.map((item) => {
             item.year = item.year + "";
@@ -118,15 +142,14 @@ export default {
           this.count = res.data.data.total;
         })
         .catch(() => {
-          this.loading=false
+          this.loading = false;
           this.dataList = [];
           this.count = 0;
         });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>

src/views/summary/reward.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="reward ele-body">
     <el-card>
-      <search></search>
+      <search :type="2" @search:task="updateParams($event)" />
       <el-table
         highlight-current-row
         :data="dataList"
@@ -16,23 +16,23 @@
           align="center"
           label="编号"
         ></el-table-column>
-         <el-table-column
-            label="一级指标"
-            min-width="100"
-            align="center"
-            prop="quota1"
-          ></el-table-column>
-          <el-table-column
-            label="二级指标"
-            min-width="100"
-            align="center"
-            prop="quota2"
-          ></el-table-column>
+        <el-table-column
+          label="一级指标"
+          min-width="100"
+          align="center"
+          prop="quota1"
+        ></el-table-column>
+        <el-table-column
+          label="二级指标"
+          min-width="100"
+          align="center"
+          prop="quota2"
+        ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
           min-width="200"
           align="center"
-          prop="content" 
+          prop="content"
         ></el-table-column>
         <el-table-column
           label="封顶分值"
@@ -52,18 +52,21 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
+        <el-table-column label="牵头部门" min-width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
-          label="牵头部门"
-          min-width="80"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-          <el-table-column
           label="责任领导"
           min-width="100"
           align="center"
           prop="leaderPrincipalList"
-        ></el-table-column>
+        >
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="得分说明"
           min-width="120"
@@ -86,41 +89,67 @@
 </template>
 
 <script>
-import search from '../assessingTarget/search';
-import api from '../../api/summary/reward'
+import search from "../assessingTarget/search";
+import api from "../../api/summary/reward";
 export default {
-  name: '',
+  name: "",
   data() {
     return {
-      loading:false,
-      tableHeight: document.documentElement.clientHeight - 360,
+      loading: false,
+      tableHeight: document.documentElement.clientHeight - 300,
       dataList: [],
       count: 0,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 360 - 45) / 45
+          (document.documentElement.clientHeight - 300 - 45) / 45
         ),
       },
-    }
+      searchParams: {
+        quota1: "",
+        quota2: "",
+        leaderDept: undefined,
+        cooperateDept: undefined,
+        quota: "",
+        content: "",
+        leaderUnit: "",
+      },
+    };
   },
   components: {
     search,
   },
   created() {
     this.getDataList();
-    this.$store.dispatch('base/getQuota1List',1)
+    this.$store.dispatch("base/getQuota1List", 1);
+  },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
   },
   methods: {
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
     selectionChange(rows) {
       this.multipleSelection = rows;
     },
     getDataList(params) {
-      this.loading=true
+      this.loading = true;
       api
-        .getList(params ? Object.assign(this.page, params) : this.page)
+        .getList(Object.assign({}, this.searchParams, this.page, params))
         .then((res) => {
-          this.loading=false
+          this.loading = false;
           let data = res.data.data.records;
           data = data.map((item) => {
             item.year = item.year + "";
@@ -130,15 +159,14 @@ export default {
           this.count = res.data.data.total;
         })
         .catch(() => {
-          this.loading=false
+          this.loading = false;
           this.dataList = [];
           this.count = 0;
         });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>