Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-12-29 15:33:29 +08:00
@@ -5,16 +5,17 @@
<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="2"></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-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="制修订状态" class="search-item">
<el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="未制定" value="2"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="企标名称" class="search-item">
@@ -221,16 +222,17 @@
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="2"></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-option label="已取消" value="3"></el-option>
<el-option label="已完成" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="0"></el-option>
<el-option label="制定中" value="1"></el-option>
<el-option label="未制定" value="2"></el-option>
<el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">