From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Thu, 13 Oct 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index 547ecef..57d399e 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -44,12 +44,12 @@
<el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
</template>
</el-table-column>
- <el-table-column fixed="right" label="操作" align="center" width="250">
+ <el-table-column fixed="right" label="操作" align="center" width="300">
<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="warning" size="small" :icon="Delete" @click="deleteRecordBtn(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>
@@ -88,13 +88,13 @@
<div class="stepCard">
<el-card class="box-card" shadow="always">
<div class="text">
- 审批结果：<span>{{ item.approvalResultDesc }}</span>
+ 审批结果：<span class="bold-text">{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批类型：<span>{{ item.typeDesc }}</span>
+ 审批类型：<span class="bold-text">{{ item.typeDesc }}</span>
</div>
<div class="text" v-if="item.auditTypeDesc">
- 审批类型：<span>{{ item.auditTypeDesc }}</span>
+ 审批类型：<span class="bold-text">{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -133,7 +133,7 @@
</div>
</div>
</div>
- <div class="text" v-show="item.expFinishApprovalTime != null">
+ <div class="text" v-show="item.expFinishApprovalTime && item.expFinishApprovalTime != null">
期望结束时间：<span>{{ item.expFinishApprovalTime }}</span>
</div>
<div class="text" v-show="item.finishApprovalTime != null">
@@ -321,7 +321,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
@@ -353,12 +353,13 @@
}
};
- // 分页获取工作时间组列表
+ // 分页获取
const getListByPage = async () => {
const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
let res = await workApplyApi().getApplyListPage(data);
if (res.data.code === '200') {
state.applyData = JSON.parse(JSON.stringify(res.data.data));
+ console.log(state.applyData,'applyData')
state.applyData = state.applyData.map((item) => {
if (item.operators == null || item.operators == []) {
item.operators = [];
@@ -694,10 +695,13 @@
padding-left: 10px;
span {
- font-weight: bolder;
color: #409eff;
}
+ .bold-text{
+ font-weight: bolder;
+ }
+
&:last-of-type {
margin-bottom: 0;
}
--
Gitblit v1.9.2