Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
commit
29ace46c69
|
|
@ -88,16 +88,49 @@
|
|||
<!--审批详情-->
|
||||
<div>
|
||||
<div class="title">审批详情</div>
|
||||
<div v-for="item in this.dataSource.data" :key="item">
|
||||
<a-table :dataSource="item[1]" :columns="columns">
|
||||
<!-- <div v-for="item in this.dataSource.data" :key="item"> -->
|
||||
<!-- <a-table :dataSource="item[1]" :columns="columns">
|
||||
<template #bodyCell="{ column, text }">
|
||||
<template v-if="column.dataIndex === 'name'">
|
||||
<a>{{ text }}</a>
|
||||
</template>
|
||||
</template>
|
||||
</a-table>
|
||||
</a-table> -->
|
||||
<el-table
|
||||
:data="dataSource.data[0][1]"
|
||||
style="width: 100%">
|
||||
<el-table-column
|
||||
prop="activityName"
|
||||
label="任务名称"
|
||||
width="180">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assigneeName"
|
||||
label="处理人"
|
||||
width="120">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="startTime"
|
||||
label="任务开始时间"
|
||||
width="180">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="任务结束时间"
|
||||
width="180">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="审核意见" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="duration"
|
||||
label="任务时长"
|
||||
width="100">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
<!-- <div else>
|
||||
gai
|
||||
</div> -->
|
||||
|
|
@ -228,6 +261,7 @@ export default {
|
|||
}
|
||||
}
|
||||
}
|
||||
console.log("this.dataSource.data[0]========",this.dataSource.data[0][1])
|
||||
},
|
||||
// init () {
|
||||
// this.visible = true
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!--审核状态-->
|
||||
<el-form-item>
|
||||
<el-form-item >
|
||||
<span>审核状态：</span>
|
||||
<el-select
|
||||
v-model="examineStatus"
|
||||
|
|
@ -46,8 +46,9 @@
|
|||
clearable
|
||||
>
|
||||
<el-option label="全部" value="-1"></el-option>
|
||||
<el-option label="审核完成" value="1"></el-option>
|
||||
<el-option label="审核中" value="0"></el-option>
|
||||
<el-option label="审核中" value="0"></el-option>
|
||||
<el-option label="通过" value="1"></el-option>
|
||||
<el-option label="不通过" value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -371,8 +372,9 @@ export default {
|
|||
{ name: '组件服务', key: 1 },
|
||||
{ name: '应用资源', key: 2 },
|
||||
{ name: '基础设施', key: 3 },
|
||||
{ name: '数据资源', key: 3 },
|
||||
{ name: '知识库', key: 3 }
|
||||
{ name: '数据资源', key: 4 },
|
||||
{ name: '知识库', key: 5 },
|
||||
{ name: '会议室', value: 6}
|
||||
],
|
||||
tableData: [],
|
||||
tableData2: [
|
||||
|
|
@ -396,7 +398,8 @@ export default {
|
|||
{ name: '图层服务', value: 2 },
|
||||
{ name: '通用开发组件', value: 3 },
|
||||
{ name: '页面开发组件', value: 4 },
|
||||
{ name: '应用资源', value: 5 }
|
||||
{ name: '应用资源', value: 5 },
|
||||
{ name: '会议室', value: 6}
|
||||
], // 类型备选列表
|
||||
detailFlag: false, // 明细返回按钮显示标志位
|
||||
startDate: '', // 开始时间
|
||||
|
|
@ -478,7 +481,9 @@ export default {
|
|||
} else if (this.examineStatus == '0') {
|
||||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '审核完成'
|
||||
this.status = '通过'
|
||||
}else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
}
|
||||
|
|
@ -534,7 +539,9 @@ export default {
|
|||
} else if (this.examineStatus == '0') {
|
||||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '审核完成'
|
||||
this.status = '通过'
|
||||
} else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
}
|
||||
|
|
@ -627,13 +634,15 @@ export default {
|
|||
},
|
||||
// 能力上架明细
|
||||
getOneDetail (page) {
|
||||
var passAndReview = '' // 转变"审核完成"字段为通过
|
||||
var passAndReview = '' // 转变"通过"字段为通过
|
||||
if (this.examineStatus == '-1') {
|
||||
this.status = ''
|
||||
} else if (this.examineStatus == '0') {
|
||||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '通过'
|
||||
} else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
}
|
||||
|
|
@ -657,13 +666,15 @@ export default {
|
|||
},
|
||||
// 能力使用明细
|
||||
getTwoDetail (page) {
|
||||
var passAndReview = '' // 转变"审核完成"字段为通过
|
||||
var passAndReview = '' // 转变"通过"字段为通过
|
||||
if (this.examineStatus == '-1') {
|
||||
this.status = ''
|
||||
} else if (this.examineStatus == '0') {
|
||||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '通过'
|
||||
} else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue