修改

src/views/second/search.vue

@@ -36,7 +36,7 @@
               v-for="(item, index) of quota"
               :key="index"
               :label="item"
-              :value="item"
+              :value="item" 
             ></el-option>
           </el-select>
         </el-form-item>

src/views/second/segmentation/basicTable.vue

@@ -17,7 +17,7 @@
         :span-method="arraySpanMethod"
         ref="table"
       >
-        <el-table-column
+      <el-table-column
           type="index"
           width="50"
           align="center"
@@ -25,31 +25,32 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="80"
+          max-width="300"
           align="center"
           prop="content"
         ></el-table-column>
         <el-table-column
           label="小条内容"
-          min-width="150"
+          min-width="320"
           align="center"
           prop="itemContent"
         ></el-table-column>
         <el-table-column
           label="分值"
-          min-width="60"
+          min-width="50"
           align="center"
           prop="points"
         ></el-table-column>
@@ -58,8 +59,7 @@
           min-width="80"
           align="center"
           prop="leaderUnit"
-        >
-        </el-table-column>
+        ></el-table-column>
         <el-table-column label="牵头部门" min-width="80" align="center">
           <template slot-scope="{ row }">
             {{ row.leaderDeptList | formatList }}
@@ -90,7 +90,7 @@
             {{ row.cooperatePrincipalList | formatList }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="125" align="center">
+        <el-table-column label="操作" width="80" align="center">
           <template slot-scope="{ row }">
             <router-link
               :to="{ name: 'segmentation', params: { id:row.id, type: 1 } }"

src/views/second/segmentation/constraint.vue

@@ -25,13 +25,13 @@
         ></el-table-column>
         <el-table-column
           label="考核指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="150"
           align="center"
           prop="content"
         ></el-table-column>
@@ -39,11 +39,11 @@
           label="小条内容"
           min-width="150"
           align="center"
-          prop="littleContent"
+          prop="itemContent"
         ></el-table-column>
         <el-table-column
           label="分值"
-          min-width="60"
+          min-width="50"
           align="center"
           prop="points"
         ></el-table-column>
@@ -53,19 +53,19 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column label="牵头部门" min-width="80" align="center">
+        <el-table-column label="牵头部门" min-width="100" align="center">
           <template slot-scope="{ row }">
             {{ row.leaderDeptList | formatList }}
           </template>
         </el-table-column>
-        <el-table-column label="责任领导" min-width="80" align="center">
+        <el-table-column label="责任领导" min-width="60" align="center">
           <template slot-scope="{ row }">
             {{ row.leaderPrincipalList | formatList }}
           </template>
         </el-table-column>
         <el-table-column
           label="配合部门"
-          min-width="80"
+          min-width="100"
           align="center"
           prop="cooperateDept"
         >
@@ -75,7 +75,7 @@
         </el-table-column>
         <el-table-column
           label="责任领导"
-          min-width="80"
+          min-width="60"
           align="center"
           prop="cooperateDeptList"
         >
@@ -83,7 +83,7 @@
             {{ row.cooperatePrincipalList | formatList }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="125" align="center">
+        <el-table-column label="操作" width="60" align="center">
           <template slot-scope="{ row }">
             <router-link
               :to="{ name: 'segmentation', params: { id: row.id, type: 3 } }"

src/views/second/segmentation/reward.vue

@@ -17,7 +17,7 @@
         :span-method="arraySpanMethod"
         ref="table"
       >
-        <el-table-column
+ <el-table-column
           type="index"
           width="50"
           align="center"
@@ -25,31 +25,32 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="80"
+          max-width="300"
           align="center"
           prop="content"
         ></el-table-column>
         <el-table-column
           label="小条内容"
-          min-width="150"
+          min-width="320"
           align="center"
-          prop="littleContent"
+          prop="itemContent"
         ></el-table-column>
         <el-table-column
           label="分值"
-          min-width="60"
+          min-width="50"
           align="center"
           prop="points"
         ></el-table-column>

src/views/second/taskSummary/basicTable.vue

@@ -5,7 +5,7 @@
       v-loading="loading"
       element-loading-background="rgba(255, 255, 255, 1)"
     >
-      <search :type="1" :search-params="searchParams" />
+      <search :type="1" @search:task="updateParams($event)" />
       <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
       </div>
@@ -16,7 +16,7 @@
         border
         :span-method="arraySpanMethod"
       >
-        <el-table-column
+         <el-table-column
           type="index"
           width="50"
           align="center"
@@ -24,31 +24,32 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="80"
+          max-width="300"
           align="center"
           prop="content"
         ></el-table-column>
         <el-table-column
           label="小条内容"
-          min-width="150"
+          min-width="320"
           align="center"
           prop="itemContent"
         ></el-table-column>
         <el-table-column
           label="分值"
-          min-width="60"
+          min-width="50"
           align="center"
           prop="points"
         ></el-table-column>
@@ -60,7 +61,7 @@
         ></el-table-column>
         <el-table-column
           label="牵头部门"
-          min-width="80"
+          min-width="100"
           align="center"
           prop="leaderDeptList"
         ></el-table-column>
@@ -68,22 +69,23 @@
           label="责任领导"
           min-width="80"
           align="center"
+          prop="leaderPrincipalList"
         ></el-table-column>
         <el-table-column
           label="配合部门"
-          min-width="80"
+          min-width="100"
           align="center"
-          prop="cooperateDept"
+          prop="cooperateDeptList"
         ></el-table-column>
         <el-table-column
           label="责任领导"
           min-width="80"
           align="center"
-          prop="cooperateDeptList"
+          prop="cooperatePrincipalList"
         ></el-table-column>
         <el-table-column
           label="操作"
-          width="125"
+          width="80"
           align="center"
           :key="Math.random()"
         >
@@ -98,6 +100,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </el-table>
       <el-pagination
         :current-page.sync="page.page"
         :page-size="page.limit"
@@ -233,6 +236,16 @@ export default {
     ...mapGetters(["formatDep"]),
   },
   methods: {
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
     getDataList() {
       this.loading = true;
       api
@@ -249,7 +262,7 @@ export default {
         .finally(() => {
           this.loading = false;
         });
-      },
+    },
     edit(row) {
       this.showEdit = true;
     },

src/views/second/taskSummary/constraint.vue

@@ -1,40 +1,99 @@
 <template>
   <div class="assessing-content ele-body">
-    <el-card shadow="never" v-loading="loading" element-loading-background="rgba(255, 255, 255, 1)">
-    <search :type="3" :search-params="searchParams" />
-    <div class="operating">
+    <el-card
+      shadow="never"
+      v-loading="loading"
+      element-loading-background="rgba(255, 255, 255, 1)"
+    >
+      <search :type="3" @search:task="updateParams($event)" />
+      <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
-    </div>
-    <el-table highlight-current-row :data="dataList" :height="tableHeight" border>
-      <el-table-column type="index" width="50" align="center" label="编号"></el-table-column>
-      <el-table-column label="考核指标" min-width="150" align="center"></el-table-column>
-      <el-table-column label="考核内容和计分细则" min-width="200" align="center"></el-table-column>
-      <el-table-column label="小条内容" min-width="150" align="center"></el-table-column>
-      <el-table-column label="分值" min-width="60" align="center"></el-table-column>
-      <el-table-column label="区牵头单位" min-width="80" align="center"></el-table-column>
-      <el-table-column label="牵头部门" min-width="80" align="center"></el-table-column>
-      <el-table-column label="责任领导" min-width="80" align="center"></el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center"></el-table-column>
-      <el-table-column label="责任领导" min-width="80" align="center"></el-table-column>
-      <el-table-column
-        label="操作"
-        width="125"
-        align="center"
-        :key="Math.random()"
+      </div>
+      <el-table
+        highlight-current-row
+        :data="dataList"
+        :height="tableHeight"
+        border
       >
-        <template slot-scope="{ row }">
-          <el-link
-            slot="reference"
-            type="primary"
-            :underline="false"
-            @click="edit(row)"
-            >编辑</el-link
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          type="index"
+          width="50"
+          align="center"
+          label="编号"
+        ></el-table-column>
+        <el-table-column
+          label="考核指标"
+          min-width="100"
+          align="center"
+          prop="quota"
+        ></el-table-column>
+        <el-table-column
+          label="考核内容和计分细则"
+          min-width="480"
+          align="center"
+          prop="content"
+        ></el-table-column>
+        <el-table-column
+          label="小条内容"
+          min-width="320"
+          align="center"
+          prop="itemContent"
+        ></el-table-column>
+        <el-table-column
+          label="分值"
+          min-width="50"
+          align="center"
+          prop="points"
+        ></el-table-column>
+        <el-table-column
+          label="区牵头单位"
+          min-width="80"
+          align="center"
+          prop="leaderUnit"
+        ></el-table-column>
+        <el-table-column
+          label="牵头部门"
+          min-width="100"
+          align="center"
+          prop="leaderDeptList"
+        ></el-table-column>
+        <el-table-column
+          label="责任领导"
+          min-width="80"
+          align="center"
+          prop="leaderPrincipalList"
+        ></el-table-column>
+        <el-table-column
+          label="配合部门"
+          min-width="100"
+          align="center"
+          prop="cooperateDeptList"
+        ></el-table-column>
+        <el-table-column
+          label="责任领导"
+          min-width="80"
+          align="center"
+          prop="cooperatePrincipalList"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          width="80"
+          align="center"
+          :key="Math.random()"
+        >
+          <template slot-scope="{ row }">
+            <el-link
+              slot="reference"
+              type="primary"
+              :underline="false"
+              @click="edit(row)"
+              >编辑</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
-     <el-pagination
+      <el-pagination
         :current-page.sync="page.page"
         :page-size="page.limit"
         :total="count"
@@ -94,28 +153,28 @@
               }
             "
           />
-          </el-form-item>
-          <el-form-item label="配合部门：" prop="">
-            <treeselect
-              :flat="true"
-              :options="formatDep"
-              :multiple="true"
-              placeholder="请选择牵头部门"
-              :defaultExpandLevel="2"
-              :normalizer="
-                (d) => {
-                  return {
-                    id: d.id,
-                    label: d.name,
-                    children:
-                      d.children && d.children.length > 0
-                        ? d.children
-                        : undefined,
-                  };
-                }
-              "
-            />
-          </el-form-item>
+        </el-form-item>
+        <el-form-item label="配合部门：" prop="">
+          <treeselect
+            :flat="true"
+            :options="formatDep"
+            :multiple="true"
+            placeholder="请选择牵头部门"
+            :defaultExpandLevel="2"
+            :normalizer="
+              (d) => {
+                return {
+                  id: d.id,
+                  label: d.name,
+                  children:
+                    d.children && d.children.length > 0
+                      ? d.children
+                      : undefined,
+                };
+              }
+            "
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button type="primary" @click="save">确定</el-button>
@@ -130,17 +189,23 @@ import search from "../search";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import { mapGetters } from "vuex";
+import api from "@/api/second/taskSummary";
+import { mergeSpan } from "@/utils/mixin";
 export default {
   components: {
     search,
-    Treeselect
+    Treeselect,
   },
+  mixins: [
+    mergeSpan([
+      { name: "quota", col: [1] },
+      { name: "content", col: [2] },
+    ]),
+  ],
   data() {
     return {
       searchParams: {},
-      dataList: [
-        {}
-      ],
+      dataList: [{}],
       loading: false,
       showEdit: false,
       form: {},
@@ -161,14 +226,39 @@ export default {
     ...mapGetters(["formatDep"]),
   },
   methods: {
-    getDataList() {},
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
+    getDataList() {
+      api
+        .getContraintList(Object.assign({}, this.page, this.searchParams))
+        .then((res) => {
+          let data = res.data.data;
+          this.count = data.total;
+          this.dataList = this.reduceData(data.records);
+        })
+        .catch((e) => {
+          this.dataList = [];
+          this.count = 0;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     edit(row) {
-      this.showEdit = true
+      this.showEdit = true;
     },
     save() {
-      this.showEdit = false
-    }
-  }
+      this.showEdit = false;
+    },
+  },
 };
 </script>
 

src/views/second/taskSummary/reward.vue

@@ -1,39 +1,101 @@
 <template>
   <div class="assessing-content ele-body">
     <el-card shadow="never" v-loading="loading" element-loading-background="rgba(255, 255, 255, 1)">
-    <search :type="2" :search-params="searchParams" />
+    <search :type="2" @search:task="updateParams($event)" />
     <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
     </div>
-    <el-table highlight-current-row :data="dataList" :height="tableHeight" border>
-      <el-table-column type="index" width="50" align="center" label="编号"></el-table-column>
-      <el-table-column label="一级指标" min-width="150" align="center" prop="quota1"></el-table-column>
-      <el-table-column label="二级指标" min-width="150" align="center" prop=""></el-table-column>
-      <el-table-column label="考核内容和计分细则" min-width="200" align="center" prop=""></el-table-column>
-      <el-table-column label="小条内容" min-width="150" align="center" prop=""></el-table-column>
-      <el-table-column label="分值" min-width="60" align="center" prop=""></el-table-column>
-      <el-table-column label="区牵头单位" min-width="80" align="center" prop=""></el-table-column>
-      <el-table-column label="牵头部门" min-width="80" align="center" prop=""></el-table-column>
-      <el-table-column label="责任领导" min-width="80" align="center" prop=""></el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center" prop=""></el-table-column>
-      <el-table-column label="责任领导" min-width="80" align="center" prop=""></el-table-column>
-      <el-table-column
-        label="操作"
-        width="125"
-        align="center"
-        :key="Math.random()"
+     <el-table
+        highlight-current-row
+        :data="dataList"
+        :height="tableHeight"
+        border
+        :span-method="arraySpanMethod"
       >
-        <template slot-scope="{ row }">
-          <el-link
-            slot="reference"
-            type="primary"
-            :underline="false"
-            @click="edit(row)"
-            >编辑</el-link
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          type="index"
+          width="50"
+          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="80"
+          max-width="300"
+          align="center"
+          prop="content"
+        ></el-table-column>
+        <el-table-column
+          label="小条内容"
+          min-width="320"
+          align="center"
+          prop="itemContent"
+        ></el-table-column>
+        <el-table-column
+          label="分值"
+          min-width="50"
+          align="center"
+          prop="points"
+        ></el-table-column>
+        <el-table-column
+          label="区牵头单位"
+          min-width="80"
+          align="center"
+          prop="leaderUnit"
+        ></el-table-column>
+        <el-table-column
+          label="牵头部门"
+          min-width="100"
+          align="center"
+          prop="leaderDeptList"
+        ></el-table-column>
+        <el-table-column
+          label="责任领导"
+          min-width="80"
+          align="center"
+          prop="leaderPrincipalList"
+        ></el-table-column>
+        <el-table-column
+          label="配合部门"
+          min-width="100"
+          align="center"
+          prop="cooperateDeptList"
+        ></el-table-column>
+        <el-table-column
+          label="责任领导"
+          min-width="80"
+          align="center"
+          prop="cooperatePrincipalList"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          width="80"
+          align="center"
+          :key="Math.random()"
+        >
+          <template slot-scope="{ row }">
+            <el-link
+              slot="reference"
+              type="primary"
+              :underline="false"
+              @click="edit(row)"
+              >编辑</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
      <el-pagination
         :current-page.sync="page.page"
@@ -131,11 +193,20 @@ import search from "../search";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import { mapGetters } from "vuex";
+import api from "@/api/second/taskSummary";
+import { mergeSpan } from "@/utils/mixin";
 export default {
   components: {
     search,
     Treeselect
   },
+  mixins: [
+    mergeSpan([
+      { name: "quota1", col: [1] },
+      { name: "quota2", col: [2] },
+      { name: "content", col: [3] },
+    ]),
+  ],
   data() {
     return {
       searchParams: {},
@@ -162,7 +233,32 @@ export default {
     ...mapGetters(["formatDep"]),
   },
   methods: {
-    getDataList() {},
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
+    getDataList() {
+      api
+        .getRewardList(Object.assign({}, this.page, this.searchParams))
+        .then((res) => {
+          let data = res.data.data;
+          this.count = data.total
+          this.dataList = this.reduceData(data.records);
+        })
+        .catch((e) => {
+          this.dataList = [];
+          this.count=0
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     edit(row) {
       this.showEdit = true
     },