From 6e78516c64866bc9bcb9ac680139597c88a15ca3 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 9 May 2023 18:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Report/ReportList.vue               |  8 +++----
 src/views/Report/ReportManager.vue            |  5 ++--
 .../reportProcess/components/reportForm.vue   | 16 ++++++-------
 src/views/reportProcess/launch.vue            |  9 +++----
 .../userCenter/processCenter/gencyProcess.vue | 24 +++++++++++++++++--
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 8814492..d1b3dff 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -109,7 +109,7 @@
 
     <div class="table">
       <el-row>
-        <el-col :span="4" class="treeList ">
+        <el-col :span="3" class="treeList ">
           <el-input placeholder="输入关键字进行过滤" v-model="filterText">
           </el-input>
           <div class="lef-tree scroll-myself">
@@ -136,7 +136,7 @@
           </div>
         </el-col>
 
-        <el-col :span="19">
+        <el-col :span="21" style="padding-left: 15px">
           <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe
                      v-table-min-height="'calc(100vh - 320px)'"
                      @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
@@ -150,7 +150,7 @@
               <template #default="{ row, rowIndex }">
                 <!--                      <label class="row-title" >-->
                 <!--                          <el-tooltip :content="row.name" placement="top-start">-->
-                <span class="report-name blurcolor" @click="goReportDetail(row)"> {{ row.name }}</span>
+                <span class="report-name"> {{ row.name }}</span>
                 <!--                          </el-tooltip>-->
                 <!--                      </label>-->
                 <!--                        <div class="row-info">-->
@@ -512,7 +512,7 @@ export default {
 .treeList {
   padding: 20px 20px 0;
   box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-  margin-right: 20px;
+  //margin-right: 20px;
 
   .filter-tree {
     margin-top: 20px;
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index cdfb919..7f4bfb1 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -42,7 +42,7 @@
             </el-row>
         </div>
         <el-row>
-            <el-col :span="4"  class="treeList">
+            <el-col :span="3"  class="treeList">
                 <el-input placeholder="输入关键字进行过滤" v-model="filterText">
                     </el-input>
                   <div class="lef-tree scroll-myself" >
@@ -68,7 +68,7 @@
                     </el-tree>
                    </div>
             </el-col>
-            <el-col :span="19 ">
+          <el-col :span="21" style="padding-left: 15px">
                 <div class="table">
             <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
                 <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
@@ -1003,7 +1003,6 @@ export default {
     padding: 20px;
     margin-left: 13px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-    margin-right: 20px;
     .filter-tree{
         margin-top: 20px;
         height: calc(100vh - 320px);
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index 83c0326..de72b83 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -3,13 +3,13 @@
     <el-form ref="processFormRef" :model="form" label-width="150px"
              :rules="processFormRule" class="label-input-form" size="medium">
       <el-row>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-form-item label="报告名称:" prop="name">
             <el-input :disabled="formControl" v-model="form.name"
                       placeholder="请输入报告名称"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="9" :offset="6">
+        <el-col :span="10" :offset="4">
           <el-form-item label="报告年份:" prop="year">
             <el-date-picker :disabled="formControl" v-model="form.year" type="year" value-format="yyyy"
                             placeholder="请选择报告年份"
@@ -18,13 +18,13 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="9">
+        <el-col :span="10">
           <el-form-item label="报告所属部门:" prop="department">
             <el-input  readonly :disabled="formControl" v-model="form.departmentName" @click.na.native="handleClick"   placeholder="请选择报告所属部门"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="9" :offset="6">
+        <el-col :span="10" :offset="4">
           <el-form-item label="标签:" prop="department">
             <el-cascader :disabled="formControl" width="100%" v-model="form.labelList" :options="cascaderOptions"
                          filterable  collapse-tags
@@ -37,7 +37,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="9" >
+        <el-col :span="10" >
           <el-form-item label="报告涉密等级:" prop="confidentialLevel">
             <el-select :disabled="formControl" v-model="form.confidentialLevel" placeholder="请选择报告涉密等级" @change="reportLevel">
               <el-option v-for="item in privacyLevelOptions " :key="item.value" :label="item.value"
@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="9" :offset="6" v-if="isShowTime">
+        <el-col :span="10" :offset="4" v-if="isShowTime">
           <el-form-item label="保密到期日期:" prop="secrecyLast">
           <el-date-picker :disabled="formControl" v-model="form.secrecyLast" type="date" value-format="yyyy-mm-dd"
                           placeholder="请选择保密到期日期"
@@ -56,7 +56,7 @@
       </el-row>
       <el-row>
 
-        <el-col :span="9" >
+        <el-col :span="10" >
           <el-form-item label="报告隐私等级:" prop="privacyLevel">
             <el-select :disabled="formControl" v-model="form.privacyLevel" placeholder="请选择报告隐私等级">
               <el-option v-for="item in  confidentialLevelOptions" :key="item.value" :label="item.value"
@@ -65,7 +65,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="9" :offset="6">
+        <el-col :span="10" :offset="4">
           <el-form-item label="关键词:" prop="tags">
             <vue-tags-input :disabled="formControl" :class="{'is-diable':formControl}" placeholder="请输入关键词"
                             v-model="form.tags" :tags="tags"
diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue
index c3141b2..abbe21a 100644
--- a/src/views/reportProcess/launch.vue
+++ b/src/views/reportProcess/launch.vue
@@ -31,7 +31,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="9" style="margin-left: 5px">
-                <el-button size="medium" type="primary" @click="handleCheck('spr1')">选取</el-button>
+                <el-button size="medium" type="primary" class="checkBtn" @click="handleCheck('spr1')">选取</el-button>
               </el-col>
             </el-row>
 
@@ -138,7 +138,6 @@ export default {
           this.$set(this.assignForm,'oneApproveName',submitJson.oneApproveName)
         }
         this.$nextTick(()=>{
-          this.$refs.processFormRef.clearValidate()
           this.$refs.assignFormRef.clearValidate()
         })
       })
@@ -345,6 +344,8 @@ export default {
 }
 </script>
 
-<style  scoped>
-
+<style lang="scss"  scoped>
+.checkBtn {
+  padding: 11px 20px !important;
+}
 </style>
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index a015c16..1f6affd 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -2,7 +2,9 @@
   <div>
 
     <div class="table">
-      <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
+      <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center"
+                  border stripe v-table-min-height="'calc(100vh - 380px)'"
+                  @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
           <template #default="{ row, rowIndex }">
@@ -56,7 +58,9 @@ export default {
         size:10
       },
       total: 0,
-      tableData: []
+      tableData: [],
+      checkList:[],
+      checkIds:[]
     };
   },
   props:{
@@ -79,6 +83,22 @@ export default {
       this.loadData()
     },
     methods: {
+      selectAllEvent({checked}) {
+        const records = this.$refs.xTable.getCheckboxRecords()
+        this.checkList = records
+        this.checkIds = records.map(item => {
+          return item.id
+        })
+        this.$bus.$emit('handleClick', this.checkList);
+      },
+      selectChangeEvent({checked}) {
+        const records = this.$refs.xTable.getCheckboxRecords()
+        this.checkList = records
+        this.checkIds = records.map(item => {
+          return item.id
+        })
+        this.$bus.$emit('handleClick', this.checkList);
+      },
       loadData() {
         let userId=this.$store.getters.userInfo.usid
         this.$api.processCenter.gencyProcessPage({...this.q,...this.form,userId:userId}).then(res=>{