From ecdee79675130dec1eee772b7c0efbaf26971d27 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 10 May 2023 17:59:37 +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=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProcessMixin.vue             |  8 ++--
 src/views/permissionApplication/examine.vue | 42 ++++++++---------
 src/views/permissionApplication/launch.vue  | 50 ++++++++-------------
 src/views/userCenter/processCenter.vue      |  6 +--
 4 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue
index 9901d1a..aff50e6 100644
--- a/src/components/ProcessMixin.vue
+++ b/src/components/ProcessMixin.vue
@@ -11,10 +11,10 @@
               userId: this.$store.getters.userInfo.usid,
               userName:this.$store.getters.userInfo.usname,
                 processTypeList: [
-                    {
-                        label: '下载申请',
-                        value: '3'
-                    },
+                  {
+                      label: '下载申请',
+                      value: '3'
+                  },
                   {
                     label: '预览申请',
                     value: '1'
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index a8866d9..8d556b3 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -13,8 +13,8 @@
                      :disabled="formControl">
               <el-row>
                 <el-col :span="9">
-                  <el-form-item label="上传人:" prop="applyReason">
-                    <el-input  v-model="applicationForm.applyReason" placeholder="请输入申请原因"></el-input>
+                  <el-form-item label="上传人:" prop="createUserName">
+                    <el-input  v-model="applicationForm.createUserName" ></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -22,7 +22,7 @@
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="内容摘要:" prop="mainContent">
-                    <el-input  v-model="applicationForm.mainContent" placeholder="请输入内容摘要"></el-input>
+                    <el-input  v-model="applicationForm.mainContent" ></el-input>
 
                   </el-form-item>
                 </el-col>
@@ -30,12 +30,12 @@
               <el-row>
                 <el-col :span="9">
                   <el-form-item label="报告涉密等级:" prop="applyReason">
-                    <el-input  v-model="applicationForm.confidentialLevel" placeholder="请输入报告涉密等级"></el-input>
+                    <el-input  v-model="applicationForm.confidentialLevel" ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="9">
                   <el-form-item label="报告隐私等级:" prop="privacyLevel">
-                    <el-input  v-model="applicationForm.privacyLevel" placeholder="请输入报告隐私等级"></el-input>
+                    <el-input  v-model="applicationForm.privacyLevel" ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -51,15 +51,15 @@
               <el-row>
                 <el-col :span="9">
                   <el-form-item label="申请原因:" prop="applyReason">
-                    <el-input  v-model="applicationForm.applyReason" ></el-input>
+                    <el-input  v-model="applicationForm2.applyReason" ></el-input>
                   </el-form-item>
                 </el-col>
 
               </el-row>
               <el-row>
-                <el-col :span="24">
-                  <el-form-item label="申请权限:" prop="power">
-                    <el-input  v-model="applicationForm.power" placeholder="请输入申请原因"></el-input>
+                <el-col :span="9">
+                  <el-form-item label="申请权限:" prop="powerName">
+                    <el-input  v-model="applicationForm2.powerName" ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -79,16 +79,6 @@
 <!--        v-if="$route.query.type !=='yiban'"-->
 
       </div>
-      <process-footer
-        v-if="!disabled"
-        showCancel
-        :show-transfer="isShowTran"
-        :show-submit="isShowSubmit"
-        :submitLoading="isSubmit"
-        :TransferLoading="tranLoading"
-        @transfer="handleTransfer"
-        @submit="handleSubmit"
-      ></process-footer>
 <!--      <process-choose-tree-->
 <!--        dialog-model-->
 <!--        :visible.sync="visibleTree"-->
@@ -105,6 +95,7 @@
 </template>
 
 <script>
+
 import processHeader from '@/components/ProcessHeader'
 import processFooter from '@/components/ProcessFooter'
 import processChooseTree from '../../components/OrgTable'
@@ -126,6 +117,7 @@ export default {
   },
   data () {
     return {
+      PERMISSION,
       applicationForm2:{
         power:'',
         applyReason:''
@@ -148,7 +140,6 @@ export default {
         pageSize: 10000,
         pageNo: 1
       },
-      PERMISSION,
       submitjson:{},
       prcType:1
     }
@@ -159,7 +150,6 @@ export default {
     this.prcId=this.$store.getters.handleProcess.prcId
     this.prcName=this.$store.getters.handleProcess.prcName
     this.$set(this.processForm,'prcName',this.prcName)
-
     let params={
       prcId: this.prcId,
       prcType: this.prcType
@@ -169,12 +159,18 @@ export default {
     }
     this.getProcessDetail(params).then(res=>{
       this.tableData = JSON.parse(this.processOld.dataJson)
-      this.$set(this.applicationForm2,'power',this.tableData.power)
+      let powerName=''
+       this.PERMISSION.forEach(item=>{
+        if(item.value==  this.tableData.power ){
+          powerName=item.label
+        }
+      })
+      this.$set(this.applicationForm2,'powerName',powerName)
       this.$set(this.applicationForm2,'applyReason',this.tableData.applyReason)
       this.$set(this.applicationForm,'mainContent',this.tableData.mainContent)
       this.$set(this.applicationForm,'privacyLevel',this.tableData.privacyLevel)
       this.$set(this.applicationForm,'confidentialLevel',this.tableData.confidentialLevel)
-      this.$set(this.applicationForm,'applyReason',this.tableData.applyReason)
+      this.$set(this.applicationForm,'createUserName',this.tableData.createUserName)
       this.disabled=false
       this.formControl= true
       if(this.$route.query.type=='yiban'){
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 3453a97..239d9a5 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -158,7 +158,13 @@ export default {
       this.showTableD = true
       this.$set(this.processForm,'prcName',  this.prcName)
       this.getProcessDetail().then((res) => {
+        let dataJson = JSON.parse(this.processOld.dataJson)
+        let submitJson = JSON.parse(this.processOld.submitJson)
 
+        this.tableData[0]=dataJson
+        this.tableData[0].oneApproveName=submitJson.oneApproveName
+        this.tableData[0].twoApproveName=submitJson.twoApproveName
+        this.$set(this,'tableData',this.tableData)
       })
     }
   },
@@ -236,7 +242,6 @@ export default {
           createUser:this.userId,
           createUserName:this.userName,
           userId:this.userId,
-          submitIson:'',
           dataJson:'',
           bpnId: this.$store.getters.handleProcess?.id,
           reportId: item.reportId
@@ -246,6 +251,7 @@ export default {
           oneApproveName:item.oneApproveName,
           twoApprove:item.twoApprove,
           twoApproveName:item.twoApproveName,
+          userId:this.userId,
         }
         delete item['oneApprove']
         delete item['oneApproveName']
@@ -253,7 +259,7 @@ export default {
         delete item['twoApproveName']
         let dataJson=item
         obj.submitJson=JSON.stringify(submitJson)
-        obj.dataJson=JSON.stringify(dataJson)
+        obj.dataJson=JSON.stringify({...dataJson, createUser:this.userId, createUserName:this.userName})
         return obj
       })
        this.params=newParams
@@ -296,7 +302,6 @@ export default {
     },
     // 提交
     handleSubmit() {
-
         // 过了校验  需要把数据都整合 this.tableData  this.applicationForm   this.assignForm
         // 表格数据没有不能提交  需要提示
         if (this.tableData.length == 0) {
@@ -310,34 +315,16 @@ export default {
           if (this.initShow) {
             let flag= this.JuggleSub(this.taskId)
             if(flag){
-              console.log(this.delData,"flagflagflagflag")
-
-              if(this.delData){
-                this.delDatas().then(()=>{
-                  this.organizeData()
-                  let dataJson = JSON.stringify(this.tableData)
-                  let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
-                  this.completeProcess({
-                    dataJson,
-                    submitJson,
-                    taskId: this.taskId,
-                    userId: this.$store.getters.userInfo.usid,
-                    prcType: this.prcType
-                  })
-                })
-              }else{
-                this.organizeData()
-                let dataJson = JSON.stringify(this.tableData)
-                let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
-                this.completeProcess({
-                  dataJson,
-                  submitJson,
-                  taskId: this.taskId,
-                  userId: this.$store.getters.userInfo.usid,
-                  prcType: this.prcType
-                })
-              }
-
+              this.organizeData()
+              let dataJson = JSON.stringify(this.tableData)
+              let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
+              this.completeProcess({
+                dataJson,
+                submitJson,
+                taskId: this.taskId,
+                userId: this.$store.getters.userInfo.usid,
+                prcType: this.prcType
+              })
             }
           } else {
             if(this.JuggleTableAll()){
@@ -379,7 +366,6 @@ export default {
       //把表单都整合到form中
 
       this.$api.process.startProcessALL(this.params).then((res) => {
-        debugger
         let data=res.data.result.split(',')
         this.params=this.params.map((item,index)=>{
           item.taskId=data[index]
diff --git a/src/views/userCenter/processCenter.vue b/src/views/userCenter/processCenter.vue
index c9320a8..ab1f876 100644
--- a/src/views/userCenter/processCenter.vue
+++ b/src/views/userCenter/processCenter.vue
@@ -33,8 +33,8 @@
 
         </div>
       <el-row class="agreeBtn" v-if="isShowbtn">
-        <el-button @click="allAgree('yes')">批量同意</el-button>
-        <el-button @click="allAgree('no')">批量不同意</el-button>
+        <el-button size="small" type="primary" @click="allAgree('yes')">批量同意</el-button>
+        <el-button  size="small" type="primary" @click="allAgree('no')">批量不同意</el-button>
 
       </el-row>
         <div class="tabs">
@@ -167,7 +167,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
         margin: 10px 0 0 13px;
     }
   .agreeBtn{
-    margin: 10px 20px  0;
+    margin: 20px 20px  0;
   }
 
 }