代码合并

src/views/second/coordinationManage/applyCooperation/basicTarget.vue

@@ -28,13 +28,13 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="80"
+        min-width="250"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="220"
+        min-width="320"
         prop="content"
       ></el-table-column>
       <el-table-column

src/views/second/coordinationManage/applyCooperation/constraint.vue

@@ -22,13 +22,13 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="200"
+        min-width="250"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="100"
+        min-width="400"
         prop="itemContent"
       ></el-table-column>
       <el-table-column

src/views/second/coordinationManage/applyCooperation/reward.vue

@@ -28,13 +28,13 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="100"
+        min-width="250"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
+        min-width="320"
         prop="content"
       ></el-table-column>
       <el-table-column

src/views/second/segmentation/basicTable.vue

@@ -25,20 +25,19 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="80"
-          max-width="300"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>

src/views/second/segmentation/constraint.vue

@@ -25,19 +25,19 @@
         ></el-table-column>
         <el-table-column
           label="考核指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="150"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>
         <el-table-column
           label="小条内容"
-          min-width="150"
+          min-width="400"
           align="center"
           prop="itemContent"
         ></el-table-column>

src/views/second/segmentation/reward.vue

@@ -25,20 +25,19 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="80"
-          max-width="300"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>

src/views/second/taskSummary/basicTable.vue

@@ -20,20 +20,19 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="80"
-          max-width="300"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>
@@ -55,35 +54,40 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column
-          label="牵头部门"
-          width="100"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-        <el-table-column
-          label="责任领导"
-          width="80"
-          align="center"
-          prop="leaderPrincipalList"
-        ></el-table-column>
+        <el-table-column label="牵头部门" width="100" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="配合部门"
           width="100"
           align="center"
-          prop="cooperateDeptList"
-        ></el-table-column>
+          prop="cooperateDept"
+        >
+          <template slot-scope="{ row }">
+            {{ row.cooperateDeptList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="责任领导"
           width="80"
           align="center"
-          prop="cooperatePrincipalList"
-        ></el-table-column>
+          prop="cooperateDeptList"
+        >
+          <template slot-scope="{ row }">
+            {{ row.cooperatePrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           width="80"
           align="center"
-          :key="Math.random()"
         >
           <template slot-scope="{ row }">
             <el-link
@@ -277,6 +281,13 @@ export default {
   computed: {
     ...mapGetters(["formatDep", "principalList" ]),
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
+  },
   methods: {
     updateParams(data) {
       this.searchParams = data;
@@ -294,12 +305,12 @@ export default {
         .getBasicTableList(Object.assign({}, this.page, this.searchParams))
         .then((res) => {
           let data = res.data.data;
-          this.count=data.total
+          this.count = data.total;
           this.dataList = this.reduceData(data.records);
         })
         .catch((e) => {
           this.dataList = [];
-          this.count=0
+          this.count = 0;
         })
         .finally(() => {
           this.loading = false;

src/views/second/taskSummary/constraint.vue

@@ -24,19 +24,19 @@
         ></el-table-column>
         <el-table-column
           label="考核指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>
         <el-table-column
           label="小条内容"
-          min-width="320"
+          min-width="400"
           align="center"
           prop="itemContent"
         ></el-table-column>
@@ -52,36 +52,37 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column
-          label="牵头部门"
-          width="100"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-        <el-table-column
-          label="责任领导"
-          width="80"
-          align="center"
-          prop="leaderPrincipalList"
-        ></el-table-column>
+        <el-table-column label="牵头部门" width="100" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="配合部门"
           width="100"
           align="center"
-          prop="cooperateDeptList"
-        ></el-table-column>
+          prop="cooperateDept"
+        >
+          <template slot-scope="{ row }">
+            {{ row.cooperateDeptList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="责任领导"
           width="80"
           align="center"
-          prop="cooperatePrincipalList"
-        ></el-table-column>
-        <el-table-column
-          label="操作"
-          width="80"
-          align="center"
-          :key="Math.random()"
+          prop="cooperateDeptList"
         >
+          <template slot-scope="{ row }">
+            {{ row.cooperatePrincipalList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="80" align="center">
           <template slot-scope="{ row }">
             <el-link
               slot="reference"
@@ -273,6 +274,13 @@ export default {
   computed: {
     ...mapGetters(["formatDep", "principalList" ]),
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
+  },
   methods: {
     updateParams(data) {
       this.searchParams = data;

src/views/second/taskSummary/reward.vue

@@ -1,11 +1,15 @@
 <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:task="updateParams($event)" />
-    <div class="operating">
+    <el-card
+      shadow="never"
+      v-loading="loading"
+      element-loading-background="rgba(255, 255, 255, 1)"
+    >
+      <search :type="2" @search:task="updateParams($event)" />
+      <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
-    </div>
-     <el-table
+      </div>
+      <el-table
         highlight-current-row
         :data="dataList"
         :height="tableHeight"
@@ -20,20 +24,19 @@
         ></el-table-column>
         <el-table-column
           label="一级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota1"
         ></el-table-column>
         <el-table-column
           label="二级指标"
-          min-width="100"
+          min-width="80"
           align="center"
           prop="quota2"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="80"
-          max-width="300"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>
@@ -55,36 +58,37 @@
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column
-          label="牵头部门"
-          width="100"
-          align="center"
-          prop="leaderDeptList"
-        ></el-table-column>
-        <el-table-column
-          label="责任领导"
-          width="80"
-          align="center"
-          prop="leaderPrincipalList"
-        ></el-table-column>
+        <el-table-column label="牵头部门" width="100" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderDeptList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center">
+          <template slot-scope="{ row }">
+            {{ row.leaderPrincipalList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="配合部门"
           width="100"
           align="center"
-          prop="cooperateDeptList"
-        ></el-table-column>
+          prop="cooperateDept"
+        >
+          <template slot-scope="{ row }">
+            {{ row.cooperateDeptList | formatList }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="责任领导"
           width="80"
           align="center"
-          prop="cooperatePrincipalList"
-        ></el-table-column>
-        <el-table-column
-          label="操作"
-          width="80"
-          align="center"
-          :key="Math.random()"
+          prop="cooperateDeptList"
         >
+          <template slot-scope="{ row }">
+            {{ row.cooperatePrincipalList | formatList }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="80" align="center">
           <template slot-scope="{ row }">
             <el-link
               slot="reference"
@@ -97,7 +101,7 @@
         </el-table-column>
       </el-table>
 
-     <el-pagination
+      <el-pagination
         :current-page.sync="page.page"
         :page-size="page.limit"
         :total="count"
@@ -109,21 +113,13 @@
         @current-change="getDataList()"
       />
       <el-dialog
-      title="编辑考核内容"
-      :visible.sync="showEdit"
-      width="400px"
-      custom-class="ele-dialog-form"
-      :lock-scroll="false"
-      :destroy-on-close="true"
-      @closed="form = {}"
-    >
-      <el-form
-        :model="form"
-        label-width="82px"
-        custom-class="editForm"
-        @keyup.enter.native="save"
-        @submit.native.prevent
-        ref="editForm"
+        title="编辑考核内容"
+        :visible.sync="showEdit"
+        width="400px"
+        custom-class="ele-dialog-form"
+        :lock-scroll="false"
+        :destroy-on-close="true"
+        @closed="form = {}"
       >
         <el-form-item label="小条内容：">
           <el-input
@@ -244,7 +240,7 @@ import editApi from "@/api/second/segmentation/reward";
 export default {
   components: {
     search,
-    Treeselect
+    Treeselect,
   },
   mixins: [
     mergeSpan([
@@ -277,6 +273,13 @@ export default {
   computed: {
     ...mapGetters(["formatDep", "principalList" ]),
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join(",");
+      }
+    },
+  },
   methods: {
     updateParams(data) {
       this.searchParams = data;
@@ -293,12 +296,12 @@ export default {
         .getRewardList(Object.assign({}, this.page, this.searchParams))
         .then((res) => {
           let data = res.data.data;
-          this.count = data.total
+          this.count = data.total;
           this.dataList = this.reduceData(data.records);
         })
         .catch((e) => {
           this.dataList = [];
-          this.count=0
+          this.count = 0;
         })
         .finally(() => {
           this.loading = false;