调整机构类型

src/views/system/dept/dialog.edit.vue

@@ -70,6 +70,27 @@
             </el-col>
           </el-row>
           <el-row>
+          <el-col :span="12" >
+            <el-form-item label="机构类型" prop="type">
+              <el-select
+              prop="type"
+              label="机构类型"
+              v-model="form.type"
+              placeholder="请选择机构类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="是否可用" prop="isLock">
                 <el-switch

src/views/system/dept/extend.vue

@@ -4,8 +4,9 @@
     <div class="info-box">
       <el-descriptions>
         <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
-        <el-descriptions-item label="机构组织类型">{{ getLabel(dict.type.sys_org_type, type) }}</el-descriptions-item>
+        <el-descriptions-item label="机构组织类型">{{ getLabel(dict.type.reality_org_type,orgType) }}</el-descriptions-item>
         <el-descriptions-item label="是否可用">{{ isLock == 1 ? "否" : "是" }}</el-descriptions-item>
+        <el-descriptions-item label="机构类型">{{ getLabel(dict.type.sys_org_type, type) }}</el-descriptions-item>
       </el-descriptions>
     </div>
 
@@ -14,39 +15,39 @@
       <el-form inline class="demo-form-inline" label-position="left" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="机构类型">
-              <el-select v-model="orgType" placeholder="机构类型">
-                <el-option v-for="dict in dict.type.org_extend_type" :key="dict.value" :label="dict.label"
+            <el-form-item label="机构类型" v-if="false">
+              <el-select v-model="type" placeholder="机构类型">
+                <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 1" label="天气区域编码">
+            <el-form-item v-if="type == 4" label="天气区域编码">
               <el-input v-model="weatherAreaCode" placeholder="天气区域编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 1" label="营业场所面积">
+            <el-form-item v-if="type == 4" label="营业场所面积">
               <el-input v-model="premisesArea" placeholder="营业场所面积"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="建设时间" prop="constructionTime">
+            <el-form-item v-if="type == 10" label="建设时间" prop="constructionTime">
               <el-date-picker clearable v-model="constructionTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择建设时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="最近一次更新" prop="lastUpdateTime">
+            <el-form-item v-if="type == 10" label="最近一次更新" prop="lastUpdateTime">
               <el-date-picker clearable v-model="lastUpdateTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择更新日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="平台品牌">
+            <el-form-item v-if="type == 10" label="平台品牌">
               <el-select v-model="platformBrand" placeholder="平台品牌">
                 <el-option v-for="dict in dict.type.org_platform_brand" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
@@ -54,7 +55,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="平台供应商品牌">
+            <el-form-item v-if="type == 10" label="平台供应商品牌">
               <el-select v-model="platformSupplierBrand" placeholder="平台供应商品牌">
                 <el-option v-for="dict in dict.type.org_platform_supplier_brand" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
@@ -64,7 +65,7 @@
         </el-row>
       </el-form>
     </div>
-    <div v-if="orgType == 1" class="info-box">
+    <div v-if="type == 4" class="info-box">
       <!--  下拉框选择    -->
       <div>
         <el-switch v-model="ownership" active-text inactive-text="是否自有产权" :active-value="1"
@@ -137,7 +138,7 @@
       </div>
     </div>
 
-    <div v-if="orgType == 1">
+    <div v-if="type == 4">
       <h3 class="title">业务库设置</h3>
       <div class="info-box">
         <el-form inline label-position="left" label-width="100px">
@@ -409,7 +410,7 @@ import {
 
 export default {
   dicts: [
-    "sys_org_type", "org_platform_brand", "org_platform_supplier_brand", "org_extend_type", "business_library_type"
+    "sys_org_type", "org_platform_brand", "org_platform_supplier_brand", "org_extend_type", "business_library_type","reality_org_type",
   ],
   props: [],
   components: {},

src/views/system/dept/index.vue

@@ -127,6 +127,29 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12" >
+            <el-form-item label="机构类型" prop="type">
+              <el-select
+              prop="type"
+              label="机构类型"
+              v-model="form.type"
+              placeholder="请选择机构类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+
         <el-row>
           <el-col :span="12" v-if="false">
             <el-form-item label="邮箱" prop="email">