Merge remote-tracking branch 'origin/master'

src/api/allApi/index.js

@@ -132,6 +132,23 @@ export function postCheckListAdd(data) {
   })
 }
 
+// 岗位责任制清单 -> 提交审核 
+export function postCheckListsubmitApprove(params) {
+  return request({
+    url: `/postCheck/postCheckListsubmitApprove`,
+    method: 'get',
+    params: params
+  })
+}
+// 岗检表 -> 提交审核 
+export function submitApprove(params) {
+  return request({
+    url: `postCheck/postChecked/submitApprove`,
+    method: 'get',
+    params: params
+  })
+}
+
 // 导出岗位责任制清单列表
 export function exportFun(data) {
   return request({
@@ -616,3 +633,12 @@ export function approveTypeUserList1() {
   });
 }
 
+// 台账导出
+export function batchExportTaiZhang(params) {
+  return request({
+    url: "/postCheck/postCheckedProblem/batchExportTaiZhang",
+    method: "get",
+    params
+  });
+}
+

src/views/jobinspectionHistory/jobinspectionProblem/index.vue

@@ -38,9 +38,12 @@
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
 
+      <el-button type="primary" @click="batchExport" style="float: right;">批量导出</el-button>
+
     </el-form>
 
-    <el-table border v-loading="loading" :data="tableData" height="calc(100% - 100px)">
+    <el-table border v-loading="loading" :data="tableData" height="calc(100% - 100px)" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" width="80">
         <template slot-scope="scope">
           <span>{{
@@ -480,14 +483,17 @@
 <script>
 import {
   postCheckedProblemList,
-  postCheckedProblemDetail
+  postCheckedProblemDetail,
+  batchExportTaiZhang
 } from '@/api/allApi/index.js'
+import download from "@/plugins/download.js";
 import { getBase64 } from '@/api/postInspectionPlanning/projectManagement.js'
 export default {
   name: 'PostResponsibilityMeun',
 
   data() {
     return {
+      ids:[],
       valueYear: '',
       queryParams: {
         dutyType: '',
@@ -605,6 +611,10 @@ export default {
   },
 
   methods: {
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+    },
     initYear() {
       let _now = new Date()
       let currentYear = _now.getFullYear()
@@ -662,7 +672,12 @@ export default {
           }
         )
       }
-    }
+    },
+    batchExport() {
+      batchExportTaiZhang({ ids: this.ids.join(",") }).then((res) => {
+        download.resource(res.msg);
+      });
+    },
   }
 }
 </script>

src/views/postInspectionPlanning/tableManagement/index.vue

@@ -105,6 +105,9 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
+          <el-button type="text" @click="doShen(scope.row)"
+            >提交审核</el-button
+          >
           <el-button
             type="text"
             @click="handleCheck('edit', '修改', scope.row)"
@@ -319,6 +322,9 @@ import {
   preview,
 } from "@/api/postInspectionPlanning/tableManagement.js";
 import {
+  submitApprove
+} from '@/api/allApi/index.js'
+import {
   listGroupList,
   getDeptTree,
   getOptionselect,
@@ -496,6 +502,29 @@ export default {
         }
       }
     },
+    // 提交审核
+    doShen(row) {
+      this.$confirm('确认提交审核?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      .then(async () => {
+        const res = await submitApprove({id:row.id})
+        if (res.code !== 200) return this.$message.error(res.msg)
+        this.$message({
+          type: 'success',
+          message: '提交审核成功!'
+        })
+        this.getList()
+      })
+      .catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
+    },
     getGroupList() {
       listGroupList().then((data) => {
         this.groupList = data.data;

src/views/postResponsibility/postResponsibilityOrganization/index.vue

@@ -152,9 +152,12 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="150"
+        width="200"
       >
         <template slot-scope="scope">
+          <el-button type="text" @click="doShen(scope.row)"
+            >提交审核</el-button
+          >
           <el-button
             type="text"
             @click="
@@ -397,6 +400,29 @@ export default {
           })
         })
     },
+    // 提交审核
+    doShen(row) {
+      this.$confirm('确认提交审核?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await postCheckListsubmitApprove({id:row.id})
+          if (res.code !== 200) return this.$message.error(res.msg)
+          this.$message({
+            type: 'success',
+            message: '提交审核成功!'
+          })
+          this.getList()
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
+    },
     // 导入证件文件取消按钮
     cancelCredent() {
       this.importWen = false