From 4ff81c14c4e56b3c029af34a15de6aec08bf49d8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 30 May 2022 09:28:02 +0800
Subject: [PATCH 1/3] 0530

---
 client/src/api/ability.js                 | 7 +++++++
 client/src/views/ability/mQualityTask.vue | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/api/ability.js b/client/src/api/ability.js
index af3dc79..1f97b9f 100644
--- a/client/src/api/ability.js
+++ b/client/src/api/ability.js
@@ -196,4 +196,11 @@ export function qactionMy(query) {
     params: query
   })
 }
+//报送操作操作记录
+export function qaction(id) {
+  return request({
+    url:`/ability/qaction/${id}/`,
+    method:'get',
+  })
+}
 
diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue
index 15f1b9d..3fc7641 100644
--- a/client/src/views/ability/mQualityTask.vue
+++ b/client/src/views/ability/mQualityTask.vue
@@ -184,7 +184,7 @@
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisibleAbility = false">取消</el-button>
-        <el-button type="primary" @click="confirmAbility('abilityForm')">确认</el-button>
+        <el-button v-if="checkPermission(['qaction_confirm'])" type="primary"  @click="confirmAbility('abilityForm')">确认</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -296,7 +296,7 @@
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+        <el-button v-if="checkPermission(['qaction_confirm'])" type="primary" @click="confirm('Form')">确认</el-button>
       </div>
     </el-dialog>
   </div>

From 177531485abf66b66749af173eba65b719de6bf0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 30 May 2022 09:55:00 +0800
Subject: [PATCH 2/3] 0530

---
 client/src/router/index.js             |   6 +
 client/src/views/ability/qactionMy.vue | 161 +++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 client/src/views/ability/qactionMy.vue

diff --git a/client/src/router/index.js b/client/src/router/index.js
index 2c62144..e87f730 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -132,6 +132,12 @@ export const asyncRoutes = [
         component: () => import('@/views/ability/mQualityTask.vue'),
         meta: { title: '我的资质报送任务', perms: ['qtask_my'] }
       },
+      {
+        path: 'qactionMy',
+        name: 'qactionMy',
+        component: () => import('@/views/ability/qactionMy.vue'),
+        meta: { title: '我的报送操作', perms: ['qtask_my'] }
+      },
      /* {
         path: 'content',
         name: 'Content',
diff --git a/client/src/views/ability/qactionMy.vue b/client/src/views/ability/qactionMy.vue
new file mode 100644
index 0000000..87b8f7f
--- /dev/null
+++ b/client/src/views/ability/qactionMy.vue
@@ -0,0 +1,161 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row :gutter="6">
+        <el-col :xs="24" :md="4">
+          <el-select v-model="listQuery.qtask" placeholder="所属任务" @change="handleFilter" clearable style="width: 100%;">
+            <el-option
+              v-for="item in taskOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :xs="24" :md="6">
+          <el-input
+            v-model="listQuery.search"
+            placeholder="资质/服务"
+            style="width: 100%;"
+            class="filter-item"
+            @keyup.enter.native="handleFilter"
+          />
+        </el-col>
+        <el-col :xs="24" :md="6">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="handleFilter"
+          >搜索
+          </el-button>
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="resetFilter"
+          >重置
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card style="margin-top: 10px">
+      <el-table
+        v-loading="listLoading"
+        :data="list.results"
+        style="width: 100%;"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="700"
+        ref="filterTable"
+      >
+        <el-table-column type="index" width="50"/>
+        <el-table-column label="资质名称" prop="quali_name">
+
+        </el-table-column>
+        <el-table-column label="能力文件" prop="afield_name">
+          <template slot-scope="scope">
+            <el-link :href="scope.row.file" target="_blank" type="primary">{{scope.row.afield_name }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column label="能力类型" prop="atype_name">
+        </el-table-column>
+        <el-table-column label="操作类型" prop="action">
+        </el-table-column>
+        <el-table-column label="所属单位" prop="belong_dept"></el-table-column>
+        <el-table-column label="创建日期">
+          <template slot-scope="scope">{{scope.row.create_time.substring(0, 10)}}</template>
+        </el-table-column>
+        <el-table-column label="变更日期">
+          <template slot-scope="scope">{{scope.row.update_time.substring(0, 10)}}</template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="list.count > 0"
+        :total="list.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+
+</template>
+
+<script>
+  import {getOrgList} from "@/api/org";
+  import {getCMAGroup} from "@/api/cma";
+  import { qactionMy,getQtask } from "@/api/ability";
+  import checkPermission from "@/utils/permission";
+  import Pagination from "@/components/Pagination";
+
+  export default {
+    components: {Pagination},
+    name: "qactionMy",
+    data() {
+      return {
+        list: {count: 0},
+        listQuery: {
+          page: 1,
+          page_size: 20,
+          qtask: '',
+          search: ''
+        },
+        org: [],
+        taskOptions: [],
+        listLoading: true,
+        dialogVisible: false,
+        dialogType: "new",
+        typeOptions: {
+          'CMA': '',
+          'CNAS': '',
+          'OTHER': ''
+        },
+      };
+    },
+    mounted() {
+      this.getList();
+      // this.getGroup();
+      this.getQtaskList();
+    },
+    methods: {
+      checkPermission,
+      getList() {
+        this.listLoading = true;
+        qactionMy(this.listQuery).then((response) => {
+          if (response.data) {
+            this.list = response.data;
+          }
+          this.listLoading = false;
+        });
+      },
+      getQtaskList() {
+        getQtask().then((response) => {
+          if (response.data) {
+            this.taskOptions = response.data.results;
+          }
+        })
+      },
+      getGroup() {
+        getOrgList({ can_supervision: true }).then((res) => {
+          this.org = res.data;
+        });
+      },
+      handleFilter() {
+        this.getList();
+      },
+      resetFilter() {
+        this.listQuery.qtask = '';
+        this.listQuery.search = '';
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
+

From 0dc4b56a133aec290ca2fb4acd7da87a7b9784a3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 30 May 2022 10:08:00 +0800
Subject: [PATCH 3/3] 0530

---
 client/src/api/ability.js              | 16 ++++++-
 client/src/router/index.js             |  2 +-
 client/src/views/ability/qactionMy.vue | 60 +++++++++++++++++++++++++-
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/client/src/api/ability.js b/client/src/api/ability.js
index 1f97b9f..51a6852 100644
--- a/client/src/api/ability.js
+++ b/client/src/api/ability.js
@@ -197,10 +197,24 @@ export function qactionMy(query) {
   })
 }
 //报送操作操作记录
-export function qaction(id) {
+export function qactionItem(id) {
   return request({
     url:`/ability/qaction/${id}/`,
     method:'get',
   })
 }
+//报送操作操作记录queren
+export function qactionConfirm(id) {
+  return request({
+    url:`/ability/qaction/${id}/confirm/`,
+    method:'put',
+  })
+}
+//报送操作操作记录del
+export function qactionDelete(id) {
+  return request({
+    url:`/ability/qaction/${id}/`,
+    method:'delete',
+  })
+}
 
diff --git a/client/src/router/index.js b/client/src/router/index.js
index e87f730..388abc8 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -136,7 +136,7 @@ export const asyncRoutes = [
         path: 'qactionMy',
         name: 'qactionMy',
         component: () => import('@/views/ability/qactionMy.vue'),
-        meta: { title: '我的报送操作', perms: ['qtask_my'] }
+        meta: { title: '资质报送操作', perms: ['qtask_my'] }
       },
      /* {
         path: 'content',
diff --git a/client/src/views/ability/qactionMy.vue b/client/src/views/ability/qactionMy.vue
index 87b8f7f..65e792d 100644
--- a/client/src/views/ability/qactionMy.vue
+++ b/client/src/views/ability/qactionMy.vue
@@ -71,6 +71,30 @@
         <el-table-column label="变更日期">
           <template slot-scope="scope">{{scope.row.update_time.substring(0, 10)}}</template>
         </el-table-column>
+        <el-table-column
+          align="center"
+          label="操作"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-link
+              v-if="checkPermission(['qaction_confirm'])"
+              type="warning"
+              size="small"
+              icon="el-icon-s-promotion"
+              @click="handleDelete(scope)"
+            >删除
+            </el-link>
+            <el-link
+              v-if="checkPermission(['qaction_confirm'])"
+              type="primary"
+              size="small"
+              icon="el-icon-s-promotion"
+              @click="handleCheck(scope)"
+            >审核
+            </el-link>
+          </template>
+        </el-table-column>
       </el-table>
 
       <pagination
@@ -88,7 +112,7 @@
 <script>
   import {getOrgList} from "@/api/org";
   import {getCMAGroup} from "@/api/cma";
-  import { qactionMy,getQtask } from "@/api/ability";
+  import { qactionMy,getQtask,qactionDelete,qactionConfirm,qactionItem } from "@/api/ability";
   import checkPermission from "@/utils/permission";
   import Pagination from "@/components/Pagination";
 
@@ -151,6 +175,40 @@
         this.listQuery.qtask = '';
         this.listQuery.search = '';
       },
+      handleDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await qactionDelete(scope.row.id);
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "成功删除!",
+            });
+          })
+          .catch((err) => {
+          });
+      },
+      handleCheck(scope){
+        this.$confirm("确认审核通过?", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(async () => {
+            await qactionConfirm(scope.row.id);
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+          })
+          .catch((err) => {
+          });
+      },
     },
   }
 </script>