Merge remote-tracking branch 'origin/master'

src/views/system/dept/invWarehouse.vue

@@ -184,14 +184,14 @@
               <!--</el-form-item>-->
             </el-col>
 
-            <!--<el-col :span="12" class="el-col">-->
+            <el-col :span="12" class="el-col">
-            <!--  <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">-->
+              <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
-            <!--    <el-radio-group v-model="subData.spUse">-->
+                <el-radio-group v-model="subData.spUse">
-            <!--      <el-radio :label="true">是</el-radio>-->
+                  <el-radio :label="true">是</el-radio>
-            <!--      <el-radio :label="false">否</el-radio>-->
+                  <el-radio :label="false">否</el-radio>
-            <!--    </el-radio-group>-->
+                </el-radio-group>
-            <!--  </el-form-item>-->
+              </el-form-item>
-            <!--</el-col>-->
+            </el-col>
           </el-row>