机构扩展需求变更

src/views/system/dept/extend.vue

@@ -21,7 +21,7 @@
       </el-descriptions>
     </div>
 
-    <h3 v-if="type == 4" class="title" style="margin-top: 50px">
+    <h3 class="title" style="margin-top: 50px">
       <i class="el-icon-collection-tag"></i>
       安全防范设施建设达标信息
     </h3>
@@ -49,13 +49,11 @@
           align="center"
           v-if="false"
         />
-        <el-table-column type="index" label="序号" align="center" prop="id" />
+        <el-table-column type="index" label="序号" align="center" />
         <el-table-column label="机构类型" align="center" prop="type">
-          <template slot-scope="r"
-            >{{ getLabels(`${r.row.type}`) }}
-          </template>
+          <template slot-scope="r">{{ getLabels(`${r.row.type}`) }} </template>
         </el-table-column>
-        <el-table-column label="标准" align="center" prop="standard">
+        <el-table-column label="GA38标准" align="center" prop="standard">
           <template slot-scope="r"
             >{{ getLabel(dict.type.org_extend_standard, `${r.row.standard}`) }}
           </template>
@@ -111,10 +109,10 @@
         </el-table-column>
       </el-table>
     </div>
-    <h3 v-if="type == 4" class="title" style="margin-top: 50px">
+    <h3 class="title" style="margin-top: 50px">
       <i class="el-icon-collection-tag"></i> 补充信息
     </h3>
-    <div class="info-box">
+    <div class="info-box" v-if="type != 5">
       <el-form
         inline
         class="demo-form-inline"
@@ -122,7 +120,7 @@
         label-width="120px"
       >
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item
               v-if="type == 10"
               label="建设时间"
@@ -138,10 +136,10 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item
               v-if="type == 10"
-              label="最近一次更新"
+              label="最近一次改造时间"
               prop="lastUpdateTime"
             >
               <el-date-picker
@@ -149,17 +147,17 @@
                 v-model="lastUpdateTime"
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择最近一次更新"
+                placeholder="请选择最近一次改造时间"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item v-if="type == 10" label="平台品牌">
+          <el-col :span="6">
+            <el-form-item v-if="type == 10" label="系统平台品牌">
               <el-select
                 clearable
                 v-model="platformBrand"
-                placeholder="请选择平台品牌"
+                placeholder="请选择系统平台品牌"
               >
                 <el-option
                   v-for="dict in dict.type.org_platform_brand"
@@ -171,7 +169,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6" v-if="false">
             <el-form-item v-if="type == 10" label="平台供应商品牌">
               <el-select
                 clearable
@@ -190,7 +188,7 @@
         </el-row>
       </el-form>
     </div>
-    <div v-if="type == 4" class="info-box">
+    <div class="info-box" v-if="type != 5">
       <!--  下拉框选择    -->
       <div>
         <el-form
@@ -212,7 +210,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="产权模式">
+              <el-form-item label="产权模式" v-if="type == 4">
                 <el-select
                   clearable
                   v-model="ownership"
@@ -228,11 +226,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="地理位置">
+              <el-form-item label="所在位置" v-if="type == 4">
                 <el-select
                   clearable
                   v-model="outsideArea"
-                  placeholder="请选择是否区域外"
+                  placeholder="请选择所在位置"
                 >
                   <el-option
                     v-for="dict in dict.type.org_extend_is"
@@ -243,47 +241,90 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-        </el-form>
-      </div>
+            <el-col :span="6" v-if="type == 4">
+              <el-form-item label="夜间值守方式">
+                <!-- <el-radio-group v-model="dutyMode">
+                  <el-radio :label="0">同楼异地值守</el-radio>
+                  <el-radio :label="1">远程值守</el-radio>
+                </el-radio-group> -->
 
-      <!--   上传   -->
-      <div style="margin-top: 30px">
-        <el-switch
-          v-model="askari"
-          active-text
-          inactive-text="是否配备保安"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
-        <div></div>
-        <el-row v-if="askari">
-          <el-col :span="12" :xs="24">
-            <p style="font-size: 12px; color: #999">上传保安证</p>
-            <image-upload
-              :limit="5"
-              :value="askariCertificate"
-              :fileSize="2"
-              @input="getImgUrl"
-            ></image-upload>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <el-switch
-      v-if="type == 4"
-      style="margin-top: 30px; margin-left: 30px"
-      v-model="businessLibrary"
-      active-text
-      inactive-text="是否设立业务库"
-      :active-value="1"
-      :inactive-value="0"
-    ></el-switch>
-    <div v-if="(type == 4) & (businessLibrary > 0)" style="margin-top: 30px">
-      <div class="info-box">
-        <el-form inline label-position="left" label-width="100px">
+                <el-select
+                  clearable
+                  v-model="dutyMode"
+                  placeholder="请选择夜间值守方式"
+                >
+                  <el-option
+                    v-for="dict in dutyModeoptions"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="6">
+              <el-form-item label="">
+                <el-switch
+                  v-if="type == 4"
+                  v-model="safeBox"
+                  active-text
+                  inactive-text="是否设立保管箱库"
+                  :active-value="1"
+                  :inactive-value="0"
+                ></el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="">
+                <el-switch
+                  v-if="type == 4"
+                  v-model="selfServiceBank"
+                  active-text
+                  inactive-text="是否设立在行式自助银行"
+                  :active-value="1"
+                  :inactive-value="0"
+                ></el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="大堂式设备" v-if="type == 4">
+                <el-input-number
+                  v-model="lobbyEquipment"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="9999"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="穿墙式设备" v-if="type == 4">
+                <el-input-number
+                  v-model="wallPenetratingEquipment"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="9999"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="" v-if="type == 4">
+                <el-switch
+                  v-if="type == 4"
+                  v-model="businessLibrary"
+                  active-text
+                  inactive-text="是否设立业务库"
+                  :active-value="1"
+                  :inactive-value="0"
+                ></el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" v-if="type == 4">
               <el-form-item label="业务库类型">
                 <el-select
                   clearable
@@ -299,102 +340,178 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="值守方式">
-                <el-radio-group v-model="dutyMode">
-                  <el-radio :label="0">同楼异地值守</el-radio>
-                  <el-radio :label="1">远程值守</el-radio>
+            <el-col :span="6" v-if="type == 4 || type == 10">
+              <el-form-item label="出入口远程控制与授权" label-width="150">
+                <!-- <el-switch
+                  v-model="remoteControl"
+                  active-text
+                  inactive-text
+                  :active-value="1"
+                  :inactive-value="0"
+                ></el-switch> -->
+
+                <el-radio-group v-model="remoteControl">
+                  <el-radio :label="0">是</el-radio>
+                  <el-radio :label="1">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="6" v-if="type == 4 || type == 10">
+              <el-form-item
+                label="业务库防控隔离门出入口数量"
+                label-width="150"
+              >
+                <el-select
+                  clearable
+                  v-model="remoteCount"
+                  placeholder="请选择数量"
+                >
+                  <el-option
+                    v-for="option in remoteCountoptions"
+                    :key="option.value"
+                    :label="option.label"
+                    :value="option.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" v-if="type == 10">
+              <el-form-item label="离行式加钞间出入口数量" label-width="150">
+                <el-select
+                  clearable
+                  v-model="cashAddingRoom"
+                  placeholder="请选择数量"
+                >
+                  <el-option
+                    v-for="option in cashAddingRoomoptions"
+                    :key="option.value"
+                    :label="option.label"
+                    :value="option.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+
+    <div style="margin-top: 30px" v-if="type != 5">
+      <div class="info-box">
+        <el-form inline label-position="left" label-width="100px">
+          <el-row v-if="type == 4">
             <el-col :span="6">
-              <el-form-item label="业务库出入口远程控制" label-width="150">
+              <el-form-item>
                 <el-switch
-                  v-model="remoteControl"
+                  v-model="askari"
                   active-text
-                  inactive-text
+                  inactive-text="是否配备保安"
                   :active-value="1"
                   :inactive-value="0"
                 ></el-switch>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="内部保安人数">
+                <el-input-number
+                  v-model="innerCount"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="9999"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外聘保安人数">
+                <el-input-number
+                  v-model="outsideCount"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :max="9999"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="askari & (type == 4)">
+            <el-col :span="12" :xs="24">
+              <p style="font-size: 12px; color: #999">上传保安证</p>
+              <image-upload
+                :limit="5"
+                :value="askariCertificate"
+                :fileSize="2"
+                @input="getImgUrl"
+              ></image-upload>
+            </el-col>
           </el-row>
         </el-form>
       </div>
     </div>
-    <el-row>
-      <el-form style="margin-left: 30px">
-        <el-col :span="6">
-          <el-form-item label="">
-            <el-switch
-              v-if="type == 4"
-              v-model="selfServiceBank"
-              active-text
-              inactive-text="是否设立在行自助银行"
-              :active-value="1"
-              :inactive-value="0"
-            ></el-switch>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="大堂设备"
-            v-if="(type == 4)"
-          >
-            <el-input-number
-              v-model="lobbyEquipment"
-              controls-position="right"
-              @change="handleChange"
-              :min="0"
-              :max="9999"
-            ></el-input-number>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item
-            label="穿墙设备"
-            v-if="(type == 4)"
-          >
-            <el-input-number
-              v-model="wallPenetratingEquipment"
-              controls-position="right"
-              @change="handleChange"
-              :min="0"
-              :max="9999"
-            ></el-input-number>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
 
-    <div v-if="type == 5">
-      <h3 class="title">
-        <i class="el-icon-collection-tag"></i>离行自助银行信息
-      </h3>
-      <div class="info-box">
-        <span>大堂设备</span>
-        <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="detachedLobbyEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="0"
-            :max="9999"
-          ></el-input-number>
-        </div>
-        <span style="margin-left: 50px">穿墙设备</span>
-        <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="detachedWallPenetratingEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="0"
-            :max="9999"
-          ></el-input-number>
-        </div>
-      </div>
+    <!--   上传   -->
+
+    <div v-if="type == 5" style="margin-top: 50px">
+      <el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="大堂式设备" label-width="150">
+              <el-input-number
+                style="margin-left: 10px"
+                v-model="detachedLobbyEquipment"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="9999"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="穿墙式设备" label-width="150">
+              <el-input-number
+                style="margin-left: 10px"
+                v-model="detachedWallPenetratingEquipment"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="9999"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="加钞间出入口数量" label-width="150">
+              <el-select
+                clearable
+                v-model="cashAddingRoom"
+                placeholder="请选择数量"
+              >
+                <el-option
+                  v-for="option in cashAddingRoomoptions"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出入口远程控制与授权" label-width="150">
+              <!-- <el-switch
+                  v-model="remoteControl"
+                  active-text
+                  inactive-text
+                  :active-value="1"
+                  :inactive-value="0"
+                ></el-switch> -->
+
+              <el-radio-group v-model="remoteControl">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
     <div style="margin-top: 50px; margin-left: 42%">
       <el-button type="primary" @click="saveExtend" size="small"
@@ -410,7 +527,12 @@
       width="500px"
       append-to-body
     >
-      <el-form ref="orgform" :model="orgform" label-width="100px" :rules="rules">
+      <el-form
+        ref="orgform"
+        :model="orgform"
+        label-width="100px"
+        :rules="rules"
+      >
         <el-form-item label="机构类型" prop="type">
           <!-- <el-input v-model="orgform.standard" placeholder="请输入标准" /> -->
           <el-select
@@ -581,7 +703,22 @@ export default {
         //   { validator: this.isreq, message: "请选择图片", trigger: "blur" },
         // ],
       },
-
+      remoteCountoptions: [
+        { label: "0", value: 0 },
+        { label: "1", value: 1 },
+        { label: "2", value: 2 },
+        { label: "3", value: 3 },
+      ],
+      cashAddingRoomoptions: [
+        { label: "0", value: 0 },
+        { label: "1", value: 1 },
+        { label: "2", value: 2 },
+        { label: "3", value: 3 },
+      ],
+      dutyModeoptions: [
+        { label: "同楼异地值守", value: 0 },
+        { label: "远程值守", value: 1 },
+      ],
       //基础信息key
       infoKeys: [
         { label: "机构名称", key: "name" },
@@ -593,9 +730,12 @@ export default {
         // { label: "是否可用", key: "isLock" },
         { label: "更新时间", key: "updateTime" },
         { label: "同步时间", key: "createTime" },
-
       ],
-
+      innerCount: 0,
+      outsideCount: 0,
+      safeBox: 0,
+      remoteCount: 0,
+      cashAddingRoom: 0,
       type: null,
       isLock: null,
       dataInfo: [],
@@ -676,10 +816,10 @@ export default {
       uplp: uplpng,
       //下拉框生成信息
       orgTypes: [
-         { label: "营业网点", value: 0 },
-         { label: "网点业务库", value: 1 },
-         { label: "在行式自助银行", value: 2 },
-         ],
+        { label: "营业网点", value: 0 },
+        { label: "网点业务库", value: 1 },
+        { label: "在行式自助银行", value: 2 },
+      ],
       businessLibraryTypes: {
         businessLibraryTyp1: { label: "1类业务库", value: 1 },
         businessLibraryTyp2: { label: "2类业务库", value: 2 },
@@ -759,12 +899,12 @@ export default {
   },
   computed: {
     getLabels() {
-    return function(value) {
-      const option = this.orgTypes.filter(item => item.value == value);
-      // console.log(option[0].label,"option")
-      return option ? option[0].label : '';
-    }
-  },
+      return function (value) {
+        const option = this.orgTypes.filter((item) => item.value == value);
+        // console.log(option[0].label,"option")
+        return option ? option[0].label : "";
+      };
+    },
     switchModel: {
       get() {
         return this.switchValue === 1; // 将0转换为false，1转换为true
@@ -888,6 +1028,11 @@ export default {
       getExtendByOrgId(this.$route.params.id).then((data) => {
         console.log(data.data);
         if (data.data != null) {
+          this.safeBox = data.data.safeBox;
+          this.innerCount = data.data.innerCount;
+          this.outsideCount = data.data.outsideCount;
+          this.cashAddingRoom = data.data.cashAddingRoom;
+          this.remoteCount = data.data.remoteCount;
           this.orgType = data.data.orgType;
           this.weatherAreaCode = data.data.weatherAreaCode;
           this.premisesArea = data.data.premisesArea;
@@ -1390,7 +1535,12 @@ export default {
     },
     saveExtend() {
       let dat = {
+        safeBox: this.safeBox,
+        innerCount: this.innerCount,
+        outsideCount: this.outsideCount,
+        cashAddingRoom: this.cashAddingRoom,
         orgType: this.orgType,
+        remoteCount: this.remoteCount,
         weatherAreaCode: this.weatherAreaCode,
         askariCertificate:
           this.imgs.length > 0

src/views/system/dept/index.vue

@@ -14,7 +14,7 @@
           />
         </div> -->
 
-          <!-- <div style="margin-bottom: 10px">
+    <!-- <div style="margin-bottom: 10px">
             <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox"
               >关联下级</el-checkbox
             >
@@ -53,13 +53,14 @@
             :inline="true"
             v-show="showSearch"
           >
-            <el-form-item label="机构名称" prop="name" >
+            <el-form-item label="机构名称" prop="name">
               <el-input
                 v-model="queryParams.name"
                 placeholder="请输入机构名称"
                 clearable
                 @keyup.enter.native="handleQuery"
-                maxlength="50" @input="inputRestriction"
+                maxlength="50"
+                @input="inputRestriction"
               />
             </el-form-item>
             <el-form-item label="机构编码" prop="code">
@@ -70,122 +71,141 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="状态" prop="isLock">
+            <el-form-item label="机构类型" prop="type">
               <el-select
-                v-model="queryParams.isLock"
-                placeholder="请选择状态"
+                v-model="queryParams.type"
+                placeholder="请选择机构类型"
                 clearable
               >
                 <el-option
-                  v-for="dict in dict.type.sys_normal_disable"
+                  v-for="dict in dict.type.sys_org_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="机构类型" prop="type">
+            <el-form-item label="机构状态" prop="isLock">
               <el-select
-                v-model="queryParams.type"
-                placeholder="请选择机构类型"
+                v-model="queryParams.isLock"
+                placeholder="请选择机构状态"
                 clearable
               >
                 <el-option
-                  v-for="dict in dict.type.sys_org_type"
+                  v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 />
               </el-select>
             </el-form-item>
-            <el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-            </el-form-item>
+           
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                  >
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item>
+                  <el-button
+                    v-if="false"
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="showDialogEdit(0)"
+                    v-hasPermi="['system:dept:add']"
+                  ></el-button>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:dept:add']"
+                    >新增机构</el-button
+                  >
+                </el-form-item>
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
           </el-form>
 
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                v-if="false"
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="showDialogEdit(0)"
-                v-hasPermi="['system:dept:add']"
-              ></el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:dept:add']"
-                >新增</el-button
-              >
-            </el-col>
-            <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
-          </el-row>
+          <el-table
+            border
+            height="650"
+            size="small"
+            v-loading="loading"
+            :data="deptList"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column label="序号" align="center" min-width="50">
+              <template v-slot:default="scope">
+                <span v-text="getPageIndex(scope.$index)"> </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="false"
+              prop="name"
+              label="机构名称"
+              min-width="200"
+            ></el-table-column>
+            <el-table-column
+              prop="shortName"
+              label="机构简称"
+              min-width="50"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              prop="type"
+              width="150"
+              label="机构类型"
+            >
+              <template v-slot="scope">
+                <dict-tag
+                  :options="dict.type.sys_org_type"
+                  :value="scope.row.type"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="code"
+              label="机构编码"
+              min-width="50"
+            ></el-table-column>
 
-        <el-table
-          border
-          height="650"
-          size="small"
-          v-loading="loading"
-          :data="deptList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column label="序号" align="center" min-width="50">
-            <template v-slot:default="scope">
-              <span v-text="getPageIndex(scope.$index)"> </span>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="false"
-            prop="name"
-            label="机构名称"
-            min-width="200"
-          ></el-table-column>
-          <el-table-column
-            prop="shortName"
-            label="机构简称"
-            min-width="50"
-          ></el-table-column>
-          <el-table-column align="center" prop="type" width="150" label="机构类型">
-            <template v-slot="scope">
-              <dict-tag
-                :options="dict.type.sys_org_type"
-                :value="scope.row.type"
-              />
-            </template>
-          </el-table-column>
-           <el-table-column  prop="code" label="机构编码" min-width="50"></el-table-column>
+            <el-table-column prop="isLock" align="center" label="机构状态">
+              <template v-slot="scope">
+                <dict-tag
+                  :options="dict.type.sys_normal_disable"
+                  :value="scope.row.isLock"
+                />
+              </template>
+            </el-table-column>
 
-          <el-table-column prop="isLock" align="center" label="状态">
-            <template v-slot="scope">
-              <dict-tag
-                :options="dict.type.sys_normal_disable"
-                :value="scope.row.isLock"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="sort"
-            label="排序"
-            min-width="60"
-            width="60"
-          ></el-table-column>
-            <el-table-column v-if="false"
+            <el-table-column
+              align="center"
+              prop="sort"
+              label="排序"
+              min-width="60"
+              width="60"
+            ></el-table-column>
+            <el-table-column
+              v-if="false"
               align="center"
               prop="weatherCityCode"
               label="城市天气区域"
@@ -202,13 +222,15 @@
               <span v-text="scope.row.managerPhone"> </span>
             </template>
           </el-table-column> -->
-            <el-table-column  v-if="false"
+            <el-table-column
+              v-if="false"
               align="center"
               prop="manager"
               label="负责人"
               width="150"
             ></el-table-column>
-            <el-table-column v-if="false"
+            <el-table-column
+              v-if="false"
               align="center"
               prop="managerPhone"
               label="负责人电话"
@@ -217,8 +239,8 @@
             <el-table-column
               label="操作"
               align="center"
-            width="300"
-            fixed="right"
+              width="300"
+              fixed="right"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
@@ -226,19 +248,19 @@
                   :to="'/system/dept-extend/extend/' + scope.row.id"
                   class="link-type"
                 > -->
-                  <el-button
-                    v-if="
-                      scope.row.type == 4 ||
-                      scope.row.type == 10 ||
-                      scope.row.type == 5
-                    "
-                    size="mini"
-                    type="text"
-                    icon="el-icon-plus"
-                    v-hasPermi="['system:dept:extend']"
-                    @click="handleReplenish( scope.row.id)"
-                    >补充信息</el-button
-                  >
+                <el-button
+                  v-if="
+                    scope.row.type == 4 ||
+                    scope.row.type == 10 ||
+                    scope.row.type == 5
+                  "
+                  size="mini"
+                  type="text"
+                  icon="el-icon-plus"
+                  v-hasPermi="['system:dept:extend']"
+                  @click="handleReplenish(scope.row.id)"
+                  >补充信息</el-button
+                >
                 <!-- </router-link> -->
                 <el-divider direction="vertical"></el-divider>
                 <el-button
@@ -286,14 +308,14 @@
           <el-col :span="24">
             <el-form-item
               v-if="this.pId != -1 && !form.source"
-              label="上级机构"
+              label="所属机构"
               prop="parentId"
             >
               <treeselect
                 v-model="form.parentId"
                 :options="deptOptions2"
                 :normalizer="tenantIdnormalizer"
-                placeholder="请选择上级机构"
+                placeholder="请选择所属机构"
               />
             </el-form-item>
           </el-col>
@@ -302,7 +324,8 @@
           <el-col :span="24">
             <el-form-item label="机构名称" prop="name">
               <el-input
-              :maxlength="50" @input="editRestriction"
+                :maxlength="50"
+                @input="editRestriction"
                 v-model="form.name"
                 placeholder="请输入机构名称"
                 :disabled="form.source == 1"
@@ -313,7 +336,8 @@
             <el-form-item label="机构简称" prop="shortName">
               <el-input
                 v-model="form.shortName"
-                :maxlength="50" @input="shorteditRestriction"
+                :maxlength="50"
+                @input="shorteditRestriction"
                 placeholder="请输入机构简称"
                 :disabled="form.source == 1"
               />
@@ -339,14 +363,16 @@
                   v-show="
                     addIndex == 2 ||
                     (addIndex == 3 && dict.value == 5) ||
-                    (addIndex == 3 && dict.value == 6)
+                    (addIndex == 3 && dict.value == 10)||
+                    (addIndex == 3 && dict.value == 6)||
+                    (addIndex == 3 && dict.value == 7)
                   "
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="manager">
+            <el-form-item label="负责人" prop="manager" v-if="false">
               <el-input
                 v-model="form.manager"
                 placeholder="请输入负责人"
@@ -355,11 +381,22 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序号" prop="sort">
+              <el-input-number
+                v-model="form.sort"
+                controls-position="right"
+                style="width: 100%"
+                :min="0"
+                :max="999999"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="负责人电话" prop="managerPhone">
+          <el-col :span="12" v-if="false">
+            <el-form-item label="负责人电话" prop="managerPhone" >
               <el-input
                 v-model="form.managerPhone"
                 placeholder="请输入负责人电话"
@@ -368,17 +405,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="排序" prop="sort">
-              <el-input-number
-                v-model="form.sort"
-                controls-position="right"
-                style="width: 100%"
-                :min="0"
-                :max="999999"
-              />
-            </el-form-item>
-          </el-col>
+          
         </el-row>
 
         <el-row>
@@ -408,12 +435,12 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          v-if="title == '编辑'"
+          v-if="title == '编辑机构信息'"
           type="primary"
           @click="changeSubmitForm"
           >确 定</el-button
         >
-        <el-button v-if="title == '新增'" type="primary" @click="addSubmitForm"
+        <el-button v-if="title == '新增机构信息'" type="primary" @click="addSubmitForm"
           >确 定</el-button
         >
         <el-button @click="cancel">取 消</el-button>
@@ -483,7 +510,7 @@ export default {
         parentId: undefined,
         checkSub: true,
         type: null,
-        code:null,
+        code: null,
       },
       // 表单参数
       form: {},
@@ -536,17 +563,23 @@ export default {
     this.getAreaList();
   },
   methods: {
-    inputRestriction(){
+    inputRestriction() {
       // 限制只允许输入汉字、英文和数字
-      this.queryParams.name = this.queryParams.name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+      this.queryParams.name = this.queryParams.name.replace(
+        /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
+        ""
+      );
     },
-    editRestriction(){
+    editRestriction() {
       // 限制只允许输入汉字、英文和数字
-      this.form.name = this.form.name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+      this.form.name = this.form.name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, "");
     },
-    shorteditRestriction(){
+    shorteditRestriction() {
       // 限制只允许输入汉字、英文和数字
-      this.form.shortName = this.form.shortName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+      this.form.shortName = this.form.shortName.replace(
+        /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
+        ""
+      );
     },
     getCode(item) {
       if (item != null && item.length > 0) {
@@ -681,7 +714,7 @@ export default {
         }
         this.form.parentId = this.queryParams.parentId;
         this.open = true;
-        this.title = "新增";
+        this.title = "新增机构信息";
       }
     },
     /** 展开/折叠操作 */
@@ -692,9 +725,9 @@ export default {
         this.refreshTable = true;
       });
     },
-    handleReplenish(id){
-      let link=`/system/dept-extend/extend/${id}`      
-      this.$router.push(link)
+    handleReplenish(id) {
+      let link = `/system/dept-extend/extend/${id}`;
+      this.$router.push(link);
     },
     /** 修改按钮操作 */
     async handleUpdate(row) {
@@ -715,7 +748,7 @@ export default {
             this.deptOptions2 = response.data;
             // this.defaultKeys.push(response.data[0].id);
             this.open = true;
-            this.title = "编辑";
+            this.title = "编辑机构信息";
           }
         );
       }
@@ -725,7 +758,7 @@ export default {
       this.addIndex = 2;
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.queryParams,'queryParams')
+          console.log(this.queryParams, "queryParams");
           updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("处理成功");
             this.open = false;
@@ -786,7 +819,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.status_no_class{
+.status_no_class {
   color: red;
 }
 </style>