【修改】修改报告上传流程

src/views/reportProcess/examine.vue

@@ -12,26 +12,19 @@
                        :process-form="processForm"></report-form>
 
         </div>
+        <div class="process_content" v-if="$route.query.type !=='yiban'">
+          <span class="base_title">审核信息</span>
+          <audit-operation ref="operationRef" :prcId="prcId" :prcType="prcType" :taskId="taskId"
+                          :examine="submitjson" :is-disable="disabled" @handleSubmit="handleSubmit" @handleTransfer="handleTransfer"></audit-operation>
+        </div>
         <div class="process_content">
           <span class="base_title">审批历史</span>
           <process-approval-history :prcNum="prcNum"></process-approval-history>
         </div>
 <!--        v-if="$route.query.type !=='yiban'"-->
-        <div class="process_content" v-if="$route.query.type !=='yiban'">
-          <span class="base_title">审核信息</span>
-          <audit-operation ref="operationRef" :examine="submitjson" :is-disable="disabled"></audit-operation>
-        </div>
+
       </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"-->
@@ -49,8 +42,7 @@
 
 <script>
 import processHeader from '@/components/ProcessHeader'
-import processFooter from '@/components/ProcessFooter'
-import processChooseTree from '../../components/OrgTable'
+import processChooseTree from '@//components/OrgTable'
 import processApprovalHistory from '@/components/ProcessApprovalHistory'
 import auditOperation from './components/AuditOperation'
 import reportTable from './components/reportForm'
@@ -63,11 +55,10 @@ export default {
   components: {
     processHeader,
     reportTable,
-    processFooter,
     processApprovalHistory,
     auditOperation,
-    processChooseTree,
-    reportForm
+    reportForm,
+    processChooseTree
   },
   data () {
     return {
@@ -83,11 +74,8 @@ export default {
         }]
       },
       processForm: { prcName : ''},
+
       visibleTree: false,
-      isSubmit: false,
-      tranLoading: false,
-      isShowTran: true,
-      isShowSubmit: true,
       formControl: true,
       disabled:false,
       assignForm: {},
@@ -102,7 +90,7 @@ export default {
       },
       PERMISSION,
       submitjson:{},
-      prcType:2
+      prcType: 4
     }
   },
   created () {
@@ -142,22 +130,22 @@ export default {
     // 选择转办
     handleDblClick(treeNode) {
       this.JuggleSub(this.taskId).then(res=> {
-          if(res){
-            if( treeNode[0].USID ==  this.$store.getters.userInfo.usid){
-              this.$message.warning("您不能转办给自己")
-            }else{
-              this.$api.process.changeAssignee({
-                taskId: this.taskId,
-                assignee: treeNode[0].USID,
-                userId: this.$store.getters.userInfo.usid,
-                pId: this.prcId
-              }).then(() => {
-                this.$message.success('转办成功')
-                this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
-                this.visibleTree = false
-              })
-            }
+        if(res){
+          if( treeNode[0].USID ==  this.$store.getters.userInfo.usid){
+            this.$message.warning("您不能转办给自己")
+          }else{
+            this.$api.process.changeAssignee({
+              taskId: this.taskId,
+              assignee: treeNode[0].USID,
+              userId: this.$store.getters.userInfo.usid,
+              pId: this.prcId
+            }).then(() => {
+              this.$message.success('转办成功')
+              this.$router.push({path: '/userCenter/processCenter', query: {id: this.$route.query.id}})
+              this.visibleTree = false
+            })
           }
+        }
       })
       // taskId: this.$store.getters.getHandleInfo.taskId, // 任务id
       //   assignee: treeNode[0].userId, // 转办人
@@ -166,25 +154,28 @@ export default {
 
 
     },
-    handleSubmit() {
-      this.JuggleSub(this.taskId).then(res=> {
-        if(res){
-          let submit = JSON.parse(this.processOld.submitJson)
-          let dataJson = this.processOld.dataJson
-          let submitJson = JSON.stringify({...submit, ...this.$refs.operationRef.examineForm})
-          this.completeProcess({
-            dataJson,
-            submitJson,
-            taskId: this.taskId,
-            userId: this.$store.getters.userInfo.usid,
-            prcType: this.prcType
-          })
-        }
-      })
-        // if (this.$refs.operationRef.submit()) {
-          // 通过了校验  需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
+    handleSubmit(type) {
+      if(this.$refs.operationRef.submit()){
+        this.JuggleSub(this.taskId).then(res=> {
+          if(res){
+            let submit = JSON.parse(this.processOld.submitJson)
+            let dataJson = this.processOld.dataJson
+            let submitJson = JSON.stringify({...submit, ...this.$refs.operationRef.examineForm})
+            this.completeProcess({
+              dataJson,
+              submitJson,
+              taskId: this.taskId,
+              userId: this.$store.getters.userInfo.usid,
+              prcType: this.prcType
+            })
+          }
+        })
+      }
 
-        }
+      // if (this.$refs.operationRef.submit()) {
+      // 通过了校验  需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
+
+    },
 
   }
 }