Sfoglia il codice sorgente

更改月统计计划树形去掉,更改月统计计划响应树形去掉,思想政治新增按钮添加下边距

sunyanqiang 3 anni fa
parent
commit
778d99da07

+ 1 - 1
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1804,7 +1804,7 @@ export default {
 }
 /* 右侧内容盒子 */
 .app-container .box-right {
-  flex: 1;
+  width: 85%;
 }
 .app-container .box-lfet .data {
   height: 40px;

+ 1 - 1
src/views/thought/getready/index.vue

@@ -175,7 +175,7 @@
     </el-form> -->
 
       <!-- <el-row :gutter="10" class="mb8"> -->
-      <el-col :span="1.5">
+      <el-col :span="1.5" class="mb8">
         <el-button
           type="primary"
           plain

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

@@ -1,337 +1,182 @@
 <template>
   <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="计划名称" prop="planName">
-        <el-input
-          v-model="queryParams.planName"
-          placeholder="请输入计划名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="计划开始时间" prop="planStartTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.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="queryParams.planEndTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择计划结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="计划简介" prop="planIntroduction">
-        <el-input
-          v-model="queryParams.planIntroduction"
-          placeholder="请输入计划简介"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件路径" prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createName">
-        <el-input
-          v-model="queryParams.createName"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人id" prop="createId">
-        <el-input
-          v-model="queryParams.createId"
-          placeholder="请输入创建人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="需响应计划数" prop="planNumber">
-        <el-input
-          v-model="queryParams.planNumber"
-          placeholder="请输入需响应计划数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="已响应计划数" prop="responseNumber">
-        <el-input
-          v-model="queryParams.responseNumber"
-          placeholder="请输入已响应计划数"
-          clearable
-          size="small"
-          @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-input
-          v-model="queryParams.state"
-          placeholder="请输入计划状态(0进行中,1已完成,2已审批,3已驳回)"
-          clearable
-          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="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>-->
-    <!-- <div class="box-lfet">
-      <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="20">
-      <el-col :span="4" :xs="24">
-        <div class="dadui">
-          <img src="../../../images/星星.png" alt />
-          大队
-        </div>
-        <div class="tree">
-          <el-tree
-            class="userAgrees"
-            style="height: 700px; overflow: auto"
-            :data="deptOptions"
-            :props="defaultProps"
-            @node-click="handleNodeClick"
-            default-expand-all
-            highlight-current
-            :expand-on-click-node="false"
-          ></el-tree>
-        </div>
+    <el-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:thoughtPlan:add']"
+          >新增</el-button
+        >
       </el-col>
-      <!-- <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:thoughtPlan: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:thoughtPlan:edit']"
-            >修改</el-button
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['thought:thoughtPlan: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:thoughtPlan: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:thoughtPlan:export']"
+          >导出</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <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"
+        width="120"
+      />
+      <el-table-column
+        label="计划简介"
+        align="center"
+        prop="planIntroduction"
+        width="150"
+      />
+      <el-table-column
+        label="计划开始时间"
+        align="center"
+        prop="planStartTime"
+        width="150"
+      >
+        <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="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="planNumber" />
+      <el-table-column
+        label="需响应计划数"
+        align="center"
+        prop="planNumber"
+        width="120"
+      />
+      <el-table-column
+        label="已响应计划数"
+        align="center"
+        prop="responseNumber"
+        width="120"
+      />
+      <el-table-column label="计划状态" align="center" prop="state">
+        <template slot-scope="scope">
+          <span v-if="scope.row.state == '0'" style="color: #00eaff"
+            >未响应</span
           >
-        </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:thoughtPlan:remove']"
-            >删除</el-button
+          <span v-if="scope.row.state == '1'" style="color: #13ce66"
+            >已完成</span
           >
-        </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
+          <span v-if="scope.row.state == '2'" style="color: #ffba00"
+            >已审批</span
           >
-        </el-col>
-      </el-row> -->
-      <el-col :span="20" :xs="24">
-        <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"
-            width="120"
-          />
-          <el-table-column
-            label="计划简介"
-            align="center"
-            prop="planIntroduction"
-            width="150"
-          />
-          <el-table-column
-            label="计划开始时间"
-            align="center"
-            prop="planStartTime"
-            width="150"
+          <span
+            v-if="scope.row.state == '3'"
+            style="color: #ff4949"
+            :title="scope.row.reasons"
+            >已驳回</span
           >
-            <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="150"
+          <span v-if="scope.row.state == '4'" style="color: #00eaff"
+            >进行中</span
           >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="计划个数" align="center" prop="planNumber" />
-          <el-table-column
-            label="需响应计划数"
-            align="center"
-            prop="planNumber"
-            width="120"
-          />
-          <el-table-column
-            label="已响应计划数"
-            align="center"
-            prop="responseNumber"
-            width="120"
-          />
-          <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"
-                :title="scope.row.reasons"
-                >已驳回</span
-              >
-              <span v-if="scope.row.state == '4'" style="color: #00eaff"
-                >进行中</span
-              >
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            width="120"
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="200"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.state == '1'"
+            size="btc"
+            type="text"
+            @click="handleUpdate1(scope.row)"
+            v-hasPermi="['thought:thoughtPlan:edit']"
+            >审批</el-button
           >
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            width="200"
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            fixed="right"
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['thought:thoughtPlan:edit']"
+            >查看</el-button
           >
-            <template slot-scope="scope">
-              <el-button
-                v-if="scope.row.state == '1'"
-                size="btc"
-                type="text"
-                @click="handleUpdate1(scope.row)"
-                v-hasPermi="['thought:thoughtPlan:edit']"
-                >审批</el-button
-              >
-              <el-button
-                size="btc"
-                type="text"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['thought:thoughtPlan:edit']"
-                >查看</el-button
-              >
-              <!-- <el-button
+          <!-- <el-button
               size="btc"
               type="text"
               @click="handleDelete(scope.row)"
               v-hasPermi="['thought:thoughtPlan:remove']"
               >删除</el-button
             > -->
-            </template>
-          </el-table-column>
-        </el-table>
+        </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-col>
-    </el-row>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改月教育计划对话框 -->
     <el-dialog
@@ -432,7 +277,11 @@
       >
         <div class="jiben">文档信息</div>
         <el-form-item label="计划名称" prop="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+          <el-input
+            v-model="form.planName"
+            placeholder="请输入计划名称"
+            readonly
+          />
         </el-form-item>
         <el-form-item label="计划开始时间" prop="planStartTime">
           <el-date-picker
@@ -442,6 +291,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择计划开始时间"
+            readonly
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="计划结束时间" prop="planEndTime">
@@ -452,6 +302,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择计划结束时间"
+            readonly
           ></el-date-picker>
         </el-form-item>
         <div class="jiben">计划简介</div>
@@ -460,6 +311,7 @@
             type="textarea"
             v-model="form.planIntroduction"
             placeholder="请输入计划简介"
+            readonly
           />
         </el-form-item>
         <div class="jiben">计划条数</div>
@@ -470,6 +322,7 @@
                 type="textarea"
                 v-model="item.planContent"
                 placeholder="请输入计划详情"
+                readonly
               />
             </el-form-item>
           </el-form>
@@ -481,6 +334,7 @@
               label="附件名称"
               v-model="item.fileName"
               style="width: 260px"
+              readonly
             />
             <a
               :href="item.filePath"
@@ -519,7 +373,11 @@
       >
         <div class="jiben">文档信息</div>
         <el-form-item label="计划名称" prop="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" />
+          <el-input
+            v-model="form.planName"
+            placeholder="请输入计划名称"
+            readonly
+          />
         </el-form-item>
         <el-form-item label="计划开始时间" prop="planStartTime">
           <el-date-picker
@@ -529,6 +387,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择计划开始时间"
+            readonly
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="计划结束时间" prop="planEndTime">
@@ -539,6 +398,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择计划结束时间"
+            readonly
           ></el-date-picker>
         </el-form-item>
         <div class="jiben">计划简介</div>
@@ -547,6 +407,7 @@
             type="textarea"
             v-model="form.planIntroduction"
             placeholder="请输入计划简介"
+            readonly
           />
         </el-form-item>
         <div class="jiben">计划条数</div>
@@ -557,6 +418,7 @@
                 type="textarea"
                 v-model="item.planContent"
                 placeholder="请输入计划详情"
+                readonly
               />
             </el-form-item>
           </el-form>
@@ -568,6 +430,7 @@
               label="附件名称"
               v-model="item.fileName"
               style="width: 260px"
+              readonly
             />
             <a
               :href="item.filePath"
@@ -593,7 +456,7 @@ import {
   updateResponses,
   exportResponses,
 } from "@/api/thought/responses";
-import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "responses",
@@ -676,13 +539,25 @@ export default {
           { required: true, message: "请输入驳回原因", trigger: "blur" },
         ],
       },
+      // 用户信息
+      user: {},
     };
   },
   created() {
-    this.getList();
-    this.treeselect();
+    // this.getList();
+    this.getUser();
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        console.log(response.data);
+        this.user = response.data;
+        this.unitId = response.data.deptId;
+        this.queryParams.unitId = this.unitId;
+        this.getList();
+      });
+    },
     // 审批确定提交操作
     submitForm1() {
       if (this.form.id != null) {
@@ -717,6 +592,7 @@ export default {
       const id = row.id || this.ids;
       getResponses(id).then((response) => {
         this.form = response.data;
+        this.form.reasons = null;
         this.checkShop = response.data.responseContents;
         response.data.planResponsefus.forEach((element) => {
           element.name = element.fileName;
@@ -873,34 +749,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.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>
@@ -1153,9 +1001,6 @@ export default {
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-.app-container {
-  display: flex;
-}
 /* 左侧树状盒子 */
 .app-container .box-lfet {
   width: 15%;

+ 1 - 1
src/views/thought/talk/index.vue

@@ -190,7 +190,7 @@
     </el-form> -->
       <!-- <div class="box-right"> -->
       <!-- <el-row :gutter="10" class="mb8"> -->
-      <el-col :span="1.5">
+      <el-col :span="1.5" class="mb8">
         <el-button
           type="primary"
           plain

+ 254 - 244
src/views/thought/thoughtPlan/index.vue

@@ -1,24 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
-      <el-col :span="4" :xs="24">
-        <div class="dadui">
-          <img src="../../../images/星星.png" alt />
-          大队
-        </div>
-        <div class="tree">
-          <el-tree
-            class="userAgrees"
-            style="height: 700px; overflow: auto"
-            :data="deptOptions"
-            :props="defaultProps"
-            @node-click="handleNodeClick"
-            default-expand-all
-            highlight-current
-            :expand-on-click-node="false"
-          ></el-tree>
-        </div>
-      </el-col>
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -31,199 +13,184 @@
         >
       </el-col>
       <!-- <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate4"
-            v-hasPermi="['thought:responses:edit']"
-            >修改</el-button
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate4"
+          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">
+        <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"
+        width="100"
+      />
+      <el-table-column
+        label="计划简介"
+        align="center"
+        prop="planIntroduction"
+        width="120"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="计划个数"
+        align="center"
+        prop="planIntroduction"
+        width="120"
+        show-overflow-tooltip
+      />
+      <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"
+        width="100"
+      />
+      <el-table-column
+        label="已响应计划数"
+        align="center"
+        prop="responseNumber"
+        width="100"
+      />
+
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="planStartTime"
+        width="150"
+      >
+        <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="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
           >
-        </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
+          <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
           >
-        </el-col>
-        <el-col :span="1.5">
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="260" fixed="right">
+        <template slot-scope="scope">
           <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            :loading="exportLoading"
-            @click="handleExport"
-            v-hasPermi="['thought:responses:export']"
-            >导出</el-button
+            v-if="scope.row.state == '3'"
+            size="btu"
+            type="text"
+            @click="handleUpdate3(scope.row)"
+            v-hasPermi="['thought:thoughtPlan:get']"
+            >整改</el-button
           >
-        </el-col> -->
-      <!-- </el-row> -->
-      <el-col :span="20" :xs="24">
-        <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">
-            <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"
-            width="100"
-          />
-          <el-table-column
-            label="计划简介"
-            align="center"
-            prop="planIntroduction"
-            width="120"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="计划个数"
-            align="center"
-            prop="planIntroduction"
-            width="120"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="planStartTime"
-            width="180"
+          <el-button
+            v-if="scope.row.state == '4'"
+            size="btj"
+            type="text"
+            @click="handleUpdate2(scope.row)"
+            v-hasPermi="['thought:thoughtPlan:get']"
+            >继续响应</el-button
           >
-            <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"
-            width="100"
-          />
-          <el-table-column
-            label="已响应计划数"
-            align="center"
-            prop="responseNumber"
-            width="100"
-          />
-
-          <el-table-column
-            label="开始时间"
-            align="center"
-            prop="planStartTime"
-            width="150"
+          <el-button
+            v-if="scope.row.state == '0'"
+            size="btc"
+            type="text"
+            @click="handleUpdate1(scope.row)"
+            v-hasPermi="['thought:thoughtPlan:query']"
+            >响应</el-button
           >
-            <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="150"
+          <el-button
+            v-if="scope.row.responseNumber <= 0"
+            size="btu"
+            type="text"
+            @click="handleUpdate4(scope.row)"
+            v-hasPermi="['thought:responses:edit']"
+            >修改</el-button
           >
-            <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
-            label="操作"
-            align="center"
-            width="200"
-            fixed="right"
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['thought:responses:edit']"
+            >查看</el-button
           >
-            <template slot-scope="scope">
-              <el-button
-                v-if="scope.row.state == '3'"
-                size="btu"
-                type="text"
-                @click="handleUpdate3(scope.row)"
-                v-hasPermi="['thought:thoughtPlan:get']"
-                >整改</el-button
-              >
-              <el-button
-                v-if="scope.row.state == '4'"
-                size="btj"
-                type="text"
-                @click="handleUpdate2(scope.row)"
-                v-hasPermi="['thought:thoughtPlan:get']"
-                >继续响应</el-button
-              >
-              <el-button
-                v-if="scope.row.state == '0'"
-                size="btc"
-                type="text"
-                @click="handleUpdate1(scope.row)"
-                v-hasPermi="['thought:thoughtPlan:query']"
-                >响应</el-button
-              >
-              <el-button
-                v-if="scope.row.responseNumber <= 0"
-                size="btu"
-                type="text"
-                @click="handleUpdate4(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
+          <!-- <el-button
               size="btu"
               type="text"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['thought:responses:edit']"
               >修改</el-button
             > -->
-              <!-- <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -231,20 +198,17 @@
             v-hasPermi="['thought:responses:remove']"
             >删除</el-button
           > -->
-            </template>
-          </el-table-column>
-        </el-table>
+        </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-col>
-    </el-row>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改月教育计划响应对话框 -->
     <el-dialog
@@ -252,6 +216,7 @@
       :visible.sync="open"
       width="1064px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -317,12 +282,20 @@
                 v-if="e > 0"
                 @click="delForms(e)"
               ></el-button>
-              <el-radio
+              <el-switch
+                v-model="item.isresponse"
+                active-color="#13ce66"
+                inactive-color="#ccc"
+                active-value="1"
+                :inactive-value="null"
+              >
+              </el-switch>
+              <!-- <el-radio
                 v-model="item.isresponse"
                 :label="danxuan"
                 @click.native.prevent="xuanZhong(item.isresponse, e)"
                 >响应</el-radio
-              >
+              > -->
             </el-form-item>
           </el-form>
         </div>
@@ -343,6 +316,7 @@
       :visible.sync="open1"
       width="1064px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form1"
@@ -394,12 +368,15 @@
                 placeholder="请输入计划详情"
                 autosize
               />
-              <el-radio
+              <el-switch
                 v-model="item.responseStatus"
-                label="1"
-                @change.native="xuanZhong1(item.responseStatus)"
-                >响应</el-radio
+                active-color="#13ce66"
+                inactive-color="#ccc"
+                active-value="1"
+                :inactive-value="null"
               >
+              </el-switch>
+              <!-- <el-radio v-model="item.responseStatus" label="1">响应</el-radio> -->
               <span style="color: #fff" v-if="item.isresponse == '1'"
                 >此条计划需各单位配合执行</span
               >
@@ -427,6 +404,7 @@
       :visible.sync="open4"
       width="1064px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form4"
@@ -478,7 +456,15 @@
                 placeholder="请输入计划详情"
                 autosize
               />
-              <el-radio v-model="item.responseStatus" label="1">响应</el-radio>
+              <el-switch
+                v-model="item.responseStatus"
+                active-color="#13ce66"
+                inactive-color="#ccc"
+                active-value="1"
+                :inactive-value="null"
+              >
+              </el-switch>
+              <!-- <el-radio v-model="item.responseStatus" label="1">响应</el-radio> -->
               <span style="color: #fff" v-if="item.isresponse == '1'"
                 >此条计划需各单位配合执行</span
               >
@@ -516,6 +502,7 @@
       :visible.sync="open2"
       width="1064px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form2"
@@ -567,7 +554,21 @@
                 placeholder="请输入计划详情"
                 autosize
               />
-              <el-radio v-model="item.responseStatus" label="1">响应</el-radio>
+              <el-switch
+                v-model="item.responseStatus"
+                active-color="#13ce66"
+                inactive-color="#ccc"
+                active-value="1"
+                :inactive-value="null"
+              >
+              </el-switch>
+              <span style="color: #fff" v-if="item.isresponse == '1'"
+                >此条计划需各单位配合执行</span
+              >
+              <span style="color: #fff" v-if="item.isresponse == '0'"
+                >此条计划非必要,各单位根据实际执行</span
+              >
+              <!-- <el-radio v-model="item.responseStatus" label="1">响应</el-radio> -->
             </el-form-item>
           </el-form>
         </div>
@@ -589,6 +590,7 @@
       :visible.sync="open3"
       width="1064px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form3"
@@ -648,7 +650,13 @@
                 autosize
                 readonly
               />
-              <el-radio v-model="item.isresponse" label="1">响应</el-radio>
+              <span style="color: #fff" v-if="item.isresponse == '1'"
+                >此条计划需各单位配合执行</span
+              >
+              <span style="color: #fff" v-if="item.isresponse == '0'"
+                >此条计划非必要,各单位根据实际执行</span
+              >
+              <!-- <el-radio v-model="item.isresponse" label="1">响应</el-radio> -->
             </el-form-item>
           </el-form>
         </div>
@@ -659,6 +667,7 @@
               label="附件名称"
               v-model="item.fileName"
               style="width: 260px"
+              readonly
             />
             <a
               :href="item.filePath"
@@ -689,6 +698,7 @@ import {
   getXiuGaiButton,
 } from "@/api/thought/thoughtPlan";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "Responses",
@@ -782,23 +792,37 @@ export default {
       // 整改弹出层的想显示与隐藏
       open4: false,
       rules4: {},
-      // 单选框状态
+      // 新增单选框状态
       danxuan: "1",
+      // 用户信息
+      user: {},
     };
   },
   created() {
-    this.getList();
+    // this.getList();
     this.treeselect();
+    this.getUser();
   },
   methods: {
-    // 新增单选按钮触发
-    xuanZhong(value, e) {
-      if (value == "1") {
-        this.checkShops[e].isresponse = null;
-        return;
-      }
-      this.checkShops[e].isresponse = "1";
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        console.log(response.data);
+        this.user = response.data;
+        this.unitId = response.data.deptId;
+        this.queryParams.unitId = this.unitId;
+        this.getList();
+      });
     },
+
+    // xuanZhong(value, e) {
+    //   if (value == "1") {
+    //     this.checkShops[e].isresponse = null;
+    //     return;
+    //   }
+    //   this.checkShops[e].isresponse = "1";
+    // },
+
     // 继续响应保存进度
     baocun2() {
       this.form.common = "0";
@@ -856,16 +880,6 @@ export default {
         this.open1 = true;
       });
     },
-    // 响应单选按钮触发
-    xuanZhong1(value, e) {
-      // console.log(value);
-      if (value == "1") {
-        // this.checkShop[e].responseStatus = null;
-        console.log(this.checkShop[e].responseStatus);
-        return;
-      }
-      this.checkShop[e].responseStatus = "1";
-    },
     // 响应提交按钮
     submitForm1() {
       var number = null;
@@ -903,7 +917,6 @@ export default {
       this.form.planResponsefus = this.planResponsefus;
       this.form.responseContents = this.checkShop;
       this.thoughtPlanResponses = this.form;
-      // console.log(this.form);
       xiangYing(this.thoughtPlanResponses).then((response) => {
         this.$modal.msgSuccess("响应成功");
         this.open1 = false;
@@ -1321,7 +1334,7 @@ export default {
   width: 912px;
   min-height: 80px !important;
 }
-.el-radio {
+.el-switch {
   color: #fff;
   float: right;
   margin-top: 10px;
@@ -1445,9 +1458,6 @@ export default {
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-.app-container {
-  display: flex;
-}
 /* 左侧树状盒子 */
 .app-container .box-lfet {
   width: 15%;

+ 1 - 1
src/views/thought/weekjob/index.vue

@@ -190,7 +190,7 @@
       </el-form-item>
      </el-form> -->
       <!-- <el-row :gutter="10" class="mb8"> -->
-      <el-col :span="1.5">
+      <el-col :span="1.5" class="mb8">
         <el-button
           type="primary"
           plain