修复一周工作安排tiem报错，更改导航栏显示用户名跟单位

src/layout/components/Navbar.vue

@@ -15,8 +15,8 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="yong_hu">
-      <span class="span">{{ danWie }}</span>
-      <span>{{ yongHu }}</span>
+      <span class="span">单位 : {{ danWie }}</span>
+      <span>用户名 : {{ yongHu }}</span>
     </div>
     <div class="right-menu">
       <template v-if="device !== 'mobile'">
@@ -227,7 +227,7 @@ export default {
   display: inline-block;
   margin-top: 14px;
   font-size: 15px;
-  margin-left: 60%;
+  margin-left: 50%;
 }
 .span {
   margin-right: 60px;

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -651,7 +651,6 @@ export default {
     },
 
     change_time(date, i) {
-      // console.log(date);
       this.gongZuoTiem = date;
       if (
         new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
@@ -661,8 +660,8 @@ export default {
         this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
       }
       if (date) {
-        // console.log(`data${date}${i}`);
         this.tomList[i].week = this.getNowWeek(date);
+        console.log(this.getNowWeek(date));
       } else {
         this.tomList[i].week = "";
       }
@@ -823,7 +822,6 @@ export default {
           contents: null,
           organizer: null,
         },
-        (this.names = null),
       ]),
         this.resetForm("refform");
     },
@@ -852,6 +850,7 @@ export default {
     handleAdd() {
       // 人员列表
       (this.renYuan = []), this.getTreeselect();
+      this.names = null;
       this.reset();
       this.open = true;
       this.title = "添加一周工作安排";

src/views/thought/thoughtPlan/index.vue

@@ -132,7 +132,7 @@
       <div class="tree">
         <el-tree
           class="userAgrees"
-          style="height:700px;overflow:auto;"
+          style="height: 700px; overflow: auto"
           :data="deptOptions"
           :props="defaultProps"
           @node-click="handleNodeClick"
@@ -191,10 +191,10 @@
             >导出</el-button
           >
         </el-col>
-        <right-toolbar
+        <!-- <right-toolbar
           :showSearch.sync="showSearch"
           @queryTable="getList"
-        ></right-toolbar>
+        ></right-toolbar> -->
       </el-row>
 
       <el-table
@@ -239,6 +239,11 @@
       <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"
@@ -293,8 +298,20 @@
     </div>
 
     <!-- 添加或修改月教育计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :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>
@@ -320,11 +337,12 @@
         </el-form-item>
         <el-form-item label="计划简介" prop="planIntroduction">
           <el-input
+            type="textarea"
             v-model="form.planIntroduction"
             placeholder="请输入计划简介"
           />
         </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
+        <!-- <el-form-item label="文件路径" prop="filePath">
           <el-input v-model="form.filePath" placeholder="请输入文件路径" />
         </el-form-item>
         <el-form-item label="文件名称" prop="fileName">
@@ -362,7 +380,7 @@
             v-model="form.state"
             placeholder="请输入计划状态(0进行中,1已完成,2已审批,3已驳回)"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -379,9 +397,9 @@ import {
   delThoughtPlan,
   addThoughtPlan,
   updateThoughtPlan,
-  exportThoughtPlan
+  exportThoughtPlan,
 } from "@/api/thought/thoughtPlan";
-import {  getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "ThoughtPlan",
@@ -389,7 +407,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      tiem:null,
+      tiem: null,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -423,7 +441,7 @@ export default {
         planNumber: null,
         responseNumber: null,
         unitId: null,
-        state: null
+        state: null,
       },
       // 表单参数
       form: {},
@@ -435,15 +453,15 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
-        }
+        },
       },
       // 树形配置
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 搜索时间的保存
-      timeDate: ""
+      timeDate: "",
     };
   },
   created() {
@@ -454,7 +472,7 @@ export default {
     /** 查询月教育计划列表 */
     getList() {
       this.loading = true;
-      listThoughtPlan(this.queryParams).then(response => {
+      listThoughtPlan(this.queryParams).then((response) => {
         this.thoughtPlanList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -483,7 +501,7 @@ export default {
         planNumber: null,
         responseNumber: null,
         unitId: null,
-        state: null
+        state: null,
       };
       this.resetForm("form");
     },
@@ -499,7 +517,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -513,7 +531,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getThoughtPlan(id).then(response => {
+      getThoughtPlan(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改月教育计划";
@@ -521,16 +539,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateThoughtPlan(this.form).then(response => {
+            updateThoughtPlan(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addThoughtPlan(this.form).then(response => {
+            addThoughtPlan(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -544,7 +562,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm('是否确认删除月教育计划编号为"' + ids + '"的数据项？')
-        .then(function() {
+        .then(function () {
           return delThoughtPlan(ids);
         })
         .then(() => {
@@ -562,7 +580,7 @@ export default {
           this.exportLoading = true;
           return exportThoughtPlan(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -570,7 +588,7 @@ export default {
     },
     // 获取部门数据
     getShuJu(data) {
-      exportBdgShuju(data).then(res => {
+      exportBdgShuju(data).then((res) => {
         this.DataTime = data;
         this.registrationData = res;
         this.cg = res.cg;
@@ -589,7 +607,7 @@ export default {
     },
     // 获取外面部门树形
     treeselect() {
-      getWeiShu().then(res => {
+      getWeiShu().then((res) => {
         this.deptOptions = res.data;
       });
     },
@@ -597,8 +615,8 @@ export default {
     handleNodeClick(data) {
       this.queryParams.unitId = data.id;
       this.getList();
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -668,6 +686,7 @@ 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 {