Merge branch 'FJC' into 'dev'

fix: 场景管理添加公司时校验是否已选择省市

See merge request skyeye/skyeye_frontend/skyeye-admin!126

src/views/system-config/scene-manage/CompanyDrawer.vue

@@ -74,7 +74,7 @@
             ></div>
           </div>
         </el-form-item>
-        <el-form-item label="所在省市" prop="regionCode">
+        <el-form-item label="所在省市" prop="regionCode" required>
           <el-select v-model="ruleForm.regionCode" placeholder="请选择省市" style="width: 200px">
             <el-option
               v-for="item in provinceList"
@@ -213,6 +213,8 @@
       { required: true, message: '公司代码不能为空', trigger: 'blur' },
       { min: 1, max: 100, message: '长度在1-100之间', trigger: 'blur' },
     ],
+
+    regionCode: [{ required: true, message: '省市不能为空', trigger: 'blur' }],
   });
 
   const { data: provinceList } = useRequest(getProvinceList);