1

src/api/bdglSecret/secretaccount.js

@@ -50,3 +50,11 @@ export function getNumber() {
     method: 'get'
   })
 }
+
+// 审批获取所有单位
+export function getAllDept() {
+  return request({
+    url: 'grassrootsregistration/common/getAllDept',
+    method: 'get'
+  })
+}

src/views/bdglSecret/secretaccount/index.vue

@@ -25,7 +25,11 @@
         />
       </el-form-item>
       <el-form-item label prop="confidentialitylevel">
-        <el-select v-model="queryParams.confidentialitylevel" placeholder="请选择密级">
+        <el-select
+          v-model="queryParams.confidentialitylevel"
+          placeholder="请选择密级"
+          clearable
+        >
           <el-option
             v-for="item in ziDian"
             :key="item.dictValue"
@@ -35,8 +39,26 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="persoeliable">
+        <el-select
+          v-model="queryParams.persoeliable"
+          placeholder="请选择责任人"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="item in renList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+            class="input_xiala"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="btr" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" size="btr" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -50,7 +72,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['bdglSecret:secretaccount:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -73,7 +96,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['bdglSecret:secretaccount:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -88,27 +112,26 @@
     </el-row>
     <div class="hezi">
       <div class="tji">涉密物品统计</div>
-      <div style="display: flex;flex-wrap: wrap;  padding: 11px 20px">
+      <div style="display: flex; flex-wrap: wrap; padding: 11px 20px">
         <div
-          style="
-            width: 25%;
-            display: flex;
-            align-items: center;
-            height: 100px;
-          "
+          style="width: 25%; display: flex; align-items: center; height: 100px"
           v-for="item in tongJiList"
           :key="item.name"
         >
-          <div class="div-l" style="flex:2;text-align:right;margin-right:30px;">
-            <span>{{item.name}}</span>
+          <div
+            class="div-l"
+            style="flex: 2; text-align: right; margin-right: 30px"
+          >
+            <span>{{ item.name }}</span>
           </div>
-          <div class="div-r" style="flex:1;text-align:right;margin-right:120px;">
+          <div
+            class="div-r"
+            style="flex: 1; text-align: right; margin-right: 120px"
+          >
             <span>
               <span style="font-size: 25px; margin-right: 18px">
-                {{
-                item.num
-                }}
-              </span>台
+                {{ item.num }} </span
+              >台
             </span>
           </div>
         </div>
@@ -126,13 +149,20 @@
         <template scope="scope">
           <span>
             {{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
             }}
           </span>
         </template>
       </el-table-column>
       <el-table-column label="单位" align="center" prop="unitname" />
-      <el-table-column label="类型" align="center" prop="stype" :formatter="stypeFn" />
+      <el-table-column
+        label="类型"
+        align="center"
+        prop="stype"
+        :formatter="stypeFn"
+      />
       <el-table-column
         label="密级"
         align="center"
@@ -141,25 +171,44 @@
       ></el-table-column>
       <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column label="型号" align="center" prop="model" />
-      <el-table-column label="硬盘序列号" align="center" prop="harddisknumber" />
-      <el-table-column label="MAC地址/物理地" align="center" prop="macaddress" />
+      <el-table-column
+        label="硬盘序列号"
+        align="center"
+        prop="harddisknumber"
+      />
+      <el-table-column
+        label="MAC地址/物理地"
+        align="center"
+        prop="macaddress"
+      />
       <el-table-column label="保密编码" align="center" prop="levelnumber" />
-      <el-table-column label="责任人" align="center" prop="persoeliable" :formatter="persoeliableFn" />
+      <el-table-column
+        label="责任人"
+        align="center"
+        prop="persoeliable"
+        :formatter="persoeliableFn"
+      />
       <el-table-column label="备注" align="center" prop="remarks" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['bdglSecret:secretaccount:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['bdglSecret:secretaccount:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -174,7 +223,13 @@
 
     <!-- 添加或修改涉密计算机台账对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
         <el-form-item label="单位" prop="unitname">
           <treeselect
             v-model="form.unitid"
@@ -184,7 +239,11 @@
           />
         </el-form-item>
         <el-form-item label="密级" prop="confidentialitylevel">
-          <el-select v-model="form.confidentialitylevel" placeholder="请选择密级">
+          <el-select
+            v-model="form.confidentialitylevel"
+            placeholder="请选择密级"
+            clearable
+          >
             <el-option
               v-for="item in ziDian"
               :key="item.dictValue"
@@ -195,7 +254,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="类型" prop="stype">
-          <el-select v-model="form.stype" placeholder="请选择类型" clearable size="small">
+          <el-select
+            v-model="form.stype"
+            placeholder="请选择类型"
+            clearable
+            size="small"
+          >
             <el-option
               v-for="item in stypeList"
               :key="item.dictValue"
@@ -209,7 +273,12 @@
           <el-input v-model="form.brand" placeholder="请输入品牌" />
         </el-form-item>
         <el-form-item label="责任人" prop="persoeliable">
-          <el-select v-model="form.persoeliable" placeholder="请选择负责人">
+          <el-select
+            v-model="form.persoeliable"
+            placeholder="请选择负责人"
+            filterable
+            clearable
+          >
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -223,10 +292,16 @@
           <el-input v-model="form.model" placeholder="请输入型号" />
         </el-form-item>
         <el-form-item label="硬盘序列号" prop="harddisknumber">
-          <el-input v-model="form.harddisknumber" placeholder="请输入硬盘序列号" />
+          <el-input
+            v-model="form.harddisknumber"
+            placeholder="请输入硬盘序列号"
+          />
         </el-form-item>
         <el-form-item label="MAC地址/物理地" prop="macaddress">
-          <el-input v-model="form.macaddress" placeholder="请输入MAC地址/物理地" />
+          <el-input
+            v-model="form.macaddress"
+            placeholder="请输入MAC地址/物理地"
+          />
         </el-form-item>
 
         <el-form-item label="保密编码" prop="levelnumber">
@@ -234,7 +309,11 @@
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item label prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入备注"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -252,17 +331,18 @@ import {
   delSecretaccount,
   addSecretaccount,
   updateSecretaccount,
-  getNumber
+  getNumber,
 } from "@/api/bdglSecret/secretaccount";
 // 单位
 import {
   getZhuChiRen,
-  getDept
+  getDept,
 } from "@/api/grassrootsregistration/bdglmeeting";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import { getAll } from "@/api/grassrootsregistration/bdglmeeting";
+import { listUsers } from "@/api/workingArrangements/worktaskplan";
 
 export default {
   name: "Secretaccount",
@@ -302,7 +382,7 @@ export default {
 
         persoeliable: null,
         remarks: null,
-        unitid: null
+        unitid: null,
       },
       // 表单参数
       form: {},
@@ -318,7 +398,9 @@ export default {
       stypeList: [],
       suoyouLiit: [],
       //获取统计数据
-      tongJiList: []
+      tongJiList: [],
+      // 搜索所有人员
+      renList:[]
     };
   },
   created() {
@@ -328,12 +410,15 @@ export default {
     this.getdicts();
     this.getSuoYou();
     this.gettongji();
+    // 获取搜索所有人员
+    getAll().then((res) => {
+      this.renList = res.data;
+    });
   },
   methods: {
     //获取涉密物品统计
     gettongji() {
-      getNumber().then(res => {
-        console.log(res.data, 123);
+      getNumber().then((res) => {
         if (res.code == 200) {
           this.tongJiList = res.data;
         } else {
@@ -346,13 +431,13 @@ export default {
     },
     // 获取所有人员
     getSuoYou() {
-      getAll().then(response => {
+      getAll().then((response) => {
         this.suoyouLiit = response.data;
       });
     },
     persoeliableFn(row) {
       var name = "";
-      this.suoyouLiit.map(item => {
+      this.suoyouLiit.map((item) => {
         if (item.id == row.persoeliable) {
           name = item.name;
         }
@@ -361,7 +446,7 @@ export default {
     },
     confidentialitylevelFn(row) {
       var name = null;
-      this.ziDian.map(item => {
+      this.ziDian.map((item) => {
         if (row.confidentialitylevel == item.dictValue) {
           name = item.dictLabel;
         }
@@ -370,7 +455,7 @@ export default {
     },
     stypeFn(row) {
       var name = null;
-      this.stypeList.map(item => {
+      this.stypeList.map((item) => {
         if (row.stype == item.dictValue) {
           name = item.dictLabel;
         }
@@ -379,19 +464,19 @@ export default {
     },
     // 查询电子产品
     getdicts() {
-      getDicts("electronic").then(res => {
+      getDicts("electronic").then((res) => {
         this.stypeList = res.data;
       });
     },
     // 查询密级
     getdict() {
-      getDicts("brigade_secret").then(res => {
+      getDicts("brigade_secret").then((res) => {
         this.ziDian = res.data;
       });
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then(response => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -411,14 +496,14 @@ export default {
     // 获取主持人
     getZhuChi(id) {
       console.log(id);
-      getZhuChiRen(id).then(res => {
+      getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });
     },
     /** 查询涉密计算机台账列表 */
     getList() {
       this.loading = true;
-      listSecretaccount(this.queryParams).then(response => {
+      listSecretaccount(this.queryParams).then((response) => {
         this.secretaccountList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -444,7 +529,7 @@ export default {
 
         persoeliable: null,
         remarks: null,
-        unitid: null
+        unitid: null,
       };
       this.resetForm("form");
     },
@@ -460,7 +545,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -474,7 +559,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSecretaccount(id).then(response => {
+      getSecretaccount(id).then((response) => {
         this.form = response.data;
         this.form.persoeliable = response.data.persoeliable * 1;
         this.open = true;
@@ -484,17 +569,17 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateSecretaccount(this.form).then(response => {
+            updateSecretaccount(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
               this.gettongji();
             });
           } else {
-            addSecretaccount(this.form).then(response => {
+            addSecretaccount(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -509,7 +594,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除涉密计算机台账的数据项？")
-        .then(function() {
+        .then(function () {
           return delSecretaccount(ids);
         })
         .then(() => {
@@ -524,12 +609,12 @@ export default {
       this.download(
         "bdglSecret/secretaccount/export",
         {
-          ...this.queryParams
+          ...this.queryParams,
         },
         `secretaccount_${new Date().getTime()}.xlsx`
       );
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/single/dormitory/index.vue

@@ -12,8 +12,6 @@
         <el-input
           v-model="queryParams.unitName"
           placeholder="请输入单位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
           @input="handleQuery"
         />
       </el-form-item>
@@ -21,8 +19,6 @@
         <el-input
           v-model="queryParams.occupant"
           placeholder="请输入入住人姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
           @input="handleQuery"
         />
       </el-form-item>
@@ -65,7 +61,7 @@
           v-hasPermi="['single:dormitory:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -74,8 +70,7 @@
           @click="handleExport"
           v-hasPermi="['single:dormitory:export']"
         >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -135,58 +130,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改单身干部宿舍对话框 -->
-    <!-- <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="800px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位ID" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位ID" />
-        </el-form-item>
-        <el-form-item label="单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="入住人姓名" prop="occupant">
-          <el-input v-model="form.occupant" placeholder="请输入入住人姓名" />
-        </el-form-item>
-        <el-form-item label="入住时间" prop="entryTime">
-          <el-date-picker
-            clearable
-            v-model="form.entryTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择入住时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="退房时间" prop="endTime">
-          <el-date-picker
-            clearable
-            v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择退房时间"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="位置1" prop="position">
-          <el-input v-model="form.position" placeholder="请输入位置1" />
-        </el-form-item>
-        <el-form-item label="位置2" prop="position2">
-          <el-input v-model="form.position2" placeholder="请输入位置2" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </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"
@@ -506,4 +449,7 @@ export default {
   width: 200px;
   height: 36px;
 }
+::v-deep .el-icon-circle-close:before{
+  margin-left: -48px;
+}
 </style>