Browse Source

添加月计划响应APi,完成月计划响应功能,完善导航栏大小间距不一样掉下来

sunyanqiang 3 years ago
parent
commit
bf8e4421c1

+ 19 - 1
src/api/thought/thoughtPlan.js

@@ -50,4 +50,22 @@ export function exportThoughtPlan(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 响应月教育计划
+export function xiangYing(data) {
+  return request({
+    url: '/thought/thoughtPlan/addJinDu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 继续响应月教育计划列表
+export function JXxiangYing(unitId, planId) {
+  return request({
+    url: '/thought/thoughtPlan/get',
+    method: 'get',
+    params: { unitId, planId }
+  })
+}

+ 7 - 8
src/layout/components/Navbar.vue

@@ -14,13 +14,13 @@
     />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
-    <div class="yong_hu">
-      <span style="color: ">单位 :</span>
-      <span class="span" style="padding-left: 4px">{{ danWie }}</span>
-      <span>用户名 :</span>
-      <span style="padding-left: 4px">{{ yongHu }}</span>
-    </div>
     <div class="right-menu">
+      <div class="yong_hu">
+        <span style="color: ">单位 :</span>
+        <span class="span" style="padding-left: 4px">{{ danWie }}</span>
+        <span>用户名 :</span>
+        <span style="padding-left: 4px">{{ yongHu }}</span>
+      </div>
       <template v-if="device !== 'mobile'">
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
       </template>
@@ -227,9 +227,8 @@ export default {
 }
 .yong_hu {
   display: inline-block;
-  margin-top: 14px;
+  vertical-align: top;
   font-size: 15px;
-  margin-left: 58%;
 }
 .span {
   margin-right: 26px;

+ 293 - 214
src/views/thought/parliament/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <!-- <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-select v-model="queryParams.unitName" placeholder="请选择单位名称" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select> -->
-        <!-- <treeselect
+    <!-- <treeselect
           v-model="queryParams.unitName"
           :options="userss"
           placeholder="请选择到访单位"
@@ -13,7 +13,7 @@
           @select="selectPeo"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="单位id" prop="unitId">
+    <!-- <el-form-item label="单位id" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位id"
@@ -22,7 +22,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="开始时间" prop="startTime">
+    <!-- <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.startTime"
           type="date"
@@ -38,7 +38,7 @@
           placeholder="选择结束时间">
         </el-date-picker>
       </el-form-item> -->
-      <!-- <el-form-item prop="createName">
+    <!-- <el-form-item prop="createName">
         <el-input
           v-model="queryParams.createName"
           placeholder="请输入创建人姓名"
@@ -47,7 +47,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"
@@ -56,7 +56,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item  prop="filePath">
+    <!-- <el-form-item  prop="filePath">
         <el-input
           v-model="queryParams.filePath"
           placeholder="请输入文件路径"
@@ -65,7 +65,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item  prop="fileName">
+    <!-- <el-form-item  prop="fileName">
         <el-input
           v-model="queryParams.fileName"
           placeholder="请输入文件名称"
@@ -83,7 +83,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"
@@ -92,7 +92,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item  prop="participants">
+    <!-- <el-form-item  prop="participants">
         <el-input
           v-model="queryParams.participants"
           placeholder="请输入参加人"
@@ -101,7 +101,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="参加人id" prop="participantsId">
+    <!-- <el-form-item label="参加人id" prop="participantsId">
         <el-input
           v-model="queryParams.participantsId"
           placeholder="请输入参加人id"
@@ -110,7 +110,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item  prop="organizer">
+    <!-- <el-form-item  prop="organizer">
         <el-input
           v-model="queryParams.organizer"
           placeholder="请输入组织人"
@@ -119,7 +119,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="组织人id" prop="organizerId">
+    <!-- <el-form-item label="组织人id" prop="organizerId">
         <el-input
           v-model="queryParams.organizerId"
           placeholder="请输入组织人id"
@@ -128,9 +128,9 @@
           @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-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> -->
 
@@ -143,7 +143,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['thought:parliament:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -154,7 +155,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['thought:parliament:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -165,7 +167,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['thought:parliament:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -176,66 +179,114 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['thought:parliament: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="parliamentList" @selection-change="handleSelectionChange">
+    <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="序号" 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="创建人姓名" 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">
+      <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="recorder" show-overflow-tooltip/>
+      <el-table-column
+        label="记录人"
+        align="center"
+        prop="recorder"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
-      <el-table-column label="参加人" align="center" prop="participants"  show-overflow-tooltip :formatter="unit2Format"/>
+      <el-table-column
+        label="参加人"
+        align="center"
+        prop="participants"
+        show-overflow-tooltip
+        :formatter="unit2Format"
+      />
       <!-- <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" show-overflow-tooltip/>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column
+        label="议会主题"
+        align="center"
+        prop="talkTheme"
+        show-overflow-tooltip
+      />
+      <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="btu"
             type="text"
-          
             @click="handleUpdate(scope.row)"
             v-hasPermi="['thought:parliament:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
-            
             @click="handleDelete(scope.row)"
             v-hasPermi="['thought:parliament: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"
@@ -243,37 +294,52 @@
     />
 
     <!-- 添加或修改党委议教会对话框 -->
-    <el-dialog  :title="title"
+    <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" >
+      :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="请输入内容" />
+        <div class="jiben">基本信息</div>
+        <el-form-item prop="talkTheme" label="议会主题">
+          <el-input v-model="form.talkTheme" placeholder="请输入内容" />
         </el-form-item>
-         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable size="small"
-          editable
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            editable
             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" label-width="115px">
-          <el-date-picker editable clearable size="small"
+          <el-date-picker
+            editable
+            clearable
+            size="small"
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择结束时间">
+            placeholder="选择结束时间"
+          >
           </el-date-picker>
         </el-form-item>
         <!-- <el-form-item prop="unitName" label="单位名称"> -->
@@ -295,7 +361,7 @@
         <!-- <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> -->
@@ -308,40 +374,39 @@
         <el-form-item label="文件名称" prop="fileName">
           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item> -->
-          <el-form-item label="组 织 人" prop="organizer">
+        <el-form-item label="组 织 人" prop="organizer">
           <!-- <el-input v-model="form." placeholder="请输入组织人" /> -->
-             <el-select
-             filterable
-              v-model="form.organizer"
-              ref="createName"
-              placeholder="请选择组织人"
-            >
-              <el-option
-                v-for="item in executor"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                @click.native="zuzhiPeople(item.id)"
-              />
-            </el-select>
+          <el-select
+            filterable
+            v-model="form.organizer"
+            ref="createName"
+            placeholder="请选择组织人"
+          >
+            <el-option
+              v-for="item in executor"
+              :key="item.id"
+              :label="item.name"
+              :value="item.name"
+              @click.native="zuzhiPeople(item.id)"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="记 录 人" prop="recorder">
           <!-- <el-input v-model="form.recorder" placeholder="请输入记录人" /> -->
-            <el-select
-              v-model="form.recorder"
-              ref="recorder"
-              placeholder="请选择记录人"
-              filterable
-              
-            >
-              <el-option
-                v-for="item in recodeexecutor"
-                :key="item.id"
-                :label="item.name"
-                :value="item.name"
-                 @click.native="jiluPeople(item.id)"
-              />
-            </el-select>
+          <el-select
+            v-model="form.recorder"
+            ref="recorder"
+            placeholder="请选择记录人"
+            filterable
+          >
+            <el-option
+              v-for="item in recodeexecutor"
+              :key="item.id"
+              :label="item.name"
+              :value="item.name"
+              @click.native="jiluPeople(item.id)"
+            />
+          </el-select>
         </el-form-item>
         <!-- <el-form-item label="记录人id" prop="recorderId">
           <el-input v-model="form.recorderId" placeholder="请输入记录人id" />
@@ -350,8 +415,8 @@
           <el-input v-model="form.participants" placeholder="请输入参加人" />
         </el-form-item> -->
         <el-form-item label="参 加 人" prop="participants" label-width="100px">
-            <div>
-              <!-- <el-select
+          <div>
+            <!-- <el-select
                 multiple
                 v-model="form.participants"
                 placeholder="请选择参加人"
@@ -367,14 +432,13 @@
                   @click.native="returnExecutor(item.deptId, item.nickName)"
                 />
               </el-select> -->
-              <el-select
+            <el-select
               v-model="form.participants"
               ref="participants"
               placeholder="请选择参加人"
               class="canjiaren"
               multiple
               filterable
-              
             >
               <el-option
                 v-for="item in executor"
@@ -384,37 +448,37 @@
                 @click.native="returnExecutor(item.id, item.name)"
               />
             </el-select>
-            </div>
-          </el-form-item>
+          </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="组织人id" prop="organizerId">
           <el-input v-model="form.organizerId" placeholder="请输入组织人id" />
         </el-form-item> -->
-       
+
         <div class="jiben">会议内容</div>
-        <el-form-item >
+        <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>
+            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>
+        <div class="jiben">附件</div>
+        <el-form-item>
           <FileUpload v-model="form.fileName" />
-           </el-form-item>
-           <!-- <a :href="form.filePath" download class="downloadfile">下载附件</a> -->
+        </el-form-item>
+        <!-- <a :href="form.filePath" download class="downloadfile">下载附件</a> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -425,7 +489,14 @@
 </template>
 
 <script>
-import { listParliament, getParliament, delParliament, addParliament, updateParliament, exportParliament } from "@/api/thought/parliament";
+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";
@@ -434,8 +505,8 @@ import { getDept2, getAll } from "@/api/grassrootsregistration/bdglmeeting";
 // import { getDept2, getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Parliament",
-  components:{
-    Treeselect
+  components: {
+    Treeselect,
   },
   data() {
     return {
@@ -478,72 +549,72 @@ export default {
         participantsId: null,
         organizer: null,
         organizerId: null,
-        talkTheme: null
+        talkTheme: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         talkTheme: [
-          { required: true, message: "议会主题不能为空", trigger: "blur" }
+          { required: true, message: "议会主题不能为空", trigger: "blur" },
         ],
         startTime: [
-          { required: true, message: "开始时间不能为空", trigger: "blur" }
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
         ],
         endTime: [
-          { required: true, message: "结束时间不能为空", trigger: "blur" }
+          { required: true, message: "结束时间不能为空", trigger: "blur" },
         ],
         organizer: [
-          { required: true, message: "组织人不能为空", trigger: "blur" }
+          { required: true, message: "组织人不能为空", trigger: "blur" },
         ],
         recorder: [
-          { required: true, message: "记录人不能为空", trigger: "blur" }
+          { required: true, message: "记录人不能为空", trigger: "blur" },
         ],
         participants: [
-          { required: true, message: "参加人不能为空", trigger: "blur" }
+          { required: true, message: "参加人不能为空", trigger: "blur" },
         ],
       },
       // 获取单位列表
-      users:[],
-       // 获取单位列表
-      userss:[],
-      unitName:"",
+      users: [],
+      // 获取单位列表
+      userss: [],
+      unitName: "",
       // 组织人
-      executor:[],
+      executor: [],
       // 记录人
-      recodeexecutor:[]
+      recodeexecutor: [],
     };
   },
   created() {
     this.getList();
     getDept2().then((res) => {
-        // console.log(res,2)
-        this.userss = res.data;
-        // console.log(this.userss);
-      });
-    this.getSuoYou()
+      // console.log(res,2)
+      this.userss = res.data;
+      // console.log(this.userss);
+    });
+    this.getSuoYou();
   },
   methods: {
     // 获取执行人
-    unit2Format(row){
-      var deptName=""
+    unit2Format(row) {
+      var deptName = "";
       this.recodeexecutor.map((item) => {
         // console.log(row.talkPeople)
-          row.participants.split(",").forEach((items, index) => {
-            // console.log(item.id,item.name)
-            if (item.id == items) {
-              deptName += item.name + "  ";
-            }
-          });
+        row.participants.split(",").forEach((items, index) => {
+          // console.log(item.id,item.name)
+          if (item.id == items) {
+            deptName += item.name + "  ";
+          }
         });
-        return deptName
+      });
+      return deptName;
     },
-    zuzhiPeople(id){
+    zuzhiPeople(id) {
       // console.log(id)
-      this.form.organizerId=id
+      this.form.organizerId = id;
     },
-    jiluPeople(id){
-      this.form.recorderId=id
+    jiluPeople(id) {
+      this.form.recorderId = id;
       // console.log(id)
     },
     // 获取所有人员
@@ -551,9 +622,9 @@ export default {
       getAll().then((response) => {
         this.executors = response.rows;
         // 添加的人员
-        this.executor=response.rows
+        this.executor = response.rows;
         // 记录人
-        this.recodeexecutor=response.rows
+        this.recodeexecutor = response.rows;
         // console.log(this.executors);
       });
     },
@@ -566,16 +637,16 @@ export default {
         return str;
       }
     },
-    selectPeo(val){
+    selectPeo(val) {
       // console.log(val)
       this.queryParams.unitName = val.label;
-      this.getList()
+      this.getList();
     },
     // 到访单位选中触发
     selectPeo1(val) {
       // console.log(val)
-      this.unitName=val.label
-      this.form.unitId=val.id
+      this.unitName = val.label;
+      this.form.unitId = val.id;
       // console.log(this.unitName)
       // 获取执行单位列表
       // getDept2().then((res) => {
@@ -593,7 +664,7 @@ export default {
     /** 查询党委议教会列表 */
     getList() {
       this.loading = true;
-      listParliament(this.queryParams).then(response => {
+      listParliament(this.queryParams).then((response) => {
         this.parliamentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -625,7 +696,7 @@ export default {
         participantsId: null,
         organizer: null,
         organizerId: null,
-        talkTheme: null
+        talkTheme: null,
       };
       this.resetForm("form");
     },
@@ -636,23 +707,23 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams={}
+      this.queryParams = {};
       this.resetForm("queryForm");
       this.handleQuery();
-      this.getList()
+      this.getList();
     },
     // 多选框选中数据
     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() {
       this.reset();
       this.open = true;
       this.title = "添加党委议教会";
-       getDept2().then((res) => {
+      getDept2().then((res) => {
         // console.log(res,2)
         this.users = res.data;
         // console.log(this.users);
@@ -661,36 +732,36 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getParliament(id).then(response => {
+      const id = row.id || this.ids;
+      getParliament(id).then((response) => {
         this.form = response.data;
-         this.form.participants = this.form.participants.split(",").map(Number);
+        this.form.participants = this.form.participants.split(",").map(Number);
         this.open = true;
         this.title = "修改党委议教会";
       });
     },
     /** 提交按钮 */
     submitForm() {
-       if(this.form.fileName){
-      this.form.filePath=this.form.fileName[0].url
-      this.form.fileName=this.form.fileName[0].name
+      if (this.form.fileName) {
+        this.form.filePath = this.form.fileName[0].url;
+        this.form.fileName = this.form.fileName[0].name;
       }
-     
+
       // console.log(this.form)
       this.form.participants = this.form.participants.join(",");
       this.form.participantsId = this.form.participants;
       // console.log(this.form)
-      this.form.unitName=this.unitName
-      this.$refs["form"].validate(valid => {
+      this.form.unitName = this.unitName;
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateParliament(this.form).then(response => {
+            updateParliament(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addParliament(this.form).then(response => {
+            addParliament(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -702,62 +773,70 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除?').then(function() {
-        return delParliament(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("是否确认删除?")
+        .then(function () {
+          return delParliament(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有党委议教会数据项?').then(() => {
-        this.exportLoading = true;
-        return exportParliament(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有党委议教会数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportParliament(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
 <style scoped>
 /* 下载文件的样式 */
-.downloadfile{
+.downloadfile {
   display: inline-block;
   width: 60px;
   height: 30px;
   border: 1px solid white;
 }
-::v-deep .el-pagination__sizes .el-input__suffix{
+::v-deep .el-pagination__sizes .el-input__suffix {
   right: 6px;
 }
-::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus {
   outline: none !important;
 }
-::v-deep .ql-snow .ql-picker:focus{
-   outline: none !important;
+::v-deep .ql-snow .ql-picker:focus {
+  outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus {
   outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+::v-deep .ql-toolbar.ql-snow .ql-picker-label {
   border: none !important;
 }
-::v-deep .ql-formats:focus{
+::v-deep .ql-formats:focus {
   outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
   border-color: none !important;
   color: black !important;
 }
 /* normal */
-::v-deep .ql-active{
- outline: none !important;
+::v-deep .ql-active {
+  outline: none !important;
 }
-::v-deep .canjiaren .el-input__inner{
+::v-deep .canjiaren .el-input__inner {
   width: 560px !important;
 }
 ::v-deep .el-dialog {
@@ -775,7 +854,7 @@ export default {
   border: 1px solid white !important;
 }
 /* 表格样式 */
-::v-deep .el-table .el-table__header-wrapper th{
+::v-deep .el-table .el-table__header-wrapper th {
   background-color: #004d86 !important;
   color: white;
 }
@@ -785,30 +864,30 @@ export default {
   /* border-bottom: 1px solid white; */
 }
 /* 标题下划线 */
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
   border-bottom: 1px solid white;
 }
 /* 日历样式 */
-::v-deep .el-date-editor .el-input__inner{
+::v-deep .el-date-editor .el-input__inner {
   height: 36px !important;
   line-height: 36px;
 }
-::v-deep .datesend .el-form-item__label{
+::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 {
+  width: 1010px;
+  /* height: 80px !important; */
 }
-::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
- /* width: 1000px; */
- 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;
+  padding-left: 35px !important;
+  padding-right: 0px !important;
+  padding-bottom: 0px !important;
 }
 /* 富文本内容 */
 /* ::v-deep .editor{
@@ -829,14 +908,14 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
-::v-deep .ql-snow .ql-picker-label{
+::v-deep .ql-snow .ql-picker-label {
   position: absolute;
   bottom: 5px;
 }
-::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
   margin-top: -2px;
 }
-::v-deep .ql-toolbar.ql-snow{
+::v-deep .ql-toolbar.ql-snow {
   display: flex;
   justify-content: space-around;
 }
@@ -872,7 +951,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-::v-deep .el-input__suffix{
+::v-deep .el-input__suffix {
   right: 22px;
 }
 /* 树形样式 */
@@ -887,11 +966,11 @@ export default {
   margin-right: 22px;
   /* color: white; */
 }
-::v-deep .vue-treeselect__single-value{
+::v-deep .vue-treeselect__single-value {
   color: white;
 }
 /* 所搜到访单位 */
-::v-deep .waibudaofang .vue-treeselect__control{
+::v-deep .waibudaofang .vue-treeselect__control {
   background-color: #00365f !important;
 }
 /* 计划附件 */
@@ -903,8 +982,8 @@ export default {
   left: 90px;
   color: white;
 }
-::v-deep .el-link.el-link--default{
-  color: white ;
+::v-deep .el-link.el-link--default {
+  color: white;
   text-indent: 0.5em;
 }
 </style>

+ 458 - 198
src/views/thought/responses/index.vue

@@ -89,10 +89,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审批状态" prop="state">
+      <el-form-item label="单位id" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划状态(0进行中,1已完成,2已审批,3已驳回)" prop="state">
         <el-input
           v-model="queryParams.state"
-          placeholder="请输入审批状态"
+          placeholder="请输入计划状态(0进行中,1已完成,2已审批,3已驳回)"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -102,155 +111,193 @@
         <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-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['thought:responses:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['thought:responses:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['thought:responses:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['thought:responses:export']"
-          >导出</el-button
-        >
-      </el-col>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="responsesList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" />
-      <el-table-column label="计划名称" align="center" prop="planName" />
-      <el-table-column
-        label="计划简介"
-        align="center"
-        prop="planIntroduction"
-      />
-      <el-table-column
-        label="计划个数"
-        align="center"
-        prop="planIntroduction"
-      />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="planStartTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="需响应计划数" align="center" prop="planNumber" />
-      <el-table-column
-        label="已响应计划数"
-        align="center"
-        prop="responseNumber"
-      />
-      <el-table-column
-        label="开始时间"
-        align="center"
-        prop="planStartTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="结束时间"
-        align="center"
-        prop="planEndTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
-      <!-- <el-table-column label="文件名称" align="center" prop="fileName" /> -->
-      <!-- <el-table-column label="创建人" align="center" prop="createName" /> -->
-      <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
-      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
-
-      <el-table-column label="审批状态" align="center" prop="state" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
+    </el-form>-->
+    <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-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
             size="mini"
-            type="text"
+            @click="handleAdd"
+            v-hasPermi="['thought:thoughtPlan:add']"
+            >新增</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['thought:responses:edit']"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['thought:thoughtPlan:edit']"
             >修改</el-button
           >
+        </el-col>
+        <el-col :span="1.5">
           <el-button
-            size="mini"
-            type="text"
+            type="danger"
+            plain
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['thought:responses:remove']"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['thought:thoughtPlan:remove']"
             >删除</el-button
           >
-        </template>
-      </el-table-column>
-    </el-table>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            :loading="exportLoading"
+            @click="handleExport"
+            v-hasPermi="['thought:thoughtPlan:export']"
+            >导出</el-button
+          >
+        </el-col>
+        <!-- <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar> -->
+      </el-row>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table
+        v-loading="loading"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
+        :data="thoughtPlanList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" />
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="计划名称" align="center" prop="planName" />
+        <el-table-column
+          label="计划简介"
+          align="center"
+          prop="planIntroduction"
+        />
+        <el-table-column
+          label="计划开始时间"
+          align="center"
+          prop="planStartTime"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="计划结束时间"
+          align="center"
+          prop="planEndTime"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+
+        <!-- <el-table-column label="文件路径" align="center" prop="filePath" />
+      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="创建人" align="center" prop="createName" />
+      <el-table-column label="创建人id" align="center" prop="createId" />
+        <el-table-column label="备注" align="center" prop="remark" />-->
+        <el-table-column label="计划个数" align="center" prop="planNumber" />
+        <el-table-column
+          label="需响应计划数"
+          align="center"
+          prop="planNumber"
+        />
+        <el-table-column
+          label="已响应计划数"
+          align="center"
+          prop="responseNumber"
+        />
+        <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
+        <!-- <el-table-column label="计划状态(0进行中,1已完成,2已审批,3已驳回)" align="center" prop="state" /> -->
+        <el-table-column label="计划状态" align="center" prop="state" />
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['thought:thoughtPlan:edit']"
+              >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['thought:thoughtPlan:remove']"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <!-- 添加或修改月教育计划响应对话框 -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+    <!-- 添加或修改月教育计划对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -297,16 +344,14 @@
         </el-form-item>
         <div class="jiben">计划条数</div>
         <div class="jiHua">
-          <el-form v-for="(item, e) in checkShop" :key="e">
+          <el-form v-for="(item1, e) in checkShop" :key="e">
             <el-form-item prop="remark">
               <el-input
                 type="textarea"
-                v-model="item.planContent"
+                v-model="form.planIntroduction"
                 placeholder="请输入计划详情"
               />
-              <el-radio v-model="item.responseStatus" label="1"
-                >是否需要响应</el-radio
-              >
+              <el-radio v-model="radio" label="1">是否需要响应</el-radio>
               <el-button
                 type="primary"
                 icon="el-icon-plus"
@@ -338,6 +383,14 @@
 </template>
 
 <script>
+// import {
+//   listThoughtPlan,
+//   getThoughtPlan,
+//   delThoughtPlan,
+//   addThoughtPlan,
+//   updateThoughtPlan,
+//   exportThoughtPlan,
+// } from "@/api/thought/thoughtPlan";
 import {
   listResponses,
   getResponses,
@@ -346,13 +399,15 @@ import {
   updateResponses,
   exportResponses,
 } from "@/api/thought/responses";
+import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
-  name: "Responses",
+  name: "ThoughtPlan",
   data() {
     return {
       // 遮罩层
       loading: true,
+      tiem: null,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -365,8 +420,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 月教育计划响应表格数据
-      responsesList: [],
+      // 月教育计划表格数据
+      thoughtPlanList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -385,31 +440,43 @@ export default {
         createId: null,
         planNumber: null,
         responseNumber: null,
+        unitId: null,
         state: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      //添加计划条数表格为空
-      checkShop: [
-        {
-          planContent: null,
-          responseStatus: null,
+      // 左侧树形
+      deptOptions: "",
+      //左侧时间选择
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
         },
-      ],
-      radio: "",
+      },
+      // 树形配置
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 搜索时间的保存
+      timeDate: "",
     };
   },
   created() {
     this.getList();
+    this.treeselect();
   },
   methods: {
     // 增加对话框
     addForms() {
       this.checkShop.push({
-        planContent: null,
-        responseStatus: null,
+        peopleName: null,
+        foremanName: null,
+        sentryName: null,
+        examineDate: null,
+        dialogue: null,
       });
     },
 
@@ -417,11 +484,11 @@ export default {
     delForms(i) {
       this.checkShop.splice(i, 1);
     },
-    /** 查询月教育计划响应列表 */
+    /** 查询月教育计划列表 */
     getList() {
       this.loading = true;
       listResponses(this.queryParams).then((response) => {
-        this.responsesList = response.rows;
+        this.thoughtPlanList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -448,6 +515,7 @@ export default {
         remark: null,
         planNumber: null,
         responseNumber: null,
+        unitId: null,
         state: null,
       };
       this.resetForm("form");
@@ -472,7 +540,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加月教育计划响应";
+      this.title = "添加月教育计划";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -481,7 +549,7 @@ export default {
       getResponses(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改月教育计划响应";
+        this.title = "修改月教育计划";
       });
     },
     /** 提交按钮 */
@@ -495,13 +563,11 @@ export default {
               this.getList();
             });
           } else {
-            this.form.planFus = this.checkShop;
-            console.log(this.form);
-            // addResponses(this.form).then((response) => {
-            //   this.$modal.msgSuccess("新增成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
+            addResponses(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
       });
@@ -510,7 +576,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除月教育计划响应编号为"' + ids + '"的数据项?')
+        .confirm('是否确认删除月教育计划编号为"' + ids + '"的数据项?')
         .then(function () {
           return delResponses(ids);
         })
@@ -524,7 +590,7 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal
-        .confirm("是否确认导出所有月教育计划响应数据项?")
+        .confirm("是否确认导出所有月教育计划数据项?")
         .then(() => {
           this.exportLoading = true;
           return exportResponses(queryParams);
@@ -535,10 +601,39 @@ export default {
         })
         .catch(() => {});
     },
+    // 获取部门数据
+    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();
+    },
   },
 };
 </script>
-</script>
 <style scoped>
 ::v-deep .el-pagination__sizes .el-input__suffix {
   right: 6px;
@@ -566,12 +661,6 @@ export default {
 ::v-deep .ql-active {
   outline: none !important;
 }
-::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;
@@ -612,10 +701,11 @@ export default {
 }
 ::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
   /* width: 1000px; */
+  width: 892px;
   height: 80px !important;
 }
 ::v-deep .el-dialog__body {
-  padding-left: 35px !important;
+  padding-left: 27px !important;
   padding-right: 0px !important;
   padding-bottom: 0px !important;
 }
@@ -670,6 +760,7 @@ export default {
 .ql-toolbar.ql-snow .ql-formats {
   margin-right: 7px !important;
 }
+
 ::v-deep .el-input__inner {
   height: 36px !important;
   color: white;
@@ -681,27 +772,171 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+::v-deep .data .el-date-editor.el-input {
+  width: 100%;
+  border: none !important;
+}
+::v-deep .data .el-input__inner {
+  width: 100% !important;
+  border: none !important;
+}
+::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 !important;
+  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 .vue-treeselect__control {
-  background-color: #004d86;
-  width: 216px;
-  margin-right: 25px;
-  color: white;
-}
-.threeselects {
-  width: 216px;
-  margin-right: 22px;
-  /* color: white; */
+::v-deep .el-tree-node__content {
+  height: 32px;
 }
-::v-deep .vue-treeselect__single-value {
-  color: white;
+::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 .waibudaofang .vue-treeselect__control {
-  background-color: #00365f !important;
+::v-deep .canjiaren .el-input__inner {
+  width: 560px;
 }
 /* 计划附件 */
 ::v-deep .el-upload__tip {
@@ -716,10 +951,35 @@ export default {
   color: white;
   text-indent: 0.5em;
 }
-::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
-  /* width: 1000px; */
-  width: 892px;
-  height: 80px !important;
+/* ::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;
+}  */
+/* 计划条数 */
+div.jiHua
+  div.el-form-item
+  div.el-form-item__content
+  div.el-input--medium
+  .el-textarea__inner {
+  width: 600px !important;
 }
 .el-radio {
   color: #fff;

+ 477 - 172
src/views/thought/thoughtPlan/index.vue

@@ -89,19 +89,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位id" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="计划状态(0进行中,1已完成,2已审批,3已驳回)" prop="state">
+      <el-form-item label="审批状态" prop="state">
         <el-input
           v-model="queryParams.state"
-          placeholder="请输入计划状态(0进行中,1已完成,2已审批,3已驳回)"
+          placeholder="请输入审批状态"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -111,7 +102,7 @@
         <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> -->
     <div class="box-lfet">
       <div class="data">
         <p>单位</p>
@@ -151,7 +142,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['thought:thoughtPlan:add']"
+            v-hasPermi="['thought:responses:add']"
             >新增</el-button
           >
         </el-col>
@@ -163,7 +154,7 @@
             size="mini"
             :disabled="single"
             @click="handleUpdate"
-            v-hasPermi="['thought:thoughtPlan:edit']"
+            v-hasPermi="['thought:responses:edit']"
             >修改</el-button
           >
         </el-col>
@@ -175,7 +166,7 @@
             size="mini"
             :disabled="multiple"
             @click="handleDelete"
-            v-hasPermi="['thought:thoughtPlan:remove']"
+            v-hasPermi="['thought:responses:remove']"
             >删除</el-button
           >
         </el-col>
@@ -187,25 +178,28 @@
             size="mini"
             :loading="exportLoading"
             @click="handleExport"
-            v-hasPermi="['thought:thoughtPlan:export']"
+            v-hasPermi="['thought:responses:export']"
             >导出</el-button
           >
         </el-col>
-        <!-- <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar> -->
       </el-row>
 
       <el-table
         v-loading="loading"
-        :header-cell-style="{ background: '#003C69', color: 'white' }"
-        :data="thoughtPlanList"
+        :data="responsesList"
         @selection-change="handleSelectionChange"
+        :header-cell-style="{ background: '#003C69', color: 'white' }"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" type="index" />
-        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="序号" align="center">
+          <template scope="scope">
+            <span>{{
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="计划名称" align="center" prop="planName" />
         <el-table-column
           label="计划简介"
@@ -213,32 +207,20 @@
           prop="planIntroduction"
         />
         <el-table-column
-          label="计划开始时间"
+          label="计划个数"
           align="center"
-          prop="planStartTime"
-          width="180"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
+          prop="planIntroduction"
+        />
         <el-table-column
-          label="计划结束时间"
+          label="创建时间"
           align="center"
-          prop="planEndTime"
+          prop="planStartTime"
           width="180"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
+            <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-
-        <!-- <el-table-column label="文件路径" align="center" prop="filePath" />
-      <el-table-column label="文件名称" align="center" prop="fileName" />
-      <el-table-column label="创建人" align="center" prop="createName" />
-      <el-table-column label="创建人id" align="center" prop="createId" />
-        <el-table-column label="备注" align="center" prop="remark" />-->
-        <el-table-column label="计划个数" align="center" prop="planNumber" />
         <el-table-column
           label="需响应计划数"
           align="center"
@@ -249,41 +231,91 @@
           align="center"
           prop="responseNumber"
         />
-        <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
-        <!-- <el-table-column label="计划状态(0进行中,1已完成,2已审批,3已驳回)" align="center" prop="state" /> -->
-        <el-table-column label="计划状态" align="center" prop="state" />
         <el-table-column
-          label="创建时间"
+          label="开始时间"
           align="center"
-          prop="createTime"
-          width="180"
+          prop="planStartTime"
+          width="150"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+            <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column
+          label="结束时间"
+          align="center"
+          prop="planEndTime"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="state">
+          <template slot-scope="scope">
+            <span v-if="scope.row.state == '0'" style="color: #00eaff"
+              >未响应</span
+            >
+            <span v-if="scope.row.state == '1'" style="color: #13ce66"
+              >已完成</span
+            >
+            <span v-if="scope.row.state == '2'" style="color: #ffba00"
+              >已审批</span
+            >
+            <span v-if="scope.row.state == '3'" style="color: #ff4949"
+              >已驳回</span
+            >
+            <span v-if="scope.row.state == '4'" style="color: #00eaff"
+              >进行中</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
+          width="200"
         >
           <template slot-scope="scope">
             <el-button
-              size="mini"
+              v-if="scope.row.state == '4'"
+              size="btu"
               type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['thought:thoughtPlan:edit']"
-              >修改</el-button
+              @click="handleUpdate2(scope.row)"
+              v-hasPermi="['thought:responses:edit']"
+              >继续响应</el-button
             >
             <el-button
-              size="mini"
+              v-if="scope.row.state == '0'"
+              size="btc"
               type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['thought:thoughtPlan:remove']"
-              >删除</el-button
+              @click="handleUpdate1(scope.row)"
+              v-hasPermi="['thought:responses:edit']"
+              >响应</el-button
             >
+            <el-button
+              size="btc"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['thought:responses:edit']"
+              >查看</el-button
+            >
+            <!-- <el-button
+              size="btu"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['thought:responses:edit']"
+              >修改</el-button
+            > -->
+            <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['thought:responses:remove']"
+            >删除</el-button
+          > -->
           </template>
         </el-table-column>
       </el-table>
@@ -297,7 +329,7 @@
       />
     </div>
 
-    <!-- 添加或修改月教育计划对话框 -->
+    <!-- 添加或修改月教育计划响应对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -344,14 +376,13 @@
         </el-form-item>
         <div class="jiben">计划条数</div>
         <div class="jiHua">
-          <el-form v-for="(item1, e) in checkShop" :key="e">
+          <el-form v-for="(item, e) in checkShop" :key="e">
             <el-form-item prop="remark">
               <el-input
                 type="textarea"
-                v-model="form.planIntroduction"
+                v-model="item.planContent"
                 placeholder="请输入计划详情"
               />
-              <el-radio v-model="radio" label="1">是否需要响应</el-radio>
               <el-button
                 type="primary"
                 icon="el-icon-plus"
@@ -371,12 +402,216 @@
         </div>
         <div class="jiben">文件</div>
         <el-form-item>
-          <FileUpload v-model="form.fileName" />
+          <FileUpload v-model="planResponsefus" />
+          <!-- <el-upload
+            class="upload-demo"
+            action="/responses"
+            multiple
+            :limit="3"
+            :on-preview="handlePreview"
+          >
+            <el-button size="small" type="primary">上传文件</el-button>
+            <div slot="tip" class="el-upload__tip">
+              只能上传jpg/png文件,且不超过500kb
+            </div>
+          </el-upload> -->
         </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>
+
+    <!-- 响应月教育计划响应对话框 -->
+    <el-dialog
+      title="响应月教育计划"
+      :visible.sync="open1"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        ref="form1"
+        :model="form"
+        :rules="rules1"
+        :inline="true"
+        label-width="100px"
+      >
+        <div class="jiben">文档信息</div>
+        <el-form-item label="计划名称" prop="planName">
+          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+        </el-form-item>
+        <el-form-item label="计划开始时间" prop="planStartTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.planStartTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择计划开始时间"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划结束时间" prop="planEndTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.planEndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择计划结束时间"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划简介" prop="planIntroduction">
+          <el-input
+            type="textarea"
+            v-model="form.planIntroduction"
+            placeholder="请输入计划简介"
+          />
+        </el-form-item>
+        <div class="jiben">计划条数</div>
+        <div class="jiHua">
+          <el-form v-for="(item, e) in checkShop" :key="e">
+            <el-form-item prop="remark">
+              <el-input
+                type="textarea"
+                v-model="item.planContent"
+                placeholder="请输入计划详情"
+              />
+              <el-radio v-model="item.responseStatus" label="1">响应</el-radio>
+              <!-- <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="addForms"
+                v-if="e == checkShop.length - 1"
+              ></el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-delete"
+                size="mini"
+                v-if="e > 0"
+                @click="delForms(e)"
+              ></el-button> -->
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="jiben">文件</div>
+        <el-form-item>
+          <FileUpload v-model="planResponsefus" />
+          <!-- <el-upload
+            class="upload-demo"
+            action="/responses"
+            multiple
+            :limit="3"
+            :on-preview="handlePreview"
+          >
+            <el-button size="small" type="primary">上传文件</el-button>
+            <div slot="tip" class="el-upload__tip">
+              只能上传jpg/png文件,且不超过500kb
+            </div>
+          </el-upload> -->
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="baocun1">保存进度</el-button>
+        <el-button type="primary" @click="submitForm1">响应</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 继续响应月教育计划响应对话框 -->
+    <el-dialog
+      title="响应月教育计划"
+      :visible.sync="open2"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        ref="form2"
+        :model="form"
+        :rules="rules2"
+        :inline="true"
+        label-width="100px"
+      >
+        <div class="jiben">文档信息</div>
+        <el-form-item label="计划名称" prop="planName">
+          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+        </el-form-item>
+        <el-form-item label="计划开始时间" prop="planStartTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.planStartTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择计划开始时间"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划结束时间" prop="planEndTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.planEndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择计划结束时间"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划简介" prop="planIntroduction">
+          <el-input
+            type="textarea"
+            v-model="form.planIntroduction"
+            placeholder="请输入计划简介"
+          />
+        </el-form-item>
+        <div class="jiben">计划条数</div>
+        <div class="jiHua">
+          <el-form v-for="(item, e) in checkShop" :key="e">
+            <el-form-item prop="remark">
+              <el-input
+                type="textarea"
+                v-model="item.planContent"
+                placeholder="请输入计划详情"
+              />
+              <el-radio v-model="item.responseStatus" label="1">响应</el-radio>
+              <!-- <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click="addForms"
+                v-if="e == checkShop.length - 1"
+              ></el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-delete"
+                size="mini"
+                v-if="e > 0"
+                @click="delForms(e)"
+              ></el-button> -->
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="jiben">文件</div>
+        <el-form-item>
+          <FileUpload v-model="planResponsefus" />
+          <!-- <el-upload
+            class="upload-demo"
+            action="/responses"
+            multiple
+            :limit="3"
+            :on-preview="handlePreview"
+          >
+            <el-button size="small" type="primary">上传文件</el-button>
+            <div slot="tip" class="el-upload__tip">
+              只能上传jpg/png文件,且不超过500kb
+            </div>
+          </el-upload> -->
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="baocun1">保存进度</el-button>
+        <el-button type="primary" @click="submitForm1">响应</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -390,11 +625,13 @@ import {
   addThoughtPlan,
   updateThoughtPlan,
   exportThoughtPlan,
+  xiangYing,
+  JXxiangYing,
 } from "@/api/thought/thoughtPlan";
 import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
-  name: "ThoughtPlan",
+  name: "Responses",
   data() {
     return {
       // 遮罩层
@@ -412,8 +649,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 月教育计划表格数据
-      thoughtPlanList: [],
+      // 月教育计划响应表格数据
+      responsesList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -439,6 +676,15 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      //添加计划条数表格为空
+      checkShop: [
+        {
+          planContent: null,
+          responseStatus: null,
+        },
+      ],
+      // 上传文件
+      planResponsefus: [],
       // 左侧树形
       deptOptions: "",
       //左侧时间选择
@@ -454,17 +700,15 @@ export default {
       },
       // 搜索时间的保存
       timeDate: "",
-      radio: null,
-      //添加计划条数表格为空
-      checkShop: [
-        {
-          peopleName: null,
-          foremanName: null,
-          sentryName: null,
-          examineDate: null,
-          dialogue: null,
-        },
-      ],
+      // 响应弹出层的显示与隐藏
+      open1: false,
+      rules1: {},
+      thoughtPlanResponses: {},
+      unitId: null,
+      // 继续响应
+      JiXuXY: null,
+      open2: false,
+      rules2: {},
     };
   },
   created() {
@@ -472,14 +716,80 @@ export default {
     this.treeselect();
   },
   methods: {
+    // 继续响应
+    handleUpdate2(row) {
+      // console.log(row);
+      this.JiXuXY = row.id;
+      JXxiangYing(this.unitId, this.JiXuXY).then((res) => {
+        console.log(res);
+        this.form = res.data;
+        this.open2 = true;
+      });
+    },
+    // 保存进度提交按钮
+    baocun1() {
+      this.form.common = "0";
+      this.form.planId = this.form.id;
+      this.form.unitId = this.unitId;
+      this.form.planResponsefus = this.planResponsefus;
+      this.form.responseContents = this.checkShop;
+      this.thoughtPlanResponses = this.form;
+      xiangYing(this.thoughtPlanResponses).then((response) => {
+        this.$modal.msgSuccess("响应成功");
+        this.open1 = false;
+        this.getList();
+      });
+    },
+    // 响应按钮
+    handleUpdate1(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getThoughtPlan(id).then((response) => {
+        this.form = response.data;
+        this.checkShop = response.data.planFus;
+        this.open1 = true;
+      });
+    },
+    // 响应提交按钮
+    submitForm1() {
+      if (this.checkShop.every((item) => item.responseStatus)) {
+        this.form.common = "1";
+        this.form.planId = this.form.id;
+        this.form.unitId = this.unitId;
+        this.form.responseContents = this.checkShop;
+        this.form.planResponsefus = this.planResponsefus;
+        this.thoughtPlanResponses = this.form;
+        xiangYing(this.thoughtPlanResponses).then((response) => {
+          this.$modal.msgSuccess("响应成功");
+          this.open1 = false;
+          this.getList();
+        });
+      }
+    },
+    // 搜索时间触发
+    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.unitId = data.id;
+      this.getList();
+    },
     // 增加对话框
     addForms() {
       this.checkShop.push({
-        peopleName: null,
-        foremanName: null,
-        sentryName: null,
-        examineDate: null,
-        dialogue: null,
+        planContent: null,
+        responseStatus: null,
       });
     },
 
@@ -487,11 +797,11 @@ export default {
     delForms(i) {
       this.checkShop.splice(i, 1);
     },
-    /** 查询月教育计划列表 */
+    /** 查询月教育计划响应列表 */
     getList() {
       this.loading = true;
       listThoughtPlan(this.queryParams).then((response) => {
-        this.thoughtPlanList = response.rows;
+        this.responsesList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -499,6 +809,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open1 = false;
       this.reset();
     },
     // 表单重置
@@ -518,10 +829,16 @@ export default {
         remark: null,
         planNumber: null,
         responseNumber: null,
-        unitId: null,
         state: null,
       };
-      this.resetForm("form");
+      (this.checkShop = [
+        {
+          planContent: null,
+          responseStatus: null,
+        },
+      ]),
+        (this.planResponsefus = []),
+        this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -543,7 +860,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加月教育计划";
+      this.title = "添加月教育计划响应";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -551,8 +868,14 @@ export default {
       const id = row.id || this.ids;
       getThoughtPlan(id).then((response) => {
         this.form = response.data;
+        this.checkShop = response.data.planFus;
+        response.data.planFujians.forEach((element) => {
+          element.name = element.fileName;
+          element.url = element.filePath;
+        });
+        this.planResponsefus = response.data.planFujians;
         this.open = true;
-        this.title = "修改月教育计划";
+        this.title = "修改月教育计划响应";
       });
     },
     /** 提交按钮 */
@@ -560,12 +883,16 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.planFus = this.checkShop;
+            this.form.planFujians = this.planResponsefus;
             updateThoughtPlan(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            this.form.planFus = this.checkShop;
+            this.form.planFujians = this.planResponsefus;
             addThoughtPlan(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -579,7 +906,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除月教育计划编号为"' + ids + '"的数据项?')
+        .confirm("是否确认删除月教育计划响应的数据项?")
         .then(function () {
           return delThoughtPlan(ids);
         })
@@ -593,7 +920,7 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal
-        .confirm("是否确认导出所有月教育计划数据项?")
+        .confirm("是否确认导出所有月教育计划响应数据项?")
         .then(() => {
           this.exportLoading = true;
           return exportThoughtPlan(queryParams);
@@ -604,36 +931,6 @@ export default {
         })
         .catch(() => {});
     },
-    // 获取部门数据
-    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();
-    },
   },
 };
 </script>
@@ -664,6 +961,12 @@ export default {
 ::v-deep .ql-active {
   outline: none !important;
 }
+::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;
@@ -704,11 +1007,10 @@ export default {
 }
 ::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
   /* width: 1000px; */
-  width: 892px;
   height: 80px !important;
 }
 ::v-deep .el-dialog__body {
-  padding-left: 27px !important;
+  padding-left: 35px !important;
   padding-right: 0px !important;
   padding-bottom: 0px !important;
 }
@@ -763,12 +1065,62 @@ export default {
 .ql-toolbar.ql-snow .ql-formats {
   margin-right: 7px !important;
 }
-
 ::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;
+}
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
+  /* width: 1000px; */
+  width: 892px;
+  height: 80px !important;
+}
+.el-radio {
+  color: #fff;
+  top: -22px;
+}
+
 /* 文字多余部分省略 */
 ::v-deep .el-table__cell .cell {
   overflow: hidden;
@@ -941,51 +1293,4 @@ export default {
 ::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;
-}  */
-/* 计划条数 */
-div.jiHua
-  div.el-form-item
-  div.el-form-item__content
-  div.el-input--medium
-  .el-textarea__inner {
-  width: 600px !important;
-}
-.el-radio {
-  color: #fff;
-  top: -22px;
-}
 </style>