|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <div class="box-lfet">
|
|
|
- <!-- <div class="data">
|
|
|
+ <!-- <div class="box-lfet"> -->
|
|
|
+ <!-- <div class="data">
|
|
|
<p>单位</p>
|
|
|
<div class="a1"></div>
|
|
|
<el-date-picker
|
|
@@ -14,7 +14,26 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</div> -->
|
|
|
- <div class="dadui">
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="4" :xs="24">
|
|
|
+ <div class="dadui">
|
|
|
+ <img src="../../../images/星星.png" alt />
|
|
|
+ 大队
|
|
|
+ </div>
|
|
|
+ <div class="tree">
|
|
|
+ <el-tree
|
|
|
+ class="userAgrees"
|
|
|
+ style="height: 700px; overflow: auto"
|
|
|
+ :data="deptOptions"
|
|
|
+ :props="defaultProps"
|
|
|
+ @node-click="handleNodeClick"
|
|
|
+ default-expand-all
|
|
|
+ highlight-current
|
|
|
+ :expand-on-click-node="false"
|
|
|
+ ></el-tree>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <!-- <div class="dadui">
|
|
|
<img src="../../../images/星星.png" alt="" />
|
|
|
大队
|
|
|
</div>
|
|
@@ -29,10 +48,10 @@
|
|
|
highlight-current
|
|
|
:expand-on-click-node="false"
|
|
|
></el-tree>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="box-right">
|
|
|
- <!-- <el-form
|
|
|
+ </div> -->
|
|
|
+ <!-- </div> -->
|
|
|
+ <!-- <div class="box-right"> -->
|
|
|
+ <!-- <el-form
|
|
|
:model="queryParams"
|
|
|
ref="queryForm"
|
|
|
:inline="true"
|
|
@@ -116,7 +135,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="recorder" label-width="59px"> -->
|
|
|
- <!-- <el-input
|
|
|
+ <!-- <el-input
|
|
|
v-model="queryParams.recorder"
|
|
|
placeholder="请输入记录人"
|
|
|
clearable
|
|
@@ -124,7 +143,7 @@
|
|
|
@input="handleQuery"
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
- <!-- <el-select
|
|
|
+ <!-- <el-select
|
|
|
v-model="queryParams.recorder"
|
|
|
ref="peoplenames"
|
|
|
placeholder="请选择记录人"
|
|
@@ -148,14 +167,14 @@
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
<!-- <el-form-item> -->
|
|
|
- <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
|
|
|
- <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
|
|
|
+ <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
|
|
|
+ <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
|
|
|
>重置</el-button
|
|
|
>
|
|
|
</el-form-item>
|
|
|
</el-form> -->
|
|
|
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
+ <!-- <el-row :gutter="10" class="mb8"> -->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="primary"
|
|
@@ -191,8 +210,8 @@
|
|
|
>删除</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <!-- <el-button
|
|
|
+ <!-- <el-col :span="1.5"> -->
|
|
|
+ <!-- <el-button
|
|
|
type="warning"
|
|
|
plain
|
|
|
icon="el-icon-download"
|
|
@@ -202,104 +221,134 @@
|
|
|
v-hasPermi="['thought:getready:export']"
|
|
|
>导出</el-button
|
|
|
> -->
|
|
|
- </el-col>
|
|
|
+ <!-- </el-col> -->
|
|
|
<right-toolbar
|
|
|
:showSearch.sync="showSearch"
|
|
|
@queryTable="getList"
|
|
|
></right-toolbar>
|
|
|
- </el-row>
|
|
|
+ <!-- </el-row> -->
|
|
|
+ <el-col :span="20" :xs="24">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="getreadyList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
+ <el-table-column type="selection" width="55" align="center" />
|
|
|
+ <el-table-column
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="50"
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="教育议题"
|
|
|
+ align="center"
|
|
|
+ prop="talkTheme"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="教育议题简介"
|
|
|
+ align="center"
|
|
|
+ prop="talkIntroduction"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="教育内容"
|
|
|
+ align="center"
|
|
|
+ prop="talkContent"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ onEditor(scope.row.talkContent) }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="getreadyList"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- >
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" type="index" width="50" align="center" />
|
|
|
- <el-table-column label="教育议题" align="center" prop="talkTheme" show-overflow-tooltip/>
|
|
|
- <el-table-column
|
|
|
- label="教育议题简介"
|
|
|
- align="center"
|
|
|
- prop="talkIntroduction"
|
|
|
- show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column label="教育内容" align="center" prop="talkContent" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ onEditor(scope.row.talkContent) }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column
|
|
|
- label="开始时间"
|
|
|
- align="center"
|
|
|
- prop="startTime"
|
|
|
- width="100"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="组织人" align="center" prop="createName" width="100" />
|
|
|
- <el-table-column label="记录人" align="center" prop="recorder" width="100" />
|
|
|
- <el-table-column label="参加人" align="center" prop="talkPeople" show-overflow-tooltip :formatter="unit2Format"/>
|
|
|
- <el-table-column
|
|
|
- label="结束时间"
|
|
|
- align="center"
|
|
|
- prop="endTime"
|
|
|
- width="100"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
|
|
|
- <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
|
|
|
- <!-- <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/> -->
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- width="200px"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="btk"
|
|
|
- type="text"
|
|
|
- @click="handlelook(scope.row)"
|
|
|
- v-hasPermi="['thought:getready:edit']"
|
|
|
- >查看</el-button
|
|
|
+ <el-table-column
|
|
|
+ label="开始时间"
|
|
|
+ align="center"
|
|
|
+ prop="startTime"
|
|
|
+ width="100"
|
|
|
>
|
|
|
- <el-button
|
|
|
- size="btu"
|
|
|
- type="text"
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['thought:getready:edit']"
|
|
|
- >修改</el-button
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="组织人"
|
|
|
+ align="center"
|
|
|
+ prop="createName"
|
|
|
+ width="100"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="记录人"
|
|
|
+ align="center"
|
|
|
+ prop="recorder"
|
|
|
+ width="100"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="参加人"
|
|
|
+ align="center"
|
|
|
+ prop="talkPeople"
|
|
|
+ show-overflow-tooltip
|
|
|
+ :formatter="unit2Format"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="结束时间"
|
|
|
+ align="center"
|
|
|
+ prop="endTime"
|
|
|
+ width="100"
|
|
|
>
|
|
|
- <el-button
|
|
|
- size="btd"
|
|
|
- type="text"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['thought:getready:remove']"
|
|
|
- >删除</el-button
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
|
|
|
+ <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
|
|
|
+ <!-- <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/> -->
|
|
|
+
|
|
|
+ <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ width="200px"
|
|
|
>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ size="btk"
|
|
|
+ type="text"
|
|
|
+ @click="handlelook(scope.row)"
|
|
|
+ v-hasPermi="['thought:getready:edit']"
|
|
|
+ >查看</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="btu"
|
|
|
+ type="text"
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['thought:getready:edit']"
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="btd"
|
|
|
+ type="text"
|
|
|
+ @click="handleDelete(scope.row)"
|
|
|
+ v-hasPermi="['thought:getready: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-col>
|
|
|
+ </el-row>
|
|
|
|
|
|
<!-- 添加或修改教育准备会对话框 -->
|
|
|
<el-dialog
|
|
@@ -317,13 +366,9 @@
|
|
|
label-width="100px"
|
|
|
:inline="true"
|
|
|
>
|
|
|
- <div class="jiben">基本信息</div>
|
|
|
- <el-form-item label="教育议题" prop="talkTheme">
|
|
|
- <el-input
|
|
|
- v-model="form.talkTheme"
|
|
|
-
|
|
|
- placeholder="请输入内容"
|
|
|
- />
|
|
|
+ <div class="jiben">基本信息</div>
|
|
|
+ <el-form-item label="教育议题" prop="talkTheme">
|
|
|
+ <el-input v-model="form.talkTheme" placeholder="请输入内容" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
<el-date-picker
|
|
@@ -337,12 +382,7 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="结束时间"
|
|
|
- prop="endTime"
|
|
|
- label-width="115px"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="结束时间" prop="endTime" label-width="115px">
|
|
|
<el-date-picker
|
|
|
editable
|
|
|
clearable
|
|
@@ -359,8 +399,8 @@
|
|
|
v-model="form.createName"
|
|
|
placeholder="请选择用户名称"
|
|
|
/> -->
|
|
|
- <el-select
|
|
|
- filterable
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
v-model="form.createName"
|
|
|
ref="createName"
|
|
|
placeholder="请选择组织人"
|
|
@@ -377,7 +417,7 @@
|
|
|
<!-- <el-form-item label="创建人id" prop="createId">
|
|
|
<el-input v-model="form.createId" placeholder="请输入创建人id" />
|
|
|
</el-form-item> -->
|
|
|
-
|
|
|
+
|
|
|
<!-- <el-form-item label="文件名称" prop="fileName">
|
|
|
<el-input v-model="form.fileName" placeholder="请输入文件名称" />
|
|
|
</el-form-item>
|
|
@@ -386,19 +426,18 @@
|
|
|
</el-form-item> -->
|
|
|
<el-form-item label="记录人" prop="recorder">
|
|
|
<!-- <el-input v-model="form.recorder" placeholder="请输入记录人" /> -->
|
|
|
- <el-select
|
|
|
+ <el-select
|
|
|
v-model="form.recorder"
|
|
|
ref="recorder"
|
|
|
placeholder="请选择记录人"
|
|
|
filterable
|
|
|
-
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="item in recodeexecutor"
|
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
|
:value="item.name"
|
|
|
- @click.native="jiluPeople(item.id)"
|
|
|
+ @click.native="jiluPeople(item.id)"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
@@ -433,7 +472,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<!-- <div class="jiben">会议主题</div> -->
|
|
|
-
|
|
|
+
|
|
|
<div class="jiben">教育内容</div>
|
|
|
<el-form-item>
|
|
|
<!-- <editor v-model="form.talkContent" :min-height="192"/> -->
|
|
@@ -462,10 +501,10 @@
|
|
|
></quill-editor>
|
|
|
</el-form-item>
|
|
|
<div class="jiben">附件</div>
|
|
|
- <el-form-item>
|
|
|
- <FileUpload v-model="form.fileName" />
|
|
|
- </el-form-item>
|
|
|
- <!-- <el-input
|
|
|
+ <el-form-item>
|
|
|
+ <FileUpload v-model="form.fileName" />
|
|
|
+ </el-form-item>
|
|
|
+ <!-- <el-input
|
|
|
v-model="form.fileName"
|
|
|
|
|
|
/> -->
|
|
@@ -492,8 +531,8 @@
|
|
|
label-width="100px"
|
|
|
:inline="true"
|
|
|
>
|
|
|
- <div class="jiben">基本信息</div>
|
|
|
- <el-form-item label="教育议题" prop="talkTheme">
|
|
|
+ <div class="jiben">基本信息</div>
|
|
|
+ <el-form-item label="教育议题" prop="talkTheme">
|
|
|
<el-input
|
|
|
v-model="form1.talkTheme"
|
|
|
disabled
|
|
@@ -513,14 +552,9 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="结束时间"
|
|
|
- prop="endTime"
|
|
|
- label-width="115px"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="结束时间" prop="endTime" label-width="115px">
|
|
|
<el-date-picker
|
|
|
- disabled
|
|
|
+ disabled
|
|
|
editable
|
|
|
clearable
|
|
|
size="small"
|
|
@@ -532,9 +566,9 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="组织人" prop="createName">
|
|
|
- <el-select
|
|
|
- disabled
|
|
|
- filterable
|
|
|
+ <el-select
|
|
|
+ disabled
|
|
|
+ filterable
|
|
|
v-model="form1.createName"
|
|
|
ref="createName"
|
|
|
placeholder="请选择组织人"
|
|
@@ -549,26 +583,25 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="记录人" prop="recorder">
|
|
|
- <el-select
|
|
|
- disabled
|
|
|
+ <el-select
|
|
|
+ disabled
|
|
|
v-model="form1.recorder"
|
|
|
ref="recorder"
|
|
|
placeholder="请选择记录人"
|
|
|
filterable
|
|
|
-
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="item in recodeexecutor"
|
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
|
:value="item.name"
|
|
|
- @click.native="jiluPeople(item.id)"
|
|
|
+ @click.native="jiluPeople(item.id)"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="参加人" prop="talkPeople" label-width="100px">
|
|
|
<el-select
|
|
|
- disabled
|
|
|
+ disabled
|
|
|
v-model="form1.talkPeople"
|
|
|
ref="peoplenames"
|
|
|
placeholder="请选择参加人"
|
|
@@ -589,7 +622,6 @@
|
|
|
<el-form-item prop="talkIntroduction">
|
|
|
<el-input
|
|
|
disabled
|
|
|
-
|
|
|
v-model="form1.talkIntroduction"
|
|
|
type="textarea"
|
|
|
placeholder="请输入内容"
|
|
@@ -598,7 +630,7 @@
|
|
|
<div class="jiben">教育内容</div>
|
|
|
<el-form-item>
|
|
|
<quill-editor
|
|
|
- disabled
|
|
|
+ disabled
|
|
|
class="quill-editor"
|
|
|
ref="myTextEditor"
|
|
|
v-model="form1.talkContent"
|
|
@@ -612,26 +644,26 @@
|
|
|
></quill-editor>
|
|
|
</el-form-item>
|
|
|
<div class="jiben">附件</div>
|
|
|
- <el-form-item>
|
|
|
- <!-- <FileUpload v-model="form1.fileName" /> -->
|
|
|
- <span class="filename">{{form1.fileName}}</span>
|
|
|
- <a
|
|
|
- :href="form1.filePath"
|
|
|
- download
|
|
|
- title="下载"
|
|
|
- style="color: white; margin-left: 10px"
|
|
|
- class="downloadfile"
|
|
|
- >下载附件</a
|
|
|
- >
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <!-- <FileUpload v-model="form1.fileName" /> -->
|
|
|
+ <span class="filename">{{ form1.fileName }}</span>
|
|
|
+ <a
|
|
|
+ :href="form1.filePath"
|
|
|
+ download
|
|
|
+ title="下载"
|
|
|
+ style="color: white; margin-left: 10px"
|
|
|
+ class="downloadfile"
|
|
|
+ >下载附件</a
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="open1=false">关 闭</el-button>
|
|
|
+ <el-button type="primary" @click="open1 = false">关 闭</el-button>
|
|
|
<!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- </div>
|
|
|
+ <!-- </div> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -652,12 +684,10 @@ import {
|
|
|
updateBdgldiary,
|
|
|
exportBdgldiary,
|
|
|
exportBdgShuju,
|
|
|
- updateBdglShenPi
|
|
|
+ updateBdglShenPi,
|
|
|
} from "@/api/grassrootsregistration/bdgldiary";
|
|
|
-import {
|
|
|
- allUser,
|
|
|
-} from "@/api/workingArrangements/workTask";
|
|
|
-import { getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
+import { allUser } from "@/api/workingArrangements/workTask";
|
|
|
+import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
|
|
|
// 富文本
|
|
|
import "quill/dist/quill.core.css";
|
|
|
import "quill/dist/quill.snow.css";
|
|
@@ -667,7 +697,7 @@ export default {
|
|
|
name: "Getready",
|
|
|
data() {
|
|
|
return {
|
|
|
- tiem:"",
|
|
|
+ tiem: "",
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
// 导出遮罩层
|
|
@@ -709,50 +739,50 @@ export default {
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
- talkTheme: [
|
|
|
- { required: true, message: "教育议题不能为空", trigger: "blur" }
|
|
|
+ talkTheme: [
|
|
|
+ { required: true, message: "教育议题不能为空", trigger: "blur" },
|
|
|
],
|
|
|
startTime: [
|
|
|
- { required: true, message: "开始时间不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "开始时间不能为空", trigger: "blur" },
|
|
|
],
|
|
|
endTime: [
|
|
|
- { required: true, message: "结束时间不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "结束时间不能为空", trigger: "blur" },
|
|
|
],
|
|
|
createName: [
|
|
|
- { required: true, message: "组织人不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "组织人不能为空", trigger: "blur" },
|
|
|
],
|
|
|
recorder: [
|
|
|
- { required: true, message: "记录人不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "记录人不能为空", trigger: "blur" },
|
|
|
],
|
|
|
talkPeople: [
|
|
|
- { required: true, message: "参加人不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "参加人不能为空", trigger: "blur" },
|
|
|
],
|
|
|
},
|
|
|
// 获取人员
|
|
|
executors: [],
|
|
|
// 记录人
|
|
|
- recodeexecutor:[],
|
|
|
+ recodeexecutor: [],
|
|
|
// 添加列表的人员
|
|
|
executor: [],
|
|
|
// 左侧树形
|
|
|
- deptOptions:[],
|
|
|
+ deptOptions: [],
|
|
|
//左侧时间选择
|
|
|
pickerOptions: {
|
|
|
disabledDate(time) {
|
|
|
return time.getTime() > Date.now();
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
- // 树形配置
|
|
|
+ // 树形配置
|
|
|
defaultProps: {
|
|
|
children: "children",
|
|
|
- label: "label"
|
|
|
+ label: "label",
|
|
|
},
|
|
|
// 搜索时间的保存
|
|
|
timeDate: "",
|
|
|
- rylist:[],
|
|
|
- form1:{},
|
|
|
- open1:false,
|
|
|
- title1:""
|
|
|
+ rylist: [],
|
|
|
+ form1: {},
|
|
|
+ open1: false,
|
|
|
+ title1: "",
|
|
|
};
|
|
|
},
|
|
|
components: {
|
|
@@ -770,36 +800,35 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
// 获取执行人
|
|
|
- unit2Format(row){
|
|
|
- var deptName=""
|
|
|
+ unit2Format(row) {
|
|
|
+ var deptName = "";
|
|
|
this.recodeexecutor.map((item) => {
|
|
|
// console.log(row.talkPeople)
|
|
|
- row.talkPeople.split(",").forEach((items, index) => {
|
|
|
- // console.log(item.id,item.name)
|
|
|
- if (item.id == items) {
|
|
|
- deptName += item.name + " ";
|
|
|
- }
|
|
|
- });
|
|
|
+ row.talkPeople.split(",").forEach((items, index) => {
|
|
|
+ // console.log(item.id,item.name)
|
|
|
+ if (item.id == items) {
|
|
|
+ deptName += item.name + " ";
|
|
|
+ }
|
|
|
});
|
|
|
- return deptName
|
|
|
+ });
|
|
|
+ return deptName;
|
|
|
},
|
|
|
- returnExecutor(id,name){
|
|
|
+ returnExecutor(id, name) {
|
|
|
// this.form.talkPeople=id
|
|
|
// console.log(id)
|
|
|
// console.log()
|
|
|
-
|
|
|
},
|
|
|
- zuzhiPeople(id){
|
|
|
+ zuzhiPeople(id) {
|
|
|
// console.log(id)
|
|
|
- this.form.createId=id
|
|
|
+ this.form.createId = id;
|
|
|
},
|
|
|
- jiluPeople(id){
|
|
|
- this.form.recorderId=id
|
|
|
+ jiluPeople(id) {
|
|
|
+ this.form.recorderId = id;
|
|
|
// console.log(id)
|
|
|
},
|
|
|
// 获取部门数据
|
|
|
getShuJu(data) {
|
|
|
- exportBdgShuju(data).then(res => {
|
|
|
+ exportBdgShuju(data).then((res) => {
|
|
|
this.DataTime = data;
|
|
|
this.registrationData = res;
|
|
|
this.cg = res.cg;
|
|
@@ -818,9 +847,9 @@ export default {
|
|
|
},
|
|
|
// 获取外面部门树形
|
|
|
treeselect() {
|
|
|
- getWeiShu().then(res => {
|
|
|
+ getWeiShu().then((res) => {
|
|
|
this.deptOptions = res.data;
|
|
|
- console.log(this.deptOptions)
|
|
|
+ console.log(this.deptOptions);
|
|
|
});
|
|
|
},
|
|
|
//外面树形选择搜索
|
|
@@ -834,9 +863,9 @@ export default {
|
|
|
getAll().then((response) => {
|
|
|
this.executors = response.rows;
|
|
|
// 添加的人员
|
|
|
- this.executor=response.rows
|
|
|
+ this.executor = response.rows;
|
|
|
// 记录人
|
|
|
- this.recodeexecutor=response.rows
|
|
|
+ this.recodeexecutor = response.rows;
|
|
|
// console.log(this.executors);
|
|
|
});
|
|
|
},
|
|
@@ -920,24 +949,25 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 查看按钮操作
|
|
|
- handlelook(row){
|
|
|
- console.log(row)
|
|
|
+ handlelook(row) {
|
|
|
+ console.log(row);
|
|
|
this.reset();
|
|
|
- const id = row.id || this.ids
|
|
|
- getGetready(id).then(response => {
|
|
|
+ const id = row.id || this.ids;
|
|
|
+ getGetready(id).then((response) => {
|
|
|
this.form1 = response.data;
|
|
|
- this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
|
|
|
- this.form1.filePath=process.env.VUE_APP_BASE_API+this.form1.filePath
|
|
|
- console.log(this.form1)
|
|
|
+ this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
|
|
|
+ this.form1.filePath =
|
|
|
+ process.env.VUE_APP_BASE_API + this.form1.filePath;
|
|
|
+ console.log(this.form1);
|
|
|
this.open1 = true;
|
|
|
this.title1 = "查看教育准备会";
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- if(this.form.fileName){
|
|
|
- this.form.filePath=this.form.fileName[0].url
|
|
|
- this.form.fileName=this.form.fileName[0].name
|
|
|
+ if (this.form.fileName) {
|
|
|
+ this.form.filePath = this.form.fileName[0].url;
|
|
|
+ this.form.fileName = this.form.fileName[0].name;
|
|
|
}
|
|
|
this.form.talkPeople = this.form.talkPeople.join(",");
|
|
|
this.form.talkPeopleId = this.form.talkPeople;
|
|
@@ -1001,13 +1031,13 @@ export default {
|
|
|
height: auto;
|
|
|
min-height: 30px;
|
|
|
text-indent: 1em;
|
|
|
- padding:2px;
|
|
|
+ padding: 2px;
|
|
|
line-height: 30px;
|
|
|
margin-bottom: 20px;
|
|
|
/* margin: auto; */
|
|
|
}
|
|
|
/* 附件名称样式 */
|
|
|
-.filename{
|
|
|
+.filename {
|
|
|
display: inline-block;
|
|
|
color: white;
|
|
|
width: 900px;
|
|
@@ -1027,31 +1057,31 @@ export default {
|
|
|
text-align: center;
|
|
|
}
|
|
|
|
|
|
-::v-deep .el-pagination__sizes .el-input__suffix{
|
|
|
+::v-deep .el-pagination__sizes .el-input__suffix {
|
|
|
right: 6px;
|
|
|
}
|
|
|
-::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
|
|
|
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus {
|
|
|
outline: none !important;
|
|
|
}
|
|
|
-::v-deep .ql-snow .ql-picker:focus{
|
|
|
- outline: none !important;
|
|
|
+::v-deep .ql-snow .ql-picker:focus {
|
|
|
+ outline: none !important;
|
|
|
}
|
|
|
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
|
|
|
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus {
|
|
|
outline: none !important;
|
|
|
}
|
|
|
-::v-deep .ql-toolbar.ql-snow .ql-picker-label{
|
|
|
+::v-deep .ql-toolbar.ql-snow .ql-picker-label {
|
|
|
border: none !important;
|
|
|
}
|
|
|
-::v-deep .ql-formats:focus{
|
|
|
+::v-deep .ql-formats:focus {
|
|
|
outline: none !important;
|
|
|
}
|
|
|
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
|
|
|
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
|
|
|
border-color: none !important;
|
|
|
color: black !important;
|
|
|
}
|
|
|
/* normal */
|
|
|
-::v-deep .ql-active{
|
|
|
- outline: none !important;
|
|
|
+::v-deep .ql-active {
|
|
|
+ outline: none !important;
|
|
|
}
|
|
|
/* 输入框 */
|
|
|
::v-deep .el-dialog .el-input__inner {
|
|
@@ -1119,14 +1149,14 @@ export default {
|
|
|
::v-deep .ql-editor ql-blank {
|
|
|
color: #fff !important;
|
|
|
}
|
|
|
-::v-deep .ql-snow .ql-picker-label{
|
|
|
+::v-deep .ql-snow .ql-picker-label {
|
|
|
position: absolute;
|
|
|
bottom: 5px;
|
|
|
}
|
|
|
-::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
|
|
|
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
|
|
|
margin-top: -2px;
|
|
|
}
|
|
|
-::v-deep .ql-toolbar.ql-snow{
|
|
|
+::v-deep .ql-toolbar.ql-snow {
|
|
|
display: flex;
|
|
|
justify-content: space-around;
|
|
|
}
|
|
@@ -1238,7 +1268,7 @@ export default {
|
|
|
right: 281px;
|
|
|
}
|
|
|
/* 头部样式 */
|
|
|
-.box-lfet .dadui {
|
|
|
+.dadui {
|
|
|
height: 40px;
|
|
|
background: #003156;
|
|
|
/* border-bottom: 1px solid #718A9D ; */
|
|
@@ -1248,7 +1278,7 @@ export default {
|
|
|
font-size: 16px;
|
|
|
color: #1d96ff;
|
|
|
}
|
|
|
-.box-lfet .dadui img {
|
|
|
+.dadui img {
|
|
|
margin: 10px 10px 0px 10px;
|
|
|
}
|
|
|
|
|
@@ -1309,21 +1339,24 @@ export default {
|
|
|
::v-deep .el-dialog {
|
|
|
background-color: #004d86 !important;
|
|
|
}
|
|
|
-::v-deep .el-input__suffix{
|
|
|
+::v-deep .el-input__suffix {
|
|
|
right: 22px;
|
|
|
}
|
|
|
-::v-deep .el-tree-node__content{
|
|
|
+::v-deep .el-tree-node__content {
|
|
|
height: 32px;
|
|
|
}
|
|
|
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
|
|
|
+::v-deep
|
|
|
+ .el-tree--highlight-current
|
|
|
+ .el-tree-node.is-current
|
|
|
+ > .el-tree-node__content {
|
|
|
height: 32px;
|
|
|
color: #fff !important;
|
|
|
background-color: #003156;
|
|
|
- background-image: url("../../../assets/images/选中.png");
|
|
|
- background-size: 100% 100%;
|
|
|
- background-repeat: no-repeat
|
|
|
+ background-image: url("../../../assets/images/选中.png");
|
|
|
+ background-size: 100% 100%;
|
|
|
+ background-repeat: no-repeat;
|
|
|
}
|
|
|
-::v-deep .canjiaren .el-input__inner{
|
|
|
+::v-deep .canjiaren .el-input__inner {
|
|
|
width: 560px;
|
|
|
}
|
|
|
/* 计划附件 */
|
|
@@ -1335,8 +1368,8 @@ export default {
|
|
|
left: 90px;
|
|
|
color: white;
|
|
|
}
|
|
|
-::v-deep .el-link.el-link--default{
|
|
|
- color: white ;
|
|
|
+::v-deep .el-link.el-link--default {
|
|
|
+ color: white;
|
|
|
text-indent: 0.5em;
|
|
|
}
|
|
|
/* ::v-deep .el-upload__tip {
|
|
@@ -1361,7 +1394,7 @@ export default {
|
|
|
/* ::v-deep .el-select-dropdown__item {
|
|
|
color: white;
|
|
|
} */
|
|
|
-::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
|
|
|
- color: white !important;
|
|
|
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
|
|
|
+ color: white !important;
|
|
|
}
|
|
|
</style>
|