Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/assets/styles/element-ui.scss

@@ -90,8 +90,7 @@
 }
 
 .tree-container{
-  height: calc(100vh - 180px);;
-  -max-height: 850px;
+  height: 744px;
   overflow: auto;
 }
 
@@ -101,4 +100,4 @@
 
 .el-checkbox__inner{
   border: 1px solid #008CD6 !important;
-}
+}

src/assets/styles/index.scss

@@ -12,24 +12,24 @@
 //  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-VF.ttf");
 //}
 
-@font-face {
-  font-family: SYExtraLight;
-  font-style: normal;
-  font-weight: 300;
-  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-ExtraLight.otf");
-}
-
-@font-face {
-  font-family: SYLight;
-  font-style: normal;
-  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Light.otf");
-}
-
-@font-face {
-  font-family: SYNormal;
-  font-style: normal;
-  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
-}
+//@font-face {
+//  font-family: SYExtraLight;
+//  font-style: normal;
+//  font-weight: 300;
+//  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-ExtraLight.otf");
+//}
+//
+//@font-face {
+//  font-family: SYLight;
+//  font-style: normal;
+//  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Light.otf");
+//}
+//
+//@font-face {
+//  font-family: SYNormal;
+//  font-style: normal;
+//  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
+//}
 
 body {
   height: 100%;
@@ -37,7 +37,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: #000;
-  font-family: SYExtraLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  //font-family: SYExtraLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
   /*框架自带字体*/
   //font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
   //  Microsoft YaHei, Arial, sans-serif;
@@ -45,12 +45,12 @@ body {
 
 .el-button{
   //font-weight: 400;
-  font-family: SYLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  //font-family: SYLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
 .el-table__header-wrapper{
   //font-weight: normal;
-  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  //font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
 label {
@@ -174,13 +174,14 @@ aside {
   padding: 10px;
   height: calc(100vh - 86px);
   overflow: auto;
-  background-color: #f1f1f1;
+  background-color: #f5f5f5;
 }
 
 .main-search-box{
   background-color: #fff;
   padding: 10px;
-  margin-bottom: 10px
+  margin-bottom: 10px;
+  box-shadow: 0 2px 8px #ccc;
 }
 
 .components-container {
@@ -263,10 +264,9 @@ aside {
 }
 
 .el-button--primary {
-  background: rgba(0,140,214,0.8) !important;
-  border-color:rgba(0,140,214,0.8)  !important;
+  background: rgba(0,140,214,1) !important;
+  border-color:rgba(0,140,214,.8)  !important;
   color:#fff !important;
-
 }
 
 .el-button--primary:focus,
@@ -281,8 +281,5 @@ aside {
   background-color: #009240FF;
 }
 
-.el-button [class*=el-icon-] + span{
-  margin-left: 2px;
-}
 
 

src/assets/styles/ruoyi.scss

@@ -85,11 +85,9 @@
 			font-size: 13px;
 		}
 	}
-	.el-table__body-wrapper {
-		.el-button [class*="el-icon-"] + span {
-			margin-left: 1px;
-		}
-	}
+  .el-button [class*=el-icon-] + span{
+    margin-left: 2px;
+  }
 }
 
 /** 表单布局 **/
@@ -106,11 +104,12 @@
   display: flex;
   justify-content: flex-end;
   align-items: center;
-	height: 50px;
+	height: 57px;
 	padding: 10px;
   background-color: #fff;
   border:1px solid #f1f1f1;
   border-top:none;
+  box-shadow: 0 2px 8px #ccc;
 }
 
 /* tree border */
@@ -132,6 +131,10 @@
   }
 }
 
+ .el-table{
+   box-shadow:-8px 0 8px -8px #ccc, 8px 0 8px -8px #ccc;
+ }
+
 .el-table .fixed-width .el-button--mini {
 	padding-left: 0;
 	padding-right: 0;
@@ -291,7 +294,10 @@
 .el-table thead{
   >tr{
     >th{
-      background-color: #CCE8F7!important;
+      background-color: #d1e0f1 !important;
     }
   }
 }
+.el-tree-node__content{
+	height: 32px !important;
+  }

src/components/orgTree/index.vue

@@ -173,6 +173,7 @@ export default {
 .org-tree{
   background-color: #fff;
   padding: 10px;
+  box-shadow: 0 2px 8px #ccc;
 }
 .el-tree-ex {
   // overflow: auto;

src/layout/components/Sidebar/index.vue

@@ -33,7 +33,7 @@
         </el-menu>
       </el-scrollbar>
       </div>
-      
+
       <div class="bottomBox">
         <hamburger
           id="hamburger-container"
@@ -89,7 +89,7 @@ export default {
   position: relative;
   height: 90vh;
   width: 100%;
-  overflow-y: scroll !important;
+  overflow-y: auto !important;
 }
 .bottomBox {
   //   position: absolute;
@@ -97,7 +97,7 @@ export default {
   width: 100%;
   margin-top: 10px;
   padding-left: 10px;
- 
+
   bottom: 2%;
   border-top: #ccc;
   .hamburger-container {

src/views/check/dialog.edit.vue

@@ -66,7 +66,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6" v-if="id ? false : true">
+            <el-col :span="6">
               <el-form-item
                 prop="buildTaskNow"
                 label="立即生效:"

src/views/check/index.vue

@@ -184,35 +184,35 @@
           ></el-table-column>
           <el-table-column
             prop="planName"
-            label="计划名称"
+            label="任务名称"
             v-if="columns[1].visible"
           ></el-table-column>
+         
           <el-table-column
-            prop="planOfOrgName"
-            label="计划所属机构"
-            v-if="columns[4].visible"
+            prop="checkType"
+            label="任务类型"
+            v-if="columns[2].visible"
           >
+            <template slot-scope="r"
+              >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
+            </template>
           </el-table-column>
-
           <el-table-column
             prop="planCreateOrgName"
-            label="计划创建机构"
+            label="创建机构"
             v-if="columns[3].visible"
           >
           </el-table-column>
           <el-table-column
-            prop="checkType"
-            label="检查类型"
-            v-if="columns[2].visible"
+            prop="planOfOrgName"
+            label="行社名称"
+            v-if="columns[4].visible"
           >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
-            </template>
           </el-table-column>
+
           <el-table-column
             prop="execOrgType"
-            label="检查机构类型"
-            v-if="columns[2].visible"
+            label="检查主体"
           >
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
@@ -221,9 +221,8 @@
 
           <el-table-column
             prop="checkOrgType"
-            label="受检机构类型"
+            label="受检机构"
             width="120px"
-            v-if="columns[6].visible"
           >
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
@@ -232,7 +231,7 @@
 
           <el-table-column
             prop="roleNames"
-            label="检查角色"
+            label="检查人员"
             v-if="columns[6].visible"
           >
             <template slot-scope="scope">
@@ -243,7 +242,7 @@
           ></el-table-column>
           <el-table-column
             prop="planCycle"
-            label="检查周期"
+            label="任务周期"
             width="80px"
             v-if="columns[6].visible"
           >
@@ -254,13 +253,13 @@
 
           <el-table-column
             prop="count"
-            label="检查次数"
+            label="任务次数"
             v-if="columns[6].visible"
           ></el-table-column>
 
           <el-table-column
             prop="planStatus"
-            label="状态"
+            label="任务状态"
             width="80px"
             v-if="columns[6].visible"
           >
@@ -272,21 +271,21 @@
           <el-table-column
             prop="modifiedName"
             label="修改人"
-            v-if="columns[6].visible"
+            v-if="false"
           ></el-table-column>
 
           <el-table-column
             prop="updateTime"
             label="修改时间"
             width="80px"
-            v-if="columns[6].visible"
+            v-if="false"
           >
             <template slot-scope="scope">
               <span>{{ formatTime(scope.row.updateTime, "YYYY-MM-DD") }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column label="操作">
+          <el-table-column label="操作" min-width="200">
             <template slot-scope="r">
               <el-button
                 v-if="eqOrg(r.row)"

src/views/check/task/index.vue

@@ -21,31 +21,65 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="检查名称" prop="title">
+          <el-form-item label="任务名称" prop="title">
             <el-input
-              style="width: 200px;"
+              style="width: 200px"
               v-model="queryParams.title"
-              placeholder="请输入检查名称"
+              placeholder="请输入任务名称"
               clearable
               @keyup.enter.native="handleQuery"
               :maxlength="50"
               @input="inputTitle"
             />
           </el-form-item>
-          <!-- <el-form-item label="检查角色" prop="executeRole">
+          <el-form-item label="检查人员" prop="roleId">
             <el-select
-              v-model="queryParams.executeRole"
-              placeHolder="请选择检查角色"
+              v-model="queryParams.roleId"
+              placeholder="请选择用户角色"
               clearable
             >
               <el-option
-                v-for="item in roleList"
+                v-for="item in selectRoleOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.roleName"
                 :value="item.id"
               ></el-option>
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
+          <el-form-item label="受检机构" prop="orgName">
+            <!-- <el-input
+              v-model="queryParams.orgName"
+              placeholder="请输入受检机构"
+              clearable
+              @keyup.enter.native="handleQuery"
+              :maxlength="50" @input="inputRestriction"
+            /> -->
+            <div style="width: 200px; height: 30px">
+              <org-tree-select
+                size="mini"
+                v-model="queryParams.checkOrgIds"
+                ref="checkorgTreeSelect"
+                :disable="true"
+                @change="getList"
+              >
+              </org-tree-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="任务进度" prop="status">
+            <el-select
+              style="width: 200px"
+              v-model="queryParams.status"
+              placeHolder="请选择任务进度"
+              clearable
+            >
+              <el-option
+                v-for="item in dict.type.safety_check_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!-- <el-form-item label="检查周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
@@ -61,7 +95,7 @@
             </el-select>
           </el-form-item> -->
 
-          <el-form-item
+          <!-- <el-form-item
             class="searchTitle"
             label="开始日期"
             prop="planStartTime"
@@ -76,53 +110,37 @@
               @change="updatePlanStartTime"
             >
             </el-date-picker>
-          </el-form-item>
-          <el-form-item label="检查状态" prop="status">
-            <el-select
-              style="width: 200px;"
-              v-model="queryParams.status"
-              placeHolder="请选择"
-              clearable
+          </el-form-item> -->
+          <el-form-item
+            class="searchTitle"
+            label="任务时间"
+            prop="planStartTime"
+          >
+            <el-date-picker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.range"
+              :picker-options="pickerOptions"
             >
-              <el-option
-                v-for="item in dict.type.safety_check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
+            </el-date-picker>
           </el-form-item>
-          <el-form-item label="受检机构" prop="orgName">
-            <!-- <el-input
-              v-model="queryParams.orgName"
-              placeholder="请输入受检机构"
-              clearable
-              @keyup.enter.native="handleQuery"
-              :maxlength="50" @input="inputRestriction"
-            /> -->
-            <div style="width: 200px;height: 30px;">
-              <org-tree-select
+          <el-row>
+            <el-form-item style="margin-left: 35px">
+              <el-button
+                type="primary"
+                icon="el-icon-search"
                 size="mini"
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
+                @click="getList"
+                >搜索</el-button
               >
-              </org-tree-select>
-            </div>
-          </el-form-item>
-          <el-form-item style="margin-left: 35px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-            >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-            >
-          </el-form-item>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-row>
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
@@ -161,21 +179,21 @@
           </el-table-column>
           <el-table-column
             prop="title"
-            label="检查名称"
+            label="任务名称"
             min-width="120"
             v-if="columns[1].visible"
           >
           </el-table-column>
           <el-table-column
             prop="checkOrgName"
-            label="检查机构"
+            label="检查主体"
             min-width="140"
             v-if="columns[5].visible"
           >
           </el-table-column>
           <el-table-column
             prop="roleName"
-            label="检查角色"
+            label="检查人员"
             min-width="150"
             v-if="columns[6].visible"
           >
@@ -186,6 +204,23 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="status"
+            label="任务进度"
+            width="100px"
+            v-if="columns[10].visible"
+          >
+            <template slot-scope="r">
+              <span>
+                <i class="circle" :style="statusColor(r.row.status, true)" />
+                <label :style="statusColor(r.row.status, false)">
+                  {{
+                    getLabel(dict.type.safety_check_status, r.row.status)
+                  }}</label
+                >
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="orgName"
             label="受检机构"
             min-width="140"
@@ -195,13 +230,17 @@
 
           <el-table-column
             prop="planStartTime"
-            label="开始日期"
-            min-width="100"
+            label="任务时间"
+            min-width="200"
             v-if="columns[2].visible"
             ><template slot-scope="r">
               {{
                 r.row.planStartTime
-                  ? dayjs(r.row.planStartTime).format("YYYY-MM-DD")
+                  ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
+                  : ""
+              }}~{{
+                r.row.planEndTime
+                  ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
                   : ""
               }}
             </template></el-table-column
@@ -210,7 +249,7 @@
             prop="planEndTime"
             label="截止日期"
             min-width="100"
-            v-if="columns[3].visible"
+            v-if="false"
             ><template slot-scope="r">
               {{
                 r.row.planEndTime
@@ -220,34 +259,18 @@
             </template></el-table-column
           >
 
-          <el-table-column
-            prop="status"
-            label="检查状态"
-            width="100px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r">
-              <span>
-                <i class="circle" :style="statusColor(r.row.status, true)" />
-                <label :style="statusColor(r.row.status, false)">
-                  {{
-                    getLabel(dict.type.safety_check_status, r.row.status)
-                  }}</label
-                >
-              </span>
-            </template>
-          </el-table-column>
+  
 
           <el-table-column
             prop="submitBy"
             label="检查人"
             min-width="100"
-            v-if="columns[7].visible"
+            v-if="false"
           ></el-table-column>
-          <el-table-column
+          <el-table-column 
             label="检查时间"
             min-width="120"
-            v-if="columns[8].visible"
+            v-if="false"
           >
             <template slot-scope="r">{{
               r.row.submitTime | dateTime
@@ -255,7 +278,7 @@
           </el-table-column>
           <el-table-column
             prop="exceptionCount"
-            label="问题数量"
+            label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
@@ -264,10 +287,10 @@
             prop="des"
             label="备注"
             min-width="80"
-            v-if="columns[9].visible"
+            v-if="false"
           >
           </el-table-column>
-          <el-table-column label="操作" fixed="right" min-width="120px">
+          <el-table-column label="操作" fixed="right" min-width="200">
             <template slot-scope="r">
               <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
@@ -288,13 +311,13 @@
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
-                >扫描记录</el-button
+                >检查登记簿</el-button
               >
               <el-button
                 type="text"
                 @click="showRegister(r.row)"
                 v-if="showRegisterBtn(r.row)"
-                >登记</el-button
+                >任务登记</el-button
               >
             </template>
           </el-table-column>
@@ -316,6 +339,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { allRole } from "@/api/system/role";
 import DialogDetail from "./dialog.detail";
 import DialogScanRecord from "./dialog.scanrecord";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
@@ -324,7 +348,7 @@ import * as api from "@/api/safetycheck/task.js";
 import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 export default {
   name: "checkTaskList",
@@ -344,6 +368,7 @@ export default {
       timeClearable: false,
       options: [],
       roleOptions: [],
+      selectRoleOptions: [],
       planList: [],
 
       queryParams: {
@@ -357,6 +382,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
+        range:[],
       },
       selectedOrgName: null,
       pageData: [],
@@ -466,6 +492,7 @@ export default {
     },
     resetQuery() {
       this.queryParams.checkOrgIds = [];
+      this.queryParams.range=[];
       this.resetForm("queryParams");
       this.getList();
     },
@@ -492,7 +519,9 @@ export default {
         })
         .then((r) => (this.roleOptions = r.data));
     },
-
+    selectLoadRoles() {
+      allRole().then((r) => (this.selectRoleOptions = r.data));
+    },
     // loadPlanList() {
     //   api
     //     .getPlans({
@@ -528,7 +557,9 @@ export default {
       }
     },
   },
-  async mounted() {},
+  async mounted() {
+    this.selectLoadRoles();
+  },
 };
 </script>
 

src/views/core/drill/plan/index.vue

@@ -62,7 +62,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table height="560px" border :data="planList" @selection-change="handleSelectionChange"
+        <el-table height="555px" border :data="planList" @selection-change="handleSelectionChange"
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>

src/views/core/drill/task/dialog.newtask.vue

@@ -173,6 +173,7 @@ export default {
         absentList: [],
         orgList: [],
         fileList: [],
+        presetCase:null,
         ...other,
       };
     },
@@ -358,6 +359,11 @@ export default {
       this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
     drillDictionarySelect(data){
+      // console.log("selectMaterials",this.formData)
+      if(this.formData.type==null)
+      {
+        this.formData.type=parseInt(data[0].drillType);
+      }
       this.formData.presetCase=data[0].defaultCause;
     },
 

src/views/core/drill/task/dialog.perform.vue

@@ -17,6 +17,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="演练项目" prop="type">
+                <el-select style="width: 100%;" v-model="formData.type" placeholder="请选择演练项目">
+                  <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
+                             :value="parseInt(dict.value)">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="drillSite" label="演练地点">
+                <el-input style="width: 100%;" v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
+              </el-form-item>
+            </el-col>
+         
+            <el-col :span="12">
               <el-form-item prop="drillStartTime" label="演练开始时间">
                 <el-date-picker style="width: 100%;" required v-model="formData.drillStartTime"
                                 :picker-options="startDatepickerOptions"
@@ -33,26 +48,13 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
-              <el-form-item prop="drillSite" label="演练地点">
-                <el-input style="width: 100%;" v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="演练项目" prop="type">
-                <el-select style="width: 100%;" v-model="formData.type" placeholder="请选择演练项目">
-                  <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
-                             :value="parseInt(dict.value)">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+         
 
             <el-col :span="24">
 
               <el-form-item prop="presetCase" label="预设案由">
                 <div style="display: flex;justify-content: flex-end; margin-bottom: 10px">
-                  <el-button type="primary" @click="selectMaterials">参考演练库</el-button>
+                  <el-button type="primary" @click="selectMaterials">演练范本库</el-button>
                 </div>
                 <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
@@ -79,7 +81,12 @@
                 </k-select>
               </el-form-item>
             </el-col>
-
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="演练图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
+                </imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="演练资料" prop="fileList">
                 <K-file-upload ref="upload"
@@ -87,12 +94,7 @@
                                v-model="formData.fileList"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="演练图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
-                </imgUpload>
-              </el-form-item>
-            </el-col>
+           
 
             <el-col :span="24">
               <el-form-item v-if="formData.status==2" prop="commentScore" label="评分">
@@ -425,6 +427,11 @@ export default {
       this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
     drillDictionarySelect(data) {
+      // console.log("drillDictionarySelect",data);
+      if(this.formData.type==null)
+      {
+        this.formData.type=parseInt(data[0].drillType);
+      }
       this.formData.presetCase = data[0].defaultCause;
     },
 

src/views/resumption/plan/index.vue

@@ -252,7 +252,7 @@
             v-if="false"
           ></el-table-column>
 
-          <el-table-column fixed="right" width="120" label="操作">
+          <el-table-column fixed="right" width="200" label="操作">
             <template slot-scope="r">
               <el-button
                 v-if="eqOrg(r.row)"

src/views/system/dept/extend.vue

@@ -1,196 +1,119 @@
 <template>
   <div class="app-container">
-    <h3 class="title"><i class="el-icon-collection-tag"></i> 同步信息</h3>
-    <div class="info-box">
-      <el-descriptions>
-        <el-descriptions-item
-          v-for="v in dataInfo"
-          :label="v.label"
-          :key="v.key"
+    <div class="org-extend">
+      <h3 class="title"><i class="el-icon-collection-tag"></i> 同步信息</h3>
+      <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="机构组织类型" v-if="false">{{
-          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>
+          >
+          <el-descriptions-item label="机构组织类型" v-if="false">{{
+              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>
 
-    <h3 class="title" style="margin-top: 50px">
-      <i class="el-icon-collection-tag"></i>
-      安全防范设施建设达标信息
-    </h3>
-    <!--  表格   -->
-    <div style="margin-top: 30px">
-      <el-button
-        style="margin-bottom: 20px"
-        type="primary"
-        plain
-        icon="el-icon-plus"
-        size="mini"
-        @click="handleOrgAdd"
+      <h3 class="title" style="margin-top: 50px">
+        <i class="el-icon-collection-tag"></i>
+        安全防范设施建设达标信息
+      </h3>
+      <!--  表格   -->
+      <div style="margin-top: 30px">
+        <el-button
+          style="margin-bottom: 20px"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @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"
-          v-if="false"
-        />
-        <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>
-        </el-table-column>
-        <el-table-column label="GA38标准" align="center" prop="standard">
-          <template slot-scope="r"
-            >{{ getLabel(dict.type.org_extend_standard, `${r.row.standard}`) }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="达标时间"
-          align="center"
-          prop="dateOfCompliance"
-          width="180"
         >
-          <template slot-scope="scope">
+        <el-table
+          border
+          size="small"
+          v-loading="orgloading"
+          :data="constructionList"
+          @selection-change="handleOrgSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+            v-if="false"
+          />
+          <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>
+          </el-table-column>
+          <el-table-column label="GA38标准" align="center" prop="standard">
+            <template slot-scope="r"
+            >{{ getLabel(dict.type.org_extend_standard, `${r.row.standard}`) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="达标时间"
+            align="center"
+            prop="dateOfCompliance"
+            width="180"
+          >
+            <template slot-scope="scope">
             <span>{{
-              formatTime(scope.row.dateOfCompliance, "YYYY-MM-DD")
-            }}</span>
-          </template>
-        </el-table-column>
+                formatTime(scope.row.dateOfCompliance, "YYYY-MM-DD")
+              }}</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
-              v-if="scope.row.certificate"
-              size="mini"
-              type="text"
-              icon="el-icon-search"
-              @click="downBusiness(scope.row.certificate)"
+          <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
+                v-if="scope.row.certificate"
+                size="mini"
+                type="text"
+                icon="el-icon-search"
+                @click="downBusiness(scope.row.certificate)"
               >查看证书</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit-outline"
-              @click="handleOrgUpdate(scope.row)"
-              >编辑</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleOrgDelete(scope.row)"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <h3 class="title" style="margin-top: 50px">
-      <i class="el-icon-collection-tag"></i> 补充信息
-    </h3>
-    <div class="info-box" v-if="type != 5">
-      <el-form
-        inline
-        class="demo-form-inline"
-        label-position="left"
-        label-width="120px"
-      >
-        <el-row>
-          <el-col :span="6">
-            <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="6">
-            <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="6">
-            <el-form-item v-if="type == 10" label="系统平台品牌">
-              <el-select
-                clearable
-                v-model="platformBrand"
-                placeholder="请选择系统平台品牌"
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit-outline"
+                @click="handleOrgUpdate(scope.row)"
+              >编辑</el-button
               >
-                <el-option
-                  v-for="dict in dict.type.org_platform_brand"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6" v-if="false">
-            <el-form-item v-if="type == 10" label="平台供应商品牌">
-              <el-select
-                clearable
-                v-model="platformSupplierBrand"
-                placeholder="请选择平台供应商品牌"
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleOrgDelete(scope.row)"
+              >删除</el-button
               >
-                <el-option
-                  v-for="dict in dict.type.org_platform_supplier_brand"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="info-box" v-if="type != 5">
-      <!--  下拉框选择    -->
-      <div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <h3 class="title" style="margin-top: 50px">
+        <i class="el-icon-collection-tag"></i> 补充信息
+      </h3>
+      <div class="info-box" v-if="type != 5">
         <el-form
           inline
           class="demo-form-inline"
@@ -199,41 +122,46 @@
         >
           <el-row>
             <el-col :span="6">
-              <el-form-item v-if="type == 4" label="行政区域气象">
-                <el-cascader
+              <el-form-item
+                v-if="type == 10"
+                label="建设时间"
+                prop="constructionTime"
+              >
+                <el-date-picker
                   clearable
-                  v-model="weatherAreaCode"
-                  :options="areaList"
-                  @change="selectArea"
-                  placeholder="请选择行政区域气象"
-                ></el-cascader>
+                  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="6">
-              <el-form-item label="产权模式" v-if="type == 4">
-                <el-select
+              <el-form-item
+                v-if="type == 10"
+                label="最近一次改造时间"
+                prop="lastUpdateTime"
+              >
+                <el-date-picker
                   clearable
-                  v-model="ownership"
-                  placeholder="请选择产权模式"
+                  v-model="lastUpdateTime"
+                  type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择最近一次改造时间"
                 >
-                  <el-option
-                    v-for="dict in dict.type.property_situation"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="所在位置" v-if="type == 4">
+              <el-form-item v-if="type == 10" label="系统平台品牌">
                 <el-select
                   clearable
-                  v-model="outsideArea"
-                  placeholder="请选择所在位置"
+                  v-model="platformBrand"
+                  placeholder="请选择系统平台品牌"
                 >
                   <el-option
-                    v-for="dict in dict.type.org_extend_is"
+                    v-for="dict in dict.type.org_platform_brand"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -241,20 +169,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <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> -->
 
+            <el-col :span="6" v-if="false">
+              <el-form-item v-if="type == 10" label="平台供应商品牌">
                 <el-select
                   clearable
-                  v-model="dutyMode"
-                  placeholder="请选择夜间值守方式"
+                  v-model="platformSupplierBrand"
+                  placeholder="请选择平台供应商品牌"
                 >
                   <el-option
-                    v-for="dict in dutyModeoptions"
+                    v-for="dict in dict.type.org_platform_supplier_brand"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -263,35 +187,293 @@
               </el-form-item>
             </el-col>
           </el-row>
+        </el-form>
+      </div>
+      <div class="info-box" v-if="type != 5">
+        <!--  下拉框选择    -->
+        <div>
+          <el-form
+            inline
+            class="demo-form-inline"
+            label-position="left"
+            label-width="120px"
+          >
+            <el-row>
+              <el-col :span="6">
+                <el-form-item v-if="type == 4" label="行政区域气象">
+                  <el-cascader
+                    clearable
+                    v-model="weatherAreaCode"
+                    :options="areaList"
+                    @change="selectArea"
+                    placeholder="请选择行政区域气象"
+                  ></el-cascader>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="产权模式" v-if="type == 4">
+                  <el-select
+                    clearable
+                    v-model="ownership"
+                    placeholder="请选择产权模式"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.property_situation"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="所在位置" v-if="type == 4">
+                  <el-select
+                    clearable
+                    v-model="outsideArea"
+                    placeholder="请选择所在位置"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.org_extend_is"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <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> -->
+
+                  <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="999"
+                  ></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="999"
+                  ></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
+                    v-model="businessLibraryType"
+                    placeholder="请选择业务库类型"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.business_library_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <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-input-number
+                    v-model="remoteCount"
+                    controls-position="right"
+                    @change="handleChange"
+                    :min="0"
+                    :max="999"
+                  ></el-input-number>
+                </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-input-number
+                    v-model="cashAddingRoom"
+                    controls-position="right"
+                    @change="handleChange"
+                    :min="0"
+                    :max="999"
+                  ></el-input-number>
+                </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>
+                  <el-switch
+                    v-model="askari"
+                    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-input-number
+                    v-model="innerCount"
+                    controls-position="right"
+                    @change="handleChange"
+                    :min="0"
+                    :max="999"
+                  ></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="999"
+                  ></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>
+
+      <!--   上传   -->
+
+      <div v-if="type == 5" style="margin-top: 50px">
+        <el-form>
           <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-form-item label="大堂式设备" label-width="150">
                 <el-input-number
-                  v-model="lobbyEquipment"
+                  style="margin-left: 10px"
+                  v-model="detachedLobbyEquipment"
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
@@ -300,9 +482,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="穿墙式设备" v-if="type == 4">
+              <el-form-item label="穿墙式设备" label-width="150">
                 <el-input-number
-                  v-model="wallPenetratingEquipment"
+                  style="margin-left: 10px"
+                  v-model="detachedWallPenetratingEquipment"
                   controls-position="right"
                   @change="handleChange"
                   :min="0"
@@ -310,80 +493,8 @@
                 ></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
-                  v-model="businessLibraryType"
-                  placeholder="请选择业务库类型"
-                >
-                  <el-option
-                    v-for="dict in dict.type.business_library_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <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-input-number
-                  v-model="remoteCount"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="0"
-                  :max="999"
-                ></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" v-if="type == 10">
-              <el-form-item label="离行式加钞间出入口数量" label-width="150">
+              <el-form-item label="加钞间出入口数量" label-width="150">
                 <!-- <el-select
                   clearable
                   v-model="cashAddingRoom"
@@ -405,142 +516,33 @@
                 ></el-input-number>
               </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>
-                <el-switch
-                  v-model="askari"
-                  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-input-number
-                  v-model="innerCount"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="0"
-                  :max="999"
-                ></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="999"
-                ></el-input-number>
+              <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-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>
-
-    <!--   上传   -->
-
-    <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="999"
-              ></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="999"
-              ></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-input-number
-                  v-model="cashAddingRoom"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="0"
-                  :max="999"
-                ></el-input-number>
-            </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"
+      <div style="margin-top: 50px; margin-left: 42%">
+        <el-button type="primary" @click="saveExtend" size="small"
         >提交</el-button
-      >
-      <el-button type="primary" @click="nosaveExtend" size="small"
+        >
+        <el-button type="primary" @click="nosaveExtend" size="small"
         >取消</el-button
-      >
+        >
+      </div>
     </div>
     <DialogCom
       :title="orgtitle"
@@ -1655,6 +1657,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.org-extend{
+  background-color: #fff;
+  padding: 10px;
+}
 .title {
   font-size: 18px;
   text-align: left;

src/views/system/dept/index.vue

@@ -115,7 +115,7 @@
             prop="shortName"
             label="机构简称"
           ></el-table-column>
-          <el-table-column align="center" prop="type" width="150" label="机构类型">
+          <el-table-column align="center" prop="type" label="机构类型">
             <template v-slot="scope">
               <dict-tag
                 :options="dict.type.sys_org_type"
@@ -123,7 +123,7 @@
               />
             </template>
           </el-table-column>
-           <el-table-column  prop="code" label="机构编码" min-width="50"></el-table-column>
+           <el-table-column  prop="code" align="center" label="机构编码"></el-table-column>
 
             <el-table-column prop="isLock" align="center" label="机构状态">
               <template v-slot="scope">
@@ -138,8 +138,6 @@
               align="center"
               prop="sort"
               label="排序"
-              min-width="60"
-              width="60"
             ></el-table-column>
             <el-table-column v-if="false"
               align="center"
@@ -169,7 +167,7 @@
             ></el-table-column>
             <el-table-column
               label="操作"
-              align="center"
+              align="left"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
@@ -190,6 +188,7 @@
                   @click="handleReplenish(scope.row.id)"
                   >补充信息</el-button
                 >
+                <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
                 <!-- </router-link> -->
                 <el-divider direction="vertical"></el-divider>
                 <el-button

src/views/system/device/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -11,92 +11,93 @@
           @click="clickTreeNode"
         ></org-tree>
       </el-col>
-        <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="deviceName">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
-                @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备类别" prop="assetType">
+      <el-col :span="20" :xs="24">
+        <div class="main-search-box">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                     label-width="68px">
+              <el-form-item label="设备名称" prop="deviceName">
+                <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
+                          @keyup.enter.native="handleQuery" />
+              </el-form-item>
+              <el-form-item label="设备类别" prop="assetType">
 
-              <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
-                @change="searchChangeSelectDevice">
-                <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                  :value="`${dict.value}`"></el-option>
-              </el-select>
-            </el-form-item>
+                <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
+                           @change="searchChangeSelectDevice">
+                  <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
+                             :value="`${dict.value}`"></el-option>
+                </el-select>
+              </el-form-item>
 
-          <el-form-item label="设备分类" prop="deviceType">
+              <el-form-item label="设备分类" prop="deviceType">
 
-              <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
-                <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
-                  :value="item.dictValue"></el-option>
-              </el-select>
-            </el-form-item>
+                <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
+                  <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
+                             :value="item.dictValue"></el-option>
+                </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-form>
+              <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">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['system:device:add']"
+                >新增设备</el-button
+                >
+              </el-col>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:device:add']"
-              >新增设备</el-button
-            >
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-upload"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:device:importData']"
-              >导入设备</el-button
-            >
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-download"
-              size="mini"
-              @click="handleOut"
-              v-hasPermi="['system:user:export']"
-              >导出模版</el-button
-            >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
-        </el-row>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-upload"
+                  size="mini"
+                  @click="handleImport"
+                  v-hasPermi="['system:device:importData']"
+                >导入设备</el-button
+                >
+              </el-col>
 
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleOut"
+                  v-hasPermi="['system:user:export']"
+                >导出模版</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+          </div>
         <el-table
           border
-          height="600"
+          height="650"
           size="small"
           v-loading="loading"
           :data="deviceList"
           @selection-change="handleSelectionChange"
-          :header-cell-style="{backgroundColor:'#CCE8F7'}"
+
         >
+        <!-- :header-cell-style="{backgroundColor:'#CCE8F7'}" -->
           <!--<el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">
@@ -110,7 +111,6 @@
             align="center"
             key="assetType"
             prop="assetType"
-            width="80"
           >
             <template slot-scope="scope">
               <dict-tag
@@ -125,7 +125,6 @@
             align="center"
             key="deviceType"
             prop="deviceType"
-            width="80"
           >
             <template slot-scope="scope">
               <dict-tag
@@ -158,6 +157,7 @@
                 v-hasPermi="['system:device:edit']"
                 >编辑</el-button
               >
+              <el-divider direction="vertical"></el-divider>
               <el-button
                 size="mini"
                 type="text"

src/views/system/user/extend.vue

@@ -1,169 +1,192 @@
 <template>
   <div class="app-container">
-    <h3 class="title">编辑管理人员信息</h3>
-    <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="角色">{{ roleName }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ sex }}</el-descriptions-item>
-        <el-descriptions-item label="状态">{{ status }}</el-descriptions-item>
-      </el-descriptions>
-    </div>
-    <div class="info-box">
-      <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="120px">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="是否专职" prop="isFullTime">
-
-              <el-switch v-model="formData.isFullTime" active-value="1" inactive-value="0"></el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="持证上岗通过情况" prop="certificateWork" label-width="180">
-              <el-switch v-model="formData.certificateWork" active-value="1" inactive-value="0"></el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="8">
-
-            <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240" 
-              prop="certificateFailReason">
-              <el-select style="width: 280px;" v-model="formData.certificateFailReason" placeholder="请选择持证上岗未通过原因">
-                <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col> 
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="8">
-            <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
-             prop="professionalQualifications">
-              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
-                placeholder="请输入初级以上相关专业技术职业资格">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="所属部门" prop="deptId">
-              <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择所属部门">
-                <el-option v-for="dict in dict.type.department_name" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="现任职务" prop="duties">
-              <el-select style="width: 217px;" v-model="formData.duties" placeholder="请选择现任职务">
-                <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="最高学历" prop="highestEducation">
-              <el-select style="width: 217px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
-                <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="用工形式" prop="workType">
-              <el-select style="width: 217px;" v-model="formData.workType" placeholder="请选择用工形式">
-                <el-option v-for="dict in dict.type.sys_work_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="学历取得方式" prop="educationType">
-              <el-select style="width: 217px;" v-model="formData.educationType" placeholder="请选择学历取得方式">
-                <el-option v-for="dict in dict.type.sys_education_type" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
-            <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
-              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
-                placeholder="请输入初级以上相关专业技术职业资格">
-              </el-input>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-        <el-row>
+    <div class="user-extend">
+      <h3 class="title">基础信息</h3>
+      <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="角色">{{ roleName }}</el-descriptions-item>
+          <el-descriptions-item label="性别">{{ sex }}</el-descriptions-item>
+          <el-descriptions-item label="状态">{{ status }}</el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <h3 class="title">安保部门从业人员补充信息</h3>
+      <div class="info-box">
+        <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="120px">
+          <el-row>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <!-- <el-form-item label="是否专职" prop="isFullTime">
+
+                <el-switch v-model="formData.isFullTime" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item> -->
+              <el-form-item label="是否专职" prop="isFullTime">
+                <el-radio-group v-model="formData.isFullTime">
+                  <el-radio
+                    v-for="dict in dict.type.sys_yes_no"
+                    :key="`${dict.value}`"
+                    :label="dict.value"
+
+                  >{{ dict.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="持证上岗通过情况" prop="certificateWork" label-width="180">
+                <el-switch v-model="formData.certificateWork" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+
+              <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240"
+                            prop="certificateFailReason">
+                <el-select style="width: 280px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
+                  <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+
+          </el-row>
+          <el-row>
 
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item prop="bornTime" label="出生日期">
-              <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
-                :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择出生日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="参加工作时间" prop="workTime">
-              <el-date-picker style="width: 217px;" v-model="formData.workTime" 
-                align="right" type="date" placeholder="请选择参加工作时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <!-- :picker-options="endDatepickerOptions" -->
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item prop="entryTime" label="现任职时间">
-              <el-date-picker v-model="formData.entryTime"  align="right"
-                type="date" placeholder="选择现任职时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="分管领导姓名" prop="responsibilitiesLeaderName">
-              <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
-                placeholder="请输入分管领导姓名">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="分管领导职务" prop="responsibilitiesLeaderDuties">
-              <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择分管领导职务">
-                <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :xs="24" :sm="24" :md="24" :lg="24">
-            <el-form-item v-if="formData.certificateWork != 0" label="上传相关证书">
-              <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
-            </el-form-item>
-          </el-col>
-          <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="示例图">
-              <div style="width: 280px;">
-                <el-image :src="uplp"></el-image>
-              </div>
-            </el-form-item>
-          </el-col>-->
-        </el-row>
-      </el-form>
-    </div>
-    <div style="margin-top: 30px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" v-hasPermi="['system:information:edit']" size="small">提交</el-button>
-      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
-    </div>
+              <el-form-item label="所属部门" prop="deptId">
+                <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择所属部门">
+                  <el-option v-for="dict in dict.type.department_name" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="现任职务" prop="duties">
+                <el-select style="width: 217px;" v-model="formData.duties" placeholder="请选择现任职务">
+                  <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item prop="entryTime" label="现任职日期">
+                <el-date-picker v-model="formData.entryTime"  align="right"
+                                type="date" placeholder="选择现任职日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
+
+          </el-row>
+          <el-row>
 
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="用工形式" prop="workType">
+                <el-select style="width: 217px;" v-model="formData.workType" placeholder="请选择用工形式">
+                  <el-option v-for="dict in dict.type.sys_work_type" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="学历取得方式" prop="educationType">
+                <el-select style="width: 217px;" v-model="formData.educationType" placeholder="请选择学历取得方式">
+                  <el-option v-for="dict in dict.type.sys_education_type" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="最高学历" prop="highestEducation">
+                <el-select style="width: 217px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
+                  <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
+                <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
+                  placeholder="请输入初级以上相关专业技术职业资格">
+                </el-input>
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+          <el-row>
+
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item prop="bornTime" label="出生日期">
+                <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
+                                :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择出生日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="参加工作时间" prop="workTime">
+                <el-date-picker style="width: 217px;" v-model="formData.workTime"
+                                align="right" type="date" placeholder="请选择参加工作时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="身份证号码" prop="idCard">
+                <el-input maxlength="18" style="width: 217px;" v-model="formData.idCard"
+                          placeholder="请输入身份证号码">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <!-- :picker-options="endDatepickerOptions" -->
+
+
+          </el-row>
+          <el-row>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="分管领导姓名" prop="responsibilitiesLeaderName">
+                <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
+                          placeholder="请输入分管领导姓名">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="分管领导职务" prop="responsibilitiesLeaderDuties">
+                <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择分管领导职务">
+                  <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
+                             :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :md="8" :lg="8">
+              <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
+                            prop="professionalQualifications">
+                <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
+                          placeholder="请输入初级以上证书名称">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :xs="24" :sm="24" :md="24" :lg="24">
+              <el-form-item v-if="formData.certificateWork != 0" label="上传初级以上专业技术职业资格证书">
+                <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
+              </el-form-item>
+            </el-col>
+            <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
+              <el-form-item label="示例图">
+                <div style="width: 280px;">
+                  <el-image :src="uplp"></el-image>
+                </div>
+              </el-form-item>
+            </el-col>-->
+          </el-row>
+        </el-form>
+      </div>
+      <div style="padding-top: 10px; margin-left: 42%">
+        <el-button type="primary" @click="saveExtend" v-hasPermi="['system:information:edit']" size="small">提交</el-button>
+        <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -181,7 +204,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect ,ImgsUpload},
-  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
+  dicts: ['sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   data() {
     return {
       startDatepickerOptions: {
@@ -698,6 +721,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.user-extend{
+  background-color: #fff;
+  padding: 10px;
+}
 .title {
   font-size: 18px;
   text-align: left;
@@ -710,7 +737,7 @@ export default {
 }
 
 .info-box {
-  margin: 30px;
+  margin: 20px;
 }
 
 .demo-form-inline {}

src/views/system/user/index.vue

@@ -270,20 +270,23 @@
           />
           <el-table-column
             label="操作"
-            align="center"
-            width="300"
+            align="left"
+            width="240"
             fixed="right"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
+
               <el-button
                 size="mini"
                 type="text"
+                v-if="scope.row.isManage=='Y'"
                 icon="el-icon-plus"
                 @click="handleExtend(scope.row)"
                 v-hasPermi="['system:user:extend']"
                 >补充信息</el-button
               >
+              <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
               <el-divider direction="vertical"></el-divider>
               <el-button
                 size="mini"
@@ -294,23 +297,11 @@
                 >编辑</el-button
               >
               <el-divider direction="vertical"></el-divider>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-                >删除</el-button
-              >
-              <el-divider direction="vertical"></el-divider>
               <el-dropdown
                 size="mini"
                 @command="(command) => handleCommand(command, scope.row)"
-                v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
-              >
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"
-                  >更多</el-button
-                >
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <el-button size="mini" type="text" icon="el-icon-menu">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item
                     command="handleResetPwd"
@@ -325,6 +316,11 @@
                     v-hasPermi="['system:user:edit']"
                     >分配角色</el-dropdown-item
                   >
+                  <el-dropdown-item
+                    command="handleDelete"
+                    icon="el-icon-delete"
+                    v-hasPermi="['system:user:remove']"
+                  >删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -397,7 +393,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-          
+
         <el-row>
           <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
@@ -452,7 +448,7 @@
           </el-col>
 
         </el-row>
-        
+
         <el-row>
           <el-col :span="10">
             <el-form-item label="账号状态">
@@ -895,6 +891,9 @@ export default {
         case "handleAuthRole":
           this.handleAuthRole(row);
           break;
+        case "handleDelete":
+          this.handleDelete(row);
+          break;
         default:
           break;
       }
@@ -1002,7 +1001,7 @@ export default {
         {
           ...this.queryParams,
         },
-        `人员信息管理-用户角色_${new Date().getTime()}.xlsx`
+        `${'【'+this.$store.getters.orgShortName+'】-【人员信息管理】-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`
       );
     },
     /** 模板下载按钮操作 */
@@ -1012,7 +1011,7 @@ export default {
         {
           template: true,
         },
-        `人员信息管理-模板文件.xlsx`
+        `${'【'+this.$store.getters.orgShortName+'】-【人员信息管理-管理人员】-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`
       );
     },
     handleExportManager() {