更改军车

src/App.vue

@@ -37,6 +37,9 @@ export default {
     }
   },
   methods: {
+    // btn(){
+    //   (document.body || document.documentElement).requestFullscreen()
+    // },
     getloing() {
       this.$store.dispatch("Login", this.loginForm).then(() => {
         this.$router.push({ path: "/pt" }).catch(() => {});

src/api/combatduty/militarydutyinfo.js

@@ -94,4 +94,13 @@ export function getthebus(status) {
     method: 'get',
     params: { status: status }
   })
+}
+
+
+// 更改军车状态
+export function updatestatus() {
+  return request({
+    url: '/militaryvehicleManagement/thebus/updatestatus',
+    method: 'put',
+  })
 }

src/views/PrintsLog/printlog/index.vue

@@ -157,10 +157,10 @@
         <template slot-scope="scope">
           <!-- <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" /> -->
           <div style="color: #00ff00" v-if="scope.row.statusG == '0'">
-            未归还
+            无需归还
           </div>
           <div style="color: #90da90" v-if="scope.row.statusG == '1'">
-            已归还
+            未归还
           </div>
         </template>
       </el-table-column>

src/views/combatduty/militarydutyinfo/index.vue

@@ -1,22 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="auto"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="auto">
       <el-form-item prop="attendedTime">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.attendedTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择值班时间"
-          @change="handleQuery"
-        ></el-date-picker>
+        <el-date-picker clearable size="small" v-model="queryParams.attendedTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="选择值班时间" @change="handleQuery"></el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="号码号牌ID" prop="numberPlateId">
         <el-input
@@ -28,13 +15,8 @@
         />
       </el-form-item>-->
       <el-form-item prop="numberPlateName">
-        <el-input
-          v-model="queryParams.numberPlateName"
-          placeholder="请输入号码号牌"
-          clearable
-          size="small"
-          @input="handleQuery"
-        />
+        <el-input v-model="queryParams.numberPlateName" placeholder="请输入号码号牌" clearable size="small"
+          @input="handleQuery" />
       </el-form-item>
       <!-- <el-form-item label="车属单位ID" prop="carUnitId">
         <el-input
@@ -84,19 +66,8 @@
         />
       </el-form-item>-->
       <el-form-item prop="driverId">
-        <el-select
-          v-model="queryParams.driverId"
-          placeholder="请选择司机名字"
-          clearable
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in rylist"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
+        <el-select v-model="queryParams.driverId" placeholder="请选择司机名字" clearable size="small" @change="handleQuery">
+          <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="联系方式" prop="telephone">
@@ -118,39 +89,16 @@
 
     <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="['combatduty:militarydutyinfo:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['combatduty:militarydutyinfo: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="['combatduty:militarydutyinfo:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['combatduty:militarydutyinfo: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="['combatduty:militarydutyinfo:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['combatduty:militarydutyinfo:remove']">删除</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -166,21 +114,12 @@
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="militarydutyinfoList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
+    <el-table v-loading="loading" :data="militarydutyinfoList" @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column
-        label="值班时间"
-        align="center"
-        prop="attendedTime"
-        width="180"
-      >
+      <el-table-column label="值班时间" align="center" prop="attendedTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -192,64 +131,29 @@
       <el-table-column label="车辆类别" align="center" prop="carType" />
       <el-table-column label="车辆状态" align="center" prop="carStates">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.military"
-            :value="scope.row.carStates"
-          />
+          <dict-tag :options="dict.type.military" :value="scope.row.carStates" />
         </template>
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
       <!-- <el-table-column label="司机id" align="center" prop="driverId" /> -->
       <el-table-column label="司机名字" align="center" prop="driverName" />
       <el-table-column label="联系方式" align="center" prop="telephone" />
-      <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="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['combatduty:militarydutyinfo:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['combatduty:militarydutyinfo:remove']"
-            >删除</el-button
-          >
+          <el-button size="btu" type="text" @click="handleUpdate(scope.row)"
+            v-hasPermi="['combatduty:militarydutyinfo:edit']">修改</el-button>
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['combatduty:militarydutyinfo: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"
-    />
+    <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-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="843px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <div class="jiben">基本信息</div>
         <!-- <el-form-item label="值班时间" prop="attendedTime">
           <el-date-picker
@@ -263,44 +167,10 @@
           </el-date-picker>
         </el-form-item>-->
         <el-form-item label="值班时间" prop="attendedTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.attendedTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder=""
-            v-if="qdflg == 2"
-          ></el-date-picker>
-          <el-date-picker
-            v-model="form.attendedTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder
-            end-placeholder
-            value-format="yyyy-MM-dd"
-            v-if="qdflg == 1"
-          ></el-date-picker>
-        </el-form-item>
-        <!-- <el-form-item label="号码号牌ID" prop="numberPlateId">
-          <el-input
-            v-model="form.numberPlateId"
-            placeholder="请输入号码号牌ID"
-          />
-        </el-form-item>-->
-        <el-form-item label="号码号牌" prop="numberPlateName">
-          <el-select
-            v-model="form.numberPlateName"
-            @change="numberPlateNamechange"
-            placeholder=""
-          >
-            <el-option
-              v-for="dict in buslist"
-              :key="dict.id"
-              :label="dict.vehiclenumber"
-              :value="dict"
-            ></el-option>
-          </el-select>
+          <el-date-picker clearable size="small" v-model="form.attendedTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="" v-if="qdflg == 2"></el-date-picker>
+          <el-date-picker v-model="form.attendedTime" type="daterange" range-separator="至" start-placeholder
+            end-placeholder value-format="yyyy-MM-dd" v-if="qdflg == 1"></el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="车属单位" prop="carUnitId">
           <el-select v-model="form.carUnitId" ref="deptId" clearable placeholder="请选择车属单位">
@@ -313,18 +183,13 @@
           </el-select>
         </el-form-item> -->
         <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 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>
+        </el-form-item>
+        <el-form-item label="号码号牌" prop="numberPlateName">
+          <el-select v-model="busDuoList" @change="numberPlateNamechange" placeholder="" class="ren_yuans" multiple>
+            <el-option v-for="dict in buslist" :key="dict.id" :label="dict.vehiclenumber" :value="dict.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="车辆类别" prop="carType">
@@ -332,12 +197,8 @@
         </el-form-item>
         <el-form-item label="车辆状态" prop="carStates">
           <el-select v-model="form.carStates" placeholder="">
-            <el-option
-              v-for="dict in dict.type.military"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.military" :key="dict.value" :label="dict.label" :value="dict.value">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="所在位置" prop="adress">
@@ -347,19 +208,8 @@
           <el-input v-model="form.driverId" placeholder="请输入司机id" />
         </el-form-item>-->
         <el-form-item label="司机名字" prop="driverName">
-          <el-select
-            v-model="form.driverName"
-            @change="driverNamefun"
-            filterable
-            clearable
-            placeholder=""
-          >
-            <el-option
-              v-for="item in rylist"
-              :key="item.id"
-              :label="item.name"
-              :value="item"
-            ></el-option>
+          <el-select v-model="form.driverName" @change="driverNamefun" filterable clearable placeholder="">
+            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="telephone">
@@ -367,9 +217,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1" v-if="baoCun"
-          >保存并继续编辑</el-button
-        >
+        <el-button type="primary" @click="submitForm1" v-if="baoCun">保存并继续编辑</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
@@ -390,6 +238,7 @@ import {
   getDept,
   getthebus,
   listPeoples,
+  updatestatus
 } from "@/api/combatduty/militarydutyinfo";
 
 export default {
@@ -454,6 +303,8 @@ export default {
       buslist: [],
       // 保存显示隐藏
       baoCun: true,
+      // 车牌号多选、
+      busDuoList: []
     };
   },
   created() {
@@ -461,8 +312,14 @@ export default {
     this.gettreeselect();
     this.getrylist();
     this.getthebusfun();
+    this.getStatuse()
   },
   methods: {
+    // 更改军车状态
+    getStatuse() {
+      updatestatus().then(res => {
+      })
+    },
     // 获取每个单位下的司机
     getRen(id) {
       listPeoples({ deptId: id }).then((res) => {
@@ -553,18 +410,22 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       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
         this.open = true;
         this.title = "修改军车值班";
         this.qdflg = 2;
@@ -575,12 +436,17 @@ export default {
     submitForm1() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.timequjian = this.form.attendedTime;
-          this.form.attendedTime = this.form.attendedTime.join(",");
-          addMilitarydutyinfo(this.form).then((response) => {
-            this.getList();
-          });
-          this.reset();
+          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('号码号牌不能为空！')
+          }
         }
       });
     },
@@ -589,19 +455,30 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateMilitarydutyinfo(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            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 {
-            this.form.timequjian = this.form.attendedTime;
-            this.form.attendedTime = this.form.attendedTime.join(",");
-            addMilitarydutyinfo(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            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('号码号牌不能为空！')
+            }
           }
         }
       });
@@ -618,7 +495,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -633,7 +510,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     //司机联系方式
     driverNamefun(val) {
@@ -659,30 +536,36 @@ export default {
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
+
 ::v-deep .el-textarea__inner {
   width: 784px;
   height: 124px;
   margin-left: 29px;
 }
+
 ::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-dialog__body .el-form-item__label {
   width: 175px !important;
-}
+} */
 ::v-deep .el-dialog__body .el-form--inline .el-form-item {
   display: inline-block;
   margin-right: 10px;
@@ -696,13 +579,16 @@ export default {
   background: transparent !important;
   color: #fff;
 }
+
 ::v-deep .el-dialog__footer {
-  margin-right: 116px !important;
+  margin-right: 95px !important;
 }
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
 }
+
 /* 基本信息背景 */
 .jiben {
   width: 952px;
@@ -713,25 +599,29 @@ export default {
   padding-left: 16px;
   line-height: 32px;
 }
-/*调整表单间距 */
+
+/* 调整表单间距
 ::v-deep .el-form-item__content {
   width: 200px;
-}
+} */
 /* 时间选择 */
 ::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 .el-input-number__increase {
   background-color: transparent !important;
@@ -739,23 +629,28 @@ export default {
   color: #cccccc;
   border-bottom: none !important;
 }
+
 ::v-deep .el-input-number__decrease {
   background-color: transparent !important;
   border: none !important;
   color: #cccccc;
 }
+
 .el-radio-group {
   width: 216px;
 }
+
 ::v-deep .el-range-input {
   background: #004d86;
   color: #fff;
   font-size: 12px;
 }
+
 ::v-deep .el-range-separator {
   color: #fff;
   font-size: 12px;
 }
+
 .el-form-item ::v-deep .el-input__inner {
   width: 200px;
   height: 36px;
@@ -763,23 +658,36 @@ export default {
   color: #fff important;
   border: 1px solid #fff !important;
 }
+
 ::v-deep .el-date-editor.el-input {
   width: 200px;
   height: 36px;
 }
+
 .el-select-dropdown__item {
   /* background-color: white; */
   color: #000 !important;
 }
+
 ::v-deep .el-input-number__increase {
   background-color: transparent !important;
   border: none;
   color: #cccccc;
   border-bottom: none !important;
 }
+
 ::v-deep .el-input-number__decrease {
   background-color: transparent !important;
   border: none !important;
   color: #cccccc;
 }
+
+
+::v-deep .ren_yuans .el-input__inner {
+  width: 559px;
+}
+
+.ren_yuans {
+  width: 559px;
+}
 </style>

src/views/grassrootsregistration/bdglevens/index.vue

@@ -0,0 +1,113 @@
+<!-- 文连务会记录本领导 -->
+<template>
+  <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-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>
+  </div>
+</template>
+
+<script>
+import {
+  docList,
+  fileunits,
+} from "@/api/grassrootsregistration/bdglfilemanagement";
+import bdgleven from "@/components/look_word/bdgleven.vue";
+export default {
+  data() {
+    return {
+      lieList: [],
+      //查看页面
+      menuRoleVisible: false,
+      title: null,
+    };
+  },
+
+  created() {
+    docList().then((res) => {
+      // console.log(res);
+      this.lieList = res.rows;
+    });
+  },
+  methods: {
+    chaKan(row) {
+      const unitId = row;
+      fileunits(unitId).then((response) => {
+        this.wordInfo = response.data;
+        this.title = "查看连务会记录本";
+        this.menuRoleVisible = true;
+      });
+    },
+  },
+  components: {
+    bdgleven,
+  },
+
+  computed: {},
+
+  mounted() {},
+  watch: {},
+};
+</script>
+<style  scoped>
+::v-deep .el-dialog {
+  width: 1060px !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;
+  height: 140px;
+  width: 222px;
+  /* margin: 20px 0; */
+  margin-bottom: 20px;
+  background-size: 100% 100%;
+  flex: 0 0 16%;
+  margin-right: 10px;
+}
+.names {
+  color: #fff;
+  font-size: 14px;
+  text-align: center;
+  padding: 26px 26px 38px 26px;
+  letter-spacing: 1px;
+}
+.btn {
+  text-align: center;
+}
+</style>

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -0,0 +1,997 @@
+<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>{{
+            (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>
+    </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>
+  </div>
+</template>
+
+<script>
+//引入查看表格
+import bdglmeeting from "@/components/look_word/bdglmeeting.vue";
+import { getZhuChiRen } from "@/api/grassrootsregistration/bdglparty";
+import {
+  listBdglmeeting,
+  getBdglmeeting,
+  delBdglmeeting,
+  addBdglmeeting,
+  updateBdglmeeting,
+  exportBdglmeeting,
+  getDept,
+  getShouBu,
+  getAll,
+} 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";
+
+export default {
+  name: "Bdglmeeting",
+  components: {
+    quillEditor,
+    Treeselect,
+    bdglmeeting,
+  },
+  data() {
+    return {
+      //查看页面
+      menuRoleVisible: false,
+      wordInfo: {},
+
+      //判断关闭
+      style: "2",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 团支部会议登记本表格数据
+      bdglmeetingList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: 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: "",
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getBuMen();
+    this.getSuo();
+    this.onEditor();
+  },
+  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.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 = "修改团支部会议登记本";
+      });
+    },
+
+    //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      const id = row.id || this.ids;
+      getBdglmeeting(id).then((response) => {
+        this.wordInfo = response.data;
+        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(() => {});
+    },
+  },
+};
+</script>
+<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;
+}
+
+/* 基本信息背景 */
+.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 {
+  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;
+  height: 36px;
+  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;
+}
+::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;
+}
+
+.colors {
+  color: #ccc !important;
+}
+</style>

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -0,0 +1,989 @@
+<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="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>
+
+          <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>
+    </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>
+  </div>
+</template>
+
+<script>
+//引入查看表格
+import bdglparty from "@/components/look_word/bdglparty.vue";
+// 自建API
+import { getDeptId } from "@/api/getApi/getApi";
+
+import {
+  listBdglparty,
+  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";
+export default {
+  name: "Bdglparty",
+  components: {
+    Treeselect,
+    quillEditor,
+    bdglparty,
+  },
+  data() {
+    return {
+      //查看页面
+      menuRoleVisible: false,
+      wordInfo: {},
+
+      //判断关闭
+      style: "2",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 党支部会议登记本表格数据
+      bdglpartyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: 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: [], //存放选中选项的数组
+    };
+  },
+  created() {
+    this.getList();
+    this.getBuMen();
+    this.getSuo();
+    this.onEditor();
+  },
+  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.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 = "修改党支部会议登记本";
+      });
+    },
+    //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      const id = row.id || this.ids;
+      getBdglparty(id).then((response) => {
+        this.wordInfo = response.data;
+        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;
+      });
+    },
+  },
+};
+</script>
+<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; */
+  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;
+}
+.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;
+  height: 36px;
+  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;
+}
+::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;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  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;
+}
+</style>

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -0,0 +1,962 @@
+<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>
+
+    <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>{{
+            (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>
+
+          <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>
+    </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>
+  </div>
+</template>
+
+<script>
+import bdglsoldier from "@/components/look_word/bdglsoldier.vue";
+import {
+  listBdglsoldier,
+  getBdglsoldier,
+  delBdglsoldier,
+  addBdglsoldier,
+  updateBdglsoldier,
+  exportBdglsoldier,
+} 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";
+
+export default {
+  name: "Bdglsoldier",
+  components: {
+    Treeselect,
+    bdglsoldier,
+  },
+  data() {
+    return {
+      //查看页面
+      menuRoleVisible: false,
+      wordInfo: {},
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军人委员会会议登记本表格数据
+      bdglsoldierList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: 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: [], //存放选中选项的数组
+    };
+  },
+  created() {
+    this.getList();
+    this.getBuMen();
+    this.getSuo();
+    this.onEditor();
+  },
+  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.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 = "修改军人委员会会议登记本";
+      });
+    },
+    //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      const id = row.id || this.ids;
+      getBdglsoldier(id).then((response) => {
+        this.wordInfo = response.data;
+        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(() => {});
+    },
+  },
+};
+</script>
+<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;
+}
+
+/* 基本信息背景 */
+.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;
+}
+.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;
+}
+
+/* 时间选择 */
+::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;
+}
+::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-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;
+  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 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;
+}
+.colors {
+  color: #ccc !important;
+}
+</style>

src/views/login.vue

@@ -1,41 +1,17 @@
 <template>
   <div class="login">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-    >
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <!-- <img src="../images/dibu1.png" alt="" class="img" /> -->
       <!-- <h3 class="title">智能督察管理平台</h3> -->
       <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon
-            slot="prefix"
-            icon-class="user"
-            class="el-input__icon input-icon"
-          />
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-          class="password"
-        >
-          <svg-icon
-            slot="prefix"
-            icon-class="password"
-            class="el-input__icon input-icon"
-          />
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
+          @keyup.enter.native="handleLogin" class="password">
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <!-- <el-form-item v-if="captchaOnOff" v-show="false">
@@ -57,20 +33,13 @@
         </div>
       </el-form-item> -->
       <el-form-item style="width: 100%">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width: 100%"
-          @click.native.prevent="handleLogin"
-        >
+        <el-button :loading="loading" size="medium" type="primary" style="width: 100%"
+          @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
         <div style="float: right" v-if="register">
-          <router-link class="link-type" :to="'/register'"
-            >立即注册</router-link
-          >
+          <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
       </el-form-item>
     </el-form>
@@ -129,7 +98,19 @@ export default {
     this.getCookie();
   },
   methods: {
-    geta() {},
+    //捕获游览器全屏
+    requestFullScreen() {
+      var element = document.getElementsByTagName("body")[0];
+      var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen;
+      if (requestMethod) {
+        requestMethod.call(element);
+      } else if (typeof window.ActiveXObject !== "undefined") {
+        var wscript = new ActiveXObject("WScript.Shell");
+        if (wscript !== null) {
+          wscript.SendKeys("{F11}");
+        }
+      }
+    },
     getCode() {
       getCodeImg().then((res) => {
         this.captchaOnOff =
@@ -172,8 +153,9 @@ export default {
           this.$store
             .dispatch("Login", this.loginForm)
             .then(() => {
+              this.requestFullScreen()
               // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
-              this.$router.push({ path: "/pt" }).catch(() => {});
+              this.$router.push({ path: "/pt" }).catch(() => { });
             })
             .catch(() => {
               this.loading = false;
@@ -197,14 +179,17 @@ export default {
   background: url("../images/背景图片这是.png") center no-repeat;
   // background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
   color: #01cfff;
 }
+
 ::v-deep .login-form .el-input {
   width: 390px;
 }
+
 .login-form {
   position: relative;
   border-radius: 6px;
@@ -213,15 +198,18 @@ export default {
   padding: 180px 56px 50px 79px;
   background: url("../assets/images/边框.png") no-repeat;
   background-size: cover;
+
   .el-input {
     height: 38px;
     margin-left: 510px;
     margin-right: 63px;
+
     input {
       height: 47px;
       width: 390px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
@@ -230,24 +218,29 @@ export default {
     color: #01cfff;
   }
 }
+
 .el-form-item__error {
   margin-left: 510px;
   margin-top: 15px !important;
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #0a0606;
 }
+
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -260,9 +253,11 @@ export default {
   font-size: 0px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 38px;
 }
+
 .login-form .el-button--primary {
   background-color: #0384ea;
   font-size: 20px;
@@ -272,6 +267,7 @@ export default {
   margin-right: 63px;
   width: 390px !important;
 }
+
 .el-input__inner {
   background-color: transparent;
   color: #fff;
@@ -284,21 +280,26 @@ export default {
   left: -1px;
   width: 661px;
 }
+
 .login-form .el-form-item {
   margin-bottom: 40px;
   margin-top: 30px;
 }
+
 ::v-deep .el-form-item__error {
   margin-left: 510px !important;
   margin-top: 10px !important;
 }
+
 .el-form-item {
   margin-bottom: 40px !important;
 }
+
 ::v-deep .el-form-item.is-error .el-input__inner {
   background-color: transparent !important;
   height: 46px;
 }
+
 ::v-deep .el-input--medium .el-input__inner {
   color: #fff;
   background-color: transparent !important;

src/views/militaryvehicleManagement/thebus/index.vue

@@ -1,20 +1,8 @@
 <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
-          v-model="queryParams.unitName"
-          placeholder="请输入所属单位"
-          clearable
-          size="small"
-          @input="handleQuery"
-        />
+        <el-input v-model="queryParams.unitName" placeholder="请输入所属单位" clearable size="small" @input="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
@@ -23,108 +11,42 @@
 
     <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="['militaryvehicleManagement:thebus:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['militaryvehicleManagement:thebus: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="['militaryvehicleManagement:thebus:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['militaryvehicleManagement:thebus: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="['militaryvehicleManagement:thebus:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['militaryvehicleManagement:thebus:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          class="box"
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['medicalhealth:bdgldurgarchives:export']"
-          >导出</el-button
-        >
+        <el-button class="box" type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+          @click="handleExport" v-hasPermi="['medicalhealth:bdgldurgarchives:export']">导出</el-button>
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="thebusList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
+    <el-table v-loading="loading" :data="thebusList" @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">
         <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="vehiclenumber"
-        width="100"
-      />
-      <el-table-column
-        label="车辆型号"
-        align="center"
-        prop="vehiclemodel"
-        :formatter="vehicleModel"
-      />
-      <el-table-column
-        label="车辆负责人"
-        align="center"
-        prop="peopleNames"
-        width="120"
-      />
-      <el-table-column
-        label="所属单位"
-        align="center"
-        prop="unitName"
-        width="200px"
-      />
-      <el-table-column
-        label="联系方式"
-        align="center"
-        prop="contactnumber"
-        width="120"
-      />
+      <el-table-column label="车牌号" align="center" prop="vehiclenumber" width="100" />
+      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" :formatter="vehicleModel" />
+      <el-table-column label="车辆负责人" align="center" prop="peopleNames" width="120" />
+      <el-table-column label="所属单位" align="center" prop="unitName" width="200px" />
+      <el-table-column label="联系方式" align="center" prop="contactnumber" width="120" />
       <el-table-column label="发动机号" align="center" prop="engineNumber" />
       <el-table-column label="车架号" align="center" prop="frameNumber" />
-      <el-table-column
-        label="车辆来源"
-        align="center"
-        prop="source"
-        width="200"
-      />
+      <el-table-column label="车辆来源" align="center" prop="source" width="200" />
       <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
       <el-table-column label="出厂日期" align="center" prop="date1" width="100">
         <template slot-scope="scope">
@@ -133,13 +55,7 @@
         <!-- :formatter="vehiclePresence" -->
       </el-table-column>
       <!-- 车辆在位情况1：在位，2：值班，3：出车，4待修 -->
-      <el-table-column
-        label="车辆在位情况"
-        align="center"
-        prop="status"
-        width="100"
-        :formatter="zaiWei"
-      >
+      <el-table-column label="车辆在位情况" align="center" prop="status" width="100" :formatter="zaiWei">
         <!-- <template slot-scope="scope">
           <span v-if="scope.row.status == 1" style="color: #13ce66">在位</span>
           <span v-if="scope.row.status == 2" style="colo: #00eaff">值班</span>
@@ -148,25 +64,9 @@
         </template> -->
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="position" />
-      <el-table-column
-        label="是否上牌"
-        align="center"
-        prop="isListing"
-        :formatter="licensePlate"
-      />
-      <el-table-column
-        label="固定座位数"
-        align="center"
-        prop="seatCount"
-        width="120"
-      />
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remarks"
-        width="120"
-        show-overflow-tooltip
-      />
+      <el-table-column label="是否上牌" align="center" prop="isListing" :formatter="licensePlate" />
+      <el-table-column label="固定座位数" align="center" prop="seatCount" width="120" />
+      <el-table-column label="备注" align="center" prop="remarks" width="120" show-overflow-tooltip />
       <!-- <el-table-column label="创建时间" align="center" prop="createtime" /> -->
       <!-- <el-table-column
         label="车位号"
@@ -181,96 +81,39 @@
 
       <el-table-column label="ETC品牌" align="center" prop="etcBrand" />
       <el-table-column label="ETC编码" align="center" prop="etcNumber" /> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200"
-        fixed="right"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['militaryvehicleManagement:thebus:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['militaryvehicleManagement:thebus:remove']"
-            >删除</el-button
-          >
+          <el-button size="btu" type="text" @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebus:edit']">修改</el-button>
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebus: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"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改军车管理对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        inline
-      >
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
         <el-form-item label="车属单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="treeList"
-            placeholder="选择单位"
-            @select="selectPeo"
-          />
+          <treeselect v-model="form.unitId" :options="treeList" placeholder="选择单位" @select="selectPeo" />
         </el-form-item>
         <el-form-item label="车辆负责人" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请输入负责人"
-            filterable
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.peopleName"
-              :value="item.peopleId"
-              @click.native="cheRen(item)"
-              class="input_xiala"
-            >
+          <el-select v-model="form.peopleId" placeholder="请输入负责人" filterable>
+            <el-option v-for="(item, i) in renYuan" :key="i" :label="item.peopleName" :value="item.peopleId"
+              @click.native="cheRen(item)" class="input_xiala">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contactnumber">
-          <el-input
-            v-model="form.contactnumber"
-            placeholder="请输入联系方式"
-            readonly
-          />
+          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" readonly />
         </el-form-item>
         <el-form-item label="车牌型号" prop="vehiclemodel">
           <el-select v-model="form.vehiclemodel" placeholder="请输入车牌型号">
-            <el-option
-              v-for="(item, i) in brand"
-              :key="i"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-              class="input_xiala"
-            >
+            <el-option v-for="(item, i) in brand" :key="i" :label="item.dictLabel" :value="item.dictValue"
+              class="input_xiala">
             </el-option>
           </el-select>
         </el-form-item>
@@ -278,10 +121,7 @@
           <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
         </el-form-item>
         <el-form-item label="车位号" prop="parkingspacenumber">
-          <el-input
-            v-model="form.parkingspacenumber"
-            placeholder="请输入车位号"
-          />
+          <el-input v-model="form.parkingspacenumber" placeholder="请输入车位号" />
         </el-form-item>
         <el-form-item label="发动机号" prop="engineNumber">
           <el-input v-model="form.engineNumber" placeholder="请输入发动机号" />
@@ -293,14 +133,8 @@
           <el-input v-model="form.source" placeholder="请输入车辆来源" />
         </el-form-item>
         <el-form-item label="出厂日期" prop="date1">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.date1"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择出厂日期"
-          >
+          <el-date-picker clearable size="small" v-model="form.date1" type="date" value-format="yyyy-MM-dd"
+            placeholder="选择出厂日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="ETC品牌" prop="etcBrand">
@@ -314,13 +148,8 @@
         </el-form-item>
         <el-form-item label="是否上牌" prop="isListing">
           <el-select v-model="form.isListing" placeholder="请输入是否上牌">
-            <el-option
-              v-for="(item, i) in license"
-              :key="i"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-              class="input_xiala"
-            >
+            <el-option v-for="(item, i) in license" :key="i" :label="item.dictLabel" :value="item.dictValue"
+              class="input_xiala">
             </el-option>
           </el-select>
         </el-form-item>
@@ -331,27 +160,15 @@
           <el-input v-model="form.seatCount" placeholder="请输入固定座位数" />
         </el-form-item>
         <el-form-item label="车辆类别" prop="chelaingleibie">
-          <el-input
-            v-model="form.chelaingleibie"
-            placeholder="请输入车辆类别"
-          />
+          <el-input v-model="form.chelaingleibie" placeholder="请输入车辆类别" />
         </el-form-item>
         <el-form-item label="审查结果" prop="shenhejieguo">
           <el-input v-model="form.shenhejieguo" placeholder="请输入审查结果" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="form.status"
-            placeholder="请输入是否在位"
-            :disabled="chuF"
-          >
-            <el-option
-              v-for="(item, i) in military"
-              :key="i"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-              class="input_xiala"
-            >
+          <el-select v-model="form.status" placeholder="请输入是否在位" :disabled="chuF">
+            <el-option v-for="(item, i) in military" :key="i" :label="item.dictLabel" :value="item.dictValue"
+              class="input_xiala">
             </el-option>
           </el-select>
         </el-form-item>
@@ -360,11 +177,7 @@
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remarks">
-          <el-input
-            v-model="form.remarks"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -386,6 +199,9 @@ import {
   getDept,
   getRen,
 } from "@/api/militaryvehicleManagement/thebus";
+import {
+  updatestatus
+} from "@/api/combatduty/militarydutyinfo";
 
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -477,8 +293,14 @@ export default {
     getDicts("military").then((response) => {
       this.military = response.data;
     });
+    this.getStatuse()
   },
   methods: {
+    // 更改军车状态
+    getStatuse() {
+      updatestatus().then(res => {
+      })
+    },
     // 翻译
     zaiWei(rows) {
       var name = "";
@@ -669,7 +491,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -684,7 +506,7 @@ export default {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };
@@ -695,26 +517,32 @@ export default {
   background: #004d86 !important;
   width: 800px !important;
 }
+
 ::v-deep .el-textarea__inner {
   width: 920px;
   height: 104px;
   margin: auto;
 }
+
 ::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; */
@@ -722,10 +550,12 @@ export default {
   color: #fff;
   border: 1px solid white !important;
 }
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
 }
+
 /* 基本信息背景 */
 .jiben {
   width: 920px;
@@ -736,92 +566,113 @@ export default {
   padding-left: 16px;
   line-height: 32px;
 }
+
 /*调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
+
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 30px 50px;
 }
+
 ::v-deep .el-dialog__body {
   margin: 10px 24px 20px 34px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
 }
+
 .contents {
   padding: 0px 40px !important;
 }
+
 /* 下拉菜单 */
 .el-dropdown-link {
   cursor: pointer;
   color: #409eff;
 }
+
 .el-icon-arrow-down {
   font-size: 12px;
 }
+
 /* 下拉菜单字体/背景颜色 */
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
   color: #fff;
 }
+
 .el-select-dropdown__item {
   color: #fff;
 }
+
 /* 时间选择 */
 ::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 .vue-treeselect__control {
   background: #004d86 !important;
   color: #fff;
 }
+
 /* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !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 .el-dialog__footer {
   padding: 18px 50px;
   margin-right: 22px;
 }
+
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
   width: 1060px !important;
 }
+
 ::v-deep .el-dialog__body {
   padding: 30px 35px;
 }
+
 /* 小手样式 */
 ::v-deep .el-table__cell {
   cursor: pointer;
 }
+
 .el-button--mini {
   width: 80px !important;
   border: 1px solid transparent;
@@ -832,29 +683,37 @@ export default {
   color: #fff;
   background-color: #1890ff;
 }
+
 /* 调整输入框提示文字颜色 */
 ::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 .el-table .el-table__body .el-table__row.hover-row td {
   background-color: #004d86;
 }
+
 /* 文本域提示文字颜色 */
 ::v-deep ::-webkit-input-placeholder {
   color: #bdbdbd4f !important;
 }
+
 ::v-deep .el-input__inner {
   border: 1px solid white !important;
 }
+
 .box {
   background-color: #ffba00 !important;
 }
+
 ::v-deep .el-input.is-disabled .el-input__inner {
   background: transparent;
   color: #fff;

src/views/peopleChuRu/leaveOne/index.vue

@@ -832,4 +832,6 @@ export default {
 ::v-deep .el-table__row .el-table_4_column_41 .el-input__inner {
   background: transparent !important;
 }
+
+
 </style>