Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/chain/coordinationManage/approvalCooperation.vue

@@ -25,7 +25,7 @@
         <el-table-column
           label="申请时间"
           align="center"
-          width="150"
+          width="160"
           prop="createTime"
         ></el-table-column
         ><el-table-column
@@ -49,7 +49,7 @@
         <el-table-column
           label="指标名称"
           align="center"
-          width="100"
+          min-width="200"
           prop="content"
         ></el-table-column>
         <el-table-column
@@ -61,7 +61,7 @@
         <el-table-column
           label="第一牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="leaderDeptName"
         >
           <template slot-scope="{ row }">
@@ -71,7 +71,7 @@
         <el-table-column
           label="其它牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="otherDeptName"
         >
           <template slot-scope="{ row }">
@@ -81,7 +81,7 @@
         <el-table-column
           label="配合部门"
           align="center"
-          width="180"
+          width="130"
           prop="cooperateDeptName"
         >
           <template slot-scope="{ row }">

src/views/chain/coordinationManage/cooperateList.vue

@@ -25,7 +25,7 @@
         <el-table-column
           label="申请时间"
           align="center"
-          width="150"
+          width="160"
           prop="createTime"
         ></el-table-column
         ><el-table-column
@@ -44,12 +44,12 @@
           label="类型"
           align="center"
           width="100"
-          prop="type"
+          prop="typeName"
         ></el-table-column>
         <el-table-column
           label="指标名称"
           align="center"
-          width="100"
+          min-width="200"
           prop="content"
         ></el-table-column>
         <el-table-column
@@ -61,7 +61,7 @@
         <el-table-column
           label="第一牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="leaderDeptName"
         >
           <template slot-scope="{ row }">
@@ -71,7 +71,7 @@
         <el-table-column
           label="其它牵头部门"
           align="center"
-          width="180"
+          width="130"
           prop="otherDeptName"
         >
           <template slot-scope="{ row }">
@@ -81,14 +81,14 @@
         <el-table-column
           label="配合部门"
           align="center"
-          width="180"
+          width="130"
           prop="cooperateDeptName"
         >
           <template slot-scope="{ row }">
             <pre>{{ row.cooperateDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="120">
+        <el-table-column label="状态" align="center" width="80">
           <template slot-scope="{ row }">
             <el-link type="primary" v-if="row.status == 0">审核中</el-link>
             <el-link type="primary" v-if="row.status == 1">审核通过</el-link>
@@ -173,6 +173,13 @@ export default {
         });
     },
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join("\n");
+      }
+    },
+  },
 };
 </script>