From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/work/process/leave/detail.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
index 18a8e30..38de030 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/detail.vue
@@ -6,7 +6,7 @@
           <el-button @click="handleCancel">鍏抽棴</el-button>
         </el-form-item>
       </el-row>
-      <el-card shadow="hover">
+      <el-card v-if="false" shadow="hover">
         <div slot="header">
           <span>瀹℃壒淇℃伅</span>
         </div>
@@ -25,8 +25,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="璇峰亣鐞嗙敱">
-          <el-input :disabled="true" type="textarea" v-model="form.reason" />
+        <el-form-item label="鎻忚堪">
+          <el-input :disabled="true" type="textarea" v-model="form.processDesc" />
         </el-form-item>
       </el-card>
       <el-card shadow="hover">
@@ -91,16 +91,17 @@
             this.flowList = data.data;
           }
         })
-        leaveDetail(this.businessId).then(res => {
+        /*leaveDetail(this.businessId,this.processInstanceId).then(res => {
           const data = res.data;
           if (data.success) {
             this.form = data.data;
           }
-        })
+        })*/
       },
       handleCancel() {
         this.$router.$avueRouter.closeTag();
-        this.$router.push({path: `/work/start`});
+        this.$router.go(-1)
+        //this.$router.push({path: `/work/start`});
       }
     }
   }

--
Gitblit v1.9.3