基层登搜索已完成

src/api/grassrootsregistration/bdglmeeting.js

@@ -156,4 +156,19 @@ export function getBuMen() {
     params: { deptId: data, reign }
   })
 }
+// 获取搜索部门列表
+export function getShouBu() {
+  return request({
+    url: '/system/dept/list',
+    method: 'get'
+  })
+}
+
+// 获取所有搜索人员
+export function getAll() {
+  return request({
+    url: '/peopleManage/people/list',
+    method: 'get',
+  })
+}
 

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -102,10 +102,12 @@
       <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>
+        <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="name" />
       <el-table-column
@@ -327,7 +329,10 @@ import {
   updateBdglarmament,
   exportBdglarmament,
 } from "@/api/grassrootsregistration/bdglarmament";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
 
 // 导入树形结构
@@ -445,8 +450,8 @@ export default {
     },
     // //获取部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOptions = response.data;
+      getShouBu().then((res) => {
+        this.deptOptions = res.data;
       });
     },
     /** 查询部门下拉树结构 */
@@ -590,7 +595,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-      .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         // .confirm('是否确认删除军械装备登记簿编号为"' + ids + '"的数据项？')
         .then(function () {
           return delBdglarmament(ids);

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -106,10 +106,12 @@
       <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>
+        <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="id" /> -->
       <el-table-column label="食谱标题" align="center" prop="title" />
@@ -1699,7 +1701,10 @@ import {
   exportBdglcookbook,
   getThings,
 } from "@/api/grassrootsregistration/bdglcookbook";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -1928,8 +1933,15 @@ export default {
   },
   created() {
     this.getList();
+    this.getdept();
   },
   methods: {
+    // //获取部门列表
+    getdept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
+    },
     // 获取人员
     getRen(id) {
       getZhuChiRen(id).then((res) => {
@@ -4158,7 +4170,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除一周食谱编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglcookbook(ids);
         })

src/views/grassrootsregistration/bdglequip/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="" prop="unitId1">
+      <el-form-item label="" prop="unitId">
         <el-select
-          v-model="queryParams.unitId1"
+          v-model="queryParams.unitId"
           placeholder="请输入单位"
           @change="company"
         >
@@ -102,10 +102,12 @@
       <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>
+        <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="type" />
       <el-table-column label="物品名称" align="center" prop="title" />
@@ -351,7 +353,10 @@ import {
   exportBdglequip,
   getList,
 } from "@/api/grassrootsregistration/bdglequip";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDicts } from "@/api/system/dict/data";
 import { getDept, getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
@@ -492,7 +497,7 @@ export default {
     },
     // 查询搜索单位
     getBumen() {
-      getDept().then((res) => {
+      getShouBu().then((res) => {
         this.BuMeng = res.data;
       });
     },
@@ -656,7 +661,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除训练器材/教材登记薄编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglequip(ids);
         })

src/views/grassrootsregistration/bdgleven/index.vue

@@ -28,6 +28,7 @@
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
           @change="Renyuan"
+          filterable
         >
           <el-option
             v-for="item in renYuans"
@@ -103,12 +104,19 @@
       <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>
+        <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"
+        prop="title"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="会议议题" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span v-html="scope.row.title"></span>
@@ -303,7 +311,11 @@ import {
   exportBdgleven,
   getDept,
 } from "@/api/grassrootsregistration/bdgleven";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+  getAll,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
@@ -407,13 +419,39 @@ export default {
       result: {},
       // 外面的人员
       renYuans: [],
+      // 文本显示数字
+      str: "",
     };
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMens = res.data;
+      });
+    },
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+      str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+      //str = str.replace(/\n[\s| | ]*\r/g,'\n'); //去除多余空行
+      str = str.replace(/ /gi, ""); //去掉
+      // this.bdglevenList[0].title = str;
+      // console.log(this.bdglevenList[0].title);
+      this.str = str;
+    },
     // 重置表单人员
     ChongZhiRen() {
       (this.form.compereId = null),
@@ -432,7 +470,6 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      console.log(11);
       this.ChongZhiRen();
       this.form.unitId = val.id;
       // 选中单位触发获取人员
@@ -510,6 +547,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -545,7 +583,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       // 人员
-      (this.renYuan = []), this.reset();
+      this.renYuan = [];
+      this.reset();
       this.getTreeselect();
       this.open = true;
       this.opens = true;
@@ -597,6 +636,11 @@ export default {
               this.getList();
             });
           } else {
+            // var str = this.form.title;
+            // str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+            // str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+            // str = str.replace(/\n[\s| | ]*\r/g, "\n"); //去除多余空行
+            // this.form.title = str.replace(/ /gi, ""); //去掉
             (this.form.joinId = this.form.joinId.join(",")),
               addBdgleven(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
@@ -612,7 +656,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除连务会记录本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdgleven(ids);
         })
@@ -637,12 +681,6 @@ export default {
         })
         .catch(() => {});
     },
-    // //获取部门列表
-    getdept() {
-      getDept().then((response) => {
-        this.buMens = response.data;
-      });
-    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -99,10 +99,12 @@
       <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>
+        <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="borrowName" />
       <el-table-column label="文件名称" align="center" prop="name" />
@@ -195,11 +197,7 @@
           />
         </el-form-item>
         <el-form-item label="文件编号" prop="number">
-          <el-input
-            v-model="form.number"
-            placeholder="输入文件编号"
-            disabled
-          />
+          <el-input v-model="form.number" placeholder="输入文件编号" disabled />
         </el-form-item>
         <el-form-item label="文件名称" prop="name">
           <el-input v-model="form.name" placeholder="输入文件名称" />
@@ -320,7 +318,10 @@ import {
   updateBdglfilemanagement,
   exportBdglfilemanagement,
 } from "@/api/grassrootsregistration/bdglfilemanagement";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -455,10 +456,10 @@ export default {
     host() {
       this.getList();
     },
-    // //获取部门列表
+    // //获取搜索部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOption = response.data;
+      getShouBu().then((res) => {
+        this.deptOption = res.data;
       });
     },
     // 注销人选中触发
@@ -597,7 +598,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-      .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         // .confirm('是否确认删除文件管理登计本编号为"' + ids + '"的数据项？')
         .then(function () {
           return delBdglfilemanagement(ids);

src/views/grassrootsregistration/bdglfood/index.vue

@@ -8,13 +8,19 @@
       label-width="68px"
     >
       <el-form-item label="" prop="unitId">
-        <el-input
+        <el-select
           v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择单位"
+          @change="host"
+        >
+          <el-option
+            v-for="(item, i) in deptOptionss"
+            :key="i"
+            :label="item.deptName"
+            :value="item.deptId"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
@@ -86,10 +92,12 @@
       <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>
+        <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="peopleName" />
       <!-- <el-table-column label="更新时间" align="center" prop="id" /> -->
@@ -1060,7 +1068,10 @@ import {
   exportBdglfood,
 } from "@/api/grassrootsregistration/bdglfood";
 import { getDept } from "@/api/grassrootsregistration/bdglparty";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -1275,12 +1286,25 @@ export default {
       // 定义一个数组用来放对象提交
       Arr: [],
       arr: [],
+      // 获取搜索单位列表
+      deptOptionss: [],
     };
   },
   created() {
     this.getList();
+    this.getdept();
   },
   methods: {
+    // //获取部门列表
+    getdept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
+    },
+    // 搜索单位触发
+    host() {
+      this.getList();
+    },
     //增加实物检查验收表单
     tianJia() {
       this.acceptance.push({
@@ -1677,7 +1701,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除伙食管理登记薄编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglfood(ids);
         })
@@ -1978,14 +2002,16 @@ table td {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-::v-deep :-ms-input-placeholder{
+::v-deep :-ms-input-placeholder {
   color: #bdbdbd4f !important;
 }
-::v-deep ::-moz-placeholder{
+::v-deep ::-moz-placeholder {
   color: #bdbdbd4f !important;
 }
 .box2 tr td span {
   font-size: 0.1em;
 }
-::v-deep ::-webkit-input-placeholder{  color: #bdbdbd4f !important;}
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -14,7 +14,7 @@
           @change="company"
         >
           <el-option
-            v-for="item in bumeng"
+            v-for="item in buMeng"
             :key="item.deptId"
             :label="item.deptName"
             :value="item.deptId"
@@ -115,10 +115,12 @@
     >
       <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>
+        <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="召开时间"
@@ -136,7 +138,12 @@
       <el-table-column label="列席人" align="center" prop="peopleIds" />
       <el-table-column label="缺席人" align="center" prop="absentIds" />
       <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"
+        prop="title"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -353,6 +360,8 @@ import {
   updateBdglmeeting,
   exportBdglmeeting,
   getDept,
+  getShouBu,
+  getAll,
 } from "@/api/grassrootsregistration/bdglmeeting";
 
 // 富文本
@@ -364,7 +373,6 @@ import { quillEditor } from "vue-quill-editor";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Bdglmeeting",
   components: {
@@ -452,7 +460,7 @@ export default {
       //下拉菜单
       options: [],
       // 外面的部门
-      bumeng: [],
+      buMeng: [],
       // 主持人 人员
       renYuan: [],
       // 外面的人员
@@ -472,9 +480,22 @@ export default {
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
@@ -572,6 +593,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.reset();
       this.resetForm("queryForm");
       this.handleQuery();
@@ -682,7 +704,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除团支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglmeeting(ids);
         })
@@ -707,12 +729,6 @@ export default {
         })
         .catch(() => {});
     },
-    //获取部门列表
-    async getdept() {
-      const res = await getDept();
-      // //判断是否成功
-      this.bumeng = res.data;
-    },
   },
 };
 </script>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -27,9 +27,10 @@
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
           @change="compere"
+          filterable
         >
           <el-option
-            v-for="item in renYuan"
+            v-for="item in personnel"
             :key="item.id"
             :label="item.name"
             :value="item.id"
@@ -101,10 +102,12 @@
       <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>
+        <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="会议议题"
@@ -339,10 +342,11 @@ 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 loginVue from "../../login.vue";
-
+import { getShouBu, getAll } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglparty",
   components: {
@@ -446,9 +450,22 @@ export default {
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.personnel = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       (this.form.compereId = null),
@@ -476,7 +493,7 @@ export default {
       this.getList();
       var url = "/grassrootsregistration/common/getZhuChiRen";
       getDeptId(url, this.queryParams.unitId).then((res) => {
-        this.renYuan = res.data;
+        this.personnel = res.data;
       });
     },
     // 搜索主持人触发
@@ -532,6 +549,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -637,7 +655,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除党支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglparty(ids);
         })
@@ -662,12 +680,6 @@ export default {
         })
         .catch(() => {});
     },
-    //获取部门列表
-    getdept() {
-      getDept().then((response) => {
-        this.buMeng = response.data;
-      });
-    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -89,10 +89,12 @@
       <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>
+        <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="name" />
       <el-table-column label="规格型号" align="center" prop="version" />
@@ -284,7 +286,10 @@ import {
   updateBdglpublicproperty,
   exportBdglpublicproperty,
 } from "@/api/grassrootsregistration/bdglpublicproperty";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -386,8 +391,8 @@ export default {
     },
     // //获取部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOptionss = response.data;
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
       });
     },
     // 选中保管人触发
@@ -532,7 +537,7 @@ export default {
         // .confirm(
         //   '是否确认删除营产，公物管理登记簿编号为"' + ids + '"的数据项？'
         // )
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglpublicproperty(ids);
         })

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -8,9 +8,13 @@
       label-width="68px"
     >
       <el-form-item label="" prop="unitId">
-        <el-select v-model="queryParams.unitId" placeholder="请选择单位">
+        <el-select
+          v-model="queryParams.unitId"
+          placeholder="请选择单位"
+          @change="company"
+        >
           <el-option
-            v-for="item in bumeng"
+            v-for="item in buMeng"
             :key="item.deptId"
             :label="item.deptName"
             :value="item.deptId"
@@ -19,13 +23,17 @@
         </el-select>
       </el-form-item>
       <el-form-item label="" prop="compereId">
-        <el-select v-model="form.compereId" placeholder="请选择主持人">
+        <el-select
+          v-model="queryParams.compereId"
+          placeholder="请选择主持人"
+          @change="Renyuan"
+          filterable
+        >
           <el-option
-            v-for="item in arr"
+            v-for="item in renYuans"
             :key="item.id"
             :label="item.name"
             :value="item.id"
-            @change="Renyuan"
           >
           </el-option>
         </el-select>
@@ -96,12 +104,19 @@
       <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>
+        <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="title" show-overflow-tooltip/>
+      <el-table-column
+        label="会议议题"
+        align="center"
+        prop="title"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="会议议题" align="center" >
         <template slot-scope="scope">
           <span v-html="scope.row.title"></span>
@@ -324,7 +339,11 @@ import {
   exportBdglsoldier,
 } from "@/api/grassrootsregistration/bdglsoldier";
 
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+  getAll,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDept } from "@/api/grassrootsregistration/bdglparty";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -424,15 +443,41 @@ export default {
       // 修改拿到的数据
       result: {},
       // 外面部门
-      bumeng: [],
+      buMeng: [],
       // 外面人员
-      arr: [],
+      renYuans: [],
     };
   },
   created() {
     this.getList();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 搜索单位触发
+    company() {
+      this.getList();
+      // 联动人员
+      getZhuChiRen(this.queryParams.unitId).then((res) => {
+        this.renYuans = res.data;
+      });
+    },
+    // 搜索主持人选中触发
+    Renyuan() {
+      this.getList();
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
@@ -518,6 +563,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
+      this.reset();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -622,7 +669,7 @@ export default {
         // .confirm(
         //   '是否确认删除军人委员会会议登记本编号为"' + ids + '"的数据项？'
         // )
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglsoldier(ids);
         })

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -14,7 +14,7 @@
           @change="host"
         >
           <el-option
-            v-for="(item, i) in dept"
+            v-for="(item, i) in deptOptionss"
             :key="i"
             :label="item.deptName"
             :value="item.deptId"
@@ -26,7 +26,7 @@
         <el-date-picker
           clearable
           size="small"
-          v-model="queryParams.time"
+          v-model="queryParams.startTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择时间"
@@ -107,10 +107,12 @@
       <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>
+        <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="name" />
       <el-table-column
@@ -470,6 +472,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
   getZhuChiRen,
   getDept,
+  getShouBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglweekwork",
@@ -598,7 +601,7 @@ export default {
         },
       ],
       // 搜索单位列表
-      dept: [],
+      deptOptionss: [],
     };
   },
   created() {
@@ -640,9 +643,10 @@ export default {
       this.getList();
     },
     // 查询单位列表
-    async getDept() {
-      const res = await getDept();
-      this.dept = res.data;
+    getDept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
     },
     // 政治人员选中触发
     zhengZhi(name) {
@@ -752,6 +756,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.startTime = null;
       this.handleQuery();
     },
     /** 对话框重置按钮操作 */
@@ -830,7 +835,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除一周工作安排编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglweekwork(ids);
         })