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

src/views/basic/business/stockOrder.vue

@@ -42,8 +42,8 @@
                 <el-option label="草稿" :value=1>草稿</el-option>
                 <el-option label="待校验" :value=3>待校验</el-option>
                 <el-option label="待核对" :value=5>待核对</el-option>
-                <el-option label="待审核" :value=10>待审核</el-option>
+                <!--<el-option label="待审核" :value=10>待审核</el-option>-->
-                <el-option label="已审核" :value=7>已审核</el-option>
+                <!--<el-option label="已审核" :value=7>已审核</el-option>-->
               </el-select>
             </el-form-item>
           </el-col>