From c726c7af472fda3922aa0bfa5b17bdaf2f0901fb Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Thu, 11 May 2023 15:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userCenter/processCenter.vue        | 19 +++--
 .../processCenter/finishProcess.vue           | 19 ++---
 .../userCenter/processCenter/gencyProcess.vue | 79 +++++++++++++++++--
 .../processCenter/monitorProcesses.vue        | 19 ++---
 .../userCenter/processCenter/sentProcess.vue  | 18 ++---
 .../userCenter/processCenter/taskDraft.vue    |  2 +-
 6 files changed, 115 insertions(+), 41 deletions(-)

diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue
index bf7d14d..2145ebb 100644
--- a/src/views/userCenter/processCenter.vue
+++ b/src/views/userCenter/processCenter.vue
@@ -34,23 +34,23 @@
         </div>
       <el-row class="agreeBtn" v-if="isShowbtn">
         <el-button size="small" type="primary" @click="allAgree('yes')">批量同意</el-button>
-        <el-button  size="small" type="primary" @click="allAgree('no')">批量不同意</el-button>
+        <el-button  size="small" type="danger" @click="allAgree('no')">批量不同意</el-button>
 
       </el-row>
         <div class="tabs">
             <tabs  @clearForm="reset"/>
         </div>
-      <el-dialog title="审批意见" width="20%" :visible.sync="dialogVisible"  >
+      <el-dialog title="审核意见" width="20%" :visible.sync="dialogVisible"  >
         <el-form  ref="examineForm"
                   :model="approveForm"
                   :rules="approveFormRules"
                   size="medium"
                   class="label-input-form prc-content-border approveForm">
           <el-form-item  label-width="132px" class="add-form-item" prop="approvalOpinion">
-            <template slot="label">审批意见:</template>
+            <template slot="label">审核意见:</template>
             <el-input  :maxlength='1000'
                       v-model="approveForm.approvalOpinion"
-                      placeholder="请输入审批意见"
+                      placeholder="请输入审核意见"
                       :autosize="{ minRows: 2, maxRows: 4}"
                       type="textarea"
             />
@@ -76,11 +76,11 @@ import tabs from '../userCenter/processCenter/tabs.vue'
         },
         data() {
             return {
-              approveForm:{},
+              approveForm:{approvalOpinion:''},
               approveFormRules:{
                 approvalOpinion:[{
                   required:true,
-                  message:'请填写审批意见'
+                  message:'请填写审核意见'
                 }]
               },
               dialogVisible:false,
@@ -89,6 +89,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
                   prcName:''
                 },
               checkList:[],
+              flag:1,//是不是同意
               isShowbtn:this.$store.getters.activeTab =='' || this.$store.getters.activeTab =='first'
             }
         },
@@ -111,7 +112,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
               this.$refs.examineForm.validate(v=>{
                 if(v){
                   this.checkList= this.checkList.map(item=>{
-                    item.flag=2
+                    item.flag= this.flag
                     item.approvalOpinion = this.approveForm.approvalOpinion
                     return item
                   })
@@ -122,11 +123,13 @@ import tabs from '../userCenter/processCenter/tabs.vue'
               })
             },
             allAgree(type){
+              this.approveForm.approvalOpinion=''
               if(this.checkList.length>0){
                 if(type=='no'){
                   this.dialogVisible=true
+                  this.flag=2
                 }else{
-
+                  this.flag=1
                 }
               }else{
                 this.$message.warning("请至少选择一条数据")
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 02d4fec..20604ac 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -12,14 +12,9 @@
               <div class="blurcolor"  @click="view(row)">{{row.prcNum}}</div>
             </template>
           </vxe-column>
-          <vxe-column show-overflow show-header-overflow field="prcType"
-                      title="流程类型">
-              <template #default="{ row,index }">
-                <div >{{getPrcName(row.prcType)}}</div>
-              </template>
-          </vxe-column>
 
-          <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+
+          <vxe-column show-overflow show-header-overflow field="prcName" title="报告名称">
             <template #default="{ row,index }">
               <div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
             </template>
@@ -31,8 +26,14 @@
                       title="上一处理人"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="endTime"
-                      title="完成时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="status" title="状态">
+                      title="完成日期"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="prcType"
+                      title="流程类型">
+            <template #default="{ row,index }">
+              <div >{{getPrcName(row.prcType)}}</div>
+            </template>
+          </vxe-column>
+          <vxe-column show-overflow show-header-overflow field="status" title="流程状态">
             <template #default="{ row }">
               <span v-if="row.isEnd === '0'">未完成</span>
               <span v-if="row.isEnd === '1'">已完成</span>
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index f4327fe..444475d 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -17,22 +17,33 @@
             <div class="blurcolor" @click="handle(row)">{{row.prcNum}}</div>
           </template>
         </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="prcName" title="报告名称">
+          <template #default="{ row,index }" >
+            <div class="blurcolor" @click="handle(row)">{{row.prcName}}</div>
+          </template>
+        </vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcType"
                     title="流程类型">
           <template #default="{ row,index }">
             <div>{{getPrcName(row.prcType)}}</div>
           </template>
         </vxe-column>
-        <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
-          <template #default="{ row,index }" >
-            <div class="blurcolor" @click="handle(row)">{{row.prcName}}</div>
-          </template>
+
+        <vxe-column show-overflow show-header-overflow field="confidentialLevel" title="报告涉密等级">
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="privacyLevel" title="报告隐私等级">
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatUserName"
                     title="发起人"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
         <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
           <template #default="{ row }">
+            <el-button @click.native.prevent="handleSubmit(row,'yes')" type="text" size="small">
+              同意
+            </el-button>
+            <el-button @click.native.prevent="handleSubmit(row,'no')" type="text" size="small">
+              不同意
+            </el-button>
             <el-button @click.native.prevent="handle(row)" type="text" size="small">
               办理
             </el-button>
@@ -43,6 +54,28 @@
                      :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
                      :total="total" />
     </div>
+    <el-dialog title="审核意见" width="20%" :visible.sync="dialogVisible"  >
+      <el-form  ref="examineForm"
+                :model="approveForm"
+                :rules="approveFormRules"
+                size="medium"
+                class="label-input-form prc-content-border approveForm">
+        <el-form-item  label-width="132px" class="add-form-item" prop="approvalOpinion">
+          <template slot="label">审核意见:</template>
+          <el-input  :maxlength='1000'
+                     v-model="approveForm.approvalOpinion"
+                     placeholder="请输入审核意见"
+                     :autosize="{ minRows: 2, maxRows: 4}"
+                     type="textarea"
+          />
+        </el-form-item>
+
+      </el-form>
+      <div class="done">
+        <el-button size="medium" @click="cancel" class="btn">取消</el-button>
+        <el-button size="medium" type="primary" @click="submitForm" class="btn">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -53,6 +86,14 @@ export default {
   mixins:[ProcessMixin],
   data() {
     return {
+      approveForm:{approvalOpinion:''},
+      approveFormRules:{
+        approvalOpinion:[{
+          required:true,
+          message:'请填写审核意见'
+        }]
+      },
+      dialogVisible:false,
       q:{
         current:1,
         size:10
@@ -60,7 +101,8 @@ export default {
       total: 0,
       tableData: [],
       checkList:[],
-      checkIds:[]
+      checkIds:[],
+      flag:1
     };
   },
   props:{
@@ -83,6 +125,33 @@ export default {
       this.loadData()
     },
     methods: {
+      cancel(){
+        this.dialogVisible=false
+      },
+      submitForm(){
+        this.$refs.examineForm.validate(v=>{
+          if(v){
+            this.checkList= this.checkList.map(item=>{
+              item.flag=this.flag
+              item.approvalOpinion = this.approveForm.approvalOpinion
+              return item
+            })
+            this.completeProcess(this.checkList).then(res=>{
+
+            })
+          }
+        })
+      },
+      handleSubmit(row,flag){
+        this.approveForm.approvalOpinion=''
+        if(flag=='no'){
+          this.flag=2
+          this.dialogVisible=true
+        }else{
+          this.flag=1
+        }
+
+      },
       selectAllEvent({checked}) {
         const records = this.$refs.xTable.getCheckboxRecords()
         this.checkList = records
diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue
index 2561a44..8d4ea88 100644
--- a/src/views/userCenter/processCenter/monitorProcesses.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses.vue
@@ -13,13 +13,8 @@
               <div class="blurcolor" @click="view(row)">  {{row.prcNum}}</div>
             </template>
           </vxe-column>
-          <vxe-column show-overflow show-header-overflow
-                      title="流程类型">
-            <template #default="{ row,index }">
-              <div>{{getPrcName(row.prcType)}}</div>
-            </template>
-          </vxe-column>
-          <vxe-column show-overflow show-header-overflow title="流程名称">
+
+          <vxe-column show-overflow show-header-overflow title="报告名称">
             <template #default="{ row }" >
               <div class="blurcolor"  @click="view(row)">{{row.prcName}}</div>
             </template>
@@ -31,8 +26,14 @@
                       title="上一处理人"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="endTime"
-                      title="完成时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="status" title="状态">
+                      title="完成日期"></vxe-column>
+          <vxe-column show-overflow show-header-overflow
+                      title="流程类型">
+            <template #default="{ row,index }">
+              <div>{{getPrcName(row.prcType)}}</div>
+            </template>
+          </vxe-column>
+          <vxe-column show-overflow show-header-overflow field="status" title="流程状态">
             <template #default="{ row }">
               <span v-if="row.isEnd === '0'">未完成</span>
               <span v-if="row.isEnd === '1'">已完成</span>
diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue
index f7011bc..5c9fac8 100644
--- a/src/views/userCenter/processCenter/sentProcess.vue
+++ b/src/views/userCenter/processCenter/sentProcess.vue
@@ -14,14 +14,8 @@
             <div class="blurcolor" @click="view(row)">{{row.prcNum}}</div>
           </template>
         </vxe-column>
-        <vxe-column show-overflow show-header-overflow field="prcType"
-                    title="流程类型">
-          <template #default="{ row,index }">
-            <div >{{getPrcName(row.prcType)}}</div>
-          </template>
-        </vxe-column>
 
-        <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+        <vxe-column show-overflow show-header-overflow field="prcName" title="报告名称">
           <template #default="{ row,index }">
             <div class="blurcolor" @click="view(row)">{{row.prcName}}</div>
           </template>
@@ -33,8 +27,14 @@
                     title="上一处理人"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="endTime"
-                    title="完成时间"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="status" title="状态">
+                    title="完成日期"></vxe-column>
+        <vxe-column show-overflow show-header-overflow field="prcType"
+                    title="流程类型">
+          <template #default="{ row,index }">
+            <div >{{getPrcName(row.prcType)}}</div>
+          </template>
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="status" title="流程状态">
           <template #default="{ row }">
             <span v-if="row.isEnd === '0'">未完成</span>
             <span v-if="row.isEnd === '1'">已完成</span>
diff --git a/src/views/userCenter/processCenter/taskDraft.vue b/src/views/userCenter/processCenter/taskDraft.vue
index 09dd668..b3af6c5 100644
--- a/src/views/userCenter/processCenter/taskDraft.vue
+++ b/src/views/userCenter/processCenter/taskDraft.vue
@@ -19,7 +19,7 @@
             <div>{{getPrcName(row.prcType)}}</div>
           </template>
         </vxe-column>
-        <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+        <vxe-column show-overflow show-header-overflow field="prcName" title="报告名称">
           <template #default="{ row,index }" >
             <div class="blurcolor" @click="handle(row)">{{row.prcName}}</div>
           </template>