Browse Source

思想政治

ltao 3 năm trước cách đây
mục cha
commit
6f8424e4b9

+ 2 - 0
src/views/barracksManagement/flats/index.vue

@@ -950,6 +950,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {};
+      this.resetForm("queryForm");
+      this.handleQuery();
       this.getList();
       this.getSuoYou();
     },

+ 773 - 131
src/views/thought/getready/index.vue

@@ -1,16 +1,69 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="谈心人员" prop="talkPeople">
+      <div class="box-lfet">
+      <div class="data">
+        <p>单位</p>
+        <div class="a1"></div>
+        <el-date-picker
+          v-model="tiem"
+          type="date"
+          :editable="false"
+          placeholder="选择日期"
+          value-format="yyyy-MM-dd"
+          @change="shiJian"
+        >
+        </el-date-picker>
+      </div>
+      <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>
+    </div>
+    <div class="box-right">
+    <!-- <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    > -->
+      <!-- <el-form-item label="谈心人员" prop="talkPeople" label-width="69px">
         <el-input
           v-model="queryParams.talkPeople"
           placeholder="请输入谈心人员"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      </el-form-item> -->
+      <!-- <el-form-item>
+        <el-select
+          v-model="queryParams.talkPeople"
+          ref="peoplenames"
+          placeholder="请选择谈心人员"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in executors"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.startTime"
           type="date"
@@ -25,17 +78,17 @@
           value-format="yyyy-MM-dd"
           placeholder="选择结束时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="创建人姓名" prop="createName">
+      </el-form-item> -->
+      <!-- <el-form-item prop="createName">
         <el-input
           v-model="queryParams.createName"
           placeholder="请输入创建人姓名"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="创建人id" prop="createId">
+      </el-form-item> -->
+      <!-- <el-form-item label="创建人id" prop="createId">
         <el-input
           v-model="queryParams.createId"
           placeholder="请输入创建人id"
@@ -43,8 +96,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="文件路径" prop="filePath">
+      </el-form-item> -->
+      <!-- <el-form-item label="文件路径" prop="filePath">
         <el-input
           v-model="queryParams.filePath"
           placeholder="请输入文件路径"
@@ -52,26 +105,40 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="文件名称" prop="fileName">
+      </el-form-item> -->
+      <!-- <el-form-item prop="fileName" label-width="69px">
         <el-input
           v-model="queryParams.fileName"
           placeholder="请输入文件名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="记录人" prop="recorder">
-        <el-input
+      <el-form-item prop="recorder" label-width="59px"> -->
+        <!-- <el-input
           v-model="queryParams.recorder"
           placeholder="请输入记录人"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="记录人id" prop="recorderId">
+      </el-form-item> -->
+        <!-- <el-select
+          v-model="queryParams.recorder"
+          ref="peoplenames"
+          placeholder="请选择记录人"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in executors"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="记录人id" prop="recorderId">
         <el-input
           v-model="queryParams.recorderId"
           placeholder="请输入记录人id"
@@ -79,12 +146,14 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </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
+        >
       </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="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -95,7 +164,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['thought:getready:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -106,7 +176,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['thought:getready:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -117,7 +188,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['thought:getready:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -128,56 +200,88 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['thought:getready:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="getreadyList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="getreadyList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="谈心人员" align="center" prop="talkPeople" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column label="序号" type="index" width="50" align="center" />
+      <el-table-column label="参加人" align="center" prop="talkPeople" />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        width="100"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        width="100"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人姓名" align="center" prop="createName" />
-      <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" />
-      <el-table-column label="会议内容" align="center" prop="talkContent" />
-      <el-table-column label="会议主题" align="center" prop="talkTheme" />
-      <el-table-column label="会议简介" align="center" prop="talkIntroduction" />
+      <el-table-column label="组织人" align="center" prop="createName" />
+      <!-- <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="教育内容" 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="talkTheme" show-overflow-tooltip/>
+      <el-table-column
+        label="教育议题简介"
+        align="center"
+        prop="talkIntroduction"
+        show-overflow-tooltip
+      />
       <el-table-column label="记录人" align="center" prop="recorder" />
-      <el-table-column label="记录人id" align="center" prop="recorderId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="150px"
+      >
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:getready:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:getready:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -185,70 +289,191 @@
     />
 
     <!-- 添加或修改教育准备会对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="谈心人员" prop="talkPeople">
-          <el-input v-model="form.talkPeople" placeholder="请输入谈心人员" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable size="small"
-            v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable size="small"
-            v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="创建人姓名" prop="createName">
-          <el-input v-model="form.createName" placeholder="请输入创建人姓名" />
-        </el-form-item>
-        <el-form-item label="创建人id" prop="createId">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1080px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <div class="userAgree">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
+          :inline="true"
+        >
+        <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
+              clearable
+              size="small"
+              v-model="form.startTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            label="结束时间"
+            prop="endTime"
+            label-width="115px"
+         
+          >
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.endTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择结束时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="组织人" prop="createName">
+            <el-input
+              v-model="form.createName"
+              placeholder="请选择用户名称"
+            />
+          </el-form-item>
+          <!-- <el-form-item label="创建人id" prop="createId">
           <el-input v-model="form.createId" placeholder="请输入创建人id" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="文件名称" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入文件名称" />
-        </el-form-item>
-        <el-form-item label="会议内容">
-          <editor v-model="form.talkContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="会议主题" prop="talkTheme">
-          <el-input v-model="form.talkTheme" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="会议简介" prop="talkIntroduction">
-          <el-input v-model="form.talkIntroduction" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="记录人" prop="recorder">
-          <el-input v-model="form.recorder" placeholder="请输入记录人" />
-        </el-form-item>
-        <el-form-item label="记录人id" prop="recorderId">
+        </el-form-item> -->
+          
+          <!-- <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+          </el-form-item>
+          <el-form-item label="文件路径" prop="filePath">
+            <el-input v-model="form.filePath" placeholder="请输入文件路径" />
+          </el-form-item> -->
+          <el-form-item label="记录人" prop="recorder">
+            <!-- <el-input v-model="form.recorder" placeholder="请输入记录人" /> -->
+             <el-select
+              v-model="form.recorder"
+              ref="peoplenames"
+              placeholder="请选择记录人"
+              
+            >
+              <el-option
+                v-for="item in recodeexecutor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="参加人" prop="talkPeople" label-width="100px">
+            <!-- <el-input v-model="form.talkPeople" placeholder="请输入谈心人员" /> -->
+            <el-select
+              v-model="form.talkPeople"
+              ref="peoplenames"
+              placeholder="请选择参加人"
+              class="canjiaren"
+              multiple
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                @click.native="returnExecutor(item.id, item.name)"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="记录人id" prop="recorderId">
           <el-input v-model="form.recorderId" placeholder="请输入记录人id" />
-        </el-form-item>
-      </el-form>
+        </el-form-item> -->
+          <div class="jiben">教育议题简介</div>
+          <el-form-item prop="talkIntroduction">
+            <el-input
+              v-model="form.talkIntroduction"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <!-- <div class="jiben">会议主题</div> -->
+         
+          <div class="jiben">教育内容</div>
+          <el-form-item>
+            <!-- <editor v-model="form.talkContent" :min-height="192"/> -->
+            <!-- <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.talkContent"
+            style="
+              height: 150px;
+              width: 1010px;
+              margin-left: 0px;
+              margin-bottom: 60px;
+            "
+          ></quill-editor> -->
+            <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.talkContent"
+              style="
+                height: 150px;
+                width: 1010px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
+          </el-form-item>
+          <div class="jiben">附件</div>
+           <el-form-item>
+          <FileUpload v-model="form.file" />
+           </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
-import { listGetready, getGetready, delGetready, addGetready, updateGetready, exportGetready } from "@/api/thought/getready";
-
+import {
+  listGetready,
+  getGetready,
+  delGetready,
+  addGetready,
+  updateGetready,
+  exportGetready,
+} from "@/api/thought/getready";
+import {
+  listBdgldiary,
+  getBdgldiary,
+  delBdgldiary,
+  addBdgldiary,
+  updateBdgldiary,
+  exportBdgldiary,
+  exportBdgShuju,
+  updateBdglShenPi
+} from "@/api/grassrootsregistration/bdgldiary";
+import { getDept2, getAll,getWeiShu } 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";
 export default {
   name: "Getready",
   data() {
     return {
+      tiem:"",
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -284,23 +509,122 @@ export default {
         talkTheme: null,
         talkIntroduction: null,
         recorder: null,
-        recorderId: null
+        recorderId: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+         talkTheme: [
+          { required: true, message: "教育议题不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        createName: [
+          { required: true, message: "组织人不能为空", trigger: "blur" }
+        ],
+        recorder: [
+          { required: true, message: "记录人不能为空", trigger: "blur" }
+        ],
+        talkPeople: [
+          { required: true, message: "参加人不能为空", trigger: "blur" }
+        ],
+      },
+      // 获取人员
+      executors: [],
+      // 记录人
+      recodeexecutor:[],
+      // 添加列表的人员
+      executor: [],
+      // 左侧树形
+      deptOptions:"",
+      //左侧时间选择
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+       // 树形配置
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 搜索时间的保存
+      timeDate: "",
     };
   },
+  components: {
+    quillEditor,
+  },
   created() {
     this.getList();
+    this.getSuoYou();
+    // 获取外部部门树形
+    this.treeselect();
   },
   methods: {
+    returnExecutor(id,name){
+      console.log(id,name)
+    },
+    // 获取部门数据
+    getShuJu(data) {
+      exportBdgShuju(data).then(res => {
+        this.DataTime = data;
+        this.registrationData = res;
+        this.cg = res.cg;
+        this.sb = res.sb;
+        // this.yishenpi = res.yiShenPi;
+        // this.weishenpi = res.weiShenPi;
+        this.tiems = res.time;
+      });
+    },
+    // 搜索时间触发
+    shiJian(data) {
+      this.queryParams.diaryTime = data;
+      this.timeDate = data;
+      this.getList();
+      this.getShuJu(data);
+    },
+    // 获取外面部门树形
+    treeselect() {
+      getWeiShu().then(res => {
+        this.deptOptions = res.data;
+      });
+    },
+    //外面树形选择搜索
+    handleNodeClick(data) {
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
+
+    // 获取所有人员
+    getSuoYou() {
+      getAll().then((response) => {
+        this.executors = response.rows;
+        // 添加的人员
+        this.executor=response.rows
+        // 记录人
+        this.recodeexecutor=response.rows
+        console.log(this.executors);
+      });
+    },
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
+    },
     /** 查询教育准备会列表 */
     getList() {
       this.loading = true;
-      listGetready(this.queryParams).then(response => {
+      listGetready(this.queryParams).then((response) => {
         this.getreadyList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -328,7 +652,7 @@ export default {
         talkTheme: null,
         talkIntroduction: null,
         recorder: null,
-        recorderId: null
+        recorderId: null,
       };
       this.resetForm("form");
     },
@@ -339,14 +663,15 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {};
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -356,9 +681,10 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(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.form = response.data;
         this.open = true;
         this.title = "修改教育准备会";
@@ -366,16 +692,23 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      
+      this.form.filePath=this.form.file[0].url
+      this.form.fileName=this.form.file[0].name
+      // console.log(this.form)
+      this.form.talkPeople = this.form.talkPeople.join(",");
+      // this.form.peopleId = this.form.peopleName;
+      console.log(this.form)
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateGetready(this.form).then(response => {
+            updateGetready(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addGetready(this.form).then(response => {
+            addGetready(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -387,24 +720,333 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除教育准备会编号为"' + ids + '"的数据项?').then(function() {
-        return delGetready(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除?")
+        .then(function () {
+          return delGetready(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有教育准备会数据项?').then(() => {
-        this.exportLoading = true;
-        return exportGetready(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有教育准备会数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportGetready(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 表格样式 */
+::v-deep .el-table .el-table__header-wrapper th {
+  background-color: #004d86 !important;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid white;
+}
+/* 日历样式 */
+::v-deep .el-date-editor .el-input__inner {
+  height: 36px !important;
+  line-height: 36px;
+}
+::v-deep .datesend .el-form-item__label {
+  width: 115px !important;
+}
+/* 会议文本域样式 */
+::v-deep .el-form-item__content .el-textarea {
+  width: 1010px;
+  /* height: 80px !important; */
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
+  /* width: 1000px; */
+  height: 80px !important;
+}
+::v-deep .el-dialog__body {
+  padding-left: 27px !important;
+  padding-right: 0px !important;
+  padding-bottom: 0px !important;
+}
+/* 富文本内容 */
+/* ::v-deep .editor{
+  width: 1010px;
+  color: white;
+} */
+/* 富文本 */
+::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 .ql-editor ql-blank {
+  color: #fff !important;
+}
+/* 富文本删除功能 */
+::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 .ql-toolbar {
+  display: flex;
+  justify-content: space-around;
+}
+::v-deep .el-input__inner {
+  height: 36px !important;
+  color: white;
+  background-color: #00365f !important;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+  line-height: 36px;
+  position: absolute;
+  right: -223px;
+  top: 2px;
+}
+::v-deep .data .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+  position: absolute;
+  right: 281px;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+
+.box-lfet .data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.box-lfet .data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+  line-height: 36px;
+  position: absolute;
+  right: -223px;
+  top: 2px;
+}
+::v-deep .data .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+  position: absolute;
+  right: 281px;
+}
+/* 头部样式 */
+.box-lfet .dadui {
+  height: 40px;
+  background: #003156;
+  /* border-bottom: 1px solid #718A9D ; */
+  background-image: url(../../../images/矩形底部边框.png);
+  background-repeat: no-repeat;
+  background-position: 0px 39px;
+  font-size: 16px;
+  color: #1d96ff;
+}
+.box-lfet .dadui img {
+  margin: 10px 10px 0px 10px;
+}
+
+.box-lfet .data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.box-lfet .data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+/* 划过效果 */
+::v-deep .el-tree-node__content:hover {
+  /* color: #fff; */
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+.app-container {
+  display: flex;
+}
+/* 左侧树状盒子 */
+.app-container .box-lfet {
+  width: 15%;
+  min-height: 740px;
+  /* background: #003156; */
+  /* padding: 10px; */
+  margin-right: 10px;
+  /* border: 1px solid white; */
+}
+/* 右侧内容盒子 */
+.app-container .box-right {
+  flex: 1;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.el-tree {
+  background: #003156;
+  color: #fff;
+  margin-right: 2px;
+  padding-top: 7px;
+}
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+::v-deep .el-input__suffix{
+  right: 22px;
+}
+::v-deep .el-tree-node__content{
+  height: 32px;
+}
+::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
+}
+::v-deep .canjiaren .el-input__inner{
+  width: 560px;
+}
+/* 计划附件 */
+::v-deep .el-upload__tip {
+  color: white;
+  position: absolute;
+  top: -5px;
+  width: 500px;
+  left: 90px;
+  color: white;
+}
+::v-deep .el-link.el-link--default{
+  color: white ;
+  text-indent: 0.5em;
+}
+/* ::v-deep .el-upload__tip {
+  color: white;
+  position: absolute;
+  top: -5px;
+  width: 500px;
+  left: 80px;
+  color: white;
+}
+::v-deep .el-form-item__content {
+  width: 230px;
+}
+/* 选取附件 */
+/* ::v-deep .el-upload-list__item {
+  /* width: 400px; */
+/* }
+::v-deep .el-upload-list__item a {
+  color: white;
+  text-indent: 0.5em;
+} */
+/* ::v-deep .el-select-dropdown__item {
+  color: white;
+}  */
+</style>

+ 372 - 78
src/views/thought/parliament/index.vue

@@ -1,12 +1,19 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="单位名称" prop="unitName">
-        <el-select v-model="queryParams.unitName" placeholder="请选择单位名称" clearable size="small">
+    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item  prop="unitName" > -->
+        <!-- <el-select v-model="queryParams.unitName" placeholder="请选择单位名称" clearable size="small">
           <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="单位id" prop="unitId">
+        </el-select> -->
+        <!-- <treeselect
+          v-model="queryParams.unitName"
+          :options="userss"
+          placeholder="请选择到访单位"
+          class="threeselects waibudaofang"
+          @select="selectPeo"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="单位id" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位id"
@@ -14,8 +21,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      </el-form-item> -->
+      <!-- <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.startTime"
           type="date"
@@ -30,8 +37,8 @@
           value-format="yyyy-MM-dd"
           placeholder="选择结束时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="创建人姓名" prop="createName">
+      </el-form-item> -->
+      <!-- <el-form-item prop="createName">
         <el-input
           v-model="queryParams.createName"
           placeholder="请输入创建人姓名"
@@ -39,8 +46,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="创建人id" prop="createId">
+      </el-form-item> -->
+      <!-- <el-form-item label="创建人id" prop="createId">
         <el-input
           v-model="queryParams.createId"
           placeholder="请输入创建人id"
@@ -48,8 +55,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="文件路径" prop="filePath">
+      </el-form-item> -->
+      <!-- <el-form-item  prop="filePath">
         <el-input
           v-model="queryParams.filePath"
           placeholder="请输入文件路径"
@@ -57,8 +64,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="文件名称" prop="fileName">
+      </el-form-item> -->
+      <!-- <el-form-item  prop="fileName">
         <el-input
           v-model="queryParams.fileName"
           placeholder="请输入文件名称"
@@ -67,7 +74,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="记录人" prop="recorder">
+      <el-form-item  prop="recorder">
         <el-input
           v-model="queryParams.recorder"
           placeholder="请输入记录人"
@@ -75,8 +82,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="记录人id" prop="recorderId">
+      </el-form-item> -->
+      <!-- <el-form-item label="记录人id" prop="recorderId">
         <el-input
           v-model="queryParams.recorderId"
           placeholder="请输入记录人id"
@@ -84,8 +91,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="参加人" prop="participants">
+      </el-form-item> -->
+      <!-- <el-form-item  prop="participants">
         <el-input
           v-model="queryParams.participants"
           placeholder="请输入参加人"
@@ -93,8 +100,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="参加人id" prop="participantsId">
+      </el-form-item> -->
+      <!-- <el-form-item label="参加人id" prop="participantsId">
         <el-input
           v-model="queryParams.participantsId"
           placeholder="请输入参加人id"
@@ -102,8 +109,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="组织人" prop="organizer">
+      </el-form-item> -->
+      <!-- <el-form-item  prop="organizer">
         <el-input
           v-model="queryParams.organizer"
           placeholder="请输入组织人"
@@ -111,8 +118,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="组织人id" prop="organizerId">
+      </el-form-item> -->
+      <!-- <el-form-item label="组织人id" prop="organizerId">
         <el-input
           v-model="queryParams.organizerId"
           placeholder="请输入组织人id"
@@ -120,12 +127,12 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </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>
       </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="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -176,9 +183,10 @@
 
     <el-table v-loading="loading" :data="parliamentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
+      <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+      <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="单位id" align="center" prop="unitId" />
+      <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -190,30 +198,34 @@
         </template>
       </el-table-column>
       <el-table-column label="创建人姓名" align="center" prop="createName" />
-      <el-table-column label="创建人id" align="center" prop="createId" />
+      <!-- <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" />
-      <el-table-column label="会议内容" align="center" prop="talkContent" />
+      <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="recorder" />
-      <el-table-column label="记录人id" align="center" prop="recorderId" />
+      <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
       <el-table-column label="参加人" align="center" prop="participants" />
-      <el-table-column label="参加人id" align="center" prop="participantsId" />
+      <!-- <el-table-column label="参加人id" align="center" prop="participantsId" /> -->
       <el-table-column label="组织人" align="center" prop="organizer" />
-      <el-table-column label="组织人id" align="center" prop="organizerId" />
-      <el-table-column label="议会主题" align="center" prop="talkTheme" />
+      <!-- <el-table-column label="组织人id" align="center" prop="organizerId" /> -->
+      <el-table-column label="议会主题" align="center" prop="talkTheme" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
+          
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:parliament:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
+            
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:parliament:remove']"
           >删除</el-button>
@@ -230,17 +242,23 @@
     />
 
     <!-- 添加或修改党委议教会对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位名称" prop="unitName">
+    <el-dialog  :title="title"
+      :visible.sync="open"
+      width="1080px"
+      append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true" >
+        <!-- <el-form-item label="单位名称" prop="unitName">
           <el-select v-model="form.unitName" placeholder="请选择单位名称">
             <el-option label="请选择字典生成" value="" />
           </el-select>
+          
+        </el-form-item> -->
+          <div class="jiben">基本信息</div>
+        <el-form-item  prop="talkTheme" label="议会主题">
+          <el-input v-model="form.talkTheme"  placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位id" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
+         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable size="small"
             v-model="form.startTime"
             type="date"
@@ -248,7 +266,7 @@
             placeholder="选择开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
+        <el-form-item label="结束时间" prop="endTime" label-width="115px">
           <el-date-picker clearable size="small"
             v-model="form.endTime"
             type="date"
@@ -256,46 +274,102 @@
             placeholder="选择结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="创建人姓名" prop="createName">
+        <!-- <el-form-item prop="unitName" label="单位名称"> -->
+        <!-- <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        /> -->
+        <!-- <treeselect
+          v-model="form.unitName"
+          :options="users"
+          placeholder="请选择到访单位"
+          class="threeselects"
+          @select="selectPeo1"
+        />
+      </el-form-item> -->
+        <!-- <el-form-item label="单位id" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位id" />
+        </el-form-item> -->
+       
+        <!-- <el-form-item label="创建人姓名" prop="createName">
           <el-input v-model="form.createName" placeholder="请输入创建人姓名" />
-        </el-form-item>
-        <el-form-item label="创建人id" prop="createId">
+        </el-form-item> -->
+        <!-- <el-form-item label="创建人id" prop="createId">
           <el-input v-model="form.createId" placeholder="请输入创建人id" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
+        </el-form-item> -->
+        <!-- <el-form-item label="文件路径" prop="filePath">
           <el-input v-model="form.filePath" placeholder="请输入文件路径" />
         </el-form-item>
         <el-form-item label="文件名称" prop="fileName">
           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+        </el-form-item> -->
+          <el-form-item label="组 织 人" prop="organizer">
+          <el-input v-model="form.organizer" placeholder="请输入组织人" />
         </el-form-item>
-        <el-form-item label="会议内容">
-          <editor v-model="form.talkContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="记录人" prop="recorder">
+        <el-form-item label="记 录 人" prop="recorder">
           <el-input v-model="form.recorder" placeholder="请输入记录人" />
         </el-form-item>
-        <el-form-item label="记录人id" prop="recorderId">
+        <!-- <el-form-item label="记录人id" prop="recorderId">
           <el-input v-model="form.recorderId" placeholder="请输入记录人id" />
-        </el-form-item>
-        <el-form-item label="参加人" prop="participants">
+        </el-form-item> -->
+        <!-- <el-form-item label="参加人" prop="participants">
           <el-input v-model="form.participants" placeholder="请输入参加人" />
-        </el-form-item>
-        <el-form-item label="参加人id" prop="participantsId">
+        </el-form-item> -->
+        <el-form-item label="参 加 人" prop="participants" label-width="100px">
+            <div>
+              <el-select
+                multiple
+                v-model="form.participants"
+                placeholder="请选择参加人"
+                id="execute"
+                ref="peoplenames"
+                 class="canjiaren"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.deptId"
+                  :label="item.nickName"
+                  :value="item.userId"
+                  @click.native="returnExecutor(item.deptId, item.nickName)"
+                />
+              </el-select>
+            </div>
+          </el-form-item>
+        <!-- <el-form-item label="参加人id" prop="participantsId">
           <el-input v-model="form.participantsId" placeholder="请输入参加人id" />
-        </el-form-item>
-        <el-form-item label="组织人" prop="organizer">
-          <el-input v-model="form.organizer" placeholder="请输入组织人" />
-        </el-form-item>
-        <el-form-item label="组织人id" prop="organizerId">
+        </el-form-item> -->
+      
+        <!-- <el-form-item label="组织人id" prop="organizerId">
           <el-input v-model="form.organizerId" placeholder="请输入组织人id" />
+        </el-form-item> -->
+       
+        <div class="jiben">会议内容</div>
+        <el-form-item >
+          <!-- <editor v-model="form.talkContent" :min-height="192"/> -->
+          <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.talkContent"
+              style="
+                height: 150px;
+                width: 1010px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
         </el-form-item>
-        <el-form-item label="议会主题" prop="talkTheme">
-          <el-input v-model="form.talkTheme" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+       <div class="jiben">附件</div>
+           <el-form-item>
+          <FileUpload v-model="form.file" />
+           </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -303,9 +377,16 @@
 
 <script>
 import { listParliament, getParliament, delParliament, addParliament, updateParliament, exportParliament } from "@/api/thought/parliament";
-
+// 树形
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// 单位
+import { getDept2, getAll } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Parliament",
+  components:{
+    Treeselect
+  },
   data() {
     return {
       // 遮罩层
@@ -353,13 +434,74 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        talkTheme: [
+          { required: true, message: "议会主题不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        organizer: [
+          { required: true, message: "组织人不能为空", trigger: "blur" }
+        ],
+        recorder: [
+          { required: true, message: "记录人不能为空", trigger: "blur" }
+        ],
+        participants: [
+          { required: true, message: "参加人不能为空", trigger: "blur" }
+        ],
+      },
+      // 获取单位列表
+      users:[],
+       // 获取单位列表
+      userss:[],
+      unitName:""
     };
   },
   created() {
     this.getList();
+    getDept2().then((res) => {
+        // console.log(res,2)
+        this.userss = res.data;
+        // console.log(this.userss);
+      });
   },
   methods: {
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
+    },
+    selectPeo(val){
+      console.log(val)
+      this.queryParams.unitName = val.label;
+      this.getList()
+    },
+    // 到访单位选中触发
+    selectPeo1(val) {
+      // console.log(val)
+      this.unitName=val.label
+      this.form.unitId=val.id
+      // console.log(this.unitName)
+      // 获取执行单位列表
+      // getDept2().then((res) => {
+      //   // console.log(res,2)
+      //   this.users = res.data;
+      //   // console.log(this.users);
+      // });
+      // this.queryParams.unitId = val.id;
+      // this.queryParams.peopleName = "";
+      // this.queryParams.unitName = val.label;
+      // // console.log(this.queryParams);
+      // this.getZhuChi(this.queryParams.unitId);
+      // this.getList();
+    },
     /** 查询党委议教会列表 */
     getList() {
       this.loading = true;
@@ -406,8 +548,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams={}
       this.resetForm("queryForm");
       this.handleQuery();
+      this.getList()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -420,6 +564,11 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加党委议教会";
+       getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        console.log(this.users);
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -433,6 +582,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
+      this.form.unitName=this.unitName
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -454,7 +605,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除党委议教会编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除?').then(function() {
         return delParliament(ids);
       }).then(() => {
         this.getList();
@@ -475,3 +626,146 @@ export default {
   }
 };
 </script>
+<style scoped>
+::v-deep .canjiaren .el-input__inner{
+  width: 560px !important;
+}
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 表格样式 */
+::v-deep .el-table .el-table__header-wrapper th{
+  background-color: #004d86 !important;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+/* 日历样式 */
+::v-deep .el-date-editor .el-input__inner{
+  height: 36px !important;
+  line-height: 36px;
+}
+::v-deep .datesend .el-form-item__label{
+  width: 115px !important;
+}
+/* 会议文本域样式 */
+::v-deep .el-form-item__content .el-textarea{
+ width: 1010px;
+ /* height: 80px !important; */
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
+ /* width: 1000px; */
+ height: 80px !important;
+}
+::v-deep .el-dialog__body {
+    padding-left: 35px !important;
+    padding-right: 0px !important;
+    padding-bottom: 0px !important;
+}
+/* 富文本内容 */
+/* ::v-deep .editor{
+  width: 1010px;
+  color: white;
+} */
+/* 富文本 */
+::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 .ql-editor ql-blank {
+  color: #fff !important;
+}
+/* 富文本删除功能 */
+::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 .ql-toolbar{
+  display: flex;
+  justify-content: space-around;
+}
+::v-deep .el-input__inner {
+  height: 36px !important;
+  color: white;
+  background-color: #00365f !important;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-input__suffix{
+  right: 22px;
+}
+/* 树形样式 */
+::v-deep .vue-treeselect__control {
+  background-color: #004d86;
+  width: 216px;
+  margin-right: 25px;
+  color: white;
+}
+.threeselects {
+  width: 216px;
+  margin-right: 22px;
+  /* color: white; */
+}
+::v-deep .vue-treeselect__single-value{
+  color: white;
+}
+/* 所搜到访单位 */
+::v-deep .waibudaofang .vue-treeselect__control{
+  background-color: #00365f !important;
+}
+/* 计划附件 */
+::v-deep .el-upload__tip {
+  color: white;
+  position: absolute;
+  top: -5px;
+  width: 500px;
+  left: 90px;
+  color: white;
+}
+::v-deep .el-link.el-link--default{
+  color: white ;
+  text-indent: 0.5em;
+}
+</style>

+ 170 - 43
src/views/thought/talk/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="谈心人员" prop="talkPeople">
+      <el-form-item  prop="talkPeople">
         <el-input
           v-model="queryParams.talkPeople"
           placeholder="请输入谈心人员"
@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位名称" prop="unitName">
+      <el-form-item prop="unitName">
         <el-input
           v-model="queryParams.unitName"
           placeholder="请输入单位名称"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位id" prop="unitId">
+      <!-- <el-form-item prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位id"
@@ -27,8 +27,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="谈心对象" prop="talkObject">
+      </el-form-item> -->
+      <el-form-item  prop="talkObject">
         <el-input
           v-model="queryParams.talkObject"
           placeholder="请输入谈心对象"
@@ -37,7 +37,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="谈心对象id" prop="talkObjectId">
+      <!-- <el-form-item label="谈心对象id" prop="talkObjectId">
         <el-input
           v-model="queryParams.talkObjectId"
           placeholder="请输入谈心对象id"
@@ -45,8 +45,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      </el-form-item> -->
+      <el-form-item  prop="startTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.startTime"
           type="date"
@@ -54,7 +54,7 @@
           placeholder="选择开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
+      <el-form-item  prop="endTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.endTime"
           type="date"
@@ -62,7 +62,7 @@
           placeholder="选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="创建人姓名" prop="createName">
+      <el-form-item  prop="createName">
         <el-input
           v-model="queryParams.createName"
           placeholder="请输入创建人姓名"
@@ -71,7 +71,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建人id" prop="createId">
+      <!-- <el-form-item label="创建人id" prop="createId">
         <el-input
           v-model="queryParams.createId"
           placeholder="请输入创建人id"
@@ -79,8 +79,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="文件路径" prop="filePath">
+      </el-form-item> -->
+      <el-form-item  prop="filePath">
         <el-input
           v-model="queryParams.filePath"
           placeholder="请输入文件路径"
@@ -89,7 +89,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="文件名称" prop="fileName">
+      <el-form-item  prop="fileName">
         <el-input
           v-model="queryParams.fileName"
           placeholder="请输入文件名称"
@@ -98,7 +98,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="谈话时间" prop="talkTime">
+      <el-form-item  prop="talkTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.talkTime"
           type="date"
@@ -106,7 +106,7 @@
           placeholder="选择谈话时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="谈话地点" prop="talkAddress">
+      <el-form-item  prop="talkAddress">
         <el-input
           v-model="queryParams.talkAddress"
           placeholder="请输入谈话地点"
@@ -115,7 +115,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="记录人" prop="recorder">
+      <el-form-item prop="recorder">
         <el-input
           v-model="queryParams.recorder"
           placeholder="请输入记录人"
@@ -124,7 +124,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="记录人id" prop="recorderId">
+      <!-- <el-form-item label="记录人id" prop="recorderId">
         <el-input
           v-model="queryParams.recorderId"
           placeholder="请输入记录人id"
@@ -132,10 +132,10 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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="mini" @click="resetQuery">重置</el-button>
+        <!-- <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>
 
@@ -220,16 +220,16 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
+           
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:talk:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
+           
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:talk:remove']"
           >删除</el-button>
@@ -246,23 +246,30 @@
     />
 
     <!-- 添加或修改谈心记录卡对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title"
+      :visible.sync="open"
+      width="1100px"
+      append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
         <el-form-item label="谈心人员" prop="talkPeople">
           <el-input v-model="form.talkPeople" placeholder="请输入谈心人员" />
         </el-form-item>
+        <el-form-item label="记录人" prop="recorder">
+          <el-input v-model="form.recorder" placeholder="请输入记录人" />
+        </el-form-item>
         <el-form-item label="单位名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>
-        <el-form-item label="单位id" prop="unitId">
+        <!-- <el-form-item label="单位id" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="谈心对象" prop="talkObject">
           <el-input v-model="form.talkObject" placeholder="请输入谈心对象" />
         </el-form-item>
-        <el-form-item label="谈心对象id" prop="talkObjectId">
+        <!-- <el-form-item label="谈心对象id" prop="talkObjectId">
           <el-input v-model="form.talkObjectId" placeholder="请输入谈心对象id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable size="small"
             v-model="form.startTime"
@@ -271,7 +278,7 @@
             placeholder="选择开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
+        <el-form-item label="结束时间" prop="endTime" label-width="115px">
           <el-date-picker clearable size="small"
             v-model="form.endTime"
             type="date"
@@ -282,18 +289,16 @@
         <el-form-item label="创建人姓名" prop="createName">
           <el-input v-model="form.createName" placeholder="请输入创建人姓名" />
         </el-form-item>
-        <el-form-item label="创建人id" prop="createId">
+        <!-- <el-form-item label="创建人id" prop="createId">
           <el-input v-model="form.createId" placeholder="请输入创建人id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="文件路径" prop="filePath">
           <el-input v-model="form.filePath" placeholder="请输入文件路径" />
         </el-form-item>
         <el-form-item label="文件名称" prop="fileName">
           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
-        <el-form-item label="谈话内容">
-          <editor v-model="form.talkContent" :min-height="192"/>
-        </el-form-item>
+        
         <el-form-item label="谈话时间" prop="talkTime">
           <el-date-picker clearable size="small"
             v-model="form.talkTime"
@@ -302,19 +307,33 @@
             placeholder="选择谈话时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="谈话地点" prop="talkAddress">
+        <el-form-item label="谈话地点" prop="talkAddress" label-width="115px">
           <el-input v-model="form.talkAddress" placeholder="请输入谈话地点" />
         </el-form-item>
-        <el-form-item label="记录人" prop="recorder">
-          <el-input v-model="form.recorder" placeholder="请输入记录人" />
-        </el-form-item>
-        <el-form-item label="记录人id" prop="recorderId">
+        
+        <!-- <el-form-item label="记录人id" prop="recorderId">
           <el-input v-model="form.recorderId" placeholder="请输入记录人id" />
+        </el-form-item> -->
+        <div class="jiben">谈话内容</div>
+        <el-form-item >
+          <!-- <editor v-model="form.talkContent" :min-height="192"/> -->
+           <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.talkContent"
+              style="
+                height: 150px;
+                width: 1010px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -494,3 +513,111 @@ export default {
   }
 };
 </script>
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 表格样式 */
+::v-deep .el-table .el-table__header-wrapper th{
+  background-color: #004d86 !important;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+/* 日历样式 */
+::v-deep .el-date-editor .el-input__inner{
+  height: 36px !important;
+  line-height: 36px;
+}
+::v-deep .datesend .el-form-item__label{
+  width: 115px !important;
+}
+/* 会议文本域样式 */
+::v-deep .el-form-item__content .el-textarea{
+ width: 660px;
+ /* height: 80px !important; */
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
+ /* width: 1000px; */
+ height: 80px !important;
+}
+::v-deep .el-dialog__body {
+    padding-left: 45px !important;
+    padding-right: 0px !important;
+    padding-bottom: 0px !important;
+}
+/* 富文本内容 */
+/* ::v-deep .editor{
+  width: 1010px;
+  color: white;
+} */
+/* 富文本 */
+::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 .ql-editor ql-blank {
+  color: #fff !important;
+}
+/* 富文本删除功能 */
+::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 .ql-toolbar{
+  display: flex;
+  justify-content: space-around;
+}
+::v-deep .el-input__inner {
+  height: 36px !important;
+  color: white;
+  background-color: #00365f !important;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-input__suffix{
+  right: 22px;
+}
+</style>

+ 587 - 127
src/views/thought/weekjob/index.vue

@@ -1,7 +1,39 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="创建时间" prop="creatTime">
+    <div class="box-lfet">
+      <div class="data">
+        <p>单位</p>
+        <div class="a1"></div>
+        <!-- <el-date-picker
+          v-model="tiem"
+          type="date"
+          :editable="false"
+          placeholder="选择日期"
+          value-format="yyyy-MM-dd"
+          @change="shiJian"
+        >
+        </el-date-picker> -->
+      </div>
+      <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>
+    </div>
+    <div class="box-right">
+    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item  prop="creatTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.creatTime"
           type="date"
@@ -9,7 +41,7 @@
           placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="创建人姓名" prop="creatName">
+      <el-form-item  prop="creatName">
         <el-input
           v-model="queryParams.creatName"
           placeholder="请输入创建人姓名"
@@ -17,8 +49,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="创建人id" prop="creatId">
+      </el-form-item> -->
+    <!-- <el-form-item label="创建人id" prop="creatId">
         <el-input
           v-model="queryParams.creatId"
           placeholder="请输入创建人id"
@@ -26,8 +58,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="unitName">
+      </el-form-item> -->
+    <!-- <el-form-item prop="unitName">
         <el-input
           v-model="queryParams.unitName"
           placeholder="请输入单位名称"
@@ -35,8 +67,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="单位id" prop="unitId">
+      </el-form-item> -->
+    <!-- <el-form-item label="单位id" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位id"
@@ -44,8 +76,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="值班领导" prop="dutyLeader">
+      </el-form-item> -->
+    <!-- <el-form-item prop="dutyLeader">
         <el-input
           v-model="queryParams.dutyLeader"
           placeholder="请输入值班领导"
@@ -53,8 +85,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="值班领导id" prop="dutyLeaderId">
+      </el-form-item> -->
+    <!-- <el-form-item label="值班领导id" prop="dutyLeaderId">
         <el-input
           v-model="queryParams.dutyLeaderId"
           placeholder="请输入值班领导id"
@@ -62,8 +94,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="电话" prop="phone">
+      </el-form-item> -->
+    <!-- <el-form-item  prop="phone">
         <el-input
           v-model="queryParams.phone"
           placeholder="请输入电话"
@@ -72,7 +104,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="军事长官 " prop="militaryOfficer">
+      <el-form-item prop="militaryOfficer">
         <el-input
           v-model="queryParams.militaryOfficer"
           placeholder="请输入军事长官 "
@@ -80,8 +112,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="军事长官id" prop="militaryOfficerId">
+      </el-form-item> -->
+    <!-- <el-form-item label="军事长官id" prop="militaryOfficerId">
         <el-input
           v-model="queryParams.militaryOfficerId"
           placeholder="请输入军事长官id"
@@ -89,8 +121,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="政治长官" prop="politicalOfficer">
+      </el-form-item> -->
+    <!-- <el-form-item  prop="politicalOfficer">
         <el-input
           v-model="queryParams.politicalOfficer"
           placeholder="请输入政治长官"
@@ -98,8 +130,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="政治长官id" prop="politicalOfficerId">
+      </el-form-item> -->
+    <!-- <el-form-item label="政治长官id" prop="politicalOfficerId">
         <el-input
           v-model="queryParams.politicalOfficerId"
           placeholder="请输入政治长官id"
@@ -107,8 +139,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="工作标题" prop="jobTitle">
+      </el-form-item> -->
+    <!-- <el-form-item  prop="jobTitle">
         <el-input
           v-model="queryParams.jobTitle"
           placeholder="请输入工作标题"
@@ -116,8 +148,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      </el-form-item> -->
+    <!-- <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.startTime"
           type="date"
@@ -132,12 +164,12 @@
           value-format="yyyy-MM-dd"
           placeholder="选择结束时间">
         </el-date-picker>
+      </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>
       </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="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -148,7 +180,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['thought:weekjob:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -159,7 +192,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['thought:weekjob:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -170,7 +204,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['thought:weekjob:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -181,43 +216,84 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['thought:weekjob:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="weekjobList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="weekjobList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="创建时间" align="center" prop="creatTime" width="180">
+      <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+      <el-table-column label="序号" type="index" width="50" align="center" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="creatTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.creatTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.creatTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="创建人姓名" align="center" prop="creatName" />
-      <el-table-column label="创建人id" align="center" prop="creatId" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <!-- <el-table-column label="创建人id" align="center" prop="creatId" /> -->
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
       <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="单位id" align="center" prop="unitId" />
+      <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
       <el-table-column label="值班领导" align="center" prop="dutyLeader" />
-      <el-table-column label="值班领导id" align="center" prop="dutyLeaderId" />
+      <!-- <el-table-column label="值班领导id" align="center" prop="dutyLeaderId" /> -->
       <el-table-column label="电话" align="center" prop="phone" />
-      <el-table-column label="军事长官 " align="center" prop="militaryOfficer" />
-      <el-table-column label="军事长官id" align="center" prop="militaryOfficerId" />
-      <el-table-column label="政治长官" align="center" prop="politicalOfficer" />
-      <el-table-column label="政治长官id" align="center" prop="politicalOfficerId" />
+      <el-table-column
+        label="军事长官 "
+        align="center"
+        prop="militaryOfficer"
+      />
+      <!-- <el-table-column label="军事长官id" align="center" prop="militaryOfficerId" /> -->
+      <el-table-column
+        label="政治长官"
+        align="center"
+        prop="politicalOfficer"
+      />
+      <!-- <el-table-column label="政治长官id" align="center" prop="politicalOfficerId" /> -->
       <el-table-column label="工作标题" align="center" prop="jobTitle" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -225,20 +301,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:weekjob:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:weekjob:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -246,83 +324,131 @@
     />
 
     <!-- 添加或修改周工作对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="创建时间" prop="creatTime">
-          <el-date-picker clearable size="small"
-            v-model="form.creatTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="创建人姓名" prop="creatName">
-          <el-input v-model="form.creatName" placeholder="请输入创建人姓名" />
-        </el-form-item>
-        <el-form-item label="创建人id" prop="creatId">
-          <el-input v-model="form.creatId" placeholder="请输入创建人id" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="单位名称" prop="unitName">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1100px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="单位" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
         </el-form-item>
-        <el-form-item label="单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位id" />
-        </el-form-item>
-        <el-form-item label="值班领导" prop="dutyLeader">
+        <el-form-item label="连值班领导" prop="dutyLeader">
           <el-input v-model="form.dutyLeader" placeholder="请输入值班领导" />
         </el-form-item>
-        <el-form-item label="值班领导id" prop="dutyLeaderId">
-          <el-input v-model="form.dutyLeaderId" placeholder="请输入值班领导id" />
-        </el-form-item>
         <el-form-item label="电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入电话" />
         </el-form-item>
         <el-form-item label="军事长官 " prop="militaryOfficer">
-          <el-input v-model="form.militaryOfficer" placeholder="请输入军事长官 " />
+          <el-input
+            v-model="form.militaryOfficer"
+            placeholder="请输入军事长官 "
+          />
         </el-form-item>
-        <el-form-item label="军事长官id" prop="militaryOfficerId">
-          <el-input v-model="form.militaryOfficerId" placeholder="请输入军事长官id" />
-        </el-form-item>
-        <el-form-item label="政治长官" prop="politicalOfficer">
-          <el-input v-model="form.politicalOfficer" placeholder="请输入政治长官" />
-        </el-form-item>
-        <el-form-item label="政治长官id" prop="politicalOfficerId">
-          <el-input v-model="form.politicalOfficerId" placeholder="请输入政治长官id" />
+          <el-form-item label="政治长官" prop="politicalOfficer">
+          <el-input
+            v-model="form.politicalOfficer"
+            placeholder="请输入政治长官"
+          />
         </el-form-item>
         <el-form-item label="工作标题" prop="jobTitle">
           <el-input v-model="form.jobTitle" placeholder="请输入工作标题" />
         </el-form-item>
+        <!-- <el-form-item label="创建人姓名" prop="creatName">
+          <el-input v-model="form.creatName" placeholder="请输入创建人姓名" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="creatTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.creatTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择创建时间"
+          >
+          </el-date-picker>
+        </el-form-item> -->
+
+        <!-- <el-form-item label="创建人id" prop="creatId">
+          <el-input v-model="form.creatId" placeholder="请输入创建人id" />
+        </el-form-item> -->
+
+        <!-- <el-form-item label="单位id" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位id" />
+        </el-form-item> -->
+
+        <!-- <el-form-item label="值班领导id" prop="dutyLeaderId">
+          <el-input v-model="form.dutyLeaderId" placeholder="请输入值班领导id" />
+        </el-form-item> -->
+
+        
+        <!-- <el-form-item label="军事长官id" prop="militaryOfficerId">
+          <el-input v-model="form.militaryOfficerId" placeholder="请输入军事长官id" />
+        </el-form-item> -->
+      
+        <!-- <el-form-item label="政治长官id" prop="politicalOfficerId">
+          <el-input v-model="form.politicalOfficerId" placeholder="请输入政治长官id" />
+        </el-form-item> -->
+        
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable size="small"
+          <el-date-picker
+            clearable
+            size="small"
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择开始时间">
+            placeholder="选择开始时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable size="small"
+        <el-form-item label="结束时间" prop="endTime" label-width="115px">
+          <el-date-picker
+            clearable
+            size="small"
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择结束时间">
+            placeholder="选择结束时间"
+          >
           </el-date-picker>
         </el-form-item>
+        <div class="jiben">工作登记</div>
+        <el-form-item prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
-import { listWeekjob, getWeekjob, delWeekjob, addWeekjob, updateWeekjob, exportWeekjob } from "@/api/thought/weekjob";
-
+import {
+  listWeekjob,
+  getWeekjob,
+  delWeekjob,
+  addWeekjob,
+  updateWeekjob,
+  exportWeekjob,
+} from "@/api/thought/weekjob";
+import { getDept2, getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Weekjob",
   data() {
@@ -365,23 +491,75 @@ export default {
         politicalOfficerId: null,
         jobTitle: null,
         startTime: null,
-        endTime: null
+        endTime: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+          unitName: [
+          { required: true, message: "单位不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        dutyLeader: [
+          { required: true, message: "连值班领导不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "电话不能为空", trigger: "blur" }
+        ],
+        militaryOfficer: [
+          { required: true, message: "军事长官不能为空", trigger: "blur" }
+        ],
+        politicalOfficer: [
+          { required: true, message: "政治长官不能为空", trigger: "blur" }
+        ],
+        jobTitle: [
+          { required: true, message: "工作标题不能为空", trigger: "blur" }
+        ],
+      },
+       // 左侧树形
+      deptOptions:"",
+      //左侧时间选择
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+       // 树形配置
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 搜索时间的保存
+      timeDate: "",
     };
   },
   created() {
     this.getList();
+    this.treeselect()
   },
   methods: {
+    // 获取外面部门树形
+    treeselect() {
+      getWeiShu().then(res => {
+        this.deptOptions = res.data;
+        console.log(this.deptOptions)
+      });
+    },
+    //外面树形选择搜索
+    handleNodeClick(data) {
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
     /** 查询周工作列表 */
     getList() {
       this.loading = true;
-      listWeekjob(this.queryParams).then(response => {
+      listWeekjob(this.queryParams).then((response) => {
         this.weekjobList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -412,7 +590,7 @@ export default {
         politicalOfficerId: null,
         jobTitle: null,
         startTime: null,
-        endTime: null
+        endTime: null,
       };
       this.resetForm("form");
     },
@@ -428,9 +606,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -441,8 +619,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getWeekjob(id).then(response => {
+      const id = row.id || this.ids;
+      getWeekjob(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改周工作";
@@ -450,16 +628,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateWeekjob(this.form).then(response => {
+            updateWeekjob(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addWeekjob(this.form).then(response => {
+            addWeekjob(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -471,24 +649,306 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除周工作编号为"' + ids + '"的数据项?').then(function() {
-        return delWeekjob(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除周工作编号为"' + ids + '"的数据项?')
+        .then(function () {
+          return delWeekjob(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有周工作数据项?').then(() => {
-        this.exportLoading = true;
-        return exportWeekjob(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有周工作数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportWeekjob(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 表格样式 */
+::v-deep .el-table .el-table__header-wrapper th {
+  background-color: #004d86 !important;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid white;
+}
+/* 日历样式 */
+::v-deep .el-date-editor .el-input__inner {
+  height: 36px !important;
+  line-height: 36px;
+}
+::v-deep .datesend .el-form-item__label {
+  width: 115px !important;
+}
+/* 会议文本域样式 */
+::v-deep .el-form-item__content .el-textarea {
+  width: 660px;
+  /* height: 80px !important; */
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
+  /* width: 1000px; */
+  height: 80px !important;
+}
+::v-deep .el-dialog__body {
+  padding-left: 45px !important;
+  padding-right: 0px !important;
+  padding-bottom: 0px !important;
+}
+/* 富文本内容 */
+/* ::v-deep .editor{
+  width: 1010px;
+  color: white;
+} */
+/* 富文本 */
+::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 .ql-editor ql-blank {
+  color: #fff !important;
+}
+/* 富文本删除功能 */
+::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 .ql-toolbar {
+  display: flex;
+  justify-content: space-around;
+}
+::v-deep .el-input__inner {
+  height: 36px !important;
+  color: white;
+  background-color: #00365f !important;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-input__suffix {
+  right: 22px;
+}
+/* 基本样式 */
+/* .jiben {
+  width: 660px;
+} */
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+  line-height: 36px;
+  position: absolute;
+  right: -223px;
+  top: 2px;
+}
+::v-deep .data .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+  position: absolute;
+  right: 281px;
+}
+.app-container{
+  display: flex;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+
+.box-lfet .data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.box-lfet .data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+  line-height: 36px;
+  position: absolute;
+  right: -223px;
+  top: 2px;
+}
+::v-deep .data .el-input__inner {
+  background-color: transparent;
+  color: #fff;
+  text-align: center;
+  margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+  position: absolute;
+  right: 281px;
+}
+/* 头部样式 */
+.box-lfet .dadui {
+  height: 40px;
+  background: #003156;
+  /* border-bottom: 1px solid #718A9D ; */
+  background-image: url(../../../images/矩形底部边框.png);
+  background-repeat: no-repeat;
+  background-position: 0px 39px;
+  font-size: 16px;
+  color: #1d96ff;
+}
+.box-lfet .dadui img {
+  margin: 10px 10px 0px 10px;
+}
+
+.box-lfet .data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.box-lfet .data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+/* 划过效果 */
+::v-deep .el-tree-node__content:hover {
+  /* color: #fff; */
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+.app-container {
+  display: flex;
+}
+/* 左侧树状盒子 */
+.app-container .box-lfet {
+  width: 15%;
+  min-height: 740px;
+  /* background: #003156; */
+  /* padding: 10px; */
+  margin-right: 10px;
+  /* border: 1px solid white; */
+}
+/* 右侧内容盒子 */
+.app-container .box-right {
+  flex: 1;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.el-tree {
+  background: #003156;
+  color: #fff;
+  margin-right: 2px;
+  padding-top: 7px;
+}
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+::v-deep .el-input__suffix{
+  right: 22px;
+}
+::v-deep .el-tree-node__content{
+  height: 32px;
+}
+::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
+}
+</style>

+ 161 - 23
src/views/thought/weekjobFu/index.vue

@@ -72,7 +72,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="主表ID" prop="weekjobId">
+      <!-- <el-form-item label="主表ID" prop="weekjobId">
         <el-input
           v-model="queryParams.weekjobId"
           placeholder="请输入主表ID"
@@ -80,8 +80,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="应到" prop="shouldArrive">
+      </el-form-item> -->
+      <!-- <el-form-item label="应到" prop="shouldArrive">
         <el-input
           v-model="queryParams.shouldArrive"
           placeholder="请输入应到"
@@ -98,7 +98,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="到课率" prop="percentage">
         <el-input
           v-model="queryParams.percentage"
@@ -118,8 +118,8 @@
         />
       </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="mini" @click="resetQuery">重置</el-button>
+        <!-- <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>
 
@@ -172,38 +172,41 @@
 
     <el-table v-loading="loading" :data="weekjobFuList" @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="id" />
       <el-table-column label="星期" align="center" prop="week" />
-      <el-table-column label="时间" align="center" prop="time" width="180">
+      <el-table-column label="时间" align="center" prop="time" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="时段" align="center" prop="dateline" />
-      <el-table-column label="内容" align="center" prop="contents" />
+      <el-table-column label="内容" align="center" prop="contents" >
+      <template slot-scope="scope">
+          <span>{{ onEditor(scope.row.contents) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitId1" />
       <el-table-column label="参加人员" align="center" prop="peopleIds" />
       <el-table-column label="地点" align="center" prop="address" />
       <el-table-column label="时间段1" align="center" prop="startTime" />
       <el-table-column label="时间段2" align="center" prop="endTime" />
-      <el-table-column label="主表ID" align="center" prop="weekjobId" />
+      <!-- <el-table-column label="主表ID" align="center" prop="weekjobId" /> -->
       <el-table-column label="应到" align="center" prop="shouldArrive" />
       <el-table-column label="实到" align="center" prop="realTo" />
       <el-table-column label="到课率" align="center" prop="percentage" />
       <el-table-column label="组织人" align="center" prop="organizer" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:weekjobFu:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:weekjobFu:remove']"
           >删除</el-button>
@@ -220,8 +223,12 @@
     />
 
     <!-- 添加或修改周工作附对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog  :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <el-form-item label="星期" prop="week">
           <el-input v-model="form.week" placeholder="请输入星期" />
         </el-form-item>
@@ -233,12 +240,10 @@
             placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="时段" prop="dateline">
+        <el-form-item label="时段" prop="dateline" label-width="95px">
           <el-input v-model="form.dateline" placeholder="请输入时段" />
         </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.contents" :min-height="192"/>
-        </el-form-item>
+        
         <el-form-item label="单位" prop="unitId1">
           <el-input v-model="form.unitId1" placeholder="请输入单位" />
         </el-form-item>
@@ -254,9 +259,9 @@
         <el-form-item label="时间段2" prop="endTime">
           <el-input v-model="form.endTime" placeholder="请输入时间段2" />
         </el-form-item>
-        <el-form-item label="主表ID" prop="weekjobId">
+        <!-- <el-form-item label="主表ID" prop="weekjobId">
           <el-input v-model="form.weekjobId" placeholder="请输入主表ID" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="应到" prop="shouldArrive">
           <el-input v-model="form.shouldArrive" placeholder="请输入应到" />
         </el-form-item>
@@ -269,10 +274,26 @@
         <el-form-item label="组织人" prop="organizer">
           <el-input v-model="form.organizer" placeholder="请输入组织人" />
         </el-form-item>
+        <div class="jiben">内容</div>
+        <el-form-item >
+          <!-- <editor v-model="form.contents" :min-height="192"/> -->
+          <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.contents"
+              style="
+                height: 150px;
+                width: 950px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -335,6 +356,15 @@ export default {
     this.getList();
   },
   methods: {
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
+    },
     /** 查询周工作附列表 */
     getList() {
       this.loading = true;
@@ -446,3 +476,111 @@ export default {
   }
 };
 </script>
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+  border: 1px solid white !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+/* 表格样式 */
+::v-deep .el-table .el-table__header-wrapper th{
+  background-color: #004d86 !important;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+/* 日历样式 */
+::v-deep .el-date-editor .el-input__inner{
+  height: 36px !important;
+  line-height: 36px;
+}
+::v-deep .datesend .el-form-item__label{
+  width: 115px !important;
+}
+/* 会议文本域样式 */
+::v-deep .el-form-item__content .el-textarea{
+ width: 1010px;
+ /* height: 80px !important; */
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
+ /* width: 1000px; */
+ height: 80px !important;
+}
+::v-deep .el-dialog__body {
+    padding-left: 22px !important;
+    padding-right: 0px !important;
+    padding-bottom: 0px !important;
+}
+/* 富文本内容 */
+/* ::v-deep .editor{
+  width: 1010px;
+  color: white;
+} */
+/* 富文本 */
+::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 .ql-editor ql-blank {
+  color: #fff !important;
+}
+/* 富文本删除功能 */
+::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 .ql-toolbar{
+  display: flex;
+  justify-content: space-around;
+}
+::v-deep .el-input__inner {
+  height: 36px !important;
+  color: white;
+  background-color: #00365f !important;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+::v-deep .el-input__suffix{
+  right: 22px;
+}
+</style>