瀏覽代碼

集中文印,涉密载体,要事日记

sunyanqiang 3 年之前
父節點
當前提交
02b0aedf78

+ 84 - 82
src/views/PrintsLog/printlog/index.vue

@@ -3,19 +3,10 @@
     <el-form
       :model="queryParams"
       ref="queryForm"
-      :inline="true"
+      inline
       v-show="showSearch"
       label-width="auto"
     >
-      <!-- <el-form-item label="打印id" prop="printId">
-        <el-input
-          v-model="queryParams.printId"
-          placeholder="请输入打印id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item prop="printName">
         <el-input
           v-model="queryParams.printName"
@@ -34,41 +25,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="打印份数" prop="printNumber">
-        <el-input
-          v-model="queryParams.printNumber"
-          placeholder="请输入打印份数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否需要归还(0否1是)" prop="isReturn">
-        <el-input
-          v-model="queryParams.isReturn"
-          placeholder="请输入是否需要归还(0否1是)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件打印人" prop="printfileName">
-        <el-input
-          v-model="queryParams.printfileName"
-          placeholder="请输入文件打印人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="打印时间" prop="printTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.printTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择打印时间">
-        </el-date-picker>
-      </el-form-item>-->
       <el-form-item prop="statusG">
         <el-select
           v-model="queryParams.statusG"
@@ -84,39 +40,32 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="归还份数" prop="returnNumber">
-        <el-input
-          v-model="queryParams.returnNumber"
-          placeholder="请输入归还份数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <!-- <el-form-item label="原文件路径" prop="primaryPath">
-        <el-input
-          v-model="queryParams.primaryPath"
-          placeholder="请输入原文件路径"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+      <el-form-item label="" prop="unitId">
+        <treeselect
+          v-model="queryParams.unitId"
+          :options="deptOptions"
+          placeholder="请选择单位"
+          @select="selectPeos"
         />
       </el-form-item>
-      <el-form-item label="现文件路径" prop="presentPath">
-        <el-input
-          v-model="queryParams.presentPath"
-          placeholder="请输入现文件路径"
+      <el-form-item prop="levelM">
+        <el-select
+          v-model="queryParams.levelM"
           clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item>
-        <!-- <el-button type="primary" size="btn" @click="handleQuery"
+          placeholder="请选择级别"
+        >
+          <el-option
+            v-for="dict in levelMs"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      <el-button size="btr" @click="resetQuery">重置</el-button>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -131,7 +80,7 @@
           >新增</el-button
         >
       </el-col>-->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           @click="handleUpdate"
@@ -139,7 +88,7 @@
           v-hasPermi="['PrintsLog:printlog:add']"
           >归还</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="danger"
@@ -150,7 +99,7 @@
           v-hasPermi="['PrintsLog:printlog:remove']"
         >删除</el-button>
       </el-col>-->
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -159,8 +108,9 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['PrintsLog:printlog:export']"
-        >导出</el-button>
-      </el-col>-->
+          >导出</el-button
+        >
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -192,6 +142,12 @@
       </el-table-column>-->
       <!-- <el-table-column label="归还状态" align="center" prop="statusG" /> -->
       <el-table-column label="文件打印人" align="center" prop="printfileName" />
+      <el-table-column
+        label="密级"
+        align="center"
+        prop="levelM"
+        :formatter="Alfred"
+      />
       <el-table-column
         label="打印时间"
         align="center"
@@ -228,9 +184,6 @@
           <span>{{ parseTime(scope.row.returnTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="打印编码信息" align="center" prop="printCode" />
-      <el-table-column label="原文件路径" align="center" prop="primaryPath" />
-      <el-table-column label="现文件路径" align="center" prop="presentPath" />-->
       <el-table-column
         label="操作"
         align="center"
@@ -393,10 +346,18 @@ import {
   exportPrintlog,
   listPeople,
 } from "@/api/PrintsLog/printlog";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+import { getDept } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Printlog",
   dicts: ["sys_statusG"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -447,6 +408,10 @@ export default {
       rylist: [],
       returnNumber: null,
       flg: null,
+      // 树形结构列表
+      deptOptions: [],
+      //级别
+      levelMs: [],
     };
   },
   created() {
@@ -455,8 +420,32 @@ export default {
     this.getDicts("sys_statusG").then((response) => {
       this.statusGlist = response.data;
     });
+    this.getBuMeng();
+    //级别
+    this.getDicts("level").then((response) => {
+      this.levelMs = response.data;
+    });
   },
   methods: {
+    Alfred(row) {
+      var name = "";
+      this.levelMs.map((item) => {
+        if (item.dictValue == row.levelM) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
+    // 获取部门列表
+    getBuMeng() {
+      getDept().then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
+    selectPeos(data) {
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -618,7 +607,7 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal
-        .confirm("是否确认导出所有集中文印记录数据项?")
+        .confirm("是否确认导出集中文印记录数据项?")
         .then(() => {
           this.exportLoading = true;
           return exportPrintlog(queryParams);
@@ -821,4 +810,17 @@ export default {
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: transparent !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
 </style>

+ 23 - 143
src/views/PrintsManage/manage/index.vue

@@ -25,122 +25,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
-          <el-option label="请选择字典生成" value />
-        </el-select>
-      </el-form-item>-->
-      <!-- <el-form-item label="大小" prop="size">
-        <el-input
-          v-model="queryParams.size"
-          placeholder="请输入大小"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位ID" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <!-- <el-form-item label="单位名称" prop="unitName">
-        <el-input
-          v-model="queryParams.unitName"
-          placeholder="请输入单位名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="级别" prop="levelM">
-        <el-input
-          v-model="queryParams.levelM"
-          placeholder="请输入级别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <!-- <el-form-item label="发送人ID" prop="sendId">
-        <el-input
-          v-model="queryParams.sendId"
-          placeholder="请输入发送人ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发送人" prop="sendName">
-        <el-input
-          v-model="queryParams.sendName"
-          placeholder="请输入发送人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="creattime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.creattime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.updatetime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="打印说明" prop="explainInfo">
-        <el-input
-          v-model="queryParams.explainInfo"
-          placeholder="请输入打印说明"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="打印状态(1 打印中  2 已打印)" prop="printStatus">
-        <el-select v-model="queryParams.printStatus" placeholder="请选择打印状态(1 打印中  2 已打印)" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="接收人ID" prop="receiveId">
-        <el-input
-          v-model="queryParams.receiveId"
-          placeholder="请输入接收人ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="接收人" prop="receiveName">
-        <el-input
-          v-model="queryParams.receiveName"
-          placeholder="请输入接收人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="打印回复信息" prop="printInfo">
-        <el-input
-          v-model="queryParams.printInfo"
-          placeholder="请输入打印回复信息"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
@@ -251,31 +135,24 @@
           >
         </template>
       </el-table-column>
-      <!-- <el-table-column label="大小" align="center" prop="size" /> -->
-      <!-- <el-table-column label="单位ID" align="center" prop="unitId" /> -->
-      <!-- <el-table-column label="单位名称" align="center" prop="unitName" /> -->
       <el-table-column label="级别" align="center" prop="levelM">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.level" :value="scope.row.levelM" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="发送人ID" align="center" prop="sendId" /> -->
       <el-table-column label="发送人" align="center" prop="sendName" />
-      <!-- <el-table-column label="创建时间" align="center" prop="creattime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.creattime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>-->
-      <!-- <el-table-column label="更新时间" align="center" prop="updatetime" width="180">
+      <el-table-column
+        label="发送时间"
+        align="center"
+        prop="creattime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatetime, '{y}-{m}-{d}') }}</span>
+          <span>{{
+            parseTime(scope.row.creattime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
-      </el-table-column>-->
-      <!-- <el-table-column label="打印说明" align="center" prop="explainInfo" />
-      <el-table-column label="接收人ID" align="center" prop="receiveId" />
-      <el-table-column label="接收人" align="center" prop="receiveName" />
-      <el-table-column label="生成路径" align="center" prop="sFile" />
-      <el-table-column label="打印回复信息" align="center" prop="printInfo" />-->
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -346,7 +223,7 @@
           :inline="true"
           :rules="rules"
           label-width="120px"
-             style="margin-left: 34px"
+          style="margin-left: 34px"
         >
           <div class="jiben">发送人信息</div>
           <el-form-item label="发送人" prop="sendName">
@@ -652,7 +529,7 @@
         </el-form-item>-->
         </el-form>
       </div>
-      <div slot="footer" class="dialog-footer" style="margin-right:30px;">
+      <div slot="footer" class="dialog-footer" style="margin-right: 30px">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -834,7 +711,7 @@
         </el-form-item>
       </el-form>
 
-      <div slot="footer" class="dialog-footer" style="margin-right:18px;">
+      <div slot="footer" class="dialog-footer" style="margin-right: 18px">
         <el-button type="primary" @click="updatesubmit">确 定</el-button>
         <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
@@ -1444,7 +1321,7 @@ export default {
           isPrintColor: null,
           // 是否为双面打
           isPrintTwo: null,
-          isReturn:null
+          isReturn: null,
         },
       ]),
         (this.fileList = []);
@@ -1497,7 +1374,10 @@ export default {
             var num = 0;
             var num1 = this.tomList.length;
             for (let index = 0; index < this.tomList.length; index++) {
-              if (this.tomList[index].levelM&&this.tomList[index].printNumber) {
+              if (
+                this.tomList[index].levelM &&
+                this.tomList[index].printNumber
+              ) {
                 num += 1;
               } else {
                 return this.$modal.msgWarning("请选择级别,份数");
@@ -1647,13 +1527,13 @@ export default {
       this.dyform.printNumber = row.printNumber;
       this.dyform.printRoom = row.printRoom;
       this.dyform.type = row.type;
-      this.dyform.isReturn=row.isReturn
+      this.dyform.isReturn = row.isReturn;
       this.dyform.isReturn = row.isReturn + "";
-      if(row.isReturn=="1"){
-        this.ramrk=false
+      if (row.isReturn == "1") {
+        this.ramrk = false;
       }
-      if(row.isReturn=="0"){
-        this.ramrk=true
+      if (row.isReturn == "0") {
+        this.ramrk = true;
       }
 
       if (row.isPrintColor == 1) {

+ 18 - 12
src/views/bdglSecret/secret/index.vue

@@ -4,9 +4,16 @@
       :model="queryParams"
       ref="queryForm"
       :inline="true"
-      v-show="showSearch"
       label-width="68px"
     >
+      <el-form-item label="" prop="unitId">
+        <treeselect
+          v-model="queryParams.unitId"
+          :options="deptOptions"
+          placeholder="请选择单位"
+          @select="selectshou"
+        />
+      </el-form-item>
       <el-form-item label="" prop="kind">
         <el-select
           v-model="queryParams.kind"
@@ -413,8 +420,6 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
       // 网络/手机/涉密载体登记本表格数据
@@ -490,14 +495,17 @@ export default {
   created() {
     this.getList();
     this.getdict();
+    this.getTreeselect();
     //部门数据
     getDepts().then((res) => {
-      if (res.code == 200) {
-        this.unitId = res.data;
-      }
+      this.unitId = res.data;
     });
   },
   methods: {
+    selectshou(data) {
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
@@ -629,6 +637,7 @@ export default {
     resetQuery() {
       this.reset();
       this.resetForm("queryForm");
+      this.queryParams.unitId = null;
       this.handleQuery();
     },
     /** 对话框重置按钮操作 */
@@ -776,7 +785,8 @@ export default {
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
+  background: transparent !important;
+  color: #fff;
 }
 /* 基本信息背景 */
 .jiben {
@@ -845,11 +855,7 @@ export default {
   height: 36px;
   line-height: 36px;
 }
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-  color: #fff;
-}
+
 /* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;

+ 88 - 61
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -246,6 +246,7 @@
                 placeholder="选择值班日期"
                 class="text"
                 @change="blogDate"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
@@ -860,8 +861,9 @@ import { getDicts } from "@/api/system/dict/data";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Cookies from "js-cookie";
 import { getUserzs } from "@/api/grassrootsregistration/bdgldiary";
+// 获取当前单位
+import { getUserProfile } from "@/api/system/user";
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1064,6 +1066,7 @@ export default {
       // 获取全部首长
       quanShou: [],
       sz: null,
+      dw: {},
     };
   },
   created() {
@@ -1082,8 +1085,34 @@ export default {
     this.getShuJu();
     // 获取全部首长
     this.getQuanShou();
+    // 获取登录信息
+    this.getUser();
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.dw = response.data.dept;
+        // console.log(this.dw);
+      });
+    },
+    // 新增时间获取
+    getTimes() {
+      var tiem = new Date();
+      let y = tiem.getFullYear();
+      let m = tiem.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      let d = tiem.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = tiem.getHours();
+      h = h < 10 ? "0" + h : h;
+      let M = tiem.getMinutes();
+      M = M < 10 ? "0" + M : M;
+      let s = tiem.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      this.form.blogDate = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
+      return;
+    },
     getShoufan(id) {
       this.quanShou.map((item) => {
         if (item.userId == id) {
@@ -1094,7 +1123,7 @@ export default {
     },
     getQuanShou() {
       getUserzs().then((respones) => {
-        console.log(respones);
+        // console.log(respones);
         this.quanShou = respones.rows;
       });
     },
@@ -1182,31 +1211,9 @@ export default {
     },
     // 获取训练
     XunLian(id, tiem) {
-      let y = tiem.getFullYear();
-      let m = tiem.getMonth() + 1;
-      m = m < 10 ? "0" + m : m;
-      let d = tiem.getDate();
-      d = d < 10 ? "0" + d : d;
-      let h = tiem.getHours();
-      h = h < 10 ? "0" + h : h;
-      let M = tiem.getMinutes();
-      M = M < 10 ? "0" + M : M;
-      let s = tiem.getSeconds();
-      s = s < 10 ? "0" + s : s;
-      let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
-      getXunLian(id, dateTime).then((res) => {
+      console.log(id, tiem);
+      getXunLian(id, tiem).then((res) => {
         this.xunlian = res.data;
-        // for (var i = 0; i < res.data.length; i++) {
-        //   res.data[i].centertext =
-        //     res.data[i].startTime +
-        //     "-" +
-        //     res.data[i].endTime +
-        //     "  " +
-        //     this.xunlian[i].contents +
-        //     "(" +
-        //     this.xunlian[i].organizer +
-        //     ")";
-        // }
         if (this.xunlian) {
           for (var i = 0; i < this.xunlian.length; i++) {
             this.xunlian[i].centertext =
@@ -1285,7 +1292,7 @@ export default {
     },
     // 当选择单位时候重置人员
     chongZhi() {
-      (this.form = {
+      this.form = {
         peopleId: null,
         lead: null,
         dutyA: null,
@@ -1295,12 +1302,12 @@ export default {
         dutyE: null,
         dutyF: null,
         dutylead: null,
-      }),
-        (this.relatives = [
-          {
-            peopleId: null,
-          },
-        ]);
+      };
+      this.relatives = [
+        {
+          peopleId: null,
+        },
+      ];
     },
     // 当点击完成值班时间的选择发起请求
     blogDate(data) {
@@ -1428,7 +1435,7 @@ export default {
         createId: null,
         createName: null,
       };
-      (this.relatives = [
+      this.relatives = [
         {
           name: null,
           relation: null,
@@ -1437,27 +1444,27 @@ export default {
           peopleId: null,
           peopleName: null,
         },
-      ]),
-        (this.checkShop = [
-          {
-            peopleName: null,
-            foremanName: null,
-            sentryName: null,
-            examineDate: null,
-            dialogue: null,
-          },
-        ]),
-        (this.xunlian = [
-          {
-            dateline: null,
-            contents: null,
-            shouldArrive: null,
-            realTo: null,
-            percentage: null,
-            organizer: null,
-          },
-        ]),
-        this.resetForm("form");
+      ];
+      this.checkShop = [
+        {
+          peopleName: null,
+          foremanName: null,
+          sentryName: null,
+          examineDate: null,
+          dialogue: null,
+        },
+      ];
+      this.xunlian = [
+        {
+          dateline: null,
+          contents: null,
+          shouldArrive: null,
+          realTo: null,
+          percentage: null,
+          organizer: null,
+        },
+      ];
+      this.resetForm("form");
     },
     /** 对话框重置按钮操作 */
     resertwo() {
@@ -1483,15 +1490,27 @@ export default {
     /** 新增按钮操作 */
     handleAdd(e) {
       // 获取首长
-      (this.shouZhang = []),
-        // 人员组织
-        (this.renYuan = []),
-        this.getTreeselect();
+      this.shouZhang = [];
+      // 人员组织
+      this.renYuan = [];
+      this.getTreeselect();
       this.reset();
+      this.form.unitId = this.dw.deptId;
+      this.getShiLiRen(this.form.deptId);
+      console.log(1);
+      this.getRenYuan(this.form.unitId);
+      console.log(2);
+      this.getShou(this.form.unitId);
+      console.log(3);
+      this.getTimes();
+      // 判断是否全部选择
+      if (this.form.unitId !== null && this.form.blogDate) {
+        this.XunLian(this.form.unitId, this.form.blogDate);
+      }
+      console.log(4);
       this.open = true;
       this.title = "添加要事日记";
       this.style = 2;
-      e.preventDefault();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1573,7 +1592,7 @@ export default {
           response.data.week = "星期六";
         }
         this.getShoufan(response.data.lead);
-        console.log(response.data);
+        // console.log(response.data);
         this.wordInfo = response.data;
         this.wordInfo.sz = this.sz;
         //  response.data.blogDate
@@ -2108,4 +2127,12 @@ export default {
 .app-container {
   height: calc(100vh - 108px) !important;
 }
+::v-deep .el-dialog .el-icon-circle-close:before {
+  content: "";
+  display: inline-block;
+  margin-left: 87px;
+}
+::v-deep .el-dialog .el-input--small .el-input__icon {
+  line-height: 37px;
+}
 </style>

+ 5 - 8
src/views/peopleChuRu/bdglLeave/index.vue

@@ -1667,6 +1667,7 @@ export default {
     this.getLiai();
     this.getZheng();
     this.getSuoYou();
+    this.getBuMeng();
   },
   methods: {
     // 一级审批人清除按钮触发
@@ -1812,9 +1813,9 @@ export default {
         this.deptOptions = res.data;
       });
     },
-       selectPeos(data){
-      this.queryParams.unitId=data.id;
-       this.ChongZhiRen();
+    selectPeos(data) {
+      this.queryParams.unitId = data.id;
+      this.ChongZhiRen();
       this.form.unitId = data.id;
       this.getYong(this.form.unitId);
       this.getRen(this.form.unitId, 0);
@@ -2193,10 +2194,6 @@ export default {
   color: #fff;
   border: 1px solid white !important;
 }
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-}
 /* 基本信息背景 */
 .jiben {
   width: 920px;
@@ -2263,7 +2260,7 @@ export default {
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
+  background: transparent !important;
   color: #fff;
 }
 /* 单位下拉菜单选中字体颜色 */

+ 1 - 1
src/views/pt.vue

@@ -388,7 +388,7 @@
                 <a href="#" class="a">医疗卫生管理</a>
               </div>
             </li>
-            <li v-if="str.includes('涉密载体') || str.includes('admin')">
+            <li v-if="str.includes('涉密物品外借') || str.includes('admin')">
               <div class="demo-box">
                 <div
                   class="demo active"