更改连务会领导本

src/api/grassrootsregistration/bdgleven.js

@@ -70,3 +70,20 @@ export function getDept(query) {
    params: { deptId:data}
    })
   }
+
+    // 领导本
+    export function getMeetRecordList() {
+      return request({
+       url: '/grassrootsregistration/bdgleven/getMeetRecordList',
+       method: 'get',
+      })
+     }
+
+    //  查询领导本列表
+    export function getMeetRecordOnUnitList(query) {
+      return request({
+       url: '/grassrootsregistration/bdgleven/getMeetRecordOnUnitList',
+       method: 'get',
+       params: query
+      })
+     }

src/api/grassrootsregistration/bdglmeeting.js

@@ -206,3 +206,21 @@ export function getRenYuanXiangQing(query) {
     params: { deptId: query }
   })
 }
+
+// 查看人员名册列表
+export function getMeetingList(query) {
+  return request({
+    url: '/grassrootsregistration/bdglmeeting/getMeetingList',
+    method: 'get',
+  })
+}
+
+
+// 查询领导团支部会议登记本列表
+export function getMeetingOnUnitList(query) {
+  return request({
+    url: '/grassrootsregistration/bdglmeeting/getMeetingOnUnitList',
+    method: 'get',
+    params: query
+  })
+}

src/api/grassrootsregistration/bdglparty.js

@@ -66,4 +66,22 @@ export function getZhuChiRen(data) {
     method: 'get',
     params: { deptId:data}
   })
+}
+
+//领导查看
+export function getPartyList() {
+  return request({
+    url: '/grassrootsregistration/bdglparty/getPartyList',
+    method: 'get',
+  })
+}
+
+
+// 领导列表
+export function getPartyOnUnitList(query) {
+  return request({
+    url: '/grassrootsregistration/bdglparty/getPartyOnUnitList',
+    method: 'get',
+    params: query
+  })
 }

src/api/grassrootsregistration/bdglsoldier.js

@@ -50,4 +50,22 @@ export function exportBdglsoldier(query) {
     method: 'get',
     params: query
   })
+}
+
+// 领导查询军人委员会会议登记本
+export function getSoldierList() {
+  return request({
+    url: '/grassrootsregistration/bdglsoldier/getSoldierList',
+    method: 'get',
+  })
+}
+
+
+// 查询领导军人委员会会议登记本列表
+export function getSoldierOnUnitList(query) {
+  return request({
+    url: '/grassrootsregistration/bdglsoldier/getSoldierOnUnitList',
+    method: 'get',
+    params: query
+  })
 }

src/components/look_word/bdglparty.vue

@@ -36,7 +36,7 @@
           <tr class="JR_tr" height="39">
             <th class="" colspan="2" style="font-family: '楷体_GB2312'">
               <p align="center" style="font-size: 18px;font-weight: 400;">
-                党支部委员会议(简称支委会)
+                党支部委员会会议(简称支委会)
               </p>
             </th>
           </tr>

src/views/combatduty/militarydutyinfo/index.vue

@@ -182,7 +182,7 @@
             ></el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="车属单位名称" prop="carUnitName">
+        <el-form-item label="车属单位" prop="carUnitName">
           <el-select v-model="form.carUnitName" @change="carUnitNamechange" clearable placeholder="">
             <el-option v-for="dict in deptOptions" :key="dict.deptId" :label="dict.deptName" :value="dict"></el-option>
           </el-select>
@@ -240,6 +240,8 @@ import {
   listPeoples,
   updatestatus
 } from "@/api/combatduty/militarydutyinfo";
+import { listThebus } from "@/api/militaryvehicleManagement/thebus";
+import map from "../../../../public/assets/libs/moment/src/lib/utils/map";
 
 export default {
   name: "Militarydutyinfo",
@@ -293,6 +295,13 @@ export default {
             trigger: "blur",
           },
         ],
+        carUnitName: [
+          {
+            required: true,
+            message: "车属单位名称不能为空",
+            trigger: "blur",
+          },
+        ]
       },
       //人员数据
       rylist: [],
@@ -304,7 +313,10 @@ export default {
       // 保存显示隐藏
       baoCun: true,
       // 车牌号多选、
-      busDuoList: []
+      busDuoList: [],
+      // 所有车辆
+      suoYouBus: [],
+      buses: []
     };
   },
   created() {
@@ -312,9 +324,24 @@ export default {
     this.gettreeselect();
     this.getrylist();
     this.getthebusfun();
-    this.getStatuse()
+    this.getQuanBus()
   },
   methods: {
+    getBianList() {
+      this.buses = [];
+      this.buslist = [];
+      this.suoYouBus.forEach((item, i) => {
+        if (this.form.numberPlateIdList.indexOf(item.id) != -1) {
+          this.buses.push(item);
+        }
+      });
+      this.buslist = this.buses;
+    },
+    getQuanBus() {
+      listThebus().then(res => {
+        this.suoYouBus = res.rows
+      })
+    },
     // 更改军车状态
     getStatuse() {
       updatestatus().then(res => {
@@ -365,6 +392,7 @@ export default {
         this.militarydutyinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.getStatuse()
       });
     },
     // 取消按钮
@@ -409,126 +437,129 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.getthebusfun();
-      this.baoCun = true;
+    this.reset();
+    this.getthebusfun();
+    this.baoCun = true;
+    this.open = true;
+    this.title = "添加军车值班";
+    this.qdflg = 1;
+    this.busDuoList = [];
+  },
+  /** 修改按钮操作 */
+  handleUpdate(row) {
+    this.reset();
+    this.getthebusfun();
+    const id = row.id || this.ids;
+    getMilitarydutyinfo(id).then((response) => {
+      this.baoCun = false;
+      this.form = response.data;
+      this.busDuoList = response.data.numberPlateIdList
+      if (response.data.numberPlateIdList) {
+        this.getBianList()
+      }
       this.open = true;
-      this.title = "添加军车值班";
-      this.qdflg = 1;
-      this.busDuoList = [];
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getthebusfun();
-      const id = row.id || this.ids;
-      getMilitarydutyinfo(id).then((response) => {
-        this.baoCun = false;
-        this.form = response.data;
-        this.busDuoList = response.data.numberPlateIdList
-        this.open = true;
-        this.title = "修改军车值班";
-        this.qdflg = 2;
-        this.getRen(this.form.carUnitId);
-      });
-    },
-    // 保存并继续编辑按钮
-    submitForm1() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
+      this.title = "修改军车值班";
+      this.qdflg = 2;
+      this.getRen(this.form.carUnitId);
+    });
+  },
+  // 保存并继续编辑按钮
+  submitForm1() {
+    this.$refs["form"].validate((valid) => {
+      if (valid) {
+        if (this.busDuoList.length > 0) {
+          this.form.timequjian = this.form.attendedTime;
+          this.form.attendedTime = this.form.attendedTime.join(",");
+          addMilitarydutyinfo(this.form).then((response) => {
+            this.getList();
+          });
+          this.reset();
+          this.busDuoList = [];
+        } else {
+          this.$message.error('号码号牌不能为空！')
+        }
+      }
+    });
+  },
+  /** 提交按钮 */
+  submitForm() {
+    this.$refs["form"].validate((valid) => {
+      if (valid) {
+        if (this.form.id != null) {
           if (this.busDuoList.length > 0) {
-            this.form.timequjian = this.form.attendedTime;
-            this.form.attendedTime = this.form.attendedTime.join(",");
-            addMilitarydutyinfo(this.form).then((response) => {
+            this.form.numberPlateIdList = this.busDuoList
+            updateMilitarydutyinfo(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
               this.getList();
             });
-            this.reset();
-            this.busDuoList=[];
-          } else { 
+          } else {
             this.$message.error('号码号牌不能为空！')
           }
-        }
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            if (this.busDuoList.length > 0) {
-              this.form.numberPlateIdList = this.busDuoList
-              updateMilitarydutyinfo(this.form).then((response) => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              this.$message.error('号码号牌不能为空！')
-            }
 
+        } else {
+          if (this.busDuoList.length > 0) {
+            this.form.timequjian = this.form.attendedTime;
+            this.form.attendedTime = this.form.attendedTime.join(",");
+            this.form.numberPlateIdList = this.busDuoList
+            addMilitarydutyinfo(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            if (this.busDuoList.length > 0) {
-              this.form.timequjian = this.form.attendedTime;
-              this.form.attendedTime = this.form.attendedTime.join(",");
-              this.form.numberPlateIdList = this.busDuoList
-              addMilitarydutyinfo(this.form).then((response) => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              this.$message.error('号码号牌不能为空！')
-            }
+            this.$message.error('号码号牌不能为空！')
           }
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm("是否确认删除该数据项？")
-        .then(function () {
-          return delMilitarydutyinfo(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有军车值班数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportMilitarydutyinfo(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => { });
-    },
-    //司机联系方式
-    driverNamefun(val) {
-      this.form.driverName = val.name;
-      this.form.telephone = val.phone;
-      this.form.driverId = val.id;
-    },
-    carUnitNamechange(val) {
-      this.form.carUnitId = val.deptId;
-      this.form.carUnitName = val.deptName;
-      this.getRen(this.form.carUnitId);
-    },
-    numberPlateNamechange(val) {
-      this.form.numberPlateId = val.id;
-      this.form.numberPlateName = val.vehiclenumber;
-      this.form.modelInfo = val.vehiclemodel;
-    },
+      }
+    });
+  },
+  /** 删除按钮操作 */
+  handleDelete(row) {
+    const ids = row.id || this.ids;
+    this.$modal
+      .confirm("是否确认删除该数据项？")
+      .then(function () {
+        return delMilitarydutyinfo(ids);
+      })
+      .then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+      .catch(() => { });
+  },
+  /** 导出按钮操作 */
+  handleExport() {
+    const queryParams = this.queryParams;
+    this.$modal
+      .confirm("是否确认导出所有军车值班数据项？")
+      .then(() => {
+        this.exportLoading = true;
+        return exportMilitarydutyinfo(queryParams);
+      })
+      .then((response) => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      })
+      .catch(() => { });
+  },
+  //司机联系方式
+  driverNamefun(val) {
+    this.form.driverName = val.name;
+    this.form.telephone = val.phone;
+    this.form.driverId = val.id;
+  },
+  carUnitNamechange(val) {
+    this.form.carUnitId = val.deptId;
+    this.form.carUnitName = val.deptName;
+    this.getRen(this.form.carUnitId);
+  },
+  numberPlateNamechange(val) {
+    this.form.numberPlateId = val.id;
+    this.form.numberPlateName = val.vehiclenumber;
+    this.form.modelInfo = val.vehiclemodel;
   },
+},
 };
 </script>
 <style scoped>

src/views/grassrootsregistration/bdglevens/index.vue

@@ -9,28 +9,53 @@
         </div>
       </li>
     </ul>
-    <!-- 查看 -->
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdgleven
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdgleven>
+
+    <!-- 查看第一次 -->
+    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
+      custom-class="lieBiao">
+      <el-table v-loading="loading" :data="bdglevenList" :header-cell-style="{ background: '#003C69', color: 'white' }">
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template scope="scope">
+            <span>{{
+            (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" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ onEditor(scope.row.title) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column label="出席人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+          <template slot-scope="scope">
+            <el-button size="btk" type="text" @click="handleChakan(scope.row)"><span class="chakan">查看</span>
+            </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>
+
+    <!-- 查看第二次 -->
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
+      :before-close="closes">
+      <bdgleven v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdgleven>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  docList,
-  fileunits,
-} from "@/api/grassrootsregistration/bdglfilemanagement";
+  getMeetRecordList,
+  getBdgleven,
+  getMeetRecordOnUnitList,
+} from "@/api/grassrootsregistration/bdgleven";
 import bdgleven from "@/components/look_word/bdgleven.vue";
 export default {
   data() {
@@ -39,24 +64,65 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
+      tableStatus: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 连务会记录本表格数据
+      bdglevenList: [],
+      loading: false,
+      total: 0,
+      unitId: undefined
     };
   },
 
   created() {
-    docList().then((res) => {
-      // console.log(res);
+    getMeetRecordList().then((res) => {
       this.lieList = res.rows;
     });
   },
   methods: {
+    getList() {
+      this.queryParams.unitId = this.unitId;
+      getMeetRecordOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.total = response.total;
+      });
+    },
     chaKan(row) {
-      const unitId = row;
-      fileunits(unitId).then((response) => {
+      this.queryParams.unitId = row;
+      this.unitId = row;
+      getMeetRecordOnUnitList(this.queryParams).then(res => {
+        this.bdglevenList = res.rows
+        this.total = res.total
+        this.title = "查看连务会记录本"
+        this.tableStatus = true;
+      })
+    },
+    handleChakan(row) {
+      this.tableStatus = false;
+      // console.log(row);
+      const id = row.id || this.ids;
+      getBdgleven(id).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看连务会记录本";
         this.menuRoleVisible = true;
       });
     },
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
+    },
+    closes() {
+      this.menuRoleVisible = false;
+      this.tableStatus = true;
+    }
   },
   components: {
     bdgleven,
@@ -64,31 +130,36 @@ export default {
 
   computed: {},
 
-  mounted() {},
+  mounted() { },
   watch: {},
 };
 </script>
 <style  scoped>
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 1070px !important;
 }
+
 ::v-deep .el-dialog__body {
   margin: 10px 30px 20px 44px;
   padding-top: 20px !important;
   box-sizing: border-box;
 }
+
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
+
 .arr_conten {
   padding-top: 20px;
 }
+
 ul {
   display: flex;
   /* justify-content: space-between; */
   padding: 0 22px;
   flex-wrap: wrap;
 }
+
 li {
   list-style: none;
   background: url("../../../assets/images/book.png") no-repeat;
@@ -100,6 +171,7 @@ li {
   flex: 0 0 16%;
   margin-right: 10px;
 }
+
 .names {
   color: #fff;
   font-size: 14px;
@@ -107,7 +179,54 @@ li {
   padding: 26px 26px 38px 26px;
   letter-spacing: 1px;
 }
+
 .btn {
   text-align: center;
 }
+
+
+::v-deep .lieBiao {
+  background: #004d86 !important;
+  min-height: 42vh !important;
+}
+
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+
+::v-deep .pagination-container {
+  /* display: none;  */
+  position: relative;
+  height: 49px;
+  margin-bottom: 10px;
+  margin-top: 6vh;
+  padding: 10px 20px !important;
+  background: transparent !important;
+}
+
+::v-deep .el-pagination .el-select .el-input .el-input__inner {
+  background: #00365F !important;
+}
+
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  background: #00365F !important;
+}
+
+::v-deep .el-pagination__editor.el-input .el-input__inner {
+  background: #00365F !important;
+}
+
+::v-deep .el-pagination.is-background .btn-next {
+  background: #00365F !important;
+}
+
+::v-deep .el-pagination.is-background .el-pager li {
+  background: #00365F;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -1,33 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item prop="deptName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.deptName"
-          @input="handleQuery"
-        />
+        <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery" />
       </el-form-item>
 
       <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请输入主持人"
-          @change="Renyuan"
-        >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
+        <el-select v-model="queryParams.compereId" placeholder="请输入主持人" @change="Renyuan">
+          <el-option v-for="item in renYuans" :key="item.id" :label="item.name" :value="item.id" class="input_xiala">
           </el-option>
         </el-select>
       </el-form-item>
@@ -37,15 +17,8 @@
     </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="['grassrootsregistration:bdglmeeting:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['grassrootsregistration:bdglmeeting:add']">新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -85,36 +58,27 @@
       </el-col> -->
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="bdglmeetingList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
+    <el-table v-loading="loading" :data="bdglmeetingList" @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center">
         <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="deptName" />
-      <el-table-column
-        label="召开时间"
-        align="center"
-        prop="convokeTime"
-        width="180"
-      >
+      <el-table-column label="召开时间" align="center" prop="convokeTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.convokeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
-      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
-      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
+      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
+      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <!-- <el-table-column
         label="会议议题"
@@ -127,116 +91,51 @@
           <span>{{ onEditor(scope.row.title) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" 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"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:edit']"
-            ><span class="edit">修改</span></el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"
-            ><span class="delete">删除</span></el-button
-          >
+          <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" @click="handleUpdate(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglmeeting:edit']"><span class="edit">修改</span></el-button>
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"><span class="delete">删除</span></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"
-    />
+    <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="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-      ><div class="userAgree">
+    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
+      <div class="userAgree">
         <div class="jiben">基本信息</div>
 
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="80px"
-          :inline="true"
-        >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
           <el-form-item label="单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="deptOptions"
-              placeholder="请选择单位"
-              @select="selectPeo"
-              @open="blurSelect"
-            />
+            <treeselect v-model="form.unitId" :options="deptOptions" placeholder="请选择单位" @select="selectPeo"
+              @open="blurSelect" />
           </el-form-item>
           <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker
-              clearable
-              size="small"
-              v-model="form.convokeTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择召开时间"
-              :editable="false"
-            >
+            <el-date-picker clearable size="small" v-model="form.convokeTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="选择召开时间" :editable="false">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
           <el-form-item label="主持人" prop="compereId">
-            <el-select
-              v-model="form.compereId"
-              placeholder="请选择主持人"
-              ref="headerSearchSelect"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.status == 1"
-                @click.native="compere(item.name)"
-                class="input_xiala"
-              >
+            <el-select v-model="form.compereId" placeholder="请选择主持人" ref="headerSearchSelect">
+              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
+                :disabled="item.status == 1" @click.native="compere(item.name)" class="input_xiala">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="记录人" prop="peopleId">
             <el-select v-model="form.peopleId" placeholder="请选择记录人">
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="people(item.name)"
-                class="input_xiala"
-              >
+              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
+                @click.native="people(item.name)" class="input_xiala">
               </el-option>
             </el-select>
           </el-form-item>
@@ -245,92 +144,37 @@
         </el-form-item> -->
 
           <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select
-              ref="abc"
-              v-model="form1.joinId"
-              multiple
-              placeholder="请选择参加人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                class="input_xiala"
-                :disabled="item.disabled"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abc" v-model="form1.joinId" multiple placeholder="请选择参加人" class="input_xiala" filterable
+              @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
+                class="input_xiala" :disabled="item.disabled" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="列席人" class="joinId">
-            <el-select
-              ref="abcd"
-              v-model="form1.peopleIds"
-              multiple
-              placeholder="请选择列席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :disabled="item.disabled"
-                :value="item.name"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abcd" v-model="form1.peopleIds" multiple placeholder="请选择列席人" class="input_xiala" filterable
+              @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :disabled="item.disabled"
+                :value="item.name" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="缺席人" class="joinId">
-            <el-select
-              ref="abcde"
-              v-model="form1.absentIds"
-              multiple
-              placeholder="请选择缺席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                :disabled="item.disabled"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abcde" v-model="form1.absentIds" multiple placeholder="请选择缺席人" class="input_xiala"
+              filterable @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
+                :disabled="item.disabled" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
 
           <div class="jiben">会议议题</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.title"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
+          <quill-editor class="quill-editor" ref="myTextEditor" v-model="form.title" style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.contents"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
+          <quill-editor class="quill-editor" ref="myTextEditor" v-model="form.contents" style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"></quill-editor>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -338,18 +182,8 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdglmeeting
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdglmeeting>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false">
+      <bdglmeeting v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglmeeting>
     </el-dialog>
   </div>
 </template>
@@ -559,17 +393,15 @@ export default {
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
-      (this.form.compereId = null),
-        // (this.form.compereRen = null),
-        // 记录人
-        (this.form.peopleId = null),
-        // (this.form.peopleJiLu = null),
-        // 参加人
-        (this.form.joinId = null);
+      this.form.compereId = null
+      // 记录人
+      this.form.peopleId = null
+      // 参加人
+      this.form1.joinId = [];
       // 列席人
-      (this.form.peopleIds = null),
-        // 缺席人
-        (this.form.absentIds = null);
+      this.form1.peopleIds = [];
+      // 缺席人
+      this.form1.absentIds = [];
     },
     // 获取主持人
     getZhuChi(id) {
@@ -582,6 +414,7 @@ export default {
       this.ChongZhiRen();
       this.form.unitId = val.id;
       this.getZhuChi(this.form.unitId);
+      this.changeArr = [];
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -690,7 +523,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.form1.absentIds = [];
+      this.form1.joinId = [];
+      this.form1.peopleIds = [];
       this.reset();
+      this.form.unitId = row.unitId;
+      this.getZhuChi(this.form.unitId);
       this.getTreeselect();
       const id = row.id || this.ids;
       getBdglmeeting(id).then((response) => {
@@ -709,9 +547,8 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
+        this.changeSelect()
         this.form = this.result;
-        this.form.unitId = row.unitId;
-        this.getZhuChi(this.form.unitId);
         this.open = true;
         this.title = "修改团支部会议登记本";
       });
@@ -804,7 +641,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -819,7 +656,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };
@@ -829,25 +666,31 @@ export default {
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
+
 ::v-deep .el-textarea__inner {
   width: 884px;
   height: 104px;
 }
+
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
+
 ::v-deep .el-dialog__title {
   color: #fff;
   font: 18px;
 }
+
 ::v-deep .el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
+
 ::v-deep .el-form-item__label {
   font: 16px;
   color: #fff;
   width: 100px !important;
 }
+
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
@@ -867,26 +710,32 @@ export default {
   padding-left: 16px;
   line-height: 32px;
 }
+
 ::v-deep .el-dialog__body {
   box-sizing: border-box;
   padding: 30px 0px 30px 42px;
 }
+
 /* 调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
+
 .contents {
   padding: 0px 40px !important;
 }
+
 /* 下拉菜单字体/背景颜色 */
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #196299;
   color: #fff;
 }
+
 .el-select-dropdown__item {
   color: #fff;
 }
+
 /* 刷新图标 */
 /* .el-icon-refresh {
   width: 76px;
@@ -904,89 +753,113 @@ export default {
   height: 36px;
   line-height: 36px;
 }
+
 .el-date-editor.el-input {
   width: 200px;
   height: 36px;
   line-height: 36px;
 }
+
 ::v-deep .el-date-editor.el-input .el-input__inner {
   height: 36px;
   line-height: 36px;
 }
+
 /* 富文本 */
 ::v-deep .ql-snow .ql-fill,
 .ql-snow .ql-stroke.ql-fill {
   fill: #fff !important;
 }
+
 ::v-deep .ql-snow .ql-stroke {
   stroke: #fff !important;
 }
+
 ::v-deep .ql-snow .ql-picker {
   color: #fff !important;
 }
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
 }
+
 /* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
+
 /* 出席人 */
 ::v-deep .joinId {
   width: 650px !important;
 }
+
 ::v-deep .joinId .el-input__inner {
   width: 510px !important;
 }
+
 /* 分页按钮 */
 ::v-deep .el-pagination.is-background .el-pager li {
   background-color: #004d86;
   color: #fff;
 }
+
 ::v-deep .el-pagination.is-background .btn-next {
   background-color: #004d86;
   color: #fff;
 }
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
 }
+
 ::v-deep .ql-strike {
   display: none !important;
 }
+
 ::v-deep .ql-script {
   display: none !important;
 }
+
 ::v-deep .ql-code-block {
   display: none !important;
 }
+
 ::v-deep .ql-direction {
   display: none !important;
 }
+
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+
 ::v-deep .ql-toolbar.ql-snow .ql-formats {
   margin-right: 7px;
 }
+
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 30px 55px;
 }
+
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
 }
+
 ::v-deep input::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+
 ::v-deep .el-select__input {
   color: #fff !important;
 }

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -1,997 +1,242 @@
+<!-- 查看团支部记录本领导 -->
 <template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item prop="deptName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.deptName"
-          @input="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请输入主持人"
-          @change="Renyuan"
-        >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button size="btr" @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="['grassrootsregistration:bdglmeeting: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="['grassrootsregistration:bdglmeeting:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['grassrootsregistration:bdglmeeting:export']"
-          >导出</el-button
-        >
-      </el-col> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="bdglmeetingList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50" align="center">
-        <template scope="scope">
-          <span>{{
+  <div class="arr_conten">
+    <ul>
+      <li v-for="(item, i) in lieList" :key="i">
+        <div class="names">{{ item.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item)">查看</el-button>
+        </div>
+      </li>
+    </ul>
+
+    <!-- 查看第一次 -->
+    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
+      custom-class="lieBiao">
+      <el-table v-loading="loading" :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }">
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template scope="scope">
+            <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="deptName" />
-      <el-table-column
-        label="召开时间"
-        align="center"
-        prop="convokeTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.convokeTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
-      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
-      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
-      <el-table-column label="记录人" align="center" prop="peopleJiLu" />
-      <!-- <el-table-column
-        label="会议议题"
-        align="center"
-        prop="title"
-        show-overflow-tooltip
-      /> -->
-      <el-table-column label="会议议题" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.title) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        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"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:edit']"
-            ><span class="edit">修改</span></el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglmeeting:remove']"
-            ><span class="delete">删除</span></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="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-      ><div class="userAgree">
-        <div class="jiben">基本信息</div>
-
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="80px"
-          :inline="true"
-        >
-          <el-form-item label="单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="deptOptions"
-              placeholder="请选择单位"
-              @select="selectPeo"
-              @open="blurSelect"
-            />
-          </el-form-item>
-          <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker
-              clearable
-              size="small"
-              v-model="form.convokeTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择召开时间"
-              :editable="false"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="召开地点" prop="address" class="address">
-            <el-input v-model="form.address" placeholder="请输入召开地点" />
-          </el-form-item>
-          <el-form-item label="主持人" prop="compereId">
-            <el-select
-              v-model="form.compereId"
-              placeholder="请选择主持人"
-              ref="headerSearchSelect"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.status == 1"
-                @click.native="compere(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="记录人" prop="peopleId">
-            <el-select v-model="form.peopleId" placeholder="请选择记录人">
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="people(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="会议议题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item> -->
-
-          <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select
-              ref="abc"
-              v-model="form1.joinId"
-              multiple
-              placeholder="请选择参加人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                class="input_xiala"
-                :disabled="item.disabled"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="列席人" class="joinId">
-            <el-select
-              ref="abcd"
-              v-model="form1.peopleIds"
-              multiple
-              placeholder="请选择列席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :disabled="item.disabled"
-                :value="item.name"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺席人" class="joinId">
-            <el-select
-              ref="abcde"
-              v-model="form1.absentIds"
-              multiple
-              placeholder="请选择缺席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                :disabled="item.disabled"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <div class="jiben">会议议题</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.title"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
-
-          <div class="jiben">会议内容</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.contents"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
-        </el-form>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel" size="btn">取消</el-button>
-      </div>
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" align="center" prop="deptName" />
+        <el-table-column label="召开时间" align="center" prop="convokeTime" width="120">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.convokeTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
+        <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
+        <el-table-column label="记录人" align="center" prop="peopleJiLu" />
+        <el-table-column label="会议议题" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ onEditor(scope.row.title) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <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>
+          </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>
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdglmeeting
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdglmeeting>
+
+    <!-- 查看 -->
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
+      :before-close="closes">
+      <bdglmeeting v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglmeeting>
     </el-dialog>
   </div>
 </template>
 
 <script>
-//引入查看表格
-import bdglmeeting from "@/components/look_word/bdglmeeting.vue";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglparty";
 import {
-  listBdglmeeting,
+  getMeetingList,
   getBdglmeeting,
-  delBdglmeeting,
-  addBdglmeeting,
-  updateBdglmeeting,
-  exportBdglmeeting,
-  getDept,
-  getShouBu,
-  getAll,
+  getMeetingOnUnitList
 } from "@/api/grassrootsregistration/bdglmeeting";
-
-// 富文本
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-import { quillEditor } from "vue-quill-editor";
-// 树形
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
+//引入查看表格
+import bdglmeeting from "@/components/look_word/bdglmeeting.vue";
 export default {
-  name: "Bdglmeeting",
-  components: {
-    quillEditor,
-    Treeselect,
-    bdglmeeting,
-  },
   data() {
     return {
+      lieList: [],
       //查看页面
       menuRoleVisible: false,
-      wordInfo: {},
-
-      //判断关闭
-      style: "2",
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 团支部会议登记本表格数据
-      bdglmeetingList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
+      title: null,
+      tableStatus: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-        ],
-        convokeTime: [
-          { required: true, message: "召开时间不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "召开地点不能为空", trigger: "blur" },
-        ],
-        compereId: [
-          { required: true, message: "主持人不能为空", trigger: "blur" },
-        ],
-        peopleId: [
-          { required: true, message: "记录人不能为空", trigger: "blur" },
-        ],
-        title: [
-          { required: true, message: "会议议题不能为空", trigger: "blur" },
-        ],
-        joinId: [
-          { required: true, message: "参加人不能为空", trigger: "blur" },
-        ],
-        peopleIds: [
-          { required: true, message: "列席人不能为空", trigger: "blur" },
-        ],
-        absentIds: [
-          { required: true, message: "缺席人不能为空", trigger: "blur" },
-        ],
-      },
-      //下拉菜单
-      options: [],
-      // 外面的部门
-      buMeng: [],
-      // 主持人 人员
-      renYuan: [],
-      // 外面的人员
-      renYuans: [],
-      // 单位
-      unitArr: [],
-      // 部门列表
-      deptOptions: [],
-      // 树形配置对象
-      defaultProps: {
-        children: "children",
-        label: "label",
-      },
-      // 修改拿到的数据
-      result: {},
-      changeArr: [], //存放选中选项的数组
-      // 表单参数
-      form1: {
-        joinId: "",
-        peopleIds: "",
-        absentIds: "",
       },
+      // 党支部记录本表格数据
+      bdglpartyList: [],
+      loading: false,
+      total: 0,
+      unitId: undefined
     };
   },
+
   created() {
-    this.getList();
-    this.getBuMen();
-    this.getSuo();
-    this.onEditor();
+    getMeetingList().then((res) => {
+      this.lieList = res.rows;
+    });
   },
   methods: {
-    //change方法
-    changeSelect() {
-      for (var key in this.form1) {
-        this.form1[key].forEach((item) => {
-          this.changeArr.push(item);
-        });
-      }
-      //有可能会出现重复的元素，所以对changeArr数组进行去重操作
-      this.changeArr = this.quchong(this.changeArr);
-      //对changeArr进行遍历，对hobbyList进行遍历，
-      //changeArr有哪一项，就把hobbyList中该项的disabled属性置为true，禁用
-      this.changeArr.forEach((item) => {
-        this.renYuan.forEach((yitem) => {
-          if (item === yitem.name) {
-            yitem.disabled = true;
-          }
-        });
-      });
-    },
-    //remove-tag方法，移除某一项时触发该方法
-    removeSelect(val) {
-      //将移除的那一项，从changeArr数组中找到下标，并移除
-      var str = this.changeArr.findIndex((item) => item === val);
-      this.changeArr.splice(str, 1);
-      //对hobbyList数组遍历，将移除的那项disabled属性置为false，启用
-      this.renYuan.forEach((item) => {
-        if (val === item.name) {
-          item.disabled = false;
-        }
-      });
-    },
-    //数组去重的方法，避免changeArr出现重复的元素
-    quchong(arr) {
-      return arr.filter(function (item, index, arr) {
-        return arr.indexOf(item, 0) === index;
-      });
-    },
-    // 获取搜索所有人
-    getSuo() {
-      getAll().then((res) => {
-        this.renYuans = res.rows;
-      });
-    },
-    // 转义视图不加标签
-    onEditor(str) {
-      if (str != null) {
-        var str = str.replace(/<\/?[^>]*>/g, "");
-        str = str.replace(/[ | ]*\n/g, "\n");
-        str = str.replace(/ /gi, "");
-      }
-      return str;
-    },
-    // 获取搜索下拉部门
-    getBuMen() {
-      getShouBu().then((res) => {
-        this.buMeng = res.data;
-      });
-    },
-    // 重置表单人员
-    ChongZhiRen() {
-      // 主持人
-      (this.form.compereId = null),
-        // (this.form.compereRen = null),
-        // 记录人
-        (this.form.peopleId = null),
-        // (this.form.peopleJiLu = null),
-        // 参加人
-        (this.form.joinId = null);
-      // 列席人
-      (this.form.peopleIds = null),
-        // 缺席人
-        (this.form.absentIds = null);
-    },
-    // 获取主持人
-    getZhuChi(id) {
-      getZhuChiRen(id).then((res) => {
-        this.renYuan = res.data;
-      });
-    },
-    // 单位选择触发
-    selectPeo(val) {
-      this.ChongZhiRen();
-      this.form.unitId = val.id;
-      this.getZhuChi(this.form.unitId);
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      getDept().then((response) => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 搜索时间选择触发
-    tiem() {
-      this.getList();
-    },
-    // 搜索主持人选中触发
-    Renyuan() {
-      this.getList();
-    },
-    //  主持人选中触发
-    compere(name) {
-      this.form.compereRen = name;
-    },
-    //  记录人选中触发
-    people(name) {
-      this.form.peopleJiLu = name;
-    },
-    /** 查询团支部会议登记本列表 */
     getList() {
-      this.loading = true;
-      listBdglmeeting(this.queryParams).then((response) => {
-        this.bdglmeetingList = response.rows;
+      this.queryParams.unitId = this.unitId;
+      getMeetingOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
         this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 搜索单位触发
-    company() {
-      this.getList();
-      // 联动人员
-      getZhuChiRen(this.queryParams.unitId).then((res) => {
-        this.renYuans = res.data;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.getSuo();
-      this.reset();
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 对话框重置按钮操作 */
-    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);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.form1.absentIds = [];
-      this.form1.joinId = [];
-      this.form1.peopleIds = [];
-      // 主持人 人员
-      this.renYuan = [];
-      this.reset();
-      this.style = 2;
-      this.getTreeselect();
-      this.open = true;
-      this.title = "添加团支部会议登记本";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.getTreeselect();
-      const id = row.id || this.ids;
-      getBdglmeeting(id).then((response) => {
-        this.result = response.data;
-        for (var k in this.result) {
-          if (k === "deptName") {
-            delete this.result[k];
-          }
-        }
-        if (this.result.joinId !== "") {
-          this.form1.joinId = response.data.joinId.split(",");
-        }
-        if (this.result.peopleIds !== "" && this.result.peopleIds != null) {
-          this.form1.peopleIds = response.data.peopleIds.split(",");
-        }
-        if (this.result.absentIds !== "" && this.result.absentIds != null) {
-          this.form1.absentIds = response.data.absentIds.split(",");
-        }
-        this.form = this.result;
-        this.form.unitId = row.unitId;
-        this.getZhuChi(this.form.unitId);
-        this.open = true;
-        this.title = "修改团支部会议登记本";
+    chaKan(row) {
+      this.queryParams.unitId = row.deptId;
+      this.unitId = row.deptId
+      getMeetingOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.title = "查看团支部记录本";
+        this.tableStatus = true;
+        this.total = response.total;
       });
     },
-
-    //查看按钮操作
     handleChakan(row) {
-      // 是否隐藏按钮
-      this.opens = false;
+      this.tableStatus = false;
       const id = row.id || this.ids;
       getBdglmeeting(id).then((response) => {
         this.wordInfo = response.data;
-        this.title = "查看团支部会议登记本";
+        this.title = "查看团支部记录本";
         this.menuRoleVisible = true;
       });
     },
-
-    /** 提交按钮 */
-    submitForm(style) {
-      this.style = style;
-      this.form.joinId = this.form1.joinId;
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            if (this.form1.joinId !== undefined) {
-              this.form.joinId = this.form1.joinId.join(",");
-            }
-            if (
-              this.form1.peopleIds !== undefined &&
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds !== undefined &&
-              this.form1.absentIds != null &&
-              this.form1.absentIds != ""
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            updateBdglmeeting(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            if (
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds.length != 0 &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds != null &&
-              this.form1.absentIds != "" &&
-              this.form1.absentIds.length != 0
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            this.form.joinId = this.form1.joinId.join(",");
-            addBdglmeeting(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        // .confirm('是否确认删除团支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm("是否确认删除该数据？")
-        .then(function () {
-          return delBdglmeeting(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有团支部会议登记本数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportBdglmeeting(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
     },
+    closes() {
+      this.menuRoleVisible = false;
+      this.tableStatus = true;
+    }
   },
+  components: {
+    bdglmeeting,
+  },
+
+  computed: {},
+
+  mounted() { },
+  watch: {},
 };
 </script>
-<style scoped>
-/* 对话框背景颜色 */
+<style  scoped>
 ::v-deep .el-dialog {
-  background: #004d86 !important;
-}
-::v-deep .el-textarea__inner {
-  width: 884px;
-  height: 104px;
-}
-::v-deep .el-dialog__header {
-  border-bottom: 1px solid #718a9d;
-}
-::v-deep .el-dialog__title {
-  color: #fff;
-  font: 18px;
-}
-::v-deep .el-dialog__headerbtn .el-dialog__close {
-  color: #fff;
-}
-::v-deep .el-form-item__label {
-  font: 16px;
-  color: #fff;
-  width: 100px !important;
-}
-::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
-  background: transparent;
-  color: #fff;
-  border: 1px solid white !important;
-  border-color: #fff !important;
+  width: 1070px !important;
 }
 
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
 ::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 44px;
+  padding-top: 20px !important;
   box-sizing: border-box;
-  padding: 30px 0px 30px 42px;
 }
-/* 调整表单间距 */
-::v-deep .el-form-item__content {
-  width: 200px;
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
 }
-.contents {
-  padding: 0px 40px !important;
+
+.arr_conten {
+  padding-top: 20px;
 }
-/* 下拉菜单字体/背景颜色 */
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background-color: #196299;
-  color: #fff;
+
+ul {
+  display: flex;
+  /* justify-content: space-between; */
+  padding: 0 22px;
+  flex-wrap: wrap;
 }
-.el-select-dropdown__item {
-  color: #fff;
+
+li {
+  list-style: none;
+  background: url("../../../assets/images/book.png") no-repeat;
+  height: 140px;
+  width: 222px;
+  /* margin: 20px 0; */
+  margin-bottom: 20px;
+  background-size: 100% 100%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
-/* 刷新图标 */
-/* .el-icon-refresh {
-  width: 76px;
-  height: 36px;
+
+.names {
   color: #fff;
-  background-color: #1d96ff !important;
-  border-radius: 4px;
-  border: none;
-  margin-left: 20px;
   font-size: 14px;
-} */
-/* 时间选择 */
-::v-deep .el-input--small .el-input__inner {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-.el-date-editor.el-input {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-::v-deep .el-date-editor.el-input .el-input__inner {
-  height: 36px;
-  line-height: 36px;
-}
-/* 富文本 */
-::v-deep .ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-  fill: #fff !important;
-}
-::v-deep .ql-snow .ql-stroke {
-  stroke: #fff !important;
+  text-align: center;
+  padding: 26px 26px 38px 26px;
+  letter-spacing: 1px;
 }
-::v-deep .ql-snow .ql-picker {
-  color: #fff !important;
+
+.btn {
+  text-align: center;
 }
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
+
+
+
+::v-deep .lieBiao {
   background: #004d86 !important;
+  min-height: 42vh !important;
 }
-/* 单位下拉菜单选中字体颜色 */
-::v-deep .vue-treeselect__single-value {
-  color: #fff !important;
-}
-/* 出席人 */
-::v-deep .joinId {
-  width: 650px !important;
-}
-::v-deep .joinId .el-input__inner {
-  width: 510px !important;
-}
-/* 分页按钮 */
-::v-deep .el-pagination.is-background .el-pager li {
-  background-color: #004d86;
+
+::v-deep .el-dialog__title {
   color: #fff;
+  font: 18px;
 }
-::v-deep .el-pagination.is-background .btn-next {
-  background-color: #004d86;
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
-/* 富文本删除功能 */
-::v-deep .ql-blockquote {
-  display: none !important;
-}
-::v-deep .ql-strike {
-  display: none !important;
-}
-::v-deep .ql-script {
-  display: none !important;
-}
-::v-deep .ql-code-block {
-  display: none !important;
-}
-::v-deep .ql-direction {
-  display: none !important;
-}
-::v-deep .el-input__inner {
-  cursor: pointer !important;
-}
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 30px 55px;
-}
-/* 调整输入框提示文字颜色 */
-::v-deep .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .pagination-container {
+  /* display: none;  */
+  position: relative;
+  height: 49px;
+  margin-bottom: 10px;
+  margin-top: 6vh;
+  padding: 10px 20px !important;
+  background: transparent !important;
 }
-::v-deep input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .el-pagination .el-select .el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep input:-moz-placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
-#chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+
+::v-deep .el-pagination__editor.el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep .el-select__input {
-  color: #fff !important;
+
+::v-deep .el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
 
-.colors {
-  color: #ccc !important;
+::v-deep .el-pagination.is-background .el-pager li {
+  background: #00365F;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -1,34 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item prop="unitName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.unitName"
-          @input="handleQuery"
-        />
+        <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery" />
       </el-form-item>
       <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请选择主持人"
-          @change="compere"
-          filterable
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in personnel"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
+        <el-select v-model="queryParams.compereId" placeholder="请选择主持人" @change="compere" filterable
+          class="input_xiala">
+          <el-option v-for="item in personnel" :key="item.id" :label="item.name" :value="item.id" class="input_xiala">
           </el-option>
         </el-select>
       </el-form-item>
@@ -38,15 +17,8 @@
     </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="['grassrootsregistration:bdglparty:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['grassrootsregistration:bdglparty:add']">新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -85,18 +57,14 @@
         >
       </el-col> -->
     </el-row>
-    <el-table
-      v-loading="loading"
-      :data="bdglpartyList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
+    <el-table v-loading="loading" :data="bdglpartyList" @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
         <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>
@@ -113,122 +81,52 @@
         </template>
       </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
+      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
       <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" 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"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:edit']"
-            ><span class="edit">修改</span></el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:remove']"
-            ><span class="delete">删除</span></el-button
-          >
+          <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" @click="handleUpdate(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglparty:edit']"><span class="edit">修改</span></el-button>
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['grassrootsregistration:bdglparty:remove']"><span class="delete">删除</span></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"
-    />
+    <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="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
       <div class="userAgree">
         <div class="jiben">基本信息</div>
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="80px"
-          :inline="true"
-        >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
           <el-form-item label="单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="deptOptions"
-              placeholder="请选择单位"
-              @select="selectPeo"
-              @open="blurSelect"
-            />
+            <treeselect v-model="form.unitId" :options="deptOptions" placeholder="请选择单位" @select="selectPeo"
+              @open="blurSelect" />
           </el-form-item>
           <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker
-              clearable
-              size="small"
-              v-model="form.convokeTime"
-              type="date"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择召开时间"
-            >
+            <el-date-picker clearable size="small" v-model="form.convokeTime" type="date" :editable="false"
+              value-format="yyyy-MM-dd" placeholder="请选择召开时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
           <el-form-item label="主持人" prop="compereId">
-            <el-select
-              ref="headerSearchSelect"
-              v-model="form.compereId"
-              placeholder="请选择主持人"
-              class="input_xiala"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="ZhuChiRen(item.name)"
-                class="input_xiala"
-              >
+            <el-select ref="headerSearchSelect" v-model="form.compereId" placeholder="请选择主持人" class="input_xiala">
+              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
+                @click.native="ZhuChiRen(item.name)" class="input_xiala">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="记录人" prop="peopleId">
-            <el-select
-              v-model="form.peopleId"
-              placeholder="请选择记录人"
-              class="input_xiala"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="peoples(item.name)"
-                class="input_xiala"
-              >
+            <el-select v-model="form.peopleId" placeholder="请选择记录人" class="input_xiala">
+              <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"
+                @click.native="peoples(item.name)" class="input_xiala">
               </el-option>
             </el-select>
           </el-form-item>
@@ -237,91 +135,37 @@
         </el-form-item> -->
 
           <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select
-              ref="abc"
-              v-model="form1.joinId"
-              multiple
-              placeholder="请选择参加人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                class="input_xiala"
-                :disabled="item.disabled"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abc" v-model="form1.joinId" multiple placeholder="请选择参加人" class="input_xiala" filterable
+              @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
+                class="input_xiala" :disabled="item.disabled" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="列席人" class="joinId">
-            <el-select
-              ref="abcd"
-              v-model="form1.peopleIds"
-              multiple
-              placeholder="请选择列席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :disabled="item.disabled"
-                :value="item.name"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abcd" v-model="form1.peopleIds" multiple placeholder="请选择列席人" class="input_xiala" filterable
+              @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :disabled="item.disabled"
+                :value="item.name" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="缺席人" class="joinId">
-            <el-select
-              ref="abcde"
-              v-model="form1.absentIds"
-              multiple
-              placeholder="请选择缺席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                :disabled="item.disabled"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
+            <el-select ref="abcde" v-model="form1.absentIds" multiple placeholder="请选择缺席人" class="input_xiala"
+              filterable @remove-tag="removeSelect" @change="changeSelect">
+              <el-option v-for="item in renYuan" :key="item.id" :label="item.name" :value="item.name"
+                :disabled="item.disabled" class="input_xiala" :class="item.disabled == true ? 'colors' : ''">
               </el-option>
             </el-select>
           </el-form-item>
 
           <div class="jiben">会议议题</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-            v-model="form.title"
-          ></quill-editor>
+          <quill-editor class="quill-editor" ref="myTextEditor" style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;" v-model="form.title"></quill-editor>
 
           <div class="jiben">会议内容</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            style="height: 150px; width: 920px; margin-left: 0px"
-            v-model="form.contents"
-          ></quill-editor>
+          <quill-editor class="quill-editor" ref="myTextEditor" style="height: 150px; width: 920px; margin-left: 0px"
+            v-model="form.contents"></quill-editor>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -329,18 +173,8 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdglparty
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdglparty>
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false">
+      <bdglparty v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglparty>
     </el-dialog>
   </div>
 </template>
@@ -545,12 +379,11 @@ export default {
     },
     // 重置表单人员
     ChongZhiRen() {
-      (this.form.compereId = null),
-        //  this.form.compereRen=null,
-        (this.form.peopleId = null);
-      // this.form. peopleJiLu=null,
-      this.form.joinId = null;
-      (this.form.peopleIds = null), (this.form.absentIds = null);
+      this.form.compereId = null;
+      this.form.peopleId = null;
+      this.form1.joinId = [];
+      this.form1.peopleIds = []; 
+      this.form1.absentIds = [];
     },
     // 获取主持人
     getZhuChi(id) {
@@ -561,12 +394,13 @@ export default {
         this.renYuan = res.data;
       });
     },
-    // -新增选折单位触发
+    // 新增选择单位触发
     selectPeo(val) {
       this.ChongZhiRen();
       // 获取人员1
       this.form.unitId = val.id;
       this.getZhuChi(this.form.unitId);
+      this.changeArr = [];
     },
     // 搜索单位触发
     Company() {
@@ -665,6 +499,9 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.form1.absentIds = [];
+      this.form1.joinId = [];
+      this.form1.peopleIds = [];
       this.reset();
       this.form.unitId = row.unitId;
       this.getZhuChi(this.form.unitId);
@@ -681,6 +518,7 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
+        this.changeSelect()
         this.form = this.result;
         this.open = true;
         this.title = "修改党支部会议登记本";
@@ -774,7 +612,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -789,7 +627,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -805,25 +643,31 @@ export default {
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
+
 ::v-deep .el-textarea__inner {
   width: 884px;
   height: 104px;
 }
+
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
+
 ::v-deep .el-dialog__title {
   color: #fff;
   font: 18px;
 }
+
 ::v-deep .el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
+
 ::v-deep .el-form-item__label {
   font: 16px;
   color: #fff;
   width: 100px !important;
 }
+
 ::v-deep .el-input__inner {
   /* width: 200px !important;
   height: 36px; */
@@ -832,10 +676,12 @@ export default {
   border: 1px solid white !important;
   border-color: #fff !important;
 }
+
 ::v-deep .el-textarea__inner {
   width: 884px;
   height: 104px;
 }
+
 /* 基本信息背景 */
 .jiben {
   width: 920px;
@@ -846,19 +692,23 @@ export default {
   padding-left: 16px;
   line-height: 32px;
 }
+
 ::v-deep .el-dialog__body {
   /* margin: 0px 20px; */
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
   padding: 30px 0px 30px 42px;
 }
+
 /* 调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
+
 .contents {
   padding: 0px 40px !important;
 }
+
 /* 下拉菜单字体/背景颜色 */
 /* .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
@@ -885,11 +735,13 @@ export default {
   height: 36px;
   line-height: 36px;
 }
+
 .el-date-editor.el-input {
   width: 200px;
   height: 36px;
   line-height: 36px;
 }
+
 ::v-deep .el-date-editor.el-input .el-input__inner {
   height: 36px;
   line-height: 36px;
@@ -900,72 +752,92 @@ export default {
 .ql-snow .ql-stroke.ql-fill {
   fill: #fff !important;
 }
+
 ::v-deep .ql-snow .ql-stroke {
   stroke: #fff !important;
 }
+
 ::v-deep .ql-snow .ql-picker {
   color: #fff !important;
 }
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
 }
+
 /* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
+
 /* 出席人 */
 ::v-deep .joinId {
   width: 650px !important;
 }
+
 ::v-deep .joinId .el-input__inner {
   width: 510px !important;
 }
+
 /* 分页按钮 */
 ::v-deep .el-pagination.is-background .el-pager li {
   background-color: #004d86;
   color: #fff;
 }
+
 ::v-deep .el-pagination.is-background .btn-next {
   background-color: #004d86;
   color: #fff;
 }
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
 }
+
 ::v-deep .ql-strike {
   display: none !important;
 }
+
 ::v-deep .ql-script {
   display: none !important;
 }
+
 ::v-deep .ql-code-block {
   display: none !important;
 }
+
 ::v-deep .ql-direction {
   display: none !important;
 }
+
 ::v-deep .ql-toolbar.ql-snow .ql-formats {
   margin-right: 7px;
 }
+
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 30px 50px;
 }
+
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
 }
+
 ::v-deep input::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+
 /* 文字多余部分省略 */
 .el-table__row .el-table_1_column_4 .cell el-tooltip p {
   text-overflow: ellipsis;
@@ -974,16 +846,20 @@ export default {
   overflow: hidden;
   white-space: nowrap;
 }
+
 ::v-deep .el-form-item__error {
   left: 0;
 }
+
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
+
 ::v-deep .el-select__input {
   color: #fff !important;
 }
+
 .colors {
- color: #ccc !important;
+  color: #ccc !important;
 }
 </style>

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -1,989 +1,242 @@
+<!--党支部记录本领导 -->
 <template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item prop="unitName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.unitName"
-          @input="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请选择主持人"
-          @change="compere"
-          filterable
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in personnel"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button size="btr" @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="['grassrootsregistration:bdglparty: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="['grassrootsregistration:bdglparty:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['grassrootsregistration:bdglparty:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['grassrootsregistration:bdglparty:export']"
-          >导出</el-button
-        >
-      </el-col> -->
-    </el-row>
-    <el-table
-      v-loading="loading"
-      :data="bdglpartyList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="序号" align="center" prop="id" /> -->
-      <el-table-column label="序号" type="index" width="50" align="center">
-        <template scope="scope">
-          <span>{{
-            (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="title"
-        show-overflow-tooltip
-      /> -->
-      <el-table-column label="会议议题" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.title) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
-      <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        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"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:edit']"
-            ><span class="edit">修改</span></el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglparty:remove']"
-            ><span class="delete">删除</span></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="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <div class="userAgree">
-        <div class="jiben">基本信息</div>
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="80px"
-          :inline="true"
-        >
-          <el-form-item label="单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="deptOptions"
-              placeholder="请选择单位"
-              @select="selectPeo"
-              @open="blurSelect"
-            />
-          </el-form-item>
-          <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker
-              clearable
-              size="small"
-              v-model="form.convokeTime"
-              type="date"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择召开时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="召开地点" prop="address" class="address">
-            <el-input v-model="form.address" placeholder="请输入召开地点" />
-          </el-form-item>
-          <el-form-item label="主持人" prop="compereId">
-            <el-select
-              ref="headerSearchSelect"
-              v-model="form.compereId"
-              placeholder="请选择主持人"
-              class="input_xiala"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="ZhuChiRen(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="记录人" prop="peopleId">
-            <el-select
-              v-model="form.peopleId"
-              placeholder="请选择记录人"
-              class="input_xiala"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="peoples(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="会议议题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item> -->
-
-          <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select
-              ref="abc"
-              v-model="form1.joinId"
-              multiple
-              placeholder="请选择参加人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                class="input_xiala"
-                :disabled="item.disabled"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="列席人" class="joinId">
-            <el-select
-              ref="abcd"
-              v-model="form1.peopleIds"
-              multiple
-              placeholder="请选择列席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :disabled="item.disabled"
-                :value="item.name"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺席人" class="joinId">
-            <el-select
-              ref="abcde"
-              v-model="form1.absentIds"
-              multiple
-              placeholder="请选择缺席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                :disabled="item.disabled"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
+  <div class="arr_conten">
+    <ul>
+      <li v-for="(item, i) in lieList" :key="i">
+        <div class="names">{{ item.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item)">查看</el-button>
+        </div>
+      </li>
+    </ul>
 
-          <div class="jiben">会议议题</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-            v-model="form.title"
-          ></quill-editor>
+    <!-- 查看第一次 -->
+    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
+      custom-class="lieBiao">
+      <el-table v-loading="loading" :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }">
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template scope="scope">
+            <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template scope="scope">
+            <span>{{
+            (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" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ onEditor(scope.row.title) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" 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>
+          </template>
+        </el-table-column>
+      </el-table>
 
-          <div class="jiben">会议内容</div>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            style="height: 150px; width: 920px; margin-left: 0px"
-            v-model="form.contents"
-          ></quill-editor>
-        </el-form>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel" size="btn">取消</el-button>
-      </div>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </el-dialog>
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdglparty
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></bdglparty>
+
+    <!-- 查看二次 -->
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
+      :before-close="closes">
+      <bdglparty v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglparty>
     </el-dialog>
   </div>
 </template>
 
 <script>
-//引入查看表格
-import bdglparty from "@/components/look_word/bdglparty.vue";
-// 自建API
-import { getDeptId } from "@/api/getApi/getApi";
-
 import {
-  listBdglparty,
+  getPartyOnUnitList,
+  getPartyList,
   getBdglparty,
-  delBdglparty,
-  addBdglparty,
-  updateBdglparty,
-  exportBdglparty,
-  getDept,
-  getZhuChiRen,
 } from "@/api/grassrootsregistration/bdglparty";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-// 富文本
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-import { quillEditor } from "vue-quill-editor";
-// 树形
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getShouBu, getAll } from "@/api/grassrootsregistration/bdglmeeting";
+//引入查看表格
+import bdglparty from "@/components/look_word/bdglparty.vue";
 export default {
-  name: "Bdglparty",
-  components: {
-    Treeselect,
-    quillEditor,
-    bdglparty,
-  },
   data() {
     return {
+      lieList: [],
       //查看页面
       menuRoleVisible: false,
-      wordInfo: {},
-
-      //判断关闭
-      style: "2",
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 党支部会议登记本表格数据
-      bdglpartyList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
+      title: null,
+      tableStatus: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-      },
-      // 表单参数
-      form1: {
-        joinId: "",
-        peopleIds: "",
-        absentIds: "",
-      },
-      form: {},
-      // 表单校验
-      rules: {
-        unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-        ],
-        convokeTime: [
-          { required: true, message: "召开时间不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "召开地点不能为空", trigger: "blur" },
-        ],
-        compereId: [
-          { required: true, message: "主持人不能为空", trigger: "blur" },
-        ],
-        peopleId: [
-          { required: true, message: "记录人不能为空", trigger: "blur" },
-        ],
-        title: [
-          { required: true, message: "会议议题不能为空", trigger: "blur" },
-        ],
-        joinId: [
-          { required: true, message: "参加人不能为空", trigger: "blur" },
-        ],
-        peopleIds: [
-          { required: true, message: "列席人不能为空", trigger: "blur" },
-        ],
-        absentIds: [
-          { required: true, message: "缺席人不能为空", trigger: "blur" },
-        ],
       },
-      // 人员
-      renYuan: [],
-      // 外面的部门
-      buMeng: [],
-      // 部门列表
-      deptOptions: [],
-      // 搜索人员列表
-      personnel: [],
-      // 树形配置对象
-      defaultProps: {
-        children: "children",
-        label: "label",
-      },
-      // 修改拿到的数据
-      result: {},
-      changeArr: [], //存放选中选项的数组
+      // 党支部记录本表格数据
+      bdglpartyList: [],
+      loading: false,
+      total: 0,
+      unitId: undefined
     };
   },
+
   created() {
-    this.getList();
-    this.getBuMen();
-    this.getSuo();
-    this.onEditor();
+    getPartyList().then((res) => {
+      this.lieList = res.rows;
+    });
   },
   methods: {
-    //change方法
-    changeSelect() {
-      for (var key in this.form1) {
-        this.form1[key].forEach((item) => {
-          this.changeArr.push(item);
-        });
-      }
-      //有可能会出现重复的元素，所以对changeArr数组进行去重操作
-      this.changeArr = this.quchong(this.changeArr);
-      //对changeArr进行遍历，对hobbyList进行遍历，
-      //changeArr有哪一项，就把hobbyList中该项的disabled属性置为true，禁用
-      this.changeArr.forEach((item) => {
-        this.renYuan.forEach((yitem) => {
-          if (item === yitem.name) {
-            yitem.disabled = true;
-          }
-        });
-      });
-    },
-    //remove-tag方法，移除某一项时触发该方法
-    removeSelect(val) {
-      //将移除的那一项，从changeArr数组中找到下标，并移除
-      var str = this.changeArr.findIndex((item) => item === val);
-      this.changeArr.splice(str, 1);
-      //对hobbyList数组遍历，将移除的那项disabled属性置为false，启用
-      this.renYuan.forEach((item) => {
-        if (val === item.name) {
-          item.disabled = false;
-        }
-      });
-    },
-    //数组去重的方法，避免changeArr出现重复的元素
-    quchong(arr) {
-      return arr.filter(function (item, index, arr) {
-        return arr.indexOf(item, 0) === index;
-      });
-    },
-    // 获取搜索所有人
-    getSuo() {
-      getAll().then((res) => {
-        this.personnel = res.rows;
-      });
-    },
-    // 获取搜索下拉部门
-    getBuMen() {
-      getShouBu().then((res) => {
-        this.buMeng = res.data;
-      });
-    },
-    // 转义视图不加标签
-    onEditor(str) {
-      if (str != null) {
-        var str = str.replace(/<\/?[^>]*>/g, "");
-        str = str.replace(/[ | ]*\n/g, "\n");
-        str = str.replace(/ /gi, "");
-      }
-      return str;
-    },
-    // 重置表单人员
-    ChongZhiRen() {
-      (this.form.compereId = null),
-        //  this.form.compereRen=null,
-        (this.form.peopleId = null);
-      // this.form. peopleJiLu=null,
-      this.form.joinId = null;
-      (this.form.peopleIds = null), (this.form.absentIds = null);
-    },
-    // 获取主持人
-    getZhuChi(id) {
-      getZhuChiRen(id).then((res) => {
-        res.data.forEach((item) => {
-          item.disabled = false;
-        });
-        this.renYuan = res.data;
-      });
-    },
-    // -新增选折单位触发
-    selectPeo(val) {
-      this.ChongZhiRen();
-      // 获取人员1
-      this.form.unitId = val.id;
-      this.getZhuChi(this.form.unitId);
-    },
-    // 搜索单位触发
-    Company() {
-      this.getList();
-      var url = "/grassrootsregistration/common/getZhuChiRen";
-      getDeptId(url, this.queryParams.unitId).then((res) => {
-        this.personnel = res.data;
-      });
-    },
-    // 搜索主持人触发
-    compere() {
-      this.getList();
-    },
-    // 选中主持人触发
-    ZhuChiRen(name) {
-      this.form.compereRen = name;
-    },
-    // 选中记录人触发
-    peoples(name) {
-      this.form.peopleJiLu = name;
-    },
-    /** 查询党支部会议登记本列表 */
     getList() {
-      this.loading = true;
-      listBdglparty(this.queryParams).then((response) => {
+      this.queryParams.unitId = this.unitId;
+      listBdglsoldier(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
-        this.loading = false;
       });
     },
-
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.getSuo();
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 对话框重置按钮操作 */
-    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);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.form1.absentIds = [];
-      this.form1.joinId = [];
-      this.form1.peopleIds = [];
-      // 人员
-      this.renYuan = [];
-      this.style = 2;
-      this.reset();
-      this.getTreeselect();
-      this.open = true;
-      this.title = "添加党支部会议登记本";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.form.unitId = row.unitId;
-      this.getZhuChi(this.form.unitId);
-      this.getTreeselect();
-      const id = row.id || this.ids;
-      getBdglparty(id).then((response) => {
-        this.result = response.data;
-        if (this.result.joinId !== "") {
-          this.form1.joinId = response.data.joinId.split(",");
-        }
-        if (this.result.peopleIds !== "" && this.result.peopleIds != null) {
-          this.form1.peopleIds = response.data.peopleIds.split(",");
-        }
-        if (this.result.absentIds !== "" && this.result.absentIds != null) {
-          this.form1.absentIds = response.data.absentIds.split(",");
-        }
-        this.form = this.result;
-        this.open = true;
-        this.title = "修改党支部会议登记本";
+    chaKan(row) {
+      this.queryParams.unitId = row.deptId;
+      this.unitId=row.deptId;
+      getPartyOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.total = response.total;
+        this.title = "查看党支部记录本"
+        this.tableStatus = true;
       });
     },
-    //查看按钮操作
     handleChakan(row) {
-      // 是否隐藏按钮
-      this.opens = false;
+      this.tableStatus = false;
+      // console.log(row);
       const id = row.id || this.ids;
       getBdglparty(id).then((response) => {
         this.wordInfo = response.data;
-        this.title = "查看党支部会议登记本";
+        this.title = "查看党支部记录本";
         this.menuRoleVisible = true;
       });
     },
-
-    /** 提交按钮 */
-    submitForm(style) {
-      this.style = style;
-      this.form.joinId = this.form1.joinId;
-      this.$refs["form"].validate((valid) => {
-        this.style = style;
-        if (valid) {
-          if (this.form.id != null) {
-            if (this.form1.joinId !== undefined) {
-              this.form.joinId = this.form1.joinId.join(",");
-            }
-            if (
-              this.form1.peopleIds !== undefined &&
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds !== undefined &&
-              this.form1.absentIds != null &&
-              this.form1.absentIds != ""
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            updateBdglparty(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            if (
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds.length != 0 &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds != null &&
-              this.form1.absentIds != "" &&
-              this.form1.absentIds.length != 0
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            this.form.joinId = this.form1.joinId.join(",");
-            addBdglparty(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        // .confirm('是否确认删除党支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm("是否确认删除该数据？")
-        .then(function () {
-          return delBdglparty(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有党支部会议登记本数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportBdglparty(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      getDept().then((response) => {
-        this.deptOptions = response.data;
-      });
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
     },
+    closes() {
+      this.menuRoleVisible = false;
+      this.tableStatus = true;
+    }
   },
+  components: {
+    bdglparty,
+  },
+
+  computed: {},
+
+  mounted() { },
+  watch: {},
 };
 </script>
-<style scoped>
-/* 对话框背景颜色 */
+<style  scoped>
 ::v-deep .el-dialog {
-  background: #004d86 !important;
+  width: 1070px !important;
 }
-::v-deep .el-textarea__inner {
-  width: 884px;
-  height: 104px;
+
+::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 44px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
 }
+
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
-::v-deep .el-dialog__title {
-  color: #fff;
-  font: 18px;
-}
-::v-deep .el-dialog__headerbtn .el-dialog__close {
-  color: #fff;
-}
-::v-deep .el-form-item__label {
-  font: 16px;
-  color: #fff;
-  width: 100px !important;
-}
-::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
-  color: #fff;
-  background: transparent;
-  border: 1px solid white !important;
-  border-color: #fff !important;
-}
-::v-deep .el-textarea__inner {
-  width: 884px;
-  height: 104px;
-}
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-::v-deep .el-dialog__body {
-  /* margin: 0px 20px; */
-  box-sizing: border-box;
-  /* padding: 30px 12px 30px 28px; */
-  padding: 30px 0px 30px 42px;
-}
-/* 调整表单间距 */
-::v-deep .el-form-item__content {
-  width: 200px;
+
+.arr_conten {
+  padding-top: 20px;
 }
-.contents {
-  padding: 0px 40px !important;
+
+ul {
+  display: flex;
+  /* justify-content: space-between; */
+  padding: 0 22px;
+  flex-wrap: wrap;
 }
-/* 下拉菜单字体/背景颜色 */
-/* .el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background-color: #196299;
-  color: #fff;
+
+li {
+  list-style: none;
+  background: url("../../../assets/images/book.png") no-repeat;
+  height: 140px;
+  width: 222px;
+  /* margin: 20px 0; */
+  margin-bottom: 20px;
+  background-size: 100% 100%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
-.el-select-dropdown__item {
-  color: #fff;
-} */
-/* 刷新图标 */
-/* .el-icon-refresh {
-  width: 76px;
-  height: 36px;
+
+.names {
   color: #fff;
-  background-color: #1d96ff !important;
-  border-radius: 4px;
-  border: none;
-  margin-left: 20px;
   font-size: 14px;
-} */
-/* 时间选择 */
-::v-deep .el-input--small .el-input__inner {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-.el-date-editor.el-input {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-::v-deep .el-date-editor.el-input .el-input__inner {
-  height: 36px;
-  line-height: 36px;
+  text-align: center;
+  padding: 26px 26px 38px 26px;
+  letter-spacing: 1px;
 }
 
-/* 富文本 */
-::v-deep .ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-  fill: #fff !important;
-}
-::v-deep .ql-snow .ql-stroke {
-  stroke: #fff !important;
-}
-::v-deep .ql-snow .ql-picker {
-  color: #fff !important;
+.btn {
+  text-align: center;
 }
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
+
+
+
+::v-deep .lieBiao {
   background: #004d86 !important;
+  min-height: 42vh !important;
 }
-/* 单位下拉菜单选中字体颜色 */
-::v-deep .vue-treeselect__single-value {
-  color: #fff !important;
-}
-/* 出席人 */
-::v-deep .joinId {
-  width: 650px !important;
-}
-::v-deep .joinId .el-input__inner {
-  width: 510px !important;
-}
-/* 分页按钮 */
-::v-deep .el-pagination.is-background .el-pager li {
-  background-color: #004d86;
+
+::v-deep .el-dialog__title {
   color: #fff;
+  font: 18px;
 }
-::v-deep .el-pagination.is-background .btn-next {
-  background-color: #004d86;
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
-/* 富文本删除功能 */
-::v-deep .ql-blockquote {
-  display: none !important;
-}
-::v-deep .ql-strike {
-  display: none !important;
-}
-::v-deep .ql-script {
-  display: none !important;
-}
-::v-deep .ql-code-block {
-  display: none !important;
-}
-::v-deep .ql-direction {
-  display: none !important;
-}
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .el-input__inner {
-  cursor: pointer !important;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 30px 50px;
-}
-/* 调整输入框提示文字颜色 */
-::v-deep .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input:-moz-placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .pagination-container {
+  /* display: none;  */
+  position: relative;
+  height: 49px;
+  margin-bottom: 10px;
+  margin-top: 6vh;
+  padding: 10px 20px !important;
+  background: transparent !important;
 }
-/* 文字多余部分省略 */
-.el-table__row .el-table_1_column_4 .cell el-tooltip p {
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  white-space: nowrap;
+
+::v-deep .el-pagination .el-select .el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep .el-form-item__error {
-  left: 0;
+
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
-#chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+
+::v-deep .el-pagination__editor.el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep .el-select__input {
-  color: #fff !important;
+
+::v-deep .el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
-.colors {
- color: #ccc !important;
+
+::v-deep .el-pagination.is-background .el-pager li {
+  background: #00365F;
 }
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -538,11 +538,11 @@ export default {
       this.form.peopleId = null;
       this.form.peopleJiLu = null;
       // 参加人
-      this.form.joinId = null;
+      this.form1.joinId = [];
       // 列席人
-      this.form.peopleIds = null;
+      this.form1.peopleIds = [];
       // 缺席人
-      this.form.absentIds = null;
+      this.form1.absentIds = [];
     },
     // 获取主持人
     getZhuChi(id) {
@@ -550,11 +550,12 @@ export default {
         this.renYuan = res.data;
       });
     },
-    // 人员获取
+    // 新增选择单位触发
     selectPeo(val) {
       this.ChongZhiRen();
       this.form.unitId = val.id;
       this.getZhuChi(this.form.unitId);
+      this.changeArr = [];
     },
     //  主持人点击触发
     zhuChi(name) {
@@ -649,6 +650,9 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.form1.absentIds = [];
+      this.form1.joinId = [];
+      this.form1.peopleIds = [];
       this.reset();
       this.form.unitId = row.unitId;
       this.getZhuChi(this.form.unitId);
@@ -665,6 +669,7 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
+        this.changeSelect()
         this.form = this.result;
         this.open = true;
         this.title = "修改军人委员会会议登记本";

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -1,962 +1,236 @@
+<!-- 军人委员会记录本领导 -->
 <template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item prop="deptName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.deptName"
-          @input="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="compereId">
-        <el-select
-          v-model="queryParams.compereId"
-          placeholder="请选择主持人"
-          @change="Renyuan"
-          filterable
-        >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button size="btr " @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="arr_conten">
+    <ul>
+      <li v-for="(item, i) in lieList" :key="i">
+        <div class="names">{{ item.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+        </div>
+      </li>
+    </ul>
 
-    <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="['grassrootsregistration:bdglsoldier: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="['grassrootsregistration:bdglsoldier:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['grassrootsregistration:bdglsoldier:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['grassrootsregistration:bdglsoldier:export']"
-          >导出</el-button
-        >
-      </el-col> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="bdglsoldierList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003c69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50" align="center">
-        <template scope="scope">
-          <span>{{
+    <!-- 查看第一次 -->
+    <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
+      custom-class="lieBiao">
+      <el-table v-loading="loading" :data="bdglpartyList"
+        :header-cell-style="{ background: '#003C69', color: 'white' }">
+        <el-table-column label="序号" type="index" width="50" align="center">
+          <template scope="scope">
+            <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="deptName" />
-      <el-table-column label="会议议题" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.title) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="记录人" align="center" prop="peopleJiLu" />
-      <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
-      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
-      <el-table-column label="召开地点" align="center" prop="address" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        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"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglsoldier:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdglsoldier: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-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <div class="userAgree">
-        <div class="jiben">基本信息</div>
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="80px"
-          :inline="true"
-        >
-          <el-form-item label="单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="deptOptions"
-              placeholder="请选择单位"
-              @select="selectPeo"
-              @open="blurSelect"
-            />
-          </el-form-item>
-          <el-form-item label="召开时间" prop="convokeTime">
-            <el-date-picker
-              clearable
-              size="small"
-              v-model="form.convokeTime"
-              type="date"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择召开时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="召开地点" prop="address">
-            <el-input v-model="form.address" placeholder="请输入召开地点" />
-          </el-form-item>
-          <el-form-item label="主持人" prop="compereId">
-            <el-select
-              ref="aa"
-              v-model="form.compereId"
-              placeholder="请选择主持人"
-            >
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="zhuChi(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="记录人" prop="peopleId">
-            <el-select v-model="form.peopleId" placeholder="请选择记录人">
-              <el-option
-                v-for="(item, i) in renYuan"
-                :key="i"
-                :label="item.name"
-                :value="item.id"
-                @click.native="jiLu(item.name)"
-                class="input_xiala"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="会议议题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item> -->
-          <el-form-item label="参加人" prop="joinId" class="joinId">
-            <el-select
-              ref="abc"
-              v-model="form1.joinId"
-              multiple
-              placeholder="请选择参加人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                class="input_xiala"
-                :disabled="item.disabled"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="列席人" class="joinId">
-            <el-select
-              ref="abcd"
-              v-model="form1.peopleIds"
-              multiple
-              placeholder="请选择列席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :disabled="item.disabled"
-                :value="item.name"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺席人" class="joinId">
-            <el-select
-              ref="abcde"
-              v-model="form1.absentIds"
-              multiple
-              placeholder="请选择缺席人"
-              class="input_xiala"
-              filterable
-              @remove-tag="removeSelect"
-              @change="changeSelect"
-            >
-              <el-option
-                v-for="item in renYuan"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                :disabled="item.disabled"
-                class="input_xiala"
-                :class="item.disabled == true ? 'colors' : ''"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <div class="jiben">会议议题</div>
-          <quill-editor
-            class="quill-editor"
-            v-model="form.title"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" align="center" prop="deptName" />
+        <el-table-column label="会议议题" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ onEditor(scope.row.title) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="记录人" align="center" prop="peopleJiLu" />
+        <el-table-column label="主持人" align="center" prop="compereRen" />
+        <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip />
+        <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip />
+        <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip />
+        <el-table-column label="召开地点" align="center" prop="address" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <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>
+          </template>
+        </el-table-column>
+      </el-table>
 
-          <div class="jiben">会议内容</div>
-          <quill-editor
-            class="quill-editor"
-            v-model="form.contents"
-            style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          ></quill-editor>
-        </el-form>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取消</el-button>
-      </div>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </el-dialog>
-
-    <el-dialog
-      :visible.sync="menuRoleVisible"
-      :title="title"
-      append-to-body
-      id="chakan"
-      :close-on-click-modal="false"
-    >
-      <bdglsoldier v-show="menuRoleVisible" :message="wordInfo"></bdglsoldier>
+    <!-- 查看二次-->
+    <el-dialog :visible.sync="menuRoleVisible" :title="title" append-to-body id="chakan" :close-on-click-modal="false"
+      :before-close="closes">
+      <bdglsoldier v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></bdglsoldier>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import bdglsoldier from "@/components/look_word/bdglsoldier.vue";
 import {
   listBdglsoldier,
-  getBdglsoldier,
-  delBdglsoldier,
-  addBdglsoldier,
-  updateBdglsoldier,
-  exportBdglsoldier,
+  getSoldierList,
+  getSoldierOnUnitList,
 } from "@/api/grassrootsregistration/bdglsoldier";
-
-import {
-  getZhuChiRen,
-  getShouBu,
-  getAll,
-} 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 bdglsoldier from "@/components/look_word/bdglsoldier.vue";
 export default {
-  name: "Bdglsoldier",
-  components: {
-    Treeselect,
-    bdglsoldier,
-  },
   data() {
     return {
+      lieList: [],
       //查看页面
       menuRoleVisible: false,
-      wordInfo: {},
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 军人委员会会议登记本表格数据
-      bdglsoldierList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
+      title: null,
+      tableStatus: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-        deptName: null,
-        compereRen: null,
-        peopleJiLu: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-        ],
-        convokeTime: [
-          { required: true, message: "召开时间不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "召开地点不能为空", trigger: "blur" },
-        ],
-        compereId: [
-          { required: true, message: "主持人不能为空", trigger: "blur" },
-        ],
-        peopleId: [
-          { required: true, message: "记录人不能为空", trigger: "blur" },
-        ],
-        title: [
-          { required: true, message: "会议议题不能为空", trigger: "blur" },
-        ],
-        joinId: [
-          { required: true, message: "参加人不能为空", trigger: "blur" },
-        ],
-        peopleIds: [
-          { required: true, message: "列席人不能为空", trigger: "blur" },
-        ],
-        absentIds: [
-          { required: true, message: "缺席人不能为空", trigger: "blur" },
-        ],
-      },
-      // 树形配置对象
-      defaultProps: {
-        children: "children",
-        label: "label",
       },
-      deptOptions: [],
-      // 人员列表
-      renYuan: [],
-      // 修改拿到的数据
-      result: {},
-      // 外面部门
-      buMeng: [],
-      // 外面人员
-      renYuans: [],
-      // 表单参数
-      form1: {
-        joinId: "",
-        peopleIds: "",
-        absentIds: "",
-      },
-      changeArr: [], //存放选中选项的数组
+      // 党支部记录本表格数据
+      bdglpartyList: [],
+      loading: false,
+      total: 0,
+      unitId: undefined
     };
   },
+
   created() {
-    this.getList();
-    this.getBuMen();
-    this.getSuo();
-    this.onEditor();
+    getSoldierList().then((res) => {
+      this.lieList = res.rows;
+    });
   },
   methods: {
-    //change方法
-    changeSelect() {
-      for (var key in this.form1) {
-        this.form1[key].forEach((item) => {
-          this.changeArr.push(item);
-        });
-      }
-      //有可能会出现重复的元素，所以对changeArr数组进行去重操作
-      this.changeArr = this.quchong(this.changeArr);
-      //对changeArr进行遍历，对hobbyList进行遍历，
-      //changeArr有哪一项，就把hobbyList中该项的disabled属性置为true，禁用
-      this.changeArr.forEach((item) => {
-        this.renYuan.forEach((yitem) => {
-          if (item === yitem.name) {
-            yitem.disabled = true;
-          }
-        });
-      });
-    },
-    //remove-tag方法，移除某一项时触发该方法
-    removeSelect(val) {
-      //将移除的那一项，从changeArr数组中找到下标，并移除
-      var str = this.changeArr.findIndex((item) => item === val);
-      this.changeArr.splice(str, 1);
-      //对hobbyList数组遍历，将移除的那项disabled属性置为false，启用
-      this.renYuan.forEach((item) => {
-        if (val === item.name) {
-          item.disabled = false;
-        }
-      });
-    },
-    //数组去重的方法，避免changeArr出现重复的元素
-    quchong(arr) {
-      return arr.filter(function (item, index, arr) {
-        return arr.indexOf(item, 0) === index;
-      });
-    },
-    // 获取搜索所有人
-    getSuo() {
-      getAll().then((res) => {
-        this.renYuans = res.rows;
-      });
-    },
-    // 转义视图不加标签
-    onEditor(str) {
-      if (str != null) {
-        var str = str.replace(/<\/?[^>]*>/g, "");
-        str = str.replace(/[ | ]*\n/g, "\n");
-        str = str.replace(/ /gi, "");
-      }
-      return str;
-    },
-    // 搜索主持人选中触发
-    Renyuan() {
-      this.getList();
-    },
-    // 获取搜索下拉部门
-    getBuMen() {
-      getShouBu().then((res) => {
-        this.buMeng = res.data;
-      });
-    },
-    // 重置表单人员
-    ChongZhiRen() {
-      // 主持人
-      this.form.compereId = null;
-      this.form.compereRen = null;
-      // 记录人
-      this.form.peopleId = null;
-      this.form.peopleJiLu = null;
-      // 参加人
-      this.form.joinId = null;
-      // 列席人
-      this.form.peopleIds = null;
-      // 缺席人
-      this.form.absentIds = null;
-    },
-    // 获取主持人
-    getZhuChi(id) {
-      getZhuChiRen(id).then((res) => {
-        this.renYuan = res.data;
-      });
-    },
-    // 人员获取
-    selectPeo(val) {
-      this.ChongZhiRen();
-      this.form.unitId = val.id;
-      this.getZhuChi(this.form.unitId);
-    },
-    //  主持人点击触发
-    zhuChi(name) {
-      this.form.compereRen = name;
-    },
-    //  记录人点击触发
-    jiLu(name) {
-      this.form.peopleJiLu = name;
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      getDept().then((response) => {
-        this.deptOptions = response.data;
-      });
-    },
-    /** 查询军人委员会会议登记本列表 */
     getList() {
-      this.loading = true;
-      listBdglsoldier(this.queryParams).then((response) => {
-        this.bdglsoldierList = response.rows;
+      this.queryParams.unitId = this.unitId;
+      getSoldierOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
         this.total = response.total;
-        this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        convokeTime: null,
-        address: null,
-        compereId: null,
-        joinId: null,
-        peopleIds: null,
-        absentIds: null,
-        peopleId: null,
-        title: null,
-        contents: null,
-        createtime: null,
-        updatetime: null,
-        unitId: null,
-        deptName: null,
-        compereRen: null,
-        peopleJiLu: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.getSuo();
-      this.reset();
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 对话框重置按钮操作 */
-    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);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // 人员列表
-      this.form1.absentIds = [];
-      this.form1.joinId = [];
-      this.form1.peopleIds = [];
-      this.reset();
-      this.renYuan = [];
-      this.getTreeselect();
-      this.open = true;
-      this.title = "添加军人委员会会议登记本";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.form.unitId = row.unitId;
-      this.getZhuChi(this.form.unitId);
-      this.getTreeselect();
-      const id = row.id || this.ids;
-      getBdglsoldier(id).then((response) => {
-        this.result = response.data;
-        if (this.result.joinId !== "") {
-          this.form1.joinId = response.data.joinId.split(",");
-        }
-        if (this.result.peopleIds !== "" && this.result.peopleIds != null) {
-          this.form1.peopleIds = response.data.peopleIds.split(",");
-        }
-        if (this.result.absentIds !== "" && this.result.absentIds != null) {
-          this.form1.absentIds = response.data.absentIds.split(",");
-        }
-        this.form = this.result;
-        this.open = true;
-        this.title = "修改军人委员会会议登记本";
+    chaKan(row) {
+      this.queryParams.unitId = row;
+      this.unitId = row
+      getSoldierOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.total = response.total;
+        this.title = "查看军人委员会工作记录本"
+        this.tableStatus = true;
       });
     },
-    //查看按钮操作
     handleChakan(row) {
-      // 是否隐藏按钮
-      this.opens = false;
+      this.tableStatus = false;
+      // console.log(row);
       const id = row.id || this.ids;
       getBdglsoldier(id).then((response) => {
         this.wordInfo = response.data;
-        this.title = "查看军人委员会会议登记本";
+        this.title = "查看军人委员会工作记录本";
         this.menuRoleVisible = true;
       });
     },
-
-    /** 提交按钮 */
-    submitForm() {
-      this.form.joinId = this.form1.joinId;
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            if (this.form1.joinId !== undefined) {
-              this.form.joinId = this.form1.joinId.join(",");
-            }
-            if (
-              this.form1.peopleIds !== undefined &&
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds !== undefined &&
-              this.form1.absentIds != null &&
-              this.form1.absentIds != ""
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            updateBdglsoldier(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            if (
-              this.form1.peopleIds != null &&
-              this.form1.peopleIds.length != 0 &&
-              this.form1.peopleIds != ""
-            ) {
-              this.form.peopleIds = this.form1.peopleIds.join(",");
-            } else {
-              this.form.peopleIds = "";
-            }
-            if (
-              this.form1.absentIds != null &&
-              this.form1.absentIds != "" &&
-              this.form1.absentIds.length != 0
-            ) {
-              this.form.absentIds = this.form1.absentIds.join(",");
-            } else {
-              this.form.absentIds = "";
-            }
-            this.form.joinId = this.form1.joinId.join(",");
-            addBdglsoldier(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm("是否确认删除该数据？")
-        .then(function () {
-          return delBdglsoldier(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有军人委员会会议登记本数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportBdglsoldier(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
     },
+    closes() {
+      this.menuRoleVisible = false;
+      this.tableStatus = true;
+    }
   },
+  components: {
+    bdglsoldier,
+  },
+
+  computed: {},
+
+  mounted() { },
+  watch: {},
 };
 </script>
-<style scoped>
-/* 对话框背景颜色 */
+<style  scoped>
 ::v-deep .el-dialog {
-  background: #004d86 !important;
+  width: 1070px !important;
 }
-::v-deep .el-textarea__inner {
-  width: 884px;
-  height: 104px;
+
+::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 44px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
 }
+
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
-::v-deep .el-dialog__title {
-  color: #fff;
-  font: 18px;
-}
-::v-deep .el-dialog__headerbtn .el-dialog__close {
-  color: #fff;
-}
-::v-deep .el-form-item__label {
-  font: 16px;
-  color: #fff;
-  width: 100px !important;
-}
-::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
-  background: transparent;
-  color: #fff;
-  border: 1px solid white !important;
-  border-color: #fff !important;
-}
 
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-/* 调整表单间距 */
-::v-deep .el-form-item__content {
-  width: 200px;
-}
-::v-deep .el-dialog__body {
-  box-sizing: border-box;
-  padding: 30px 0px 30px 42px;
+.arr_conten {
+  padding-top: 20px;
 }
-.contents {
-  padding: 0px 40px !important;
+
+ul {
+  display: flex;
+  /* justify-content: space-between; */
+  padding: 0 22px;
+  flex-wrap: wrap;
 }
-/* 下拉菜单字体/背景颜色 */
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background-color: #196299;
-  color: #fff;
+
+li {
+  list-style: none;
+  background: url("../../../assets/images/book.png") no-repeat;
+  height: 140px;
+  width: 222px;
+  /* margin: 20px 0; */
+  margin-bottom: 20px;
+  background-size: 100% 100%;
+  flex: 0 0 16%;
+  margin-right: 10px;
 }
-.el-select-dropdown__item {
+
+.names {
   color: #fff;
+  font-size: 14px;
+  text-align: center;
+  padding: 26px 26px 38px 26px;
+  letter-spacing: 1px;
 }
 
-/* 时间选择 */
-::v-deep .el-input--small .el-input__inner {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-.el-date-editor.el-input {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-::v-deep .el-date-editor.el-input .el-input__inner {
-  height: 36px;
-  line-height: 36px;
+.btn {
+  text-align: center;
 }
 
-/* 富文本 */
-::v-deep .ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-  fill: #fff !important;
-}
-::v-deep .ql-snow .ql-stroke {
-  stroke: #fff !important;
-}
-::v-deep .ql-snow .ql-picker {
-  color: #fff !important;
-}
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
+
+::v-deep .lieBiao {
   background: #004d86 !important;
+  min-height: 42vh !important;
 }
-/* 单位下拉菜单选中字体颜色 */
-::v-deep .vue-treeselect__single-value {
-  color: #fff !important;
-}
-/* 出席人 */
-::v-deep .joinId {
-  width: 650px !important;
-}
-::v-deep .joinId .el-input__inner {
-  width: 510px !important;
-}
-/* 单位框背景颜色 */
-::v-deep .el-tree {
-  position: relative;
-  cursor: default;
-  background: #004d86;
-  color: #fff;
-  width: 200px;
-  height: 36px;
-  border: 1px solid white;
-  border-radius: 4px;
-  z-index: 999;
-}
-::v-deep .el-tree-node__content {
-  height: 34px;
-  border-radius: 4px;
-  background: #004d86;
-}
-::v-deep .el-tree-node:focus > .el-tree-node__content {
-  background-color: #0c538a;
-}
-::v-deep .el-tree-node__children {
-  width: 206px !important;
-  margin-left: -4px;
-}
-/* 分页按钮 */
-::v-deep .el-pagination.is-background .el-pager li {
-  background-color: #004d86;
+
+::v-deep .el-dialog__title {
   color: #fff;
+  font: 18px;
 }
-::v-deep .el-pagination.is-background .btn-next {
-  background-color: #004d86;
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
-/* 富文本删除功能 */
-::v-deep .ql-blockquote {
-  display: none !important;
-}
-::v-deep .ql-strike {
-  display: none !important;
-}
-::v-deep .ql-script {
-  display: none !important;
-}
-::v-deep .ql-code-block {
-  display: none !important;
-}
-::v-deep .ql-direction {
-  display: none !important;
-}
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .el-input__inner {
-  cursor: pointer !important;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 30px 55px;
-}
-/* 调整输入框提示文字颜色 */
-::v-deep .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .pagination-container {
+  /* display: none;  */
+  position: relative;
+  height: 49px;
+  margin-bottom: 10px;
+  margin-top: 6vh;
+  padding: 10px 20px !important;
+  background: transparent !important;
 }
-::v-deep input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .el-pagination .el-select .el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep input:-moz-placeholder {
-  color: #bdbdbd4f !important;
+
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
-#chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 0px;
+
+::v-deep .el-pagination__editor.el-input .el-input__inner {
+  background: #00365F !important;
 }
-::v-deep .el-select__input {
-  color: #fff !important;
+
+::v-deep .el-pagination.is-background .btn-next {
+  background: #00365F !important;
 }
-.colors {
-  color: #ccc !important;
+
+::v-deep .el-pagination.is-background .el-pager li {
+  background: #00365F;
 }
 </style>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -293,7 +293,6 @@ export default {
     getDicts("military").then((response) => {
       this.military = response.data;
     });
-    this.getStatuse()
   },
   methods: {
     // 更改军车状态
@@ -381,6 +380,7 @@ export default {
         this.thebusList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.getStatuse()
       });
     },
     // 取消按钮
@@ -441,6 +441,8 @@ export default {
       this.open = true;
       this.chuF = false;
       this.title = "添加军车管理";
+      this.form.status="1";
+      this.chuF=true
     },
     /** 修改按钮操作 */
     handleUpdate(row) {