完成了一周工作安排

src/api/grassrootsregistration/bdglmeeting.js

@@ -157,3 +157,11 @@ export function getBuMen() {
   })
 }
 
+// 获取外面部门数据
+
+export function getShouBu(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+  })
+}

src/api/grassrootsregistration/bdglweekwork.js

@@ -50,4 +50,12 @@ export function exportBdglweekwork(query) {
     method: 'get',
     params: query
   })
-}
+}
+// 查询当前时段有么有数据
+export function exportBdglgetWeekWork(query) {
+  return request({
+    url: '/grassrootsregistration/bdglweekwork/getWeekWork',
+    method: 'get',
+    params: query
+  })
+}

src/assets/styles/global.css

@@ -859,78 +859,88 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   /* text-align: center; */
   text-indent: 2em;
 }
+
+ /* 主页左侧导航栏 */
+ .nest-menu li{
+  padding-left: 25px !important;
+ }
+ /* input下拉背景、字体颜色------input加类名 */
+ .input_xiala{
+  color: #000 !important;
+ }
+ .input_xiala:hover{
+  color: #000 !important;
+ }
+
+
 /* 要事日记数据盒子的位置 */
 #dialoges .el-dialog {
-  width: 528px !important;
-  position: absolute;
-  right: -1300px;
-  top: 100px
-}
-#dialoges  .jiben {
-  width: 461px !important;
-  height: 32px;
-  background-image: url(/static/img/小标题底.b7c6f45a.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
+ width: 528px !important;
+ position: absolute;
+right: -1300px;
+ top: 100px
+}
+#dialoges .jiben {
+ width: 461px !important;
+ height: 32px;
+ background-image: url(/static/img/小标题底.b7c6f45a.png);
+ margin-bottom: 8px;
+ color: #fff;
+ padding-left: 16px;
+ line-height: 32px;
 }
 #dialoges .el-dialog__body{
-  margin: 11px 0px 21px 0;
-  padding-top: 19px !important;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
+ margin: -5px 0px 21px 0;
+ padding-top: 19px !important;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
 }
 #dialoges .greeds{
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background-color: #FF4949;
+margin-right: 8px;
+}
+#dialoges .greedss{
   display: inline-block;
   width: 10px;
   height: 10px;
-  background-color: #FF4949;
-  margin-right: 8px;
-}
+  background-color: #13CE66;
+ margin-right: 8px;
+ }
 #dialoges .greed{
-  margin-left: 20px;
-  /* background-color: #fff; */
-  margin-bottom: 14px;
-  margin-right: 40px;
+ margin-left: 0px;
+ /* background-color: #fff; */
+ margin-bottom: 14px;
+ margin-right: 40px;
 }
 #dialoges .zuiDa{
-  width: 540px;
-  height: 284px;
-  /* background-color: #fff; */
-  color: #fff;
+ width: 540px;
+ height: 284px;
+ /* background-color: #fff; */
+ color: #fff;
 }
 #dialoges .red{
-  width: 139px;
-  display: inline-block;
-  /* margin-left: 2px; */
-  /* background-color: #fff; */
-  /* margin-bottom: 14px; */
-  margin-right: 34px;
-  font-size: 14px;
-  margin-bottom: 10px;
+ width: 139px;
+ display: inline-block;
+ /* margin-left: 2px; */
+ /* background-color: #fff; */
+ /* margin-bottom: 14px; */
+margin-right: 34px;
+ font-size: 14px;
+ margin-bottom: 10px;
 }
-#dialoges .boxxx {
-  margin-left: 20px;
+#dialoges .boxxx { margin-left: 20px;
 }
 /* #dialoges .red::after{
-  display: inline-block;
-  content: "";
-  width: 10px;
-  height: 10px;
-  background-color: #FF4949;
-  margin-left: -97px;
+  display: inline-block;
+  content: "";
+  width: 10px;
+  height: 10px;
+  background-color: #FF4949;
+  margin-left: -97px;
 } */
-
-  /* 主页左侧导航栏 */
-  .nest-menu li{
-    padding-left: 25px !important;
-  }
-  /* input下拉背景、字体颜色------input加类名 */
-  .input_xiala{
-    color: #000 !important;
-  }
-  .input_xiala:hover{
-    color: #000 !important;
-  }
+.shuJuTime { margin-bottom: 10px;
+}
 

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -746,7 +746,7 @@
           <div class="jiben">已登记部门:{{ yishenpi }}个</div>
           <div class="boxxx">
             <div v-for="(item, i) in cg" :key="i" class="greed">
-              <span class="greeds"> </span><span>{{ item }}</span>
+              <span class="greedss"> </span><span>{{ item }}</span>
             </div>
           </div>
           <!-- <span v-for="(item, i) in cg" :key="i" class="greed">{{ item }}</span> -->
@@ -1618,7 +1618,7 @@ export default {
 ::v-deep .el-table__empty-block {
   background-color: #004d86 !important; */
 /* } */
-::v-deep .el-tree-node__content{
+::v-deep .el-tree-node__content {
   height: 30px !important;
 }
 ::v-deep .el-table .el-table__header-wrapper th,

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -600,7 +600,7 @@ export default {
       // 搜索单位列表
       deptOptionss: [],
       // 已有时间不能发送
-      msg: 1,
+      code: 0,
     };
   },
   created() {
@@ -685,10 +685,11 @@ export default {
         this.form.startTime != null &&
         this.form.endTime != null
       ) {
+        this.form.bdglWeekworkRegisterList = null;
         exportBdglgetWeekWork(this.form).then((res) => {
-          if (res.msg) {
+          this.code = res.code;
+          if (res.code == 200) {
             this.$modal.msgWarning(res.msg);
-            this.msg = null;
           }
         });
       }
@@ -700,10 +701,11 @@ export default {
         this.form.startTime != null &&
         this.form.endTime != null
       ) {
+        this.form.bdglWeekworkRegisterList = null;
         exportBdglgetWeekWork(this.form).then((res) => {
-          if (res.msg) {
+          this.code = res.code;
+          if (res.code == 200) {
             this.$modal.msgWarning(res.msg);
-            this.msg = null;
           }
         });
       }
@@ -716,10 +718,12 @@ export default {
         this.form.endTime != null
       ) {
         this.form.unitName = null;
+        this.form.bdglWeekworkRegisterList = null;
         exportBdglgetWeekWork(this.form).then((res) => {
-          if (res.msg) {
+          console.log(res.code);
+          this.code = res.code;
+          if (res.code == 200) {
             this.$modal.msgWarning(res.msg);
-            this.msg = null;
           }
         });
       }
@@ -862,7 +866,8 @@ export default {
             });
           } else {
             this.form.bdglWeekworkRegisterList = this.tomList;
-            if (this.msg) {
+            console.log(this.code);
+            if (this.code != 200) {
               addBdglweekwork(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;