Kaynağa Gözat

拉取代码

liangjiahao 3 yıl önce
ebeveyn
işleme
1a26a1a10a

+ 17 - 1
src/assets/styles/global.css

@@ -123,6 +123,7 @@ color: #fff;
     background: #004D86 !important;
     border: 0px;
     color: #fff;
+    border: none !important;
 }
 .el-pagination button:disabled {
     color: #fff !important;
@@ -133,6 +134,7 @@ color: #fff;
     background: #004D86 !important;
     color: #fff;
     border: 0px;
+    border: none !important;
 }
 .el-pagination.is-background .el-pager li:not(.disabled).active {
     background-color: #004D86 !important;
@@ -601,4 +603,18 @@ background-color: #1d96ff;
     border-radius: 50%;
     background-color: #67c23A;
     margin-left:80px;
-  } */
+  } */
+
+  /* 查看弹框背景 */
+  #chakan>.el-dialog {
+    background-color: #fff !important;
+      border-radius: 7px;
+      }
+      
+      #chakan>.el-dialog .el-dialog__header .el-dialog__title ,
+      #chakan>.el-dialog .el-dialog__header .el-dialog__title button i, 
+      #chakan>.el-dialog .el-dialog__body #contents tbody,
+      #chakan>.el-dialog .el-dialog__headerbtn .el-dialog__close {
+      color: black;
+     font-family: ui-serif;
+      }

+ 2 - 1
src/components/look_word/bdglarmament.vue

@@ -167,7 +167,8 @@ export default {
 </script>
 <style scoped>
 tbody {
-  color: #fff;
+  border: black;
+  color: black;
   text-align: center;
 }
 tr:last-child {

+ 3 - 0
src/components/look_word/bdgleven.vue

@@ -133,6 +133,9 @@ tbody {
 tr:last-child {
   border-bottom: 1px solid;
 }
+::v-deep .contents{
+  background: red !important;
+}
 /* @font-face {
   font-family: 'siYuan';
   src: url('../../assets/css/siyuan.OTF');

+ 2 - 1
src/components/look_word/bdglfood.vue

@@ -388,7 +388,8 @@ export default {
 </script>
 <style scoped>
 tbody {
-  color: #fff;
+  border: black;
+  color: black;
   text-align: center;
 }
 tr:last-child {

+ 2 - 2
src/components/look_word/bdglweekwork.vue

@@ -64,8 +64,8 @@
 
         <tr
           v-for="(item, i) in message.bdglWeekworkRegisterList"
-		  :key="i"
-          style="text-align: center"
+          :key="i"
+          style="text-align: center;height: 45px;"
         >
           <td style="text-align: center" rowspan="2">
             {{ item.week }}

+ 4 - 5
src/views/grassrootsregistration/bdglarmament/index.vue

@@ -54,7 +54,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -89,7 +89,7 @@
           v-hasPermi="['grassrootsregistration:bdglarmament:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -302,7 +302,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdglarmament
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -330,7 +330,6 @@ import { getDept } from "@/api/grassrootsregistration/bdgleven";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 
 export default {
   name: "Bdglarmament",
@@ -451,7 +450,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.rese = response.data;
       });
     },

+ 63 - 12
src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -55,7 +55,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -90,7 +90,7 @@
           v-hasPermi="['grassrootsregistration:bdglcookbook:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -141,6 +141,13 @@
         width="200"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btk"
+            type="text"
+            @click="handleChakan(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+            ><span class="chakan">查看</span></el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -264,7 +271,7 @@
             width="920"
             cellspacing="0"
             align="center"
-            style="border-color: white; margin-left: -1px"
+            style="border-color: white; margin-left: -1px;color: white;"
           >
             <!-- 星期一 -->
             <tr align="center">
@@ -1660,10 +1667,19 @@
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
+      <bdglcookbook
+        v-if="menuRoleVisible"
+        ref="menuRole"
+        :message="wordInfo"
+      ></bdglcookbook>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import bdglcookbook from "@/components/look_word/bdglcookbook.vue";
+
 import {
   listBdglcookbook,
   getBdglcookbook,
@@ -1684,9 +1700,13 @@ export default {
   name: "Bdglcookbook",
   components: {
     Treeselect,
+    bdglcookbook
   },
   data() {
     return {
+      //查看页面
+      menuRoleVisible: false,
+      wordInfo: {},
       //判断关闭
       style: "2",
       // 遮罩层
@@ -2107,6 +2127,18 @@ export default {
       this.open = true;
       this.style = 2;
       this.title = "添加一周食谱";
+    },
+     //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      const id = row.id || this.ids;
+      getBdglcookbook(id).then((response) => {
+        this.wordInfo = response.data;
+        console.log(this.wordInfo);
+        this.title = "查看一周食谱";
+        this.menuRoleVisible = true;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -4198,9 +4230,9 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 0px 20px;
+  margin: 10px 30px 20px 30px;
+  padding-top: 20px !important;
   box-sizing: border-box;
-  padding: 30px 12px 30px 28px;
 }
 .contents {
   padding: 0px 40px !important;
@@ -4249,11 +4281,7 @@ export default {
   line-height: 36px;
 }
 
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-  color: #fff;
-}
+
 /* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
@@ -4280,11 +4308,34 @@ table td {
   color: #fff;
   border: none;
 }
-::v-deep .el-dialog__body {
+/* ::v-deep .el-dialog__body {
   color: #fff;
   font-size: 14px;
-}
+} */
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 42px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: none !important;
+}
+/* 树形下拉背景颜色 */
+/* .el-dialog__body {
+  color: #fff !important;
+}
+::v-deep .vue-treeselect__menu {
+  background: #004d86 !important;
+} */
+/* ::v-deep.el-input_inner ::-webkit-input-placeholder{
+        font-size:16px;  
+        color: rgba(255,255,255,0.1) !important;
+}  */
 </style>

+ 7 - 6
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -50,7 +50,7 @@
             >新增</el-button
           >
         </el-col>
-        <el-col :span="1.5">
+        <!-- <el-col :span="1.5">
           <el-button
             type="success"
             plain
@@ -85,7 +85,7 @@
             v-hasPermi="['grassrootsregistration:bdgldiary:export']"
             >导出</el-button
           >
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <!-- 搜索结果区域 -->
@@ -634,7 +634,7 @@
           <el-button type="primary" @click="submitForm(1)">确 定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body>
+      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdgldiary
           v-if="menuRoleVisible"
           ref="menuRole"
@@ -672,7 +672,6 @@ import { getDicts } from "@/api/system/dict/data";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1286,6 +1285,7 @@ export default {
 ::v-deep .el-input--small .el-input__inner {
   width: 200px !important;
   height: 36px;
+  border: 1px solid white !important;
 }
 ::v-deep .el-textarea__inner {
   width: 920px;
@@ -1316,6 +1316,7 @@ export default {
 ::v-deep .el-input__inner {
   background-color: transparent;
   color: #fff;
+  /* border: 1px solid white !important; */
 }
 /* 调整表单间距 */
 ::v-deep .el-date-editor.el-input,
@@ -1563,9 +1564,9 @@ export default {
 .el-dialog__body {
   color: #fff;
 }
-::v-deep .vue-treeselect__menu {
+/* ::v-deep .vue-treeselect__menu {
   background: #004d86;
-}
+} */
 .greedd > .el-tree-node__content:after {
   content: "";
   width: 10px;

+ 4 - 3
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -42,7 +42,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -77,7 +77,7 @@
           v-hasPermi="['grassrootsregistration:bdgldrill:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -233,7 +233,7 @@
       </div>
     </el-dialog>
     <div class="fff">
-     <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+     <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdgldrill
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -538,6 +538,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

+ 4 - 3
src/views/grassrootsregistration/bdglequip/index.vue

@@ -62,7 +62,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -97,7 +97,7 @@
           v-hasPermi="['grassrootsregistration:bdglequip:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -333,7 +333,7 @@
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdglequip
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -718,6 +718,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

+ 36 - 24
src/views/grassrootsregistration/bdgleven/index.vue

@@ -56,7 +56,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -91,7 +91,7 @@
           v-hasPermi="['grassrootsregistration:bdgleven:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -171,6 +171,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="召开时间" prop="convokeTime" class="convokeTime">
@@ -191,6 +192,7 @@
         </el-form-item>
         <el-form-item label="主持人" prop="compereId">
           <el-select
+            ref="headerSearchSelect"
             v-model="form.compereId"
             placeholder="请选择主持人"
           >
@@ -206,10 +208,7 @@
         </el-form-item>
 
         <el-form-item label="记录人" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请选择记录人"
-          >
+          <el-select v-model="form.peopleId" placeholder="请选择记录人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -224,7 +223,7 @@
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item>
         <el-form-item label="出席人" prop="joinId" class="joinId">
-          <el-select v-model="form.joinId" multiple placeholder="请选择出席人">
+          <el-select ref="abc" v-model="form.joinId" multiple placeholder="请选择出席人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -240,7 +239,7 @@
           class="quill-editor"
           ref="myTextEditor"
           v-model="form.contents"
-           style="height: 150px; width: 920px; 
+          style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
         ></quill-editor>
       </el-form>
@@ -250,15 +249,18 @@
       </div>
     </el-dialog>
     <div class="fff">
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
-      
+      <el-dialog
+        :visible.sync="menuRoleVisible"
+        :title="title"
+        append-to-body
+        id="chakan"
+      >
         <bdgleven
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdgleven>
-      
-    </el-dialog>
+          v-if="menuRoleVisible"
+          ref="menuRole"
+          :message="wordInfo"
+        ></bdgleven>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -300,7 +302,7 @@ export default {
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
-      
+
       islook: true,
       // 遮罩层
       loading: true,
@@ -397,7 +399,7 @@ export default {
     },
     //  主持人点击触发
     compere(name) {
-      this.form.compereRen =name;
+      this.form.compereRen = name;
     },
     // 获取主持人
     getZhuChi(id) {
@@ -492,6 +494,11 @@ export default {
     resertwo() {
       this.reset();
     },
+    // 让select失去焦点
+    blurSelect() {
+      this.$refs.headerSearchSelect.blur();
+      this.$refs.abc.blur();
+    },
 
     //判断对话框添加事件
     close() {
@@ -514,9 +521,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-       // 人员
-      this.renYuan= [],
-      this.reset();
+      // 人员
+      (this.renYuan = []), this.reset();
       this.getTreeselect();
       this.open = true;
       this.opens = true;
@@ -615,7 +621,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -623,6 +629,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .chakan .el-dialog {
+  background: red !important;
+}
 /* 对话框背景颜色 */
 ::v-deep .el-dialog {
   width: 1016px !important;
@@ -652,6 +661,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -753,10 +763,12 @@ export default {
 ::v-deep .el-pagination.is-background .el-pager li {
   background-color: #004d86;
   color: #fff;
+  border: none !important;
 }
 ::v-deep .el-pagination.is-background .btn-next {
   background-color: #004d86;
   color: #fff;
+  border: none !important;
 }
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
@@ -782,8 +794,8 @@ export default {
 ::v-deep .el-dialog__footer {
   padding: 30px 50px;
 }
-::v-deep .fff .el-dialog{
+::v-deep .fff .el-dialog {
   background: #fff !important;
-  color: black !important;;
+  color: black !important;
 }
 </style>

+ 16 - 7
src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -51,7 +51,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -86,7 +86,7 @@
           v-hasPermi="['grassrootsregistration:bdglfilemanagement:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -186,6 +186,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="文件编号" prop="number">
@@ -218,8 +219,9 @@
           ></el-input-number>
         </el-form-item>
         <el-form-item label="签收人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择单位">
+          <el-select ref="aa" v-model="form.peopleId" placeholder="请选择单位">
             <el-option
+              
               v-for="item in renYuan"
               :key="item.id"
               :label="item.name"
@@ -285,7 +287,7 @@
       </div>
     </el-dialog>
 
-     <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+     <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdglfilemanagement
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -310,7 +312,6 @@ import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
 export default {
   name: "Bdglfilemanagement",
@@ -463,7 +464,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -515,7 +516,10 @@ export default {
     resertwo() {
       this.reset();
     },
-
+// 让select失去焦点
+    blurSelect() {
+      this.$refs.aa.blur();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -640,6 +644,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -760,4 +765,8 @@ export default {
 ::v-deep .el-dialog__body{
   padding: none !important;
 }
+/* 文件编号背景颜色 */
+::v-deep .el-input.is-disabled .el-input__inner{
+  background: transparent !important;
+}
 </style>

+ 13 - 4
src/views/grassrootsregistration/bdglfood/index.vue

@@ -35,7 +35,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -70,7 +70,7 @@
           v-hasPermi="['grassrootsregistration:bdglfood:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -163,6 +163,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="值班员" prop="peopleId">
@@ -192,7 +193,7 @@
 
         <el-form-item label="经委会主任" prop="chairmanId">
           <!-- <el-input v-model="form.chairmanId" placeholder="请输入经委会主任" /> -->
-          <el-select v-model="form.chairmanId" placeholder="请选择单位">
+          <el-select ref="aa" v-model="form.chairmanId" placeholder="请选择单位">
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -1022,7 +1023,7 @@
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
       
         <bdglfood
         v-if="menuRoleVisible"
@@ -1330,6 +1331,10 @@ export default {
     jtDelete3(i) {
       this.canteen.splice(i, 1);
     },
+    // 让select失去焦点
+    blurSelect() {
+      this.$refs.aa.blur();
+    },
 
     // 查询电子产品
     getdict() {
@@ -1713,6 +1718,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -1830,6 +1836,7 @@ export default {
 }
 ::v-deep .box2 td .el-input__inner {
   text-align: center;
+   border: none !important;
 }
 /* 表格宽度 */
 table td {
@@ -1848,6 +1855,7 @@ table td {
   color: #fff;
   border: none;
   font-size: 10px;
+  border: none !important;
 }
 /* 实物检查验收表格 */
 .box3 {
@@ -1919,6 +1927,7 @@ table td {
   width: 704px !important;
   margin: 0;
   padding: 0;
+  border: none !important;
 }
 table td {
   border-bottom: none !important;

+ 19 - 9
src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -69,7 +69,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -104,7 +104,7 @@
           v-hasPermi="['grassrootsregistration:bdglmeeting:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -194,6 +194,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="召开时间" prop="convokeTime">
@@ -215,6 +216,7 @@
           <el-select
             v-model="form.compereId"
             placeholder="请选择主持人"
+            ref="headerSearchSelect"
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -248,7 +250,7 @@
         </el-form-item>
 
         <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select v-model="form.joinId" multiple placeholder="请选择参加人">
+          <el-select ref="aa" v-model="form.joinId" multiple placeholder="请选择参加人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -259,8 +261,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
+        <el-form-item  label="列席人" prop="peopleIds" class="joinId">
           <el-select
+          ref="bb"
             v-model="form.peopleIds"
             multiple
             placeholder="请选择列席人"
@@ -275,8 +278,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
+        <el-form-item  label="缺席人" prop="absentIds" class="joinId">
           <el-select
+          ref="cc"
             v-model="form.absentIds"
             multiple
             placeholder="请选择缺席人"
@@ -306,7 +310,7 @@
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
       <bdglmeeting
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -329,7 +333,6 @@ import {
   exportBdglmeeting,
   getDept,
 } from "@/api/grassrootsregistration/bdglmeeting";
-import { treeselect } from "@/api/system/dept";
 
 // 富文本
 import "quill/dist/quill.core.css";
@@ -480,7 +483,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -556,7 +559,13 @@ export default {
     resertwo() {
       this.reset();
     },
-
+ // 让select失去焦点
+    blurSelect() {
+      this.$refs.headerSearchSelect.blur();
+      this.$refs.aa.blur();
+      this.$refs.bb.blur();
+      this.$refs.cc.blur();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -715,6 +724,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 
 /* 基本信息背景 */

+ 20 - 12
src/views/grassrootsregistration/bdglparty/index.vue

@@ -55,7 +55,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -90,7 +90,7 @@
           v-hasPermi="['grassrootsregistration:bdglparty:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
     <el-table
       v-loading="loading"
@@ -168,6 +168,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="召开时间" prop="convokeTime">
@@ -186,7 +187,7 @@
           <el-input v-model="form.address" placeholder="请输入召开地点" />
         </el-form-item>
         <el-form-item label="主持人" prop="compereId">
-          <el-select v-model="form.compereId" placeholder="请选择主持人">
+          <el-select ref="headerSearchSelect" v-model="form.compereId" placeholder="请选择主持人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -216,7 +217,7 @@
         </el-form-item>
 
         <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select v-model="form.joinId" multiple placeholder="请选择参加人">
+          <el-select ref="abc"  v-model="form.joinId" multiple placeholder="请选择参加人">
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -226,8 +227,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
-          <el-select
+        <el-form-item   label="列席人" prop="peopleIds" class="joinId">
+          <el-select ref="abcd"
             v-model="form.peopleIds"
             multiple
             placeholder="请选择列席人"
@@ -241,8 +242,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
-          <el-select
+        <el-form-item  label="缺席人" prop="absentIds" class="joinId">
+          <el-select ref="abcde" 
             v-model="form.absentIds"
             multiple
             placeholder="请选择缺席人"
@@ -271,7 +272,7 @@
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
       <bdglparty
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -298,7 +299,6 @@ import {
   getZhuChiRen,
 } from "@/api/grassrootsregistration/bdglparty";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 // 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
@@ -504,7 +504,13 @@ export default {
     resertwo() {
       this.reset();
     },
-
+// 让select失去焦点
+    blurSelect() {
+      this.$refs.headerSearchSelect.blur();
+      this.$refs.abc.blur();
+      this.$refs.abcd.blur();
+      this.$refs.abcde.blur();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -554,6 +560,7 @@ export default {
         this.menuRoleVisible = true;
       });
     },
+    
     /** 提交按钮 */
     submitForm(style) {
       this.style = style;
@@ -627,7 +634,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -663,6 +670,7 @@ export default {
   height: 36px; */
   color: #fff;
   background: transparent;
+   border: 1px solid white !important;
 }
 ::v-deep .el-textarea__inner {
   width: 884px;

+ 5 - 5
src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -41,7 +41,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -76,7 +76,7 @@
           v-hasPermi="['grassrootsregistration:bdglpublicproperty:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -250,7 +250,7 @@
       </div>
     </el-dialog>
 
-      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
+      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdglpublicproperty
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -278,7 +278,6 @@ import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
 
 export default {
@@ -402,7 +401,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -578,6 +577,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

+ 18 - 8
src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -51,7 +51,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -86,7 +86,7 @@
           v-hasPermi="['grassrootsregistration:bdglsecrecy:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -196,6 +196,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="种类" prop="kind">
@@ -231,7 +232,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="使用人" prop="peopleId1">
-          <el-select v-model="form.peopleId1" placeholder="请选择使用人">
+          <el-select ref="aa" v-model="form.peopleId1" placeholder="请选择使用人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -268,6 +269,7 @@
         </el-form-item>
         <el-form-item label="停用时间" prop="endTime">
           <el-date-picker
+          ref="bb"
             clearable
             size="small"
             v-model="form.endTime"
@@ -297,7 +299,7 @@
       </div>
     </el-dialog>
     <div class="fff">
-      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body>
+      <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
         <bdglsecrecy
           v-if="menuRoleVisible"
           ref="menuRole"
@@ -318,11 +320,10 @@ import {
   updateBdglsecrecy,
   exportBdglsecrecy,
 } from "@/api/grassrootsregistration/bdglsecrecy";
-import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import { getZhuChiRen,getDept } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglsecrecy",
   components: { Treeselect, bdglsecrecy },
@@ -470,7 +471,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         // console.log(response);
         this.deptOptions = response.data;
       });
@@ -549,7 +550,11 @@ export default {
     resertwo() {
       this.reset();
     },
-
+// 让select失去焦点
+    blurSelect() {
+      this.$refs.aa.blur();
+      this.$refs.bb.blur();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -680,6 +685,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+   border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -786,4 +792,8 @@ export default {
 ::v-deep .el-dialog__body {
   padding: none !important;
 }
+/* 文件编号背景颜色 */
+::v-deep .el-input.is-disabled .el-input__inner{
+  background: transparent !important;
+}
 </style>

+ 44 - 22
src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -49,7 +49,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -84,7 +84,7 @@
           v-hasPermi="['grassrootsregistration:bdglsoldier:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table
@@ -165,6 +165,7 @@
             :options="deptOptions"
             placeholder="选择单位"
             @select="selectPeo"
+            @open="blurSelect"
           />
         </el-form-item>
         <el-form-item label="召开时间" prop="convokeTime">
@@ -183,7 +184,11 @@
           <el-input v-model="form.address" placeholder="请输入召开地点" />
         </el-form-item>
         <el-form-item label="主持人" prop="compereId">
-          <el-select v-model="form.compereId" placeholder="请选择主持人">
+          <el-select
+            ref="aa"
+            v-model="form.compereId"
+            placeholder="请选择主持人"
+          >
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
@@ -210,7 +215,12 @@
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item>
         <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select v-model="form.joinId" multiple placeholder="请选择参加人">
+          <el-select
+            ref="bb"
+            v-model="form.joinId"
+            multiple
+            placeholder="请选择参加人"
+          >
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -220,8 +230,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
+        <el-form-item  label="列席人" prop="peopleIds" class="joinId">
           <el-select
+          ref="cc"
             v-model="form.peopleIds"
             multiple
             placeholder="请选择列席人"
@@ -235,8 +246,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
+        <el-form-item  label="缺席人" prop="absentIds" class="joinId">
           <el-select
+          ref="dd"
             v-model="form.absentIds"
             multiple
             placeholder="请选择缺席人"
@@ -267,14 +279,17 @@
         <!-- <el-button @click="cancel">取 消</el-button> -->
       </div>
     </el-dialog>
-     <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body >
-      
-        <bdglsoldier
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+    >
+      <bdglsoldier
         v-if="menuRoleVisible"
         ref="menuRole"
         :message="wordInfo"
       ></bdglsoldier>
-      
     </el-dialog>
   </div>
 </template>
@@ -291,16 +306,16 @@ import {
 } from "@/api/grassrootsregistration/bdglsoldier";
 
 import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import { getDept } from "@/api/grassrootsregistration/bdglparty";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 
 export default {
   name: "Bdglsoldier",
   components: {
     Treeselect,
-    bdglsoldier
+    bdglsoldier,
   },
   data() {
     return {
@@ -399,7 +414,7 @@ export default {
     this.getList();
   },
   methods: {
-     // 重置表单人员
+    // 重置表单人员
     ChongZhiRen() {
       // 主持人
       (this.form.compereId = null),
@@ -409,10 +424,10 @@ export default {
         (this.form.peopleJiLu = null),
         // 参加人
         (this.form.joinId = null);
-        // 列席人
-      (this.form.peopleIds = null), 
-      // 缺席人
-      (this.form.absentIds = null);
+      // 列席人
+      (this.form.peopleIds = null),
+        // 缺席人
+        (this.form.absentIds = null);
     },
     // 获取主持人
     getZhuChi(id) {
@@ -422,7 +437,7 @@ export default {
     },
     // 人员获取
     selectPeo(val) {
-      this.ChongZhiRen()
+      this.ChongZhiRen();
       this.form.unitId = val.id;
       this.getZhuChi(this.form.unitId);
     },
@@ -437,7 +452,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -491,6 +506,13 @@ export default {
     resertwo() {
       this.reset();
     },
+    // 让select失去焦点
+    blurSelect() {
+      this.$refs.aa.blur();
+      this.$refs.bb.blur();
+      this.$refs.cc.blur();
+      this.$refs.dd.blur();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -500,8 +522,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       // 人员列表
-      this.renYuan= [],
-      this.reset();
+      (this.renYuan = []), this.reset();
       this.getTreeselect();
       this.open = true;
       this.title = "添加军人委员会会议登记本";
@@ -529,7 +550,7 @@ export default {
         this.title = "修改军人委员会会议登记本";
       });
     },
-       //查看按钮操作
+    //查看按钮操作
     handleChakan(row) {
       // 是否隐藏按钮
       this.opens = false;
@@ -638,6 +659,7 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
+  border: 1px solid white !important;
 }
 
 /* 基本信息背景 */

+ 23 - 8
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -55,7 +55,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -90,7 +90,7 @@
           v-hasPermi="['grassrootsregistration:bdglweekwork:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -204,6 +204,7 @@
             :show-count="true"
             placeholder="请选择单位"
             @select="department"
+            @open="blurSelect"
           />
           <!-- @input="department" -->
         </el-form-item>
@@ -223,7 +224,7 @@
           <el-input v-model="form.phone" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="军事长官" prop="peopleId1">
-          <el-select v-model="form.peopleId1" placeholder="请选择军事长官">
+          <el-select ref="aa" v-model="form.peopleId1" placeholder="请选择军事长官">
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -417,6 +418,8 @@
             :rows="5"
             placeholder="请输入内容"
             v-model="form.remark"
+            autosize
+            style="min-height: 100px;"
           >
           </el-input>
         </div>
@@ -427,7 +430,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan">
       <bdglweekwork
         v-if="menuRoleVisible"
         ref="menuRole"
@@ -449,7 +452,6 @@ import {
   exportBdglweekwork,
 } from "@/api/grassrootsregistration/bdglweekwork";
 
-import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
@@ -666,7 +668,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      getDept().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -785,7 +787,10 @@ export default {
         this.menuRoleVisible = true;
       });
     },
-
+    // 让select失去焦点
+    blurSelect() {
+      this.$refs.aa.blur();
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'][0].validate((valid) => {
@@ -995,13 +1000,22 @@ export default {
   width: 250px;
 }
 /* 新增-工作登记-内容 */
+::v-deep .box3 .el-form-item el-form-item--medium{
+  width: 510px !important;
+}
+::v-deep .box3 .el-form-item__content{
+  width: 510px !important;
+}
+::v-deep .box3 .el-input el-input--small el-input--suffix{
+  width: 510px !important;
+}
 ::v-deep .box3 .el-form-item__content .el-input__inner {
   width: 510px !important;
 }
 .box4 {
   width: 890px;
   min-height: 100px;
-  /* border: 1px solid black; */
+  /* border: 1px solid white; */
   margin-left: 31px;
 }
 /* 底部确定取消按钮 */
@@ -1016,4 +1030,5 @@ export default {
 ::v-deep .el-dialog__body {
   padding: none !important;
 }
+
 </style>