Merge remote-tracking branch 'origin/master'

src/views/userCenter/processCenter.vue

@@ -60,6 +60,10 @@ import tabs from '../userCenter/processCenter/tabs.vue'
 
 <style lang="scss" scoped>
 .content{
+    min-height: calc(100vh - 60px - 20px);
+    box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
+    border-radius: 6px;
+    background: #FFFFFF;
     .title {
         border-bottom: 1px solid #EBEEF5;
         height: 42px;
@@ -85,7 +89,7 @@ import tabs from '../userCenter/processCenter/tabs.vue'
        
     }
     .tabs{
-        margin: 20px 0 0 5px;
+        margin: 20px 0 0 13px;
     }
     
 }

src/views/userCenter/processCenter/sentProcess.vue

@@ -27,7 +27,7 @@
                         查看
                     </el-button>
 
-                    <el-button @click.native.prevent="back(scope.$index, tableData)" type="text" size="small"
+                    <el-button :disabled="tableData[scope.$index].status=='已完成'" @click.native.prevent="back(scope.$index, tableData)" type="text" size="small"
                         >
                         <span style="color: rgb(236, 128, 141)">强制撤回</span>
                     </el-button>
@@ -48,6 +48,7 @@ export default {
                     processName: "王小虎",
                     processPerson: "上海市普陀区金沙江路 1518 弄",
                     createTime: "2023-1-1",
+                    status:'已完成'
                 },
                 {
                     processId: "2016-05-2",
@@ -85,8 +86,9 @@ export default {
         view() {
             alert(111);
         },
-        back() {
+        back(index,tableData) {
-            alert(222);
+            console.log('index',index);
+            console.log('tableData',tableData);
         },
     },
 };