Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/region/index.vue

@@ -102,6 +102,9 @@
             <el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
           </el-form-item>
+          <el-form-item label="国家城市代码" prop="labelCode" v-if="form.type == '1' || form.type == '3' ">
+            <el-input v-model="form.labelCode" placeholder="请输入国家代码-城市代码" />
+          </el-form-item>
           <el-form-item label="显示顺序" prop="sort">
             <el-input v-model="form.sort" placeholder="请输入显示顺序" />
           </el-form-item>
@@ -185,6 +188,7 @@ export default {
         titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
         shortName: [{ required: true, message: "简称不能为空", trigger: "blur" }],
         // language: [{ required: true, message: "语言不能为空", trigger: "blur" }],
+        // labelCode: [{ required: true, message: "国家城市代码不能为空", trigger: "blur" }],
         // type: [{ required: true, message: "类型不能为空", trigger: "change" }],
         // parentId: [{ required: true, message: "父区域id不能为空", trigger: "blur" }],
         sort: [{ required: true, message: "显示顺序不能为空", trigger: "blur" }],