配合申请

src/api/second/coordinationManage/applyCooperation.js

@@ -3,4 +3,5 @@ export default {
   applyCooperate(params) {
     return axios.post('/cooperateapply/cooperateDept', params)
   }
+  
 }

src/api/second/coordinationManage/approvalCooperation.js

@@ -1,13 +1,15 @@
 import axios from "@/config/axios"
 export default {
   getBasicDataList(params) {
-    return axios.post('/cooperateapply/getBasicTaskCheckApplyList', params)
+    return axios.get('/cooperateapply/getBasicTaskCheckApplyList', {params})
   },
   getRewardDataList(params) {
-    return axios.post('/cooperateapply/getSpecialPowerCheckApplyList', params)
+    return axios.get('/cooperateapply/getSpecialPowerCheckApplyList', {params})
   },
   getConstraintDataList(params) {
-    return axios.post('/cooperateapply/getRigidityConstraintCheckApplyList', params)
+    return axios.get('/cooperateapply/getRigidityConstraintCheckApplyList', {params})
   },
-
+  editItem(params){
+    return axios.put('/cooperateapply/checkApply',params)
+  }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="basic-target" v-loading="loading">
-    <search :type="1" />
+    <search :type="1" @search:task="updateParams($event)"/>
     <el-table
       :data="dataList"
       border
@@ -13,28 +13,31 @@
       <el-table-column
         label="申请部门"
         align="center"
-        min-width="150"
+        width="150"
+        prop="applyDeptName"
       ></el-table-column
       ><el-table-column
         label="申请时间"
         align="center"
-        min-width="150"
+        width="120"
+        prop="createTime"
       ></el-table-column
       ><el-table-column
         label="申请理由"
         align="center"
-        min-width="150"
+        width="100"
+        prop="note"
       ></el-table-column>
       <el-table-column
         label="一级指标"
-        min-width="80"
+        width="100"
         align="center"
         prop="quota1"
       ></el-table-column>
 
       <el-table-column
         label="二级指标"
-        min-width="80"
+        width="120"
         align="center"
         prop="quota2"
       ></el-table-column>
@@ -42,14 +45,14 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        width="400"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
-        prop="content"
+        width="220"
+        prop="itemContent"
       ></el-table-column>
       <el-table-column
         label="分值"
@@ -64,45 +67,49 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-       <el-table-column label="第一牵头部门" width="120" align="center">
+       <el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="责任领导" width="80" align="center">
+        <el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
-      <el-table-column label="牵头部门" min-width="80" align="center">
+      <el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
         <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.otherDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.otherPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center">
+      <el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
         <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="125" align="center">
-        <el-link @click="edit(true)" type="primary" :underline="false"
-          >同意</el-link
-        >
-        <el-link @click="edit(false)" type="primary" :underline="false"
-          >不同意</el-link
-        >
+        <template slot-scope="{ row }">
+          <el-link @click="edit(row, true)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >同意</el-link
+          >
+          <el-link @click="edit(row, false)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >不同意</el-link
+          >
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -146,13 +153,15 @@
 <script>
 import search from "../../search";
 import { mapGetters } from "vuex"; 
+import api from '@/api/second/coordinationManage/approvalCooperation'
 export default {
   components: {
     search,
   },
   data() {
     return {
-      dataList: [[]],
+      searchParams: {},
+      dataList: [],
       tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
@@ -171,23 +180,57 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user']),
+    ...mapGetters(['formatDep','user']),
   },
   created() {
     this.getDataList()
   },
   methods: {
+    judge(row) {
+      if(row.status == 0) {
+        return false
+      } else if (row.status == 1 || row.status == 2) {
+        return true
+      }
+    },
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
     getDataList() {
-      console.log(this.user.user.deptId);
+      this.searchParams.leaderDept = this.user.user.deptId
+      api.getBasicDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
+        let data = res.data.data;
+        this.count = data.total;
+        this.dataList = data.records;
+      }).catch((e)=>{
+        this.dataList = [];
+        this.count = 0;
+      }).finally(()=>{
+        this.loading = false
+      })
     },
-    edit(flag) {
+    edit(row, flag) {
       this.showEdit = true;
+      this.form.type = 1
+      this.form.id = row.id
+      this.form.itemId = row.id
+      this.form.leaderDept = row.leaderDept
+      this.form.cooperateDept = row.cooperateDept
       if (flag) {
+        this.form.status = 1
         this.warning = {
           title: "确定同意此申请？",
           info: "点击确定后，该部门将添加至考核任务配合部门中",
-        };
+        };  
       } else {
+        this.form.status = 2
         this.warning = {
           title: "确定不同意此申请？",
           info:
@@ -195,7 +238,23 @@ export default {
         };
       }
     },
-    save() {},
+    save() {
+      api.editItem(Object.assign({}, this.form)).then((res)=>{
+        this.showEdit = false;
+        this.$message({
+          type: "success",
+          message: "提交成功",
+        }) 
+        this.getDataList();
+      })
+      .catch((e) => {
+        this.showEdit = false;
+        this.$message({
+          type: "error",
+          message: "提交失败",
+        });
+      });
+    },
   },
   filters: {
     formatList(val) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="constraint" v-loading="loading">
-    <search :type="3" />
+    <search :type="3" @search:task="updateParams($event)"/>
     <el-table
       :data="dataList"
       border
@@ -13,21 +13,24 @@
       <el-table-column
         label="申请部门"
         align="center"
-        min-width="150"
+        width="150"
+        prop="applyDeptName"
       ></el-table-column
       ><el-table-column
         label="申请时间"
         align="center"
-        min-width="150"
+        width="120"
+        prop="createTime"
       ></el-table-column
       ><el-table-column
         label="申请理由"
         align="center"
-        min-width="150"
+        width="100"
+        prop="note"
       ></el-table-column>
       <el-table-column
         label="考核指标"
-        min-width="80"
+        width="100"
         align="center"
         prop="quota"
       ></el-table-column>
@@ -35,14 +38,14 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        width="400"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
-        prop="content"
+        width="220"
+        prop="itemContent"
       ></el-table-column>
       <el-table-column
         label="分值"
@@ -57,45 +60,49 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-       <el-table-column label="第一牵头部门" width="120" align="center">
+       <el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderDeptList | formatList }}</pre>
           </template>
         </el-table-column>
-        <el-table-column label="责任领导" width="80" align="center">
+        <el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
           <template slot-scope="{ row }">
             <pre>{{ row.leaderPrincipalList | formatList }}</pre>
           </template>
         </el-table-column>
-      <el-table-column label="牵头部门" min-width="80" align="center">
+      <el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
         <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.otherDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.otherPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center">
+      <el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
         <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="125" align="center">
-        <el-link @click="edit(true)" type="primary" :underline="false"
-          >同意</el-link
-        >
-        <el-link @click="edit(false)" type="primary" :underline="false"
-          >不同意</el-link
-        >
+        <template slot-scope="{ row }">
+          <el-link @click="edit(row, true)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >同意</el-link
+          >
+          <el-link @click="edit(row, false)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >不同意</el-link
+          >
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -138,13 +145,16 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex"; 
+import api from '@/api/second/coordinationManage/approvalCooperation'
 export default {
   components: {
     search,
   },
   data() {
     return {
-      dataList: [[]],
+      searchParams: {},
+      dataList: [],
       tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
@@ -162,16 +172,58 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['formatDep','user']),
+  },
+  created() {
+    this.getDataList()
+  },
   methods: {
-    getDataList() {},
-    edit(flag) {
+    judge(row) {
+      if(row.status == 0) {
+        return false
+      } else if (row.status == 1 || row.status == 2) {
+        return true
+      }
+    },
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
+    getDataList() {
+      this.searchParams.leaderDept = this.user.user.deptId
+      api.getConstraintDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
+        let data = res.data.data;
+        this.count = data.total;
+        this.dataList = data.records;
+      }).catch((e)=>{
+        this.dataList = [];
+        this.count = 0;
+      }).finally(()=>{
+        this.loading = false
+      })
+    },
+    edit(row, flag) {
       this.showEdit = true;
+      this.form.type = 3
+      this.form.id = row.id
+      this.form.itemId = row.id
+      this.form.leaderDept = row.leaderDept
+      this.form.cooperateDept = row.cooperateDept
       if (flag) {
+        this.form.status = 1
         this.warning = {
           title: "确定同意此申请？",
           info: "点击确定后，该部门将添加至考核任务配合部门中",
-        };
+        };  
       } else {
+        this.form.status = 2
         this.warning = {
           title: "确定不同意此申请？",
           info:
@@ -179,7 +231,23 @@ export default {
         };
       }
     },
-    save() {},
+    save() {
+      api.editItem(Object.assign({}, this.form)).then((res)=>{
+        this.showEdit = false;
+        this.$message({
+          type: "success",
+          message: "提交成功",
+        }) 
+        this.getDataList();
+      })
+      .catch((e) => {
+        this.showEdit = false;
+        this.$message({
+          type: "error",
+          message: "提交失败",
+        });
+      });
+    },
   },
   filters: {
     formatList(val) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="reward" v-loading="loading">
-    <search :type="2" />
+    <search :type="2" @search:task="updateParams($event)"/>
    <el-table
       :data="dataList"
       border
@@ -8,33 +8,36 @@
       :height="tableHeight"
       ref="table"
     >
-      <el-table-column type="index" label="序号" align="center" width="50">
+     <el-table-column type="index" label="序号" align="center" width="50">
       </el-table-column>
       <el-table-column
         label="申请部门"
         align="center"
-        min-width="150"
+        width="150"
+        prop="applyDeptName"
       ></el-table-column
       ><el-table-column
         label="申请时间"
         align="center"
-        min-width="150"
+        width="120"
+        prop="createTime"
       ></el-table-column
       ><el-table-column
         label="申请理由"
         align="center"
-        min-width="150"
+        width="100"
+        prop="note"
       ></el-table-column>
       <el-table-column
         label="一级指标"
-        min-width="80"
+        width="100"
         align="center"
         prop="quota1"
       ></el-table-column>
 
       <el-table-column
         label="二级指标"
-        min-width="80"
+        width="120"
         align="center"
         prop="quota2"
       ></el-table-column>
@@ -42,14 +45,14 @@
       <el-table-column
         label="考核内容和计分细则"
         align="center"
-        min-width="400"
+        width="400"
         prop="content"
       ></el-table-column>
       <el-table-column
         label="小条内容"
         align="center"
-        min-width="150"
-        prop="content"
+        width="220"
+        prop="itemContent"
       ></el-table-column>
       <el-table-column
         label="分值"
@@ -64,45 +67,49 @@
         align="center"
         prop="leaderUnit"
       ></el-table-column>
-      <el-table-column label="第一牵头部门" width="120" align="center">
+       <el-table-column label="牵头部门" width="120" align="center" prop="leaderDeptList">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderDeptList | formatList }}</pre>
+          </template>
+        </el-table-column>
+        <el-table-column label="责任领导" width="80" align="center" prop="leaderPrincipalList">
+          <template slot-scope="{ row }">
+            <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          </template>
+        </el-table-column>
+      <el-table-column label="其他牵头部门" width="120" align="center" prop="otherDeptList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderDeptList | formatList }}</pre>
-        </template>
-      </el-table-column>
-      <el-table-column label="责任领导" width="80" align="center">
-        <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
-        </template>
-      </el-table-column>
-      <el-table-column label="牵头部门" min-width="80" align="center">
-        <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.otherDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="otherPrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.otherPrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
-      <el-table-column label="配合部门" min-width="80" align="center">
+      <el-table-column label="配合部门" width="100" align="center" prop="cooperateDeptList">
         <template slot-scope="{ row }">
-          <span><pre>{{ row.leaderDeptList | formatList }}</pre></span>
+          <span><pre>{{ row.cooperateDeptList | formatList }}</pre></span>
         </template>
       </el-table-column>
 
-      <el-table-column label="责任领导" min-width="80" align="center">
+      <el-table-column label="责任领导" width="80" align="center" prop="cooperatePrincipalList">
         <template slot-scope="{ row }">
-          <pre>{{ row.leaderPrincipalList | formatList }}</pre>
+          <pre>{{ row.cooperatePrincipalList | formatList }}</pre>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="125" align="center">
-        <el-link @click="edit(true)" type="primary" :underline="false"
-          >同意</el-link
-        >
-        <el-link @click="edit(false)" type="primary" :underline="false"
-          >不同意</el-link
-        >
+        <template slot-scope="{ row }">
+          <el-link @click="edit(row, true)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >同意</el-link
+          >
+          <el-link @click="edit(row, false)" type="primary" :underline="false"
+          :disabled="judge(row)"
+            >不同意</el-link
+          >
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -145,13 +152,16 @@
 
 <script>
 import search from "../../search";
+import { mapGetters } from "vuex"; 
+import api from '@/api/second/coordinationManage/approvalCooperation'
 export default {
   components: {
     search,
   },
   data() {
     return {
-      dataList: [[]],
+      searchParams: {},
+      dataList: [],
       tableHeight: document.documentElement.clientHeight - 305,
       page: {
         page: 1,
@@ -169,16 +179,58 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['formatDep','user']),
+  },
+  created() {
+    this.getDataList()
+  },
   methods: {
-    getDataList() {},
-    edit(flag) {
+    judge(row) {
+      if(row.status == 0) {
+        return false
+      } else if (row.status == 1 || row.status == 2) {
+        return true
+      }
+    },
+    updateParams(data) {
+      this.searchParams = data;
+      this.resetCurrentPage();
+      this.getDataList();
+    },
+    resetCurrentPage() {
+      let page = this.page;
+      page.page = 1;
+      this.page = page;
+    },
+    getDataList() {
+      this.searchParams.leaderDept = this.user.user.deptId
+      api.getRewardDataList(Object.assign({}, this.page, this.searchParams)).then((res)=>{
+        let data = res.data.data;
+        this.count = data.total;
+        this.dataList = data.records;
+      }).catch((e)=>{
+        this.dataList = [];
+        this.count = 0;
+      }).finally(()=>{
+        this.loading = false
+      })
+    },
+    edit(row, flag) {
       this.showEdit = true;
+      this.form.type = 2
+      this.form.id = row.id
+      this.form.itemId = row.id
+      this.form.leaderDept = row.leaderDept
+      this.form.cooperateDept = row.cooperateDept
       if (flag) {
+        this.form.status = 1
         this.warning = {
           title: "确定同意此申请？",
           info: "点击确定后，该部门将添加至考核任务配合部门中",
-        };
+        };  
       } else {
+        this.form.status = 2
         this.warning = {
           title: "确定不同意此申请？",
           info:
@@ -186,7 +238,23 @@ export default {
         };
       }
     },
-    save() {},
+    save() {
+      api.editItem(Object.assign({}, this.form)).then((res)=>{
+        this.showEdit = false;
+        this.$message({
+          type: "success",
+          message: "提交成功",
+        }) 
+        this.getDataList();
+      })
+      .catch((e) => {
+        this.showEdit = false;
+        this.$message({
+          type: "error",
+          message: "提交失败",
+        });
+      });
+    },
   },
   filters: {
     formatList(val) {