Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
<el-form :modal="form" inline class="label-input-form">
|
||||
<el-form-item label="计划状态" class="search-item">
|
||||
<el-select v-model="form.planStatus" placeholder="请选择计划状态">
|
||||
<el-option label="请选择" value=""></el-option>
|
||||
<el-option label="未开始" value="0"></el-option>
|
||||
<el-option label="制定中" value="1"></el-option>
|
||||
<el-option label="修订中" value="2"></el-option>
|
||||
@@ -14,6 +15,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="制修订状态" class="search-item">
|
||||
<el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
|
||||
<el-option label="请选择" value=""></el-option>
|
||||
<el-option label="制定" value="1"></el-option>
|
||||
<el-option label="修订" value="2"></el-option>
|
||||
</el-select>
|
||||
@@ -118,7 +120,7 @@
|
||||
align="center"
|
||||
label="制修订状态">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
|
||||
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
||||
Reference in New Issue
Block a user