From 91ccfa3ebdc7a68b6f632c3e59757ec03b15ac1f Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Fri, 02 Sep 2022 15:15:01 +0800
Subject: [PATCH] lct
---
src/views/specialWorkManage/workTicket/myJobApply/index.vue | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/myJobApply/index.vue b/src/views/specialWorkManage/workTicket/myJobApply/index.vue
index a736bf3..dbce605 100644
--- a/src/views/specialWorkManage/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkManage/workTicket/myJobApply/index.vue
@@ -24,7 +24,7 @@
<div class="main-card">
<el-row class="cardTop">
<el-col :span="24" class="mainCardBtn">
- <el-button type="primary" size="default" @click="toApply()">申请</el-button>
+<!-- <el-button type="primary" size="default" @click="toApply()">申请</el-button>-->
<!-- <el-button type="danger" :icon="Delete" size="default">删除</el-button>-->
<!-- <el-button type="success" size="default">设置分类</el-button>-->
</el-col>
@@ -56,24 +56,24 @@
</div>
</div>
</div>
- <el-dialog v-model="dialogDetails" title="作业申请详情" center>
+ <el-dialog :visible.sync="dialogDetails" title="作业申请详情" center>
<fire v-if="dialogType == 1" :details = details></fire>
- <space v-else-if="dialogType == 2" :details = details></space>
- <hoist v-else-if="dialogType == 3" :details = details></hoist>
- <ground v-else-if="dialogType == 4" :details = details></ground>
- <broken v-else-if="dialogType == 5" :details = details></broken>
- <height v-else-if="dialogType == 6" :details = details></height>
- <power v-else-if="dialogType == 7" :details = details></power>
- <plate v-else :details = details></plate>
+ <space v-if="dialogType == 2" :details = details></space>
+ <hoist v-if="dialogType == 3" :details = details></hoist>
+ <ground v-if="dialogType == 4" :details = details></ground>
+ <broken v-if="dialogType == 5" :details = details></broken>
+ <height v-if="dialogType == 6" :details = details></height>
+ <power v-if="dialogType == 7" :details = details></power>
+ <plate v-if="dialogType == 8" :details = details></plate>
<template #footer>
- <span class="dialog-footer">
+ <div class="dialog-footer" align="right">
<el-button type="primary" @click="dialogDetails = false"
>确认</el-button
>
- </span>
+ </div>
</template>
</el-dialog>
- <el-dialog v-model="dialogStatus" title="作业申请进度" width="60%">
+ <el-dialog :visible.sync="dialogStatus" title="作业申请进度" width="60%">
<el-form v-if="approveInfo.operators.length > 0" style="margin-bottom: 40px">
<el-form-item label="申请作业人">
<el-input v-model="approveInfo.operators" readonly type="textarea" />
@@ -138,7 +138,7 @@
</div>
</div>
</el-dialog>
- <el-dialog v-model="deleteDialog" title="提示" width="30%" center>
+ <el-dialog :visible.sync="deleteDialog" title="提示" width="30%" center>
<span>您确定要取消该条申请吗？</span>
<template #footer>
<span class="dialog-footer">
@@ -245,6 +245,9 @@
]
}
},
+ created(){
+ this.getListByPage()
+ },
methods:{
async getListByPage() {
const data = { pageSize: this.pageSize1, pageIndex: this.pageIndex1, searchParams: { workType: this.searchWord } };
@@ -335,8 +338,9 @@
let res = await workApplyApi().getStatus(data);
if (res.data.code === '200') {
this.approveInfo = JSON.parse(JSON.stringify(res.data.data));
- this.approveInfo.operators = Array.from(this.approveInfo.operators, ({ operatorUname }) => operatorUname);
- console.log(this.approveInfo, 'steps');
+ this.approveInfo.operators = this.approveInfo.operators.map(item => {
+ return item.operatorUname
+ }).join('、')
} else {
this.$message({
type: 'warning',
@@ -374,24 +378,24 @@
viewRecord(row) {
this.dialogType = row.workType
this.details = JSON.parse(JSON.stringify(row));
+ this.details.operators = this.details.operators.join('、')
if(this.details.workDetail.otherSpecialWork == '' || !this.details.workDetail.otherSpecialWork){
- this.details.workDetail.otherSpecialWork=[]
+ this.details.workDetail.otherSpecialWork = ''
}
else {
- console.log(this.details.workDetail.otherSpecialWork,'split')
const a = this.details.workDetail.otherSpecialWork
this.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
return this.workType.find((i) => i.id === Number(item)).name;
- });
+ }).join('、');
}
if(this.details.workDetail.involvedDepIds == '' || !this.details.workDetail.involvedDepIds){
- this.details.workDetail.involvedDepIds=[]
+ this.details.workDetail.involvedDepIds = ''
}
else {
const a = this.details.workDetail.involvedDepIds
this.details.workDetail.involvedDepIds = a.split(',').map((item) => {
return this.departmentRecursionList.find((i) => i.depId === Number(item)).depName;
- });
+ }).join('、');
}
if(this.details.workDetail.gbPath){
this.details.workDetail.gbPath = this.details.workDetail.gbPath.split(',')
--
Gitblit v1.9.2