From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/workTicket/allApplys/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/allApplys/index.vue b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
index 3923822..7c5661e 100644
--- a/src/views/specialWorkSystem/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
@@ -67,7 +67,7 @@
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
<el-button link type="success" size="small" :icon="Finished" @click="viewStatus(scope.row)">进度</el-button>
- <el-button link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出</el-button>
+ <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>
</template>
</el-table-column>
</el-table>
@@ -342,7 +342,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
--
Gitblit v1.9.2