From c89052ab9c80b1e3d18921a97e8a66eba377f77c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sun, 25 Jun 2023 14:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=8F=9C=E5=8D=95=E5=90=8D?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js                    |   2 +-
 .../views/supervisionNew/basicGoalDept.vue    |  11 +-
 client/src/views/supervisionNew/mytask.vue    |  42 ++---
 client/src/views/supervisionNew/mytaskDo.vue  | 158 ------------------
 client/src/views/supervisionNew/taskdo.vue    |   8 +-
 5 files changed, 33 insertions(+), 188 deletions(-)
 delete mode 100644 client/src/views/supervisionNew/mytaskDo.vue

diff --git a/client/src/router/index.js b/client/src/router/index.js
index aebe060..09b0c32 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -211,7 +211,7 @@ export const asyncRoutes = [
         path: 'basicGoal',
         name: 'basicGoal',
         component: () => import('@/views/supervisionNew/basicGoal.vue'),
-        meta: { title: '年度基础目标' , perms: ['task2']}
+        meta: { title: '集团年度目标' , perms: ['task2']}
       },
       {
         path: 'basicGoalDept',
diff --git a/client/src/views/supervisionNew/basicGoalDept.vue b/client/src/views/supervisionNew/basicGoalDept.vue
index bb7a428..41486d7 100644
--- a/client/src/views/supervisionNew/basicGoalDept.vue
+++ b/client/src/views/supervisionNew/basicGoalDept.vue
@@ -18,7 +18,7 @@
                 >搜索</el-button>
             </div>
         </el-card>
-        <el-card style="margin-top: 10px">
+        <el-card style="margin-top: 6px">
             <el-table
                 v-loading="listLoading"
                 :data="dataList.results"
@@ -26,7 +26,7 @@
                 fit
                 stripe
                 highlight-current-row
-                max-height="600"
+                :height="heightTable"
             >
                 <el-table-column type="index" width="50" />
                 <el-table-column label="年份" prop="year" width="80"></el-table-column>
@@ -37,13 +37,13 @@
                 <el-table-column label="能力验证满意率(%)" prop="pgoal_4"></el-table-column>
                 <el-table-column label="客户投诉处理满意率(%)" prop="pgoal_5"></el-table-column>
             </el-table>
-            <pagination
+            <!-- <pagination
                 v-show="dataList.count > 0"
                 :total="dataList.count"
                 :page.sync="listQuery.page"
                 :limit.sync="listQuery.page_size"
                 @pagination="getList"
-            />
+            /> -->
         </el-card>
     </div>
 </template>
@@ -67,11 +67,14 @@
                     goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5',
                 },
                 taskList:[],
+                heightTable:null,
                 listLoading:false
             };
         },
         mounted(){
             this.getList();
+            let height = document.getElementsByClassName('app-main')[0].clientHeight;
+            this.heightTable = height-90;
         },
         methods:{
             checkPermission,
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index b66874f..7af223c 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -903,29 +903,29 @@ import user from "@/store/modules/user";
           obj.goal_name = item.goal_name;
           obj.goal_file = item.goal_file;
           obj.goal_value_b = item.goal_value_b;
-          if(item.id){
-            updatePgoalDept(item.id,obj).then(res=>{
-              this.saveLoading = false;
-              console.log(res)
-              if(res.code>=200){
-                this.$message.success('保存成功')
-              }
-            }).catch(()=>{
-              this.saveLoading = false;
-            })
+          if(item.goal_file!==null&&item.goal_file!==''){
+            if(item.id){
+              updatePgoalDept(item.id,obj).then(res=>{
+                this.saveLoading = false;
+                if(res.code>=200){
+                  this.$message.success('保存成功')
+                }
+              }).catch(()=>{
+                this.saveLoading = false;
+              })
+            }else{
+              createPgoalDept(obj).then(res=>{
+                this.saveLoading = false;
+                if(res.code>=200){
+                  this.$message.success('保存成功')
+                }
+              }).catch(()=>{
+                this.saveLoading = false;
+              })
+            }
           }else{
-            createPgoalDept(obj).then(res=>{
-              // debugger;
-              console.log(res)
-              this.saveLoading = false;
-              if(res.code>=200){
-                this.$message.success('保存成功')
-              }
-            }).catch(()=>{
-              this.saveLoading = false;
-            })
+            this.$message.warning('请上传实施细则文件')
           }
-         
         },
         handlePreview(file) {
           if ("url" in file) {
diff --git a/client/src/views/supervisionNew/mytaskDo.vue b/client/src/views/supervisionNew/mytaskDo.vue
deleted file mode 100644
index 027cdb0..0000000
--- a/client/src/views/supervisionNew/mytaskDo.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card>
-           日常监督填报 
-    </el-card>
-    <el-row :gutter="10">
-      <el-col :span="12">
-        <el-card style="margin-top:6px">
-          已发放报告
-          <el-input></el-input>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card style="margin-top:6px">
-          应发放报告
-          <el-input></el-input>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row :gutter="10">
-      <el-col :span="8">
-        <el-card class="task task-item" shadow="hover" style="padding:10px;box-sizing: border-box;">
-          <div slot="header" style="display:flex">
-            <span class="cardTitle">不准确报告</span>
-            <el-button type="primary" icon="el-icon-plus"  @click="addFiles()">添加</el-button>
-          </div>
-          <div slot="header" style="display: flex;justify-content: space-between;">
-            <!-- <div>
-              <span>总数：</span>
-              <el-input style="width:100px;"> </el-input>
-            </div> -->
-            
-            
-          </div>
-          <el-table></el-table>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card title="超期报告">
-          <div slot="header" class="clearfix">
-            <span>超期报告</span>
-            <el-input></el-input>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card title="能力验证结果">
-          <div slot="header" class="clearfix">
-            <span>能力验证结果</span>
-            <el-input></el-input>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card title="客户投诉">
-          <div slot="header" class="clearfix">
-            <span>客户投诉</span>
-            <el-input></el-input>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card title="风险识别">
-          <div slot="header" class="clearfix">
-            <span>风险识别</span>
-            <el-input></el-input>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="8">
-        <el-card title="外部监督检查">
-          <div slot="header" class="clearfix">
-            <span>外部监督检查</span>
-            <el-input></el-input>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    
-  </div>
-</template>
-<script>
-import {
-  getmytasklist,
-} from "@/api/task";
-import { getOrgList, getSubOrgList } from "@/api/org";
-import checkPermission from "@/utils/permission";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import mytaskrecord from "@/views/supervision/mytaskrecord";
-export default {
-  components: { Pagination, mytaskrecord },
-  data() {
-    return {
-      taskList: [],
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-      form:{
-
-      },
-      listLoading: true,
-      query:null,
-      orgData: [],
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList();
-    this.getOrgList();
-  },
-  methods: {
-    checkPermission,
-    getList() {
-      this.listLoading = true;
-      getmytasklist(this.listQuery).then((response) => {
-        if (response.data) {
-          this.taskList = response.data;
-        }
-        this.listLoading = false;
-      });
-    },
-     getOrgList() {
-      if (this.checkPermission(["record_confirm"])) {
-        getOrgList({ can_supervision: true }).then((res) => {
-          this.orgData = res.data;
-        });
-      } else {
-        getSubOrgList().then((res) => {
-          this.orgData = res.data;
-        });
-      }
-    },
-    clickRow(obj){
-      this.query = {
-        dept:obj.dept,
-        task:obj.task
-      }
-    },
-     handleFilter() {
-      this.listQuery.page = 1;
-      
-      this.getList();
-    },
-    handleDo(val){
-      this.getList()
-    }
-  },
-};
-</script>
-<style scoped>
-.cardTitle{
-  display: inline-block;
-  font-size: 18px;
-  font-weight: 600;
-}
-</style>
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index 91afce7..b0db175 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -141,7 +141,7 @@
             > -->
             <el-link
               v-if="
-                checkPermission(['task_update'])
+                checkPermission(['task2'])
               "
               type="danger"
               size="small"
@@ -457,7 +457,7 @@
 </style>
 <script>
 import { getOrgList } from "@/api/org";
-import { getTask2, addDeptsTask2, getTask2Do, startTask2, confirmTaskdept ,
+import { getTask2, addDeptsTask2, getTask2Do, startTask2, confirmTaskdept ,deleteTaskdept,
   getPgoalDeptList,getRcList,getPtList,getRiskList,getComplaintList,getOinspectList} from "@/api/task";
 import Pagination from "@/components/Pagination";
 import checkPermission from "@/utils/permission";
@@ -569,11 +569,11 @@ export default {
     },
     gettaskdeptall() {
       this.listLoading = true;
-      getTask2Do({task2:this.task.id})
+      getTask2Do({task2:this.task.id,page:0})
         .then((res) => {
           this.listLoading = false;
           this.taskdeptall = [];
-          let taskdept = res.data.results;
+          let taskdept = res.data;
           taskdept.forEach(item=>{
             let obj = item;
             let pross = Number((item.count_up/item.count_all).toFixed(4))