配合申请编辑

src/api/second/coordinationManage/applyCooperation.js

@@ -0,0 +1,6 @@
+import axios from "@/config/axios"
+export default {
+  applyCooperate(params) {
+    return axios.post('/cooperateapply/cooperateDept', params)
+  }
+}

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

@@ -1,11 +1,12 @@
 <template>
   <div class="basic-target" v-loading="loading">
-    <search :type="1" />
+    <search :type="1" @search:task="updateParams($event)"/>
     <el-table
       :data="dataList"
       border
       highlight-current-row
       :height="tableHeight"
+      :span-method="arraySpanMethod"
       ref="table"
     >
       <el-table-column type="index" label="序号" align="center" width="50">
@@ -27,13 +28,13 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        min-width="80"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
+        min-width="220"
         prop="content"
       ></el-table-column>
       <el-table-column
@@ -45,7 +46,7 @@
 
       <el-table-column
         label="区牵头单位"
-        width="80 "
+        width="95 "
         align="center"
         prop="leaderUnit"
       ></el-table-column>
@@ -63,23 +64,25 @@
       </el-table-column>
       <el-table-column label="配合部门" width="100" align="center">
         <template slot-scope="{ row }">
-          <span>{{ row.leaderDeptList | formatList }}</span>
+          <span>{{ row.cooperateDeptList | formatList }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="责任领导" width="80" align="center">
         <template slot-scope="{ row }">
-          {{ row.leaderPrincipalList | formatList }}
+          {{ row.cooperatePrincipalList | formatList }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="60" align="center">
+      <el-table-column label="操作" width="80" align="center">
+        <template slot-scope="{ row }">
         <el-link
-          @click="edit"
+          @click="edit(row)"
           icon="el-icon-edit"
           type="primary"
           :underline="false"
           >申请</el-link
         >
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -115,6 +118,7 @@
             type="textarea"
             placeholder="请输入申请理由"
             :rows="5"
+            v-model="form.note"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -128,13 +132,26 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex";
+import api from "@/api/second/taskSummary";
+import { mergeSpan } from "@/utils/mixin";
+import applyApi from "@/api/second/coordinationManage/applyCooperation";
+import successVue from '../../../result/success.vue';
 export default {
   components: {
     search,
   },
+  mixins: [
+    mergeSpan([
+      { name: "quota1", col: [1] },
+      { name: "quota2", col: [2] },
+      { name: "content", col: [3] },
+    ]),
+  ],
   data() {
     return {
-      dataList: [[]],
+      searchParams: {},
+      dataList: [],
       tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
@@ -145,15 +162,70 @@ export default {
       count: 0,
       showEdit: false,
       loading: false,
-      form:{}
+      form:{note: ''}
     };
   },
+  computed: {
+    ...mapGetters(["formatDep"]),
+  },
+  created() {
+    this.getDataList();
+  },
   methods: {
-    getDataList() {},
-    edit() {
+    updateParams(data) {
+      this.searchParams = data;
+      console.log(data);
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
+    getDataList() {
+       api
+        .getBasicTableList(Object.assign({}, this.page, this.searchParams))
+        .then((res) => {
+          let data = res.data.data;
+          this.count=data.total
+          this.dataList = this.reduceData(data.records);
+          console.log(this.dataList);
+        })
+        .catch((e) => {
+          this.dataList = [];
+          this.count=0
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    edit(row) {
       this.showEdit = true;
+      this.form.type = 1
+      this.form.itemId = row.id
+      this.form.leaderDept = row.leaderDept
+    },
+    save() {
+      console.log(this.form); 
+      applyApi.
+      applyCooperate(Object.assign({}, this.form))
+      .then((res)=> {
+        this.$message({
+          type:'success',
+          message: '提交申请成功'
+        })
+        this.getDataList()
+      })
+      .catch((e)=>{
+        this.$message({
+          type:'error',
+          message: '提交申请失败'
+        })
+      })
+
+      this.showEdit = false;
     },
-    save() {},
   },
   filters: {
     formatList(val) {

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

@@ -1,12 +1,13 @@
 <template>
   <div class="constraint" v-loading="loading">
-    <search :type="3" />
+    <search :type="3" @search:task="updateParams($event)"/>
     <el-table
       :data="dataList"
       border
       highlight-current-row
       :height="tableHeight"
       ref="table"
+      :span-method="arraySpanMethod"
     >
       <el-table-column type="index" label="序号" align="center" width="50">
       </el-table-column>
@@ -21,14 +22,14 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        min-width="200"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
-        prop="content"
+        min-width="100"
+        prop="itemContent"
       ></el-table-column>
       <el-table-column
         label="分值"
@@ -39,7 +40,7 @@
 
       <el-table-column
         label="区牵头单位"
-        width="80 "
+        width="95 "
         align="center"
         prop="leaderUnit"
       ></el-table-column>
@@ -57,16 +58,16 @@
       </el-table-column>
       <el-table-column label="配合部门" width="100" align="center">
         <template slot-scope="{ row }">
-          <span>{{ row.leaderDeptList | formatList }}</span>
+          <span>{{ row.cooperateDeptList | formatList }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="责任领导" width="80" align="center">
         <template slot-scope="{ row }">
-          {{ row.leaderPrincipalList | formatList }}
+          {{ row.cooperatePrincipalList | formatList }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="60" align="center">
+      <el-table-column label="操作" width="80" align="center">
         <el-link
           @click="edit"
           icon="el-icon-edit"
@@ -122,18 +123,27 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex";
+import api from "@/api/second/taskSummary";
+import { mergeSpan } from "@/utils/mixin";
 export default {
   components: {
     search,
   },
+  mixins: [
+    mergeSpan([
+      { name: "quota", col: [1] },
+      { name: "content", col: [2] },
+    ]),
+  ],
   data() {
     return {
-      dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 310,
+      dataList: [],
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 310 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,
@@ -142,8 +152,39 @@ export default {
       form:{}
     };
   },
+  created() {
+    this.getDataList();
+  },
+  computed: {
+    ...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() {
       this.showEdit = true;
     },

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

@@ -7,6 +7,7 @@
       highlight-current-row
       :height="tableHeight"
       ref="table"
+      :span-method="arraySpanMethod"
     >
       <el-table-column type="index" label="序号" align="center" width="50">
       </el-table-column>
@@ -27,7 +28,7 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        min-width="100"
         prop="content"
       ></el-table-column>
       <el-table-column
@@ -45,7 +46,7 @@
 
       <el-table-column
         label="区牵头单位"
-        width="80 "
+        width="95 "
         align="center"
         prop="leaderUnit"
       ></el-table-column>
@@ -63,16 +64,16 @@
       </el-table-column>
       <el-table-column label="配合部门" width="100" align="center">
         <template slot-scope="{ row }">
-          <span>{{ row.leaderDeptList | formatList }}</span>
+          <span>{{ row.cooperateDeptList | formatList }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="责任领导" width="80" align="center">
         <template slot-scope="{ row }">
-          {{ row.leaderPrincipalList | formatList }}
+          {{ row.cooperatePrincipalList | formatList }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="60" align="center">
+      <el-table-column label="操作" width="80" align="center">
         <el-link
           @click="edit"
           icon="el-icon-edit"
@@ -128,18 +129,29 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex";
+import api from "@/api/second/taskSummary";
+import { mergeSpan } from "@/utils/mixin";
 export default {
   components: {
     search,
   },
+  mixins: [
+    mergeSpan([
+      { name: "quota1", col: [1] },
+      { name: "quota2", col: [2] },
+      { name: "content", col: [3] },
+    ]),
+  ],
   data() {
     return {
-      dataList: [[]],
-      tableHeight: document.documentElement.clientHeight - 355,
+      searchParams: {},
+      dataList: [],
+      tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 355 - 45) / 45
+          (document.documentElement.clientHeight - 305 - 45) / 45
         ),
       },
       count: 0,
@@ -148,8 +160,39 @@ export default {
       form:{}
     };
   },
+  created() {
+    this.getDataList();
+  },
+  computed: {
+    ...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() {
       this.showEdit = true;
     },

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

@@ -53,7 +53,7 @@
       ></el-table-column>
       <el-table-column
         label="分值"
-        min-width="60"
+        width="50"
         align="center"
         prop="points"
       ></el-table-column>
@@ -65,29 +65,29 @@
         prop="leaderUnit"
       ></el-table-column>
 
-      <el-table-column label="牵头部门" min-width="80" align="center">
+      <el-table-column label="牵头部门" width="100" align="center">
         <template slot-scope="{ row }">
           <span>{{ row.leaderDeptList | formatList }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center">
         <template slot-scope="{ row }">
           {{ row.leaderPrincipalList | formatList }}
         </template>
       </el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center">
+      <el-table-column label="配合部门" width="100" align="center">
         <template slot-scope="{ row }">
           <span>{{ row.leaderDeptList | formatList }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center">
         <template slot-scope="{ row }">
           {{ row.leaderPrincipalList | formatList }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="125" align="center">
+      <el-table-column label="操作" width="100" align="center">
         <el-link @click="edit(true)" type="primary" :underline="false"
           >同意</el-link
         >

src/views/second/segmentation/basicTable.vue

@@ -56,7 +56,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>

src/views/second/segmentation/constraint.vue

@@ -49,7 +49,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>

src/views/second/segmentation/reward.vue

@@ -56,7 +56,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>

src/views/second/taskSummary/basicTable.vue

@@ -55,7 +55,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>
@@ -265,6 +265,7 @@ export default {
     },
     edit(row) {
       this.showEdit = true;
+      
     },
     save() {
       this.showEdit = false;

src/views/second/taskSummary/constraint.vue

@@ -14,6 +14,7 @@
         :data="dataList"
         :height="tableHeight"
         border
+        :span-method="arraySpanMethod"
       >
         <el-table-column
           type="index"
@@ -29,7 +30,7 @@
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="480"
+          min-width="200"
           align="center"
           prop="content"
         ></el-table-column>
@@ -47,7 +48,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>

src/views/second/taskSummary/reward.vue

@@ -51,7 +51,7 @@
         ></el-table-column>
         <el-table-column
           label="区牵头单位"
-          width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>
@@ -210,9 +210,7 @@ export default {
   data() {
     return {
       searchParams: {},
-      dataList: [
-        {quota1:'sdewfdewd',}
-      ],
+      dataList: [],
       showEdit: false,
       form: {},
       loading: false,