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

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -11,6 +11,8 @@
                             <el-option label="修订中" value="2"></el-option>
                             <el-option label="已取消" value="3"></el-option>
                             <el-option label="已完成" value="4"></el-option>
+                            <el-option label="立项已完成" value="5"></el-option>
+                            <el-option label="计划已确认" value="6"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="制修订状态" class="search-item">
@@ -240,7 +242,7 @@
                                         </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' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
-                                                <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>
@@ -911,6 +913,8 @@
                 map.set('2','修订中')
                 map.set('3','已取消')
                 map.set('4','已完成')
+                map.set('5','立项已完成')
+                map.set('6','计划已确认')
                 return map.get(item)
             },
             TXJGcloseDrawer () {