Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/system/extend.js

@@ -37,6 +37,14 @@ export function addExtend(data) {
 }
 
 // 修改机构扩展
+export function addOrUpdate(data) {
+  return request({
+    url: '/system/extend/addOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+// 修改机构扩展
 export function updateExtend(data) {
   return request({
     url: '/system/extend',

src/views/core/accessPlan/index.vue

@@ -1,103 +1,110 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="机构类型" prop="orgType">
-        <el-select style="width: 100%;" v-model="queryParams.orgType" 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-form-item label="调阅角色" prop="roleId">
-        <el-select v-model="queryParams.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="调阅周期" prop="planCycle">
-        <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="planStatus">
-        <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="计划名称" prop="planName">
-        <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
-      </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-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:plan:add']">新增计划</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:plan:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:plan:remove']">删除</el-button>
+    <el-row :gutter="20">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
+
+        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+          @click="clickTreeNode" hangsheTree></org-tree>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['system:plan:export']">导出</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+      <!--搜索栏-->
+
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+          <el-form-item label="机构类型" prop="orgType">
+            <el-select style="width: 100%;" v-model="queryParams.orgType" 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-form-item label="调阅角色" prop="roleId">
+            <el-select v-model="queryParams.roleId" placeholder="请选择">
+              <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="调阅周期" prop="planCycle">
+            <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态" prop="planStatus">
+            <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
 
-    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="计划所属机构" align="center" prop="orgName" />
-      <el-table-column label="计划名称" align="center" prop="planName" />
+          <el-form-item label="计划名称" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
 
-      <el-table-column label="机构类型" align="center" key="orgType" prop="orgType"  width="80">
+          <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-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:plan:add']">新增计划</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" row-key="id"
+          :tree-props="{ children: 'children' }">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="计划所属机构" align="center" prop="orgName" />
+          <el-table-column label="计划名称" align="center" prop="planName" />
+
+          <el-table-column label="机构类型" align="center" key="orgType" prop="orgType" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
           </el-table-column>
-      <el-table-column label="调阅角色" align="center" prop="roleName" />
+          <el-table-column label="调阅角色" align="center" prop="roleName" />
 
-      <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle"  width="80">
+          <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle" />
             </template>
           </el-table-column>
-      <el-table-column label="调阅频次" align="center" prop="planFrequency" />
+          <el-table-column label="调阅频次" align="center" prop="planFrequency" />
 
-      <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus"  width="80">
+          <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus" />
             </template>
           </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updateBy" />
-      <el-table-column label="修改时间" align="center" prop="updateTime" />
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:plan:edit']">修改</el-button>
-          <el-button size="mini" type="text" v-if="scope.row.planStatus!=0" icon="el-icon-add" @click="handDistribute(scope.row)"
-            v-hasPermi="['system:plan:add']">下发</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+          <el-table-column label="修改人" align="center" prop="updateBy" />
+          <el-table-column label="修改时间" align="center" prop="updateTime" />
+          <el-table-column label="备注" align="center" prop="description" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:plan:edit']">修改</el-button>
+              <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
+                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">下发</el-button>
+              <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
+                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">删除</el-button>
+
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:device:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
+
+    </el-row>
 
     <!-- 添加或修改监控调阅计划对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -107,53 +114,45 @@
         </el-form-item>
 
         <el-form-item label="调阅机构类型" prop="orgType">
-        <el-select style="width: 100%;" v-model="form.orgType" 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-form-item label="调阅周期" prop="planCycle">
-        <el-select style="width: 100%;" v-model="form.planCycle" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
+          <el-select style="width: 100%;" v-model="form.orgType" 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-form-item label="调阅周期" prop="planCycle">
+          <el-select style="width: 100%;" v-model="form.planCycle" placeholder="请选择">
+            <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
+              :value="`${dict.value}`"></el-option>
+          </el-select>
+        </el-form-item>
 
 
 
 
-            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="开始时间" prop="startTime">
-              <el-date-picker
-                clearable
-                v-model="form.startTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
 
 
 
 
-            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="结束时间" prop="endTime">
-              <el-date-picker
-                clearable
-                v-model="form.endTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
 
 
 
-      <el-form-item label="调阅角色" prop="roleId">
-        <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
+        <el-form-item label="调阅角色" prop="roleId">
+          <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
+            <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="调阅频次" prop="planFrequency">
-          <el-input type="number" v-model.number="form.planFrequency"  placeholder="请输入调阅频次" />
+          <el-input type="number" v-model.number="form.planFrequency" placeholder="请输入调阅频次" />
         </el-form-item>
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
@@ -168,18 +167,26 @@
 </template>
 
 <script>
-import { listPlan, getPlan, delPlan, addPlan, updatePlan,distribute } from "@/api/core/accessPlan";
+import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
 import { listRole } from "@/api/system/role";
+import tableList from "@/mixins/tableList";
+import orgTree from "@/components/orgTree";
+import { deptTreeSelect } from "@/api/system/public";
+import KFileUpload from "@/components/K-FileUpload/index.vue";
+
 export default {
   name: "Plan",
-  dicts: ['sys_org_type','sys_access_cycle','sys_normal_disable'],
+  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable'],
+  components:{
+    orgTree
+  },
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
-      names:[],
+      names: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -263,11 +270,32 @@ export default {
       };
       this.resetForm("form");
     },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.handleQuery();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    // 节点单击事件
+    clickTreeNode(data) {
+      //this.initPlanRoleList();
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -276,7 +304,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.names=selection.map(item => item.planName)
+      this.names = selection.map(item => item.planName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -319,7 +347,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const names=row.planName || this.names;
+      const names = row.planName || this.names;
       this.$modal.confirm('是否确认删除监控调阅计划"' + names + '"的数据项？').then(function () {
         return delPlan(ids);
       }).then(() => {
@@ -327,7 +355,7 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
-    handDistribute(row){
+    handDistribute(row) {
       this.$modal.confirm('是否确认下发监控调阅计划"' + row.planName + '"的数据项？').then(function () {
         return distribute(row.id);
       }).then(() => {

src/views/system/area/index.vue

@@ -66,7 +66,7 @@
           v-hasPermi="['system:area:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -75,7 +75,7 @@
           @click="handleExport"
           v-hasPermi="['system:area:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/check/index.vue

@@ -35,10 +35,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:check:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['system:check:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

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

@@ -0,0 +1,499 @@
+<template>
+  <div class="rule-type">
+    <el-dialog
+      :title="id ? '编辑离行式自助银行' : '新增离行式自助银行'"
+      :visible.sync="isShow"
+      width="800px"
+    >
+      <div class="page-body">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                v-if="this.pId != -1"
+                label="上级机构"
+                prop="parentId"
+              >
+                <treeselect
+                  v-model="form.parentId"
+                  :options="deptOptions"
+                  :normalizer="normalizer"
+                  placeholder="选择上级机构"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机构名称">
+                <el-input v-model="form.name" placeholder="请输入机构名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="机构简称" prop="shortName">
+                <el-input
+                  v-model="form.shortName"
+                  placeholder="请输入机构简称"
+                  maxlength="20"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="部门机构电话" prop="managerPhone">
+                <el-input
+                  v-model="form.managerPhone"
+                  placeholder="请输入联系电话"
+                  maxlength="11"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="部门机构地址" prop="address">
+                <el-input
+                  v-model="form.address"
+                  placeholder="请输入地址"
+                  maxlength="50"
+                />
+              </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"
+                  :min="0"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="是否可用" prop="isLock">
+                <el-switch v-model="form.isLock" :active-value="0"
+          :inactive-value="1"> </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="加钞间出入口远程控制"
+                prop="cashAddingRoomRemoteControl"
+              >
+                <el-switch v-model="form.cashAddingRoomRemoteControl" :active-value="1"
+          :inactive-value="0">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="离行式大堂设备"
+                prop="detachedLobbyEquipment"
+              >
+                <el-input-number
+                  v-model="form.detachedLobbyEquipment"
+                  controls-position="right"
+                  :min="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="离行式穿墙设备"
+                prop="detachedWallPenetratingEquipment"
+              >
+                <el-input-number
+                  v-model="form.detachedWallPenetratingEquipment"
+                  controls-position="right"
+                  :min="0"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-button @click="handleOrgAdd">新增物防建设</el-button>
+
+        <el-table
+          border
+          size="small"
+          v-loading="orgloading"
+          :data="constructionList"
+          @selection-change="handleOrgSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column label="标准" align="center" prop="standard" />
+          <el-table-column
+            label="达标日期"
+            align="center"
+            prop="dateOfCompliance"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            v-if="false"
+            label="机构id"
+            align="center"
+            prop="orgId"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleOrgUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']"
+                >查看证书</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleOrgUpdate(scope.row)"
+                v-hasPermi="['system:construction:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleOrgDelete(scope.row)"
+                v-hasPermi="['system:construction:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onHide">取消</el-button>
+        <el-button type="primary" @click="onSubmit">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="orgtitle"
+      :visible.sync="orgopen"
+      width="500px"
+      append-to-body
+    >
+      <el-form ref="orgform" :model="orgform" label-width="80px">
+        <el-form-item label="标准" prop="standard">
+          <el-input v-model="orgform.standard" placeholder="请输入标准" />
+        </el-form-item>
+        <el-form-item label="达标日期" prop="dateOfCompliance">
+          <el-date-picker
+            clearable
+            v-model="orgform.dateOfCompliance"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择达标日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="证书佐证" prop="certificateEvidence">
+          <el-switch
+            v-model="orgform.certificateEvidence"
+            active-text
+            :active-value="1"
+            :inactive-value="0"
+          ></el-switch>
+        </el-form-item>
+        <el-form-item
+          v-if="orgform.certificateEvidence"
+          label="证书"
+          prop="certificate"
+        >
+          <el-input
+            v-if="false"
+            v-model="orgform.certificate"
+            placeholder="请输入证书"
+          />
+          <div class="image-container" style="margin-left: 20px">
+            <p style="font-size: 12px; color: #999">上传证书</p>
+            <image-upload :limit="1" :fileSize="2"></image-upload>
+          </div>
+        </el-form-item>
+        <el-form-item v-if="false" label="佐证" prop="evidence">
+          <el-input v-model="orgform.evidence" placeholder="请输入佐证" />
+        </el-form-item>
+        <el-form-item v-if="false" label="机构id" prop="orgId">
+          <el-input v-model="orgform.orgId" placeholder="请输入机构id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitOrgForm">确 定</el-button>
+        <el-button @click="orgcancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  listOrgPhysicalDefenseConstruction,
+  getOrgPhysicalDefenseConstruction,
+  addOrgPhysicalDefenseConstruction,
+  updateOrgPhysicalDefenseConstruction,
+  delOrgPhysicalDefenseConstruction,
+} from "@/api/system/OrgPhysicalDefenseConstruction";
+import { deptTreeSelect } from "@/api/system/public";
+import {
+  listExtend,
+  getExtend,
+  addExtend,
+  updateExtend,
+  delExtend,
+  getExtendByOrgId,
+  uploadFile,
+  addOrUpdate,
+} from "@/api/system/extend";
+export default {
+  dicts: ["sys_normal_disable", "sys_org_type"],
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: "",
+        status: undefined,
+        parentId: undefined,
+      },
+      // 机构树选项
+      deptOptions: [],
+      id: "",
+      pId: 0,
+      orgid: "",
+      // 表单参数
+      orgform: {},
+      //默认选中节点
+      defaultKeys: [],
+      rules: {
+        parentId: [
+          { required: true, message: "上级机构不能为空", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "机构名称不能为空", trigger: "blur" },
+        ],
+        orderNum: [
+          { required: true, message: "显示排序不能为空", trigger: "blur" },
+        ],
+        isLock: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur",
+          },
+        ],
+      },
+      orgopen: false,
+      orgtitle: "",
+      form: {},
+      constructionList: [],
+      tableData: [],
+      id: null,
+      isShow: false,
+      orgloading: false,
+    };
+  },
+
+  watch: {},
+  computed: {},
+  created() {
+    this.getDeptTree();
+  },
+  methods: {
+    getOrgPhysicalDefenseConstructionInfo() {
+      this.orgloading = true;
+      let dat = { orgId: this.orgid, type: 4 };
+      listOrgPhysicalDefenseConstruction(dat).then((data) => {
+        console.log("机构信息获取成功");
+        this.constructionList = data.rows;
+        this.orgloading = false;
+      });
+    },
+    // 多选框选中数据
+    handleOrgSelectionChange(selection) {
+      this.orgids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    // 取消按钮
+    orgcancel() {
+      this.orgopen = false;
+      this.orgreset();
+    },
+    /** 提交按钮 */
+    submitOrgForm() {
+      this.orgform.orgId = this.orgid;
+      this.$refs["orgform"].validate((valid) => {
+        if (valid) {
+          this.orgform.type = 4;
+          if (this.orgform.id != null) {
+            updateOrgPhysicalDefenseConstruction(this.orgform).then(
+              (response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.orgopen = false;
+                this.getOrgPhysicalDefenseConstructionInfo();
+              }
+            );
+          } else {
+            addOrgPhysicalDefenseConstruction(this.orgform).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.orgopen = false;
+              this.getOrgPhysicalDefenseConstructionInfo();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleOrgDelete(row) {
+      const orgids = row.id || this.orgids;
+      this.$modal
+        .confirm('是否确认删除机构物防建设编号为"' + orgids + '"的数据项？')
+        .then(function () {
+          return delOrgPhysicalDefenseConstruction(orgids);
+        })
+        .then(() => {
+          this.getOrgPhysicalDefenseConstructionInfo();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 修改按钮操作 */
+    handleOrgUpdate(row) {
+      this.orgreset();
+      const id = row.id || this.orgids;
+      getOrgPhysicalDefenseConstruction(id).then((response) => {
+        // console.log(response)
+        this.orgform = response.data;
+        this.orgopen = true;
+        this.orgtitle = "修改机构物防建设";
+      });
+    },
+    /** 新增按钮操作 */
+    handleOrgAdd() {
+      this.orgreset();
+      this.orgopen = true;
+      this.orgtitle = "添加机构物防建设";
+    },
+    // 表单重置
+    orgreset() {
+      this.orgform = {
+        id: null,
+        standard: null,
+        dateOfCompliance: null,
+        certificateEvidence: null,
+        certificate: null,
+        evidence: null,
+        createTime: null,
+        updateTime: null,
+        createBy: null,
+        updateBy: null,
+        orgId: null,
+      };
+      this.resetForm("orgform");
+    },
+    /** 转换机构数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
+    /** 查询机构下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+        this.defaultKeys.push(response.data[0].id);
+        this.queryParams.parentId = response.data[0].id;
+        // this.handleQuery();
+      });
+    },
+
+    async show(row) {
+      this.form = {};
+      this.id = 0;
+      this.constructionList = [];
+      if (row != 0) {
+        // console.log(row)
+        this.orgid = row.orgid;
+        this.form = row;
+        this.id = row.id;
+        if (row.id != null) {
+          getExtendByOrgId(row.id).then((data) => {
+            console.log(data.data);
+            if (data.data != null) {
+              this.form.cashAddingRoomRemoteControl =
+                data.data.cashAddingRoomRemoteControl;
+              this.form.detachedLobbyEquipment =
+                data.data.detachedLobbyEquipment;
+              this.form.detachedWallPenetratingEquipment =
+                data.data.detachedWallPenetratingEquipment;
+            }
+          });
+          this.getOrgPhysicalDefenseConstructionInfo();
+        }
+      }
+      this.isShow = true;
+    },
+
+    // 事件
+    onHide() {
+      this.isShow = false;
+    },
+
+    onSubmit() {
+      this.$refs.form.validate(async (isValidate) => {
+        this.form.isLock = this.form.isLock ? 0 : 1;
+        this.form.cashAddingRoomRemoteControl = this.form
+          .cashAddingRoomRemoteControl
+          ? 1
+          : 0;
+        console.log(this.form);
+        addOrUpdate(this.form).then((data) => {
+          this.$modal.msgSuccess("添加成功");
+          this.onHide();
+        });
+        // this.$emit("success");
+      });
+    },
+
+    // 事件
+    //apimark//
+  },
+  mounted() {},
+  components: { Treeselect },
+};
+</script>
+
+<style lang="scss" scoped>
+.brand_info {
+  .el-form {
+    width: 600px;
+    padding-top: 40px;
+  }
+}
+</style>

src/views/system/dept/index.vue

@@ -38,8 +38,10 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-              v-hasPermi="['system:dept:add']">新增</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="showDialogEdit(0)"
+              v-hasPermi="['system:dept:add']">新增离行式自助银行</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="handleAdd(row)"
+              v-hasPermi="['system:dept:add']">新增中心业务库</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -77,7 +79,7 @@
                 <el-button size="mini" type="text" icon="el-icon-plus"
                   v-hasPermi="['system:dept:extend']">补充信息</el-button>
               </router-link>
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="showDialogEdit(scope.row)"
                 v-hasPermi="['system:dept:edit']">修改</el-button>
               <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
                 @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
@@ -91,11 +93,11 @@
     </el-row>
 
     <!-- 添加或修改机构对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" @close="closeHandler" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item v-if="this.pId != -1" label="上级机构" prop="parentId">
+            <el-form-item v-if="this.pId !=-1" label="上级机构" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级机构" />
             </el-form-item>
           </el-col>
@@ -146,20 +148,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <DialogEdit ref="dialogEdit" ></DialogEdit>
   </div>
 </template>
 
 <script>
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 import { deptTreeSelect } from "@/api/system/public";
-import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
+import DialogEdit from "@/views/system/dept/dialog.edit.vue";
 export default {
   name: "Dept",
   dicts: ['sys_normal_disable', 'sys_org_type'],
-  components: { Treeselect },
+  components: { Treeselect ,DialogEdit},
   data() {
     return {
       // 遮罩层
@@ -232,11 +234,21 @@ export default {
       defaultKeys: []
     };
   },
+  computed: {
+    isShow() {
+      if((this.pId==null&&this.pId!=-1)){
+        return true
+      }
+    }
+  },
   created() {
     this.getDeptTree();
     this.getList();
   },
   methods: {
+    closeHandler(){
+     // alert(11111)
+    },
     getPageIndex($index) {
       //表格序号
       return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
@@ -399,6 +411,10 @@ export default {
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
+    showDialogEdit(row){
+
+      this.$refs.dialogEdit.show(row);
+    },
   },
   watch: {
     // 根据名称筛选机构树

src/views/system/device/index.vue

@@ -39,10 +39,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:device:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['system:device:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/menu/index.vue

@@ -131,9 +131,9 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column
         label="操作"