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

src/views/chain/coordinationManage/applyCooperation.vue

@@ -78,7 +78,7 @@
               icon="el-icon-edit"
               type="primary"
               :underline="false"
-              :disabled="row.isApply"
+              :disabled="row.isApply || !row.id"
               >申请</el-link
             >
           </template>

src/views/chain/coordinationManage/approvalCooperation.vue

@@ -263,6 +263,13 @@ export default {
         });
     },
   },
+  filters: {
+    formatList(val) {
+      if (val) {
+        return val.join("\n");
+      }
+    },
+  },
 };
 </script>
 

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

@@ -93,7 +93,7 @@
             icon="el-icon-edit"
             type="primary"
             :underline="false"
-            :disabled="row.isApply"
+            :disabled="row.isApply || !row.id"
             >申请</el-link
           >
         </template>

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

@@ -87,7 +87,7 @@
             icon="el-icon-edit"
             type="primary"
             :underline="false"
-            :disabled="row.isApply"
+            :disabled="row.isApply || !row.id"
             >申请</el-link
           >
         </template>
@@ -210,10 +210,10 @@ export default {
         .then((res) => {
           let data = res.data.data;
           this.count = data.total;
-          data=data.records.filter(item=>{
+          data = data.records.filter(item=>{
             return !this.judge(item)
           })
-          this.dataList = this.reduceData(data.records);
+          this.dataList = this.reduceData(data);
         })
         .catch((e) => {
           this.dataList = [];

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

@@ -93,7 +93,7 @@
             icon="el-icon-edit"
             type="primary"
             :underline="false"
-            :disabled="row.isApply"
+            :disabled="row.isApply || !row.id"
             >申请</el-link
           >
         </template>
@@ -220,7 +220,7 @@ export default {
           data = data.records.filter(item=>{
             return !this.judge(item)
           })
-          this.dataList = this.reduceData(data.records);
+          this.dataList = this.reduceData(data);
         })
         .catch((e) => {
           this.dataList = [];

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

@@ -1,6 +1,9 @@
 <template>
   <div class="basic-target" v-loading="loading">
     <search :type="1" @search:task="updateParams($event)"/>
+    <div class="operating">
+      <el-button size="small" type="primary">导出</el-button>
+    </div>
     <el-table
       :data="dataList"
       border
@@ -166,11 +169,11 @@ export default {
     return {
       searchParams: {},
       dataList: [],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

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

@@ -1,6 +1,9 @@
 <template>
   <div class="constraint" v-loading="loading">
     <search :type="3" @search:task="updateParams($event)" />
+    <div class="operating">
+      <el-button size="small" type="primary">导出</el-button>
+    </div>
     <el-table
       :data="dataList"
       border
@@ -165,11 +168,11 @@ export default {
     return {
       searchParams: {},
       dataList: [],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

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

@@ -1,6 +1,9 @@
 <template>
   <div class="reward" v-loading="loading">
     <search :type="2" @search:task="updateParams($event)" />
+    <div class="operating">
+      <el-button size="small" type="primary">导出</el-button>
+    </div>
     <el-table
       :data="dataList"
       border
@@ -172,11 +175,11 @@ export default {
     return {
       searchParams: {},
       dataList: [],
-      tableHeight: document.documentElement.clientHeight - 305,
+      tableHeight: document.documentElement.clientHeight - 355,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 305 - 45) / 45
+          (document.documentElement.clientHeight - 355 - 45) / 45
         ),
       },
       count: 0,

src/views/second/taskSummary/basicTable.vue

@@ -2,9 +2,9 @@
   <div class="assessing-content ele-body">
     <el-card shadow="never" element-loading-background="rgba(255, 255, 255, 1)">
       <search :type="1" @search:task="updateParams($event)" />
-      <!-- <div class="operating">
+      <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
-      </div> -->
+      </div>
       <el-table
         highlight-current-row
         :data="dataList"
@@ -383,11 +383,11 @@ export default {
       showEdit: false,
       form: {},
       count: 0,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 310,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 260 - 45) / 45
+          (document.documentElement.clientHeight - 310 - 45) / 45
         ),
       },
     };

src/views/second/taskSummary/constraint.vue

@@ -2,9 +2,9 @@
   <div class="assessing-content ele-body">
     <el-card shadow="never" element-loading-background="rgba(255, 255, 255, 1)">
       <search :type="3" @search:task="updateParams($event)" />
-      <!-- <div class="operating">
+      <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
-      </div> -->
+      </div>
       <el-table
         highlight-current-row
         :data="dataList"
@@ -387,11 +387,11 @@ export default {
       showEdit: false,
       form: {},
       count: 0,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 310,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 260 - 45) / 45
+          (document.documentElement.clientHeight - 310 - 45) / 45
         ),
       },
     };

src/views/second/taskSummary/reward.vue

@@ -2,9 +2,9 @@
   <div class="assessing-content ele-body">
     <el-card shadow="never" element-loading-background="rgba(255, 255, 255, 1)">
       <search :type="2" @search:task="updateParams($event)" />
-      <!-- <div class="operating">
+      <div class="operating">
         <el-button size="small" type="primary">导出</el-button>
-      </div> -->
+      </div>
       <el-table
         highlight-current-row
         :data="dataList"
@@ -384,11 +384,11 @@ export default {
       form: {},
       loading: false,
       count: 0,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 310,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 260 - 45) / 45
+          (document.documentElement.clientHeight - 310 - 45) / 45
         ),
       },
     };