Explorar el Código

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

luojun hace 2 años
padre
commit
8b026811c4

+ 44 - 0
src/api/core/send/send.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询列表【请填写功能名称】
+export function listSend(query) {
+  return request({
+    url: '/core/send/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细【请填写功能名称】
+export function getSend(id) {
+  return request({
+    url: '/core/send/' + id,
+    method: 'get'
+  })
+}
+
+// 新增【请填写功能名称】
+export function addSend(data) {
+  return request({
+    url: '/core/send',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改【请填写功能名称】
+export function updateSend(data) {
+  return request({
+    url: '/core/send',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除【请填写功能名称】
+export function delSend(id) {
+  return request({
+    url: '/core/send/' + id,
+    method: 'delete'
+  })
+}

+ 3 - 3
src/api/resumption/configuration.js

@@ -10,10 +10,10 @@ export function insertConfiguration(data) {
   }
 
   // 回显【请填写功能名称】
-export function getInfo() {
+export function getInfo(query) {
   return request({
-    url: '/core/configuration',
+    url: '/core/configuration/list',
     method: 'get',
-  
+    params: query
   })
 }

+ 17 - 1
src/api/system/user.js

@@ -9,7 +9,13 @@ export function listUser(query) {
     params: query
   })
 }
-
+export function listAllUser(query) {
+  return request({
+    url: '/system/user/allUserList',
+    method: 'get',
+    params: query
+  })
+}
 
 export function dictionListUser(query) {
   return request({
@@ -135,3 +141,13 @@ export function updateAuthRole(data) {
     params: data
   })
 }
+//获取
+export function newDateDay(time) {
+  var date =time? new Date(time):new Date()
+  var y = date.getFullYear()
+  var m = date.getMonth() + 1
+  m = m < 10 ? '0' + m : m
+  var d = date.getDate()
+  d = d < 10 ? '0' + d : d
+  return y + '-' + m+'-'+d
+}

+ 42 - 32
src/views/information/configuration/index.vue

@@ -12,7 +12,7 @@
             <el-form-item label="营业前提醒:" prop="front">
 
               <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
+                :max="100" label="描述文字"></el-input-number>
               分钟
 
 
@@ -21,7 +21,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业中提醒:" prop="centre">
               <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
+                :max="100" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
@@ -29,14 +29,14 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业后提醒:" prop="after">
               <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
+                :max="100" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="全天提醒:" prop="allDay">
               <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
+                :max="100" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
@@ -45,7 +45,7 @@
       </div>
     </el-form>
 
-    <el-form :model="week" :rules="rules" ref="week" label-width="200px">
+    <el-form :model="week" :rules="rules" ref="week" label-width="130px">
       <div class="form-item">
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="4">
@@ -54,16 +54,16 @@
             </div>
           </el-col>
           <el-col>
-            <el-form-item label="全天提醒:" prop="allDay">
+            <el-form-item label="提前" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              分钟
+                :max="100" label="描述文字"></el-input-number>
+              分钟提醒
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
       </div>
     </el-form>
-  
+
     <el-form :model="month" :rules="rules" ref="month" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -73,12 +73,12 @@
             </div>
           </el-col>
           <el-col>
-            <el-form-item label="全天提醒:" prop="allDay">
+            <el-form-item label="提前" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
-              分钟
+              天提醒
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -91,12 +91,12 @@
             </div>
           </el-col>
           <el-col>
-            <el-form-item label="全天提醒:" prop="allDay">
+            <el-form-item label="提前" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
-              分钟
+              天提醒
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -109,12 +109,12 @@
             </div>
           </el-col>
           <el-col>
-            <el-form-item label="全天提醒:" prop="allDay">
+            <el-form-item label="提前:" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
-              分钟
+              天提醒
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -127,12 +127,12 @@
             </div>
           </el-col>
           <el-col>
-            <el-form-item label="全天提醒:" prop="allDay">
+            <el-form-item label="提前:" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
-              分钟
+              天提醒
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -144,20 +144,20 @@
 </template>
 
 <script>
-import { insertConfiguration ,getInfo} from "@/api/resumption/configuration";
+import { insertConfiguration, getInfo } from "@/api/resumption/configuration";
 export default {
   props: [],
   components: {},
   data() {
     return {
-      coreResumptionConfigurationDTO:[],
+      coreResumptionConfigurationDTO: [],
       num: 1,
       day: {
         resumptionCycle: 1,
-        allDay: null,
         front: null,
         centre: null,
         after: null,
+        allDay: null,
         timeUnit: 1,
       },
       week: {
@@ -264,11 +264,23 @@ export default {
   methods: {
     request() { },
     handleChange(value) { },
-    selectInfo(){
-      getInfo().then(response=>{
-        this.coreResumptionConfigurationDTO = response.rows;
-      })
+    selectInfo() {
+      this.loading = true;
+      getInfo().then(response => {
+        if (response.data.coreResumptionConfiguration.length > 0) {
+          this.coreResumptionConfigurationDTO = response.data.coreResumptionConfiguration;
+          this.day = this.coreResumptionConfigurationDTO[0],
+            this.week = this.coreResumptionConfigurationDTO[1],
+            this.month = this.coreResumptionConfigurationDTO[2],
+            this.season = this.coreResumptionConfigurationDTO[3],
+            this.halfYear = this.coreResumptionConfigurationDTO[4],
+            this.year = this.coreResumptionConfigurationDTO[5]
+        }
+      });
     },
+
+
+
     checkForm(form) {
       let val
       this.$refs[form].validate(valid => {
@@ -278,7 +290,6 @@ export default {
       return val;
     },
     saveExtend() {
-
       let arr = ['day', 'week', 'month', 'season', 'halfYear', 'year'];
       let flags = [];
       arr.forEach(v => {
@@ -292,8 +303,7 @@ export default {
       console.log(flag, 'flag')
       if (!flag) return;
       let data = {
-
-        coreResumptionConfiguration: [this.day, this.week, this.month,this.season,this.halfYear,this.year]
+        coreResumptionConfiguration: [this.day, this.week, this.month, this.season, this.halfYear, this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("新增成功");

+ 376 - 0
src/views/information/send/index.vue

@@ -0,0 +1,376 @@
+<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="title">
+        <el-input maxlength="50" v-model="queryParams.title" placeholder="请输入标题" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+
+
+      <el-form-item label="类型" prop="type">
+        <el-input v-model="queryParams.sendStutas" 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="['core:send:add']">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="sendList">
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="类型" align="center" key="type" prop="type" width="80">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.message_type" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+
+      <el-table-column label="发送状态" align="center" key="sendStatus" prop="sendStatus" width="80">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.send_status" :value="scope.row.sendStatus" />
+        </template>
+      </el-table-column>
+
+
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="150">
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-edit"
+            @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">修改</el-button>
+
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-delete"
+            @click="handleDelete(scope.row)" v-hasPermi="['core:send:remove']">删除</el-button>
+
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 1" icon="el-icon-search"
+            @click="handleSelect(scope.row)" v-hasPermi="['core:send:query']">详情</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-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" maxlength="50" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
+            <el-option v-for="dict in dict.type.message_type" :key="dict.value" :label="dict.label"
+              :value="`${dict.value}`"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" />
+        </el-form-item>
+
+        <el-form-item label="发送目标" prop="sendUser">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
+            <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+          </el-select>
+
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+
+
+        </el-form-item>
+        <el-form-item label="发送时间" prop="sendTimeType">
+          <el-radio-group v-model="form.sendTimeType">
+            <el-radio v-for="dict in dict.type.send_time_type" :key="dict.value" :label="dict.value">
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
+          <el-date-picker style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
+            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 详情 -->
+    <el-dialog :title="title" :visible.sync="yes" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input readonly v-model="form.title" maxlength="50" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
+            <el-option v-for="dict in dict.type.message_type" :key="dict.value" :label="dict.label"
+              :value="`${dict.value}`" :disabled="true"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input readonly v-model="form.content" type="textarea" :rows="10" maxlength="2000" placeholder="输入内容" />
+        </el-form-item>
+
+        <el-form-item label="发送目标" prop="sendUser">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
+            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"
+              :disabled="true"></el-option>
+          </el-select>
+
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
+            <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
+              :disabled="true"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发送时间" prop="sendTimeType">
+          <el-radio-group v-model="form.sendTimeType">
+            <el-radio v-for="dict in dict.type.send_time_type" :key="dict.value" :label="dict.value" :disabled="true">
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
+          <el-date-picker readonly style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
+            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSend, getSend, delSend, addSend, updateSend } from "@/api/core/send/send";
+import { listAllUser } from "@/api/system/user";
+import { allRole } from "@/api/system/role"
+export default {
+  name: "Send",
+  dicts: ['send_time_type', 'message_type', 'send_status'],
+  data() {
+    return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime());
+          return time.getTime() < date;
+        },
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      //全部用户
+      userOptions: [],
+      //全部角色
+      roleOptions: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 【请填写功能名称】表格数据
+      sendList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      yes: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        type: null,
+        content: null,
+        sendUser: null,
+        sendRole: null,
+        sendTimeType: null,
+        sendTime: null,
+        sendStutas: null
+      },
+      // 表单参数
+      form: {
+        title: null,
+        type: null,
+        content: null,
+        sendUser: null,
+        sendRole: null,
+        sendTimeType: null,
+        sendTime: null,
+        sendStutas: null
+      },
+      // 表单校验
+      rules: {
+        title: [
+          { required: true, message: '请输入标题', trigger: 'change' },
+        ],
+        sendUser: [
+          { required: true, message: '请选择用户', trigger: 'change' },
+        ],
+        content: [
+          { required: true, message: '请输入内容', trigger: 'change' },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getAllUser();
+    this.getAllRole();
+  },
+  methods: {
+    /** 查询【请填写功能名称】列表 */
+    getList() {
+      this.loading = true;
+      listSend(this.queryParams).then(response => {
+        this.sendList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getAllUser() {
+      listAllUser().then(response => {
+        this.userOptions = response.data;
+        this.form.sendRole = null;
+      })
+    },
+    getAllRole() {
+      allRole().then(response => {
+        this.roleOptions = response.data;
+        this.form.sendUser = null;
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        type: null,
+        content: null,
+        sendUser: null,
+        sendRole: null,
+        sendTimeType: null,
+        sendTime: null,
+        delFlag: null,
+        createTime: null,
+        createBy: null,
+        updateBy: null,
+        updateTime: null,
+        sendStutas: null
+      };
+      this.resetForm("form");
+    },
+    startDateChanged(time) {
+      if (this.form.sendTime > this.form.endTime) {
+        this.form.endTime = this.form.sendTime;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.title)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSend(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /**
+  * 详情按钮操作
+  */
+    handleSelect(row) {
+      const id = row.id
+      getSend(id).then(response => {
+        this.form = response.data;
+        this.yes = true;
+        this.title = "详情";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSend(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSend(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      const names = row.title || this.names;
+      this.$modal.confirm('是否确认删除标题为"' + names + '"的数据项?').then(function () {
+        return delSend(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/send/export', {
+        ...this.queryParams
+      }, `send_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

+ 149 - 133
src/views/system/device/index.vue

@@ -1,54 +1,45 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
-        </div>
-        <div class="tree-container">
-          <div style="margin-bottom: 10px;">
-            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">关联下级</el-checkbox>
-          </div>
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
-            :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
-        </div>
-      </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="请输入设备名称" clearable
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="资产类别" prop="assetType">
-
-            <el-select style="width: 100%;" clearable v-model="queryParams.assetType" placeholder="请选择" @change="changeSelectDevice">
-              <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-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :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-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:device:add']">新增</el-button>
-          </el-col>
-       <!--   <el-col :span="1.5">
+    <layoutCom>
+      <org-tree slot="leftBar" v-model="queryParams.orgId" @defaultKey="defaultKeys" @checkChange="checkChange"
+        @click="handleNodeClick"></org-tree>
+      <el-row slot="rightBar">
+        <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="请输入设备名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="资产类别" prop="assetType">
+
+              <el-select style="width: 100%;" clearable v-model="queryParams.assetType" placeholder="请选择"
+                @change="changeSelectDevice">
+                <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-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择">
+                <el-option v-for="item in devices" :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-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:device: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:device:edit']">修改</el-button>
           </el-col>
@@ -56,86 +47,98 @@
             <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
               v-hasPermi="['system:device:remove']">删除</el-button>
           </el-col>-->
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table
-          border
-          height="600"
-          size="small"
-          v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
-          <!--<el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" min-width="50">
-            <template v-slot:default="scope">
-              <span v-text="getPageIndex(scope.$index)"> </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="所属机构" align="left" prop="orgName" />
-
-          <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
-            </template>
-          </el-table-column>
-
-          <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType" width="80">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
-          <el-table-column label="有效期至" align="center" prop="checkTime" width="160">
-          </el-table-column>
-          <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
-          <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:device:edit']">编辑</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>
-
-
-
-
-
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+
+          <el-table border height="600" size="small" v-loading="loading" :data="deviceList"
+            @selection-change="handleSelectionChange">
+            <!--<el-table-column type="selection" width="55" align="center" />-->
+            <el-table-column label="序号" align="center" min-width="50">
+              <template v-slot:default="scope">
+                <span v-text="getPageIndex(scope.$index)"> </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="所属机构" align="left" prop="orgName" />
+
+            <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
+              </template>
+            </el-table-column>
+
+            <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType" width="80">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="设备名称" align="center" prop="deviceName" />
+            <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
+            <el-table-column label="有效期至" align="center" prop="checkTime" width="160">
+            </el-table-column>
+            <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
+            <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:device:edit']">编辑</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>
+    </layoutCom>
 
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible="open" width="800px" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="所属机构" prop="orgId">
-              <tree-select
-                style="width: 100%"
-                v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                placeholder="请选择归属机构" @select="changeSelect">
+              <tree-select style="width: 100%" v-model="form.orgId" :options="deptOptions" :show-count="true"
+                :normalizer="tenantIdnormalizer" placeholder="请选择归属机构" @select="changeSelect">
               </tree-select>
             </el-form-item>
           </el-col>
+        </el-row> -->
+        <!-- <el-form-item label="所属机构" prop="orgId">
+          <orgDropDown v-model="form.orgId" placeholder="选择所属机构" @select="onOrgSelect" />
+        </el-form-item> -->
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="所属机构" prop="orgId">
+              <tree-select
+                v-model="form.orgId"
+                :options="deptOptions"
+                :show-count="true"
+                :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }"
+                placeholder="请选择归属机构"
+              
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
+
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="资产类别" prop="assetType">
               <el-select style="width: 100%;" v-model="form.assetType" placeholder="请选择" @change="changeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                           :value="`${dict.value}`"></el-option>
+                  :value="`${dict.value}`"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select style="width: 100%" v-model="form.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -163,7 +166,9 @@
 
           <el-col :span="12">
             <el-form-item v-if="form.deviceType == 2" label="通道号" prop="channel">
-              <el-input type="number" max="64" min="0" oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)" v-model="form.channel" placeholder="请输入" />
+              <el-input type="number" max="64" min="0"
+                oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)" v-model="form.channel"
+                placeholder="请输入" />
             </el-form-item>
           </el-col>
 
@@ -172,9 +177,9 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item  v-if="form.assetType == 0" label="有效期至" prop="checkTime">
-              <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
+            <el-form-item v-if="form.assetType == 0" label="有效期至" prop="checkTime">
+              <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -192,6 +197,8 @@
 </template>
 
 <script>
+import orgDropDown from "../../../components/orgTree/orgDropDown.vue";
+import OrgTree from "@/components/orgTree";
 import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -203,7 +210,7 @@ export default {
   mixins: [tableList],
   dicts: ['sys_asset_type', 'sys_device_type'],
   name: "Device",
-  components: { treeselect },
+  components: { OrgTree, treeselect,orgDropDown },
   data() {
     return {
       checkList: [],
@@ -277,7 +284,7 @@ export default {
         maintenanceTerm: null,
         hostId: null,
         channel: null,
-        checkSub:true
+        checkSub: true
       },
       // 表单参数
       form: {
@@ -303,6 +310,7 @@ export default {
     //this.getList();
 
   },
+
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
@@ -311,6 +319,19 @@ export default {
   },
 
   methods: {
+    onOrgSelect(node) {
+      this.form.orgPath = node.path;
+      this.form.orgName = node.name;
+    },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.handleQuery();
+    },
     getPageIndex($index) {
       //表格序号
       return (
@@ -330,17 +351,7 @@ export default {
     /** 查询机构树数据 */
 
 
-    /** treeSelect组件自定义数据*/
-    tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      }
-    },
+
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.orgId = data.id;
@@ -368,7 +379,6 @@ export default {
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions, ' this.deptOptions')
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
         this.selectOrgId = response.data[0].id;
@@ -376,15 +386,21 @@ export default {
         this.handleQuery();
       });
     },
+    // 节点单击事件
+    clickTreeNode(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
-        delete node.children
+        delete node.children;
       }
       return {
         id: node.id,
-        label: node.name,
-        children: node.children
-      }
+        label: node.shortName,
+        children: node.children,
+      };
     },
     // 取消按钮
     cancel() {
@@ -420,6 +436,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+     this.devices=null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -437,11 +454,11 @@ export default {
       this.form.orgId = this.selectOrgId;
     },
     changeSelectDevice(val) {
-      if(val){
+      if (val) {
         getDeviceType(val).then(response => {
           this.devices = response.data;
-          this.form.deviceType=null;
-          this.queryParams.deviceType=null;
+          this.form.deviceType = null;
+          this.queryParams.deviceType = null;
         })
       }
     },
@@ -460,7 +477,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {

+ 553 - 553
src/views/system/user/extend.vue

@@ -30,7 +30,7 @@
             <el-form-item label="所属部门" prop="deptId">
               <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择">
                 <el-option v-for="dict in dict.type.sys_department_type" :key="dict.value" :label="dict.label"
-                           :value="dict.value"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -39,7 +39,7 @@
             <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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -48,7 +48,7 @@
             <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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -59,7 +59,7 @@
             <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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -67,7 +67,7 @@
             <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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -75,7 +75,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="初级以上相关专业技术职业资格" prop="professionalQualifications">
               <el-input style="width: 217px;" maxlength="50" v-model="formData.professionalQualifications"
-                        placeholder="请输入">
+                placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
@@ -87,15 +87,14 @@
             <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
               <el-select style="width: 217px;" 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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item style="width: 517px;" label="参加工作时间" prop="workTime">
-              <el-date-picker clearable v-model="formData.workTime" @change="startDateChanged"
-                              :picker-options="startDatepickerOptions" type="date" value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="请选择时间">
+              <el-date-picker v-model="formData.workTime" :picker-options="endDatepickerOptions" align="right" type="date"
+                placeholder="请选择时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -103,20 +102,21 @@
           <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="选择开始日期">
+                :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 prop="entryTime" label="现任职时间">
               <el-date-picker v-model="formData.entryTime" :picker-options="endDatepickerOptions" align="right"
-                              type="date" placeholder="选择结束日期">
+                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="responsibilitiesLeaderName">
-              <el-input style="width: 217px;" v-model="formData.responsibilitiesLeaderName" placeholder="请输入">
+              <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
+                placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
@@ -124,7 +124,7 @@
             <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"/>
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -133,7 +133,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="上传相关证书">
               <image-upload :limit="5" :value="formData.qualificationCertificateUrl" :fileSize="2"
-                            @input="getImgUrl"></image-upload>
+                @input="getImgUrl"></image-upload>
             </el-form-item>
           </el-col>
           <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
@@ -155,570 +155,570 @@
 </template>
 
 <script>
-  import uploadpng from "@/assets/images/upload.png";
-  import uplpng from "@/assets/images/upl.png";
-  import {getUser} from "@/api/system/user";
-  import TreeSelect from '@riophae/vue-treeselect'
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import {deptTreeList} from "@/api/system/public";
-
-  import {extendUserInformation} from "@/api/system/information";
-
-  export default {
-    props: [],
-    components: {TreeSelect},
-    dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass','current_position'],
-    data() {
-      return {
-        startDatepickerOptions: {
-          disabledDate(time) {
-            const date = new Date();
-            date.setTime(date.getTime() - 3600 * 1000 * 24);
-            return time.getTime() > date;
-          },
-        },
-        endDatepickerOptions: {
-          disabledDate: this.disabledDate,
+import uploadpng from "@/assets/images/upload.png";
+import uplpng from "@/assets/images/upl.png";
+import { getUser } from "@/api/system/user";
+import TreeSelect from '@riophae/vue-treeselect'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { deptTreeList } from "@/api/system/public";
+
+import { extendUserInformation } from "@/api/system/information";
+
+export default {
+  props: [],
+  components: { TreeSelect },
+  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position'],
+  data() {
+    return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() >= date;
         },
-        //基础信息key
-        infoKeys: [
-          {label: '用户名称', key: 'username'},
-          {label: '用户昵称', key: 'name'},
-          {label: '工号', key: 'jobNumber'},
-          //  {label:'部门',key:'orgName'},
-          {label: '手机', key: 'phone'},
-          // {label:'性别',key:'gender'},
-          // {label:'状态',key:'isLock'},
-          {label: '机构', key: 'orgName'},
+      },
+      endDatepickerOptions: {
+        disabledDate: this.disabledDate,
+      },
+      //基础信息key
+      infoKeys: [
+        { label: '用户名称', key: 'username' },
+        { label: '用户昵称', key: 'name' },
+        { label: '工号', key: 'jobNumber' },
+        //  {label:'部门',key:'orgName'},
+        { label: '手机', key: 'phone' },
+        // {label:'性别',key:'gender'},
+        // {label:'状态',key:'isLock'},
+        { label: '机构', key: 'orgName' },
+      ],
+      dataInfo: [],
+      formData: {
+        deptId: null,
+        duties: null,
+        workType: null,
+        isFullTime: "1",
+        highestEducation: null,
+        educationType: null,
+        certificateWork: "1",
+        professionalQualifications: null,
+        certificateFailReason: null,
+        workTime: null,
+        entryTime: null,
+        bornTime: null,
+        responsibilitiesLeaderName: null,
+        responsibilitiesLeaderDuties: null,
+        qualificationCertificateUrl: null,
+        userId: null,
+      },
+      rules: {
+        deptId: [
+          { required: true, message: '请选择所属部门', trigger: 'blur' },
         ],
-        dataInfo: [],
-        formData: {
-          deptId: null,
-          duties: null,
-          workType: null,
-          isFullTime: "1",
-          highestEducation: null,
-          educationType: null,
-          certificateWork: "1",
-          professionalQualifications: null,
-          certificateFailReason: null,
-          workTime: null,
-          entryTime: null,
-          bornTime: null,
-          responsibilitiesLeaderName: null,
-          responsibilitiesLeaderDuties: null,
-          qualificationCertificateUrl: null,
-          userId: null,
-        },
-        rules: {
-          deptId: [
-            {required: true, message: '请选择所属部门', trigger: 'blur'},
-          ],
-          duties: [
-            {required: true, message: '请选择职务', trigger: 'blur'},
-          ],
-          workType: [
-            {required: true, message: '请选择用工形式', trigger: 'blur'},
-          ],
-          isFullTime: [
-            {required: true, message: '请选择是否专职', trigger: 'blur'},
-          ],
-          highestEducation: [
-            {required: true, message: '请选择最高学历', trigger: 'blur'},
-          ],
-          educationType: [
-            {required: true, message: '请选择学历取得形式', trigger: 'blur'},
-          ],
-          certificateWork: [
-            {required: true, message: '请选择是否持证上岗', trigger: 'blur'},
-          ],
-          workTime: [
-            {required: true, message: '请选择参加工作时间', trigger: 'blur'},
-          ],
-          entryTime: [
-            {required: true, message: '请选择入职时间', trigger: 'change'}
-          ],
-          bornTime: [
-            {required: true, message: '请选择出生时间', trigger: 'change'}
-          ],
-          responsibilitiesLeaderName: [
-            {required: true, message: '请输入分管领导名字', trigger: 'change'}
-          ],
-          responsibilitiesLeaderDuties: [
-            {required: true, message: '请选择分管领导职务', trigger: 'change'}
-          ],
-          qualificationCertificateUrl: [
-            {required: true, message: '请选择上传资格证', trigger: 'change'}
-          ],
-          professionalQualifications: [
-            {required: true, message: '请输入初级以上相关专业技术职业资格', trigger: 'change'}
-          ],
-          certificateFailReason: [
-            {required: true, message: '请输入持证上岗未通过原因', trigger: 'change'}
-          ],
-          date2: [
-            {type: 'date', required: true, message: '请选择时间', trigger: 'change'}
-          ],
-          type: [
-            {type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change'}
-          ],
-          resource: [
-            {required: true, message: '请选择活动资源', trigger: 'change'}
-          ],
-          desc: [
-            {required: true, message: '请填写活动形式', trigger: 'blur'}
-          ]
-        },
-        // 机构树选项
-        deptList: undefined,
-        // 遮罩层
-        orgloading: true,
-        // 选中数组
-        orgids: [],
-        // 选中数组
-        Bankids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 机构物防建设表格数据
-        constructionList: [],
-        // 银行物防建设表格数据
-        BankPhysicalDefenseConstructionList: [],
-        // 弹出层标题
-        orgtitle: "",
-        // 弹出层标题
-        Banktitle: "",
-        // 是否显示弹出层
-        Bankopen: false,
-        // 表单参数
-        Bankform: {},
-        // 是否显示弹出层
-        orgopen: false,
-        roleName: null,
-        sex: null,
-        status: null,
-        // 表单参数
-        orgform: {},
-        //2个图片信息
-        uploadp: uploadpng,
-        uplp: uplpng,
-        //下拉框生成信息
-        orgTypes: {
-          orgTyp1: {label: "营业网点", value: 0},
-          orgTyp2: {label: "监控中心", value: 1},
-        },
-
-        businessLibraryTypes: {
-          businessLibraryTyp1: {label: "1类业务库", value: 1},
-          businessLibraryTyp2: {label: "2类业务库", value: 2},
-          businessLibraryTyp3: {label: "3类业务库", value: 3},
-        },
-        platformBrands: {
-          platformBrand1: {label: "品牌1", value: 0},
-          platformBrand2: {label: "品牌2", value: 1},
-        },
-        platformSupplierBrands: {
-          platformSupplierBrand1: {label: "品牌1", value: 0},
-          platformSupplierBrand2: {label: "品牌2", value: 1},
-        },
-        prop: "",
-        propItem: "",
+        duties: [
+          { required: true, message: '请选择职务', trigger: 'blur' },
+        ],
+        workType: [
+          { required: true, message: '请选择用工形式', trigger: 'blur' },
+        ],
+        isFullTime: [
+          { required: true, message: '请选择是否专职', trigger: 'blur' },
+        ],
+        highestEducation: [
+          { required: true, message: '请选择最高学历', trigger: 'blur' },
+        ],
+        educationType: [
+          { required: true, message: '请选择学历取得形式', trigger: 'blur' },
+        ],
+        certificateWork: [
+          { required: true, message: '请选择是否持证上岗', trigger: 'blur' },
+        ],
+        workTime: [
+          { required: true, message: '请选择参加工作时间', trigger: 'blur' },
+        ],
+        entryTime: [
+          { required: true, message: '请选择入职时间', trigger: 'change' }
+        ],
+        bornTime: [
+          { required: true, message: '请选择出生时间', trigger: 'change' }
+        ],
+        responsibilitiesLeaderName: [
+          { required: true, message: '请输入分管领导名字', trigger: 'change' }
+        ],
+        responsibilitiesLeaderDuties: [
+          { required: true, message: '请选择分管领导职务', trigger: 'change' }
+        ],
+        qualificationCertificateUrl: [
+          { required: true, message: '请选择上传资格证', trigger: 'change' }
+        ],
+        professionalQualifications: [
+          { required: true, message: '请输入初级以上相关专业技术职业资格', trigger: 'change' }
+        ],
+        certificateFailReason: [
+          { required: true, message: '请输入持证上岗未通过原因', trigger: 'change' }
+        ],
+        date2: [
+          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        ],
+        type: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ],
+        resource: [
+          { required: true, message: '请选择活动资源', trigger: 'change' }
+        ],
+        desc: [
+          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ]
+      },
+      // 机构树选项
+      deptList: undefined,
+      // 遮罩层
+      orgloading: true,
+      // 选中数组
+      orgids: [],
+      // 选中数组
+      Bankids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 机构物防建设表格数据
+      constructionList: [],
+      // 银行物防建设表格数据
+      BankPhysicalDefenseConstructionList: [],
+      // 弹出层标题
+      orgtitle: "",
+      // 弹出层标题
+      Banktitle: "",
+      // 是否显示弹出层
+      Bankopen: false,
+      // 表单参数
+      Bankform: {},
+      // 是否显示弹出层
+      orgopen: false,
+      roleName: null,
+      sex: null,
+      status: null,
+      // 表单参数
+      orgform: {},
+      //2个图片信息
+      uploadp: uploadpng,
+      uplp: uplpng,
+      //下拉框生成信息
+      orgTypes: {
+        orgTyp1: { label: "营业网点", value: 0 },
+        orgTyp2: { label: "监控中心", value: 1 },
+      },
 
-        row: "",
-        imgs: []
-      };
+      businessLibraryTypes: {
+        businessLibraryTyp1: { label: "1类业务库", value: 1 },
+        businessLibraryTyp2: { label: "2类业务库", value: 2 },
+        businessLibraryTyp3: { label: "3类业务库", value: 3 },
+      },
+      platformBrands: {
+        platformBrand1: { label: "品牌1", value: 0 },
+        platformBrand2: { label: "品牌2", value: 1 },
+      },
+      platformSupplierBrands: {
+        platformSupplierBrand1: { label: "品牌1", value: 0 },
+        platformSupplierBrand2: { label: "品牌2", value: 1 },
+      },
+      prop: "",
+      propItem: "",
+
+      row: "",
+      imgs: []
+    };
+  },
+
+  computed: {
+    switchModel: {
+      get() {
+        return this.switchValue === 1; // 将0转换为false,1转换为true
+      },
+      set(value) {
+        this.switchValue = value ? 1 : 0; // 将false转换为0,true转换为1
+      },
     },
+  },
+  created() {
+    this.getInfo();
+    this.getDeptTreeList();
+  },
+  mounted() {
+  },
+  methods: {
 
-    computed: {
-      switchModel: {
-        get() {
-          return this.switchValue === 1; // 将0转换为false,1转换为true
-        },
-        set(value) {
-          this.switchValue = value ? 1 : 0; // 将false转换为0,true转换为1
-        },
-      },
+
+    getImgUrl(img) {
+
+      this.imgs.push(img);
+      console.log(this.imgs, 'imgs')
     },
-    created() {
-      this.getInfo();
-      this.getDeptTreeList();
+    handleChange(value) {
     },
-    mounted() {
+    //自定义数据
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children
+      }
+    },
+    getInfo() {
+      getUser(this.$route.params.userId).then((data) => {
+        if (!data.data) return;
+        let res = data.data;
+        this.dataInfo = this.infoKeys.map((v, i) => {
+          v.value = res[v.key];
+          return v
+        })
+        this.roleName = data.roleName;
+        this.sex = data.sex;
+        this.status = data.status;
+        this.formData = data.information;
+      });
     },
-    methods: {
-
 
-      getImgUrl(img) {
 
-        this.imgs.push(img);
-        console.log(this.imgs, 'imgs')
-      },
-      handleChange(value) {
-      },
-      //自定义数据
-      tenantIdnormalizer(node, instanceId) {
-        if (node.children && !node.children.length) {
-          delete node.children
-        }
-        return {
-          id: node.deptId,
-          label: node.deptName,
-          children: node.children
-        }
-      },
-      getInfo() {
-        getUser(this.$route.params.userId).then((data) => {
-          console.log(data, 'userdata');
-          if (!data.data) return;
-          let res = data.data;
-          this.dataInfo = this.infoKeys.map((v, i) => {
-            v.value = res[v.key];
-            return v
+    saveExtend() {
+      this.formData.userId = this.$route.params.userId;
+      this.formData.qualificationCertificateUrl = this.imgs.toString(',');
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          extendUserInformation(this.formData).then(res => {
+            this.$message.success('保存成功!')
+            this.$router.go(-1)
           })
-          this.roleName = data.roleName;
-          this.sex = data.sex;
-          this.status = data.status;
-          this.formData = data.information;
-        });
-      },
-
-
-      saveExtend() {
-        this.formData.userId = this.$route.params.userId;
-        this.formData.qualificationCertificateUrl = this.imgs.toString(',');
-        this.$refs['form'].validate((valid) => {
-          if (valid) {
-            extendUserInformation(this.formData).then(res => {
-              this.$message.success('保存成功!')
-              this.$router.go(-1)
-            })
-          }
-        });
+        }
+      });
 
-      },
-      getExtendInfo() {
-        getExtendByOrgId(this.$route.params.id).then((data) => {
-          console.log(data.data);
-          if (data.data != null) {
-            this.orgType = data.data.orgType;
-            this.weatherAreaCode = data.data.weatherAreaCode;
-            this.premisesArea = data.data.premisesArea;
-            this.ownership = data.data.ownership;
-            this.outsideArea = data.data.outsideArea;
-            this.askari = data.data.askari;
-            this.remoteControl = data.data.remoteControl;
-            this.selfServiceBank = data.data.selfServiceBank;
-            this.lobbyEquipment = data.data.lobbyEquipment;
-            this.wallPenetratingEquipment = data.data.wallPenetratingEquipment;
-            this.extendId = data.data.id;
-          }
-        });
-      },
-      startDateChanged(time) {
-        if (this.formData.bornTime > this.formData.entryTime) {
+    },
+    getExtendInfo() {
+      getExtendByOrgId(this.$route.params.id).then((data) => {
+        console.log(data.data);
+        if (data.data != null) {
+          this.orgType = data.data.orgType;
+          this.weatherAreaCode = data.data.weatherAreaCode;
+          this.premisesArea = data.data.premisesArea;
+          this.ownership = data.data.ownership;
+          this.outsideArea = data.data.outsideArea;
+          this.askari = data.data.askari;
+          this.remoteControl = data.data.remoteControl;
+          this.selfServiceBank = data.data.selfServiceBank;
+          this.lobbyEquipment = data.data.lobbyEquipment;
+          this.wallPenetratingEquipment = data.data.wallPenetratingEquipment;
+          this.extendId = data.data.id;
+        }
+      });
+    },
+    startDateChanged(time) {
+      if (this.formData.bornTime > this.formData.entryTime) {
+        if (null != this.formData.entryTime) {
           this.formData.entryTime = this.formData.bornTime;
         }
-      },
-      disabledDate(time) {
-        //小于开始日期禁止选择
-        let bornTime = new Date();
+      }
+    },
+    disabledDate(time) {
+      //小于开始日期禁止选择
+      let bornTime = new Date();
+      bornTime.setTime(bornTime.getTime() - 3600 * 1000 * 24);
+      if (this.formData.bornTime) {
+        bornTime = new Date(this.formatTime(this.formData.bornTime, 'YYYY-MM-DD'));
         bornTime.setTime(bornTime.getTime() - 3600 * 1000 * 24);
-        if (this.formData.bornTime) {
-          bornTime = new Date(this.formatTime(this.formData.bornTime, 'YYYY-MM-DD'));
-          bornTime.setTime(bornTime.getTime() - 3600 * 1000 * 24);
-        }
-        return time.getTime() > new Date(bornTime).getTime()
-      },
-      /** 查询机构下拉树结构 */
-      getDeptTreeList() {
-        deptTreeList().then(response => {
-          this.deptList = response.data;
-          this.defaultKeys = response.data[0];
-        });
-      },
-      getOrgPhysicalDefenseConstructionInfo() {
-        this.orgloading = true;
-        let dat = {orgId: this.$route.params.id};
-        listOrgPhysicalDefenseConstruction(dat).then((data) => {
-          this.constructionList = data.rows;
-          this.orgloading = false;
-        });
-      },
-      getBankPhysicalDefenseConstructionInfo() {
-        this.bankloading = true;
-        let dat = {orgId: this.$route.params.id};
-        listBankPhysicalDefenseConstruction(dat).then((data) => {
-
-          this.BankPhysicalDefenseConstructionList = data.rows;
-          this.bankloading = false;
-        });
-      },
-      // 取消按钮
-      Bankcancel() {
-        this.Bankopen = false;
-        this.Bankreset();
-      },
-      // 表单重置
-      Bankreset() {
-        this.Bankform = {
-          id: null,
-          standard: null,
-          dateOfCompliance: null,
-          certificateEvidence: null,
-          certificate: null,
-          evidence: null,
-          createTime: null,
-          updateTime: null,
-          createBy: null,
-          updateBy: null,
-          orgId: null,
-        };
-        this.resetForm("Bankform");
-      },
-      // 多选框选中数据
-      handleBankSelectionChange(selection) {
-        this.Bankids = selection.map((item) => item.id);
-        this.single = selection.length !== 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleBankAdd() {
-        this.Bankreset();
+      }
+      const date = new Date();
+      date.setTime(date.getTime());
+      return (!(new Date(bornTime).getTime() < time.getTime()) || !(time.getTime() < new Date(date).getTime()))
+    },
+    /** 查询机构下拉树结构 */
+    getDeptTreeList() {
+      deptTreeList().then(response => {
+        this.deptList = response.data;
+        this.defaultKeys = response.data[0];
+      });
+    },
+    getOrgPhysicalDefenseConstructionInfo() {
+      this.orgloading = true;
+      let dat = { orgId: this.$route.params.id };
+      listOrgPhysicalDefenseConstruction(dat).then((data) => {
+        this.constructionList = data.rows;
+        this.orgloading = false;
+      });
+    },
+    getBankPhysicalDefenseConstructionInfo() {
+      this.bankloading = true;
+      let dat = { orgId: this.$route.params.id };
+      listBankPhysicalDefenseConstruction(dat).then((data) => {
+
+        this.BankPhysicalDefenseConstructionList = data.rows;
+        this.bankloading = false;
+      });
+    },
+    // 取消按钮
+    Bankcancel() {
+      this.Bankopen = false;
+      this.Bankreset();
+    },
+    // 表单重置
+    Bankreset() {
+      this.Bankform = {
+        id: null,
+        standard: null,
+        dateOfCompliance: null,
+        certificateEvidence: null,
+        certificate: null,
+        evidence: null,
+        createTime: null,
+        updateTime: null,
+        createBy: null,
+        updateBy: null,
+        orgId: null,
+      };
+      this.resetForm("Bankform");
+    },
+    // 多选框选中数据
+    handleBankSelectionChange(selection) {
+      this.Bankids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleBankAdd() {
+      this.Bankreset();
+      this.Bankopen = true;
+      this.Banktitle = "添加银行物防建设";
+    },
+    /** 修改按钮操作 */
+    handleBankUpdate(row) {
+      this.Bankreset();
+      const id = row.id || this.Bankids;
+      getBankPhysicalDefenseConstruction(id).then((response) => {
+        this.Bankform = response.data;
         this.Bankopen = true;
-        this.Banktitle = "添加银行物防建设";
-      },
-      /** 修改按钮操作 */
-      handleBankUpdate(row) {
-        this.Bankreset();
-        const id = row.id || this.Bankids;
-        getBankPhysicalDefenseConstruction(id).then((response) => {
-          this.Bankform = response.data;
-          this.Bankopen = true;
-          this.Banktitle = "修改银行物防建设";
-        });
-      },
-      /** 提交按钮 */
-      submitBankForm() {
-        this.Bankform.orgId = this.$route.params.id;
-        this.$refs["Bankform"].validate((valid) => {
-          if (valid) {
-            if (this.Bankform.id != null) {
-              updateBankPhysicalDefenseConstruction(this.Bankform).then(
-                (response) => {
-                  this.$modal.msgSuccess("修改成功");
-                  this.Bankopen = false;
-                  this.getBankPhysicalDefenseConstructionInfo();
-                }
-              );
-            } else {
-              addBankPhysicalDefenseConstruction(this.Bankform).then(
-                (response) => {
-                  this.$modal.msgSuccess("新增成功");
-                  this.Bankopen = false;
-                  this.getBankPhysicalDefenseConstructionInfo();
-                }
-              );
-            }
+        this.Banktitle = "修改银行物防建设";
+      });
+    },
+    /** 提交按钮 */
+    submitBankForm() {
+      this.Bankform.orgId = this.$route.params.id;
+      this.$refs["Bankform"].validate((valid) => {
+        if (valid) {
+          if (this.Bankform.id != null) {
+            updateBankPhysicalDefenseConstruction(this.Bankform).then(
+              (response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.Bankopen = false;
+                this.getBankPhysicalDefenseConstructionInfo();
+              }
+            );
+          } else {
+            addBankPhysicalDefenseConstruction(this.Bankform).then(
+              (response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.Bankopen = false;
+                this.getBankPhysicalDefenseConstructionInfo();
+              }
+            );
           }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleBankDelete(row) {
+      const Bankids = row.id || this.Bankids;
+      this.$modal
+        .confirm('是否确认删除银行物防建设编号为"' + Bankids + '"的数据项?')
+        .then(function () {
+          return delBankPhysicalDefenseConstruction(Bankids);
+        })
+        .then(() => {
+          this.getBankPhysicalDefenseConstructionInfo();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {
         });
-      },
-      /** 删除按钮操作 */
-      handleBankDelete(row) {
-        const Bankids = row.id || this.Bankids;
-        this.$modal
-          .confirm('是否确认删除银行物防建设编号为"' + Bankids + '"的数据项?')
-          .then(function () {
-            return delBankPhysicalDefenseConstruction(Bankids);
-          })
-          .then(() => {
-            this.getBankPhysicalDefenseConstructionInfo();
-            this.$modal.msgSuccess("删除成功");
-          })
-          .catch(() => {
-          });
-      },
-      // 表单重置
-      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");
-      },
-      // 取消按钮
-      orgcancel() {
-        this.orgopen = false;
-        this.orgreset();
-      },
-      // 多选框选中数据
-      handleOrgSelectionChange(selection) {
-        this.orgids = selection.map((item) => item.id);
-        this.single = selection.length !== 1;
-        this.multiple = !selection.length;
-      },
-      /** 新增按钮操作 */
-      handleOrgAdd() {
-        this.orgreset();
+    },
+    // 表单重置
+    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");
+    },
+    // 取消按钮
+    orgcancel() {
+      this.orgopen = false;
+      this.orgreset();
+    },
+    // 多选框选中数据
+    handleOrgSelectionChange(selection) {
+      this.orgids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleOrgAdd() {
+      this.orgreset();
+      this.orgopen = true;
+      this.orgtitle = "添加机构物防建设";
+    },
+    /** 修改按钮操作 */
+    handleOrgUpdate(row) {
+      this.orgreset();
+      const id = row.id || this.orgids;
+      getOrgPhysicalDefenseConstruction(id).then((response) => {
+
+        this.orgform = response.data;
         this.orgopen = true;
-        this.orgtitle = "添加机构物防建设";
-      },
-      /** 修改按钮操作 */
-      handleOrgUpdate(row) {
-        this.orgreset();
-        const id = row.id || this.orgids;
-        getOrgPhysicalDefenseConstruction(id).then((response) => {
-
-          this.orgform = response.data;
-          this.orgopen = true;
-          this.orgtitle = "修改机构物防建设";
-        });
-      },
-      /** 提交按钮 */
-      submitOrgForm() {
-        this.orgform.orgId = this.$route.params.id;
-        this.$refs["orgform"].validate((valid) => {
-          if (valid) {
-            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.orgtitle = "修改机构物防建设";
+      });
+    },
+    /** 提交按钮 */
+    submitOrgForm() {
+      this.orgform.orgId = this.$route.params.id;
+      this.$refs["orgform"].validate((valid) => {
+        if (valid) {
+          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(() => {
         });
-      },
-      /** 删除按钮操作 */
-      handleOrgDelete(row) {
-        const orgids = row.id || this.orgids;
-        this.$modal
-          .confirm('是否确认删除机构物防建设编号为"' + orgids + '"的数据项?')
-          .then(function () {
-            return delOrgPhysicalDefenseConstruction(orgids);
-          })
-          .then(() => {
-            this.getOrgPhysicalDefenseConstructionInfo();
-            this.$modal.msgSuccess("删除成功");
-          })
-          .catch(() => {
-          });
-      },
+    },
 
-      nosaveExtend() {
-        this.$router.go(-1);
-      },
-      triggerFileInput() {
-        this.$refs.fileInput.click();
-      },
-      async handleFileChange(event) {
-        const file = event.target.files[0];
-        if (!file) return;
-
-        // 创建 FormData 对象并添加文件
-        const formData = new FormData();
-        formData.append('file', file);
-
-        // // 发送文件到您的文件上传 API
-        try {
-          uploadFile(formData).then((res) => {
-            console.log(res);
-            // this.orgform.certificateEvidence = res.data;
-          });
-          // 处理上传成功的逻辑
-          console.log('上传成功');
-        } catch (error) {
-          // 处理上传失败的逻辑
-          console.log('上传失败');
-        }
-        // try {
-        //   const response = await request.post('http://localhost:9527/dev-api/file/file/upload', formData, {
-        //     headers: {
-        //       'Content-Type': 'multipart/form-data',
-        //     },
-        //   });
-        //   // 处理上传成功的逻辑
-        //   console.log('上传成功', response);
-        // } catch (error) {
-        //   // 处理上传失败的逻辑
-        //   console.log('上传失败', error);
-        // }
-        // 重置 input 元素,以便下次选择相同文件时仍能触发 change 事件
-        event.target.value = '';
-      },
+    nosaveExtend() {
+      this.$router.go(-1);
+    },
+    triggerFileInput() {
+      this.$refs.fileInput.click();
+    },
+    async handleFileChange(event) {
+      const file = event.target.files[0];
+      if (!file) return;
+
+      // 创建 FormData 对象并添加文件
+      const formData = new FormData();
+      formData.append('file', file);
+
+      // // 发送文件到您的文件上传 API
+      try {
+        uploadFile(formData).then((res) => {
+          console.log(res);
+          // this.orgform.certificateEvidence = res.data;
+        });
+        // 处理上传成功的逻辑
+        console.log('上传成功');
+      } catch (error) {
+        // 处理上传失败的逻辑
+        console.log('上传失败');
+      }
+      // try {
+      //   const response = await request.post('http://localhost:9527/dev-api/file/file/upload', formData, {
+      //     headers: {
+      //       'Content-Type': 'multipart/form-data',
+      //     },
+      //   });
+      //   // 处理上传成功的逻辑
+      //   console.log('上传成功', response);
+      // } catch (error) {
+      //   // 处理上传失败的逻辑
+      //   console.log('上传失败', error);
+      // }
+      // 重置 input 元素,以便下次选择相同文件时仍能触发 change 事件
+      event.target.value = '';
     },
-    fillter: {},
-  };
+  },
+  fillter: {},
+};
 </script>
 
 <style scoped lang="scss">
-  .title {
-    font-size: 18px;
-    text-align: left;
-    background: #008CD6bd;
-    color: #fff;
-    height: 36px;
-    line-height: 36px;
-    padding-left: 8px;
-    margin: 0;
-  }
-
-  .info-box {
-    margin: 30px;
-  }
-
-  .demo-form-inline {
-  }
-
-  .dialog-footer {
-  }
-
-  .container {
-  }
-
-  .image-container {
-    display: inline-block;
-    width: 200px;
-    margin-right: 20px;
-    /* 设置与下一个div的水平间距 */
-  }
-
-  .zoom-image {
-    transition: transform 0.3s ease;
-  }
-
-  .zoom-image:hover {
-    transform: scale(1.02);
-  }
-
-  .border-color-change {
-    border: 1px solid #ccc;
-    transition: border-color 0.3s ease;
-  }
-
-  .border-color-change:hover {
-    border-color: #1ea8e9;
-    /* 您可以将此颜色更改为所需的颜色 */
-  }
+.title {
+  font-size: 18px;
+  text-align: left;
+  background: #008CD6bd;
+  color: #fff;
+  height: 36px;
+  line-height: 36px;
+  padding-left: 8px;
+  margin: 0;
+}
+
+.info-box {
+  margin: 30px;
+}
+
+.demo-form-inline {}
+
+.dialog-footer {}
+
+.container {}
+
+.image-container {
+  display: inline-block;
+  width: 200px;
+  margin-right: 20px;
+  /* 设置与下一个div的水平间距 */
+}
+
+.zoom-image {
+  transition: transform 0.3s ease;
+}
+
+.zoom-image:hover {
+  transform: scale(1.02);
+}
+
+.border-color-change {
+  border: 1px solid #ccc;
+  transition: border-color 0.3s ease;
+}
+
+.border-color-change:hover {
+  border-color: #1ea8e9;
+  /* 您可以将此颜色更改为所需的颜色 */
+}
 </style>

+ 0 - 1
src/views/system/user/index.vue

@@ -757,7 +757,6 @@ export default {
           this.userList = response.data.rows;
           this.total = response.data.total;
           this.check = response.check;
-          console.log( this.check +"%%%%%%%%%%%%")
           this.loading = false;
         })
         .catch((err) => {