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