连队钥匙日记，公共样式

src/assets/styles/global.css

@@ -14,6 +14,38 @@
   font-style: normal;
 }
 
+/* 仿宋字体 */
+@font-face {
+  font-family: 'fangsong';
+  src: url('../css/仿宋.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* 楷体字体 */
+@font-face {
+  font-family: 'kaiti';
+  src: url('../css/楷体.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* 宋体字体 */
+@font-face {
+  font-family: 'songti';
+  src: url('../css/宋体.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* 黑体字体 */
+@font-face {
+  font-family: 'heiti';
+  src: url('../css/黑体.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
 /* 新增表单字体颜色 */
 .el-dialog__body .el-form-item__label {
   color: black;
@@ -79,10 +111,6 @@
   background-color: #004D86 !important;
 }
 
-.el-table__body .el-table__row.hover-row td{
-  background-color: #004D86 !important;
-}
-
 /* 表格文字居中 */
 ::v-deep .cell {
   text-align: center;
@@ -136,7 +164,7 @@ table td {
   /* background: #004D86; */
   background-color: transparent;
   border: 1px solid #D2D6DE;
-  color: #fff !important;
+  /* color: #fff ; */
 }
 
 /* 时间日历设置 */
@@ -680,6 +708,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 /* 输入框显示手指 */
 ::v-deep .el-input__inner {
   cursor: pointer !important;
+  border: none;
 }
 
 /* 页面左栏图标大小 */
@@ -769,6 +798,43 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 }
 
 /* 工作任务表格 */
-.workTask .el-table__empty-block {
+/* .workTask .el-table__empty-block{
   border-bottom: 2px solid white !important;
 }
+.el-time-panel__content .el-scrollbar__wrap .el-scrollbar__view{
+  background-color: white !important;
+}
+.el-date-picker__editor-wrap .el-input__inner{
+  color: black;
+} */
+::v-deep .el-form-item__content{
+  border-bottom: none;
+}
+
+/* 要事日记数据盒子的位置 */
+#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;
+}
+#dialoges .el-dialog__body{
+  margin: 11px 0px 21px 16px;
+  padding-top: 19px !important;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+ 
+
+
+
+

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -52,6 +52,15 @@
             >新增</el-button
           >
         </el-col>
+        <div class="shuJu" @click="dengJI">
+          <span class="box44 public"> 当前数据为 : {{ DataTime }}</span>
+          <span class="box5 public">
+            已登记部门 : {{ registrationData.yiShenPi }}</span
+          >
+          <span class="box6">
+            未登记部门 : {{ registrationData.weiShenPi }}</span
+          >
+        </div>
         <!-- <el-col :span="1.5">
           <el-button
             type="success"
@@ -101,7 +110,11 @@
         <!-- <el-table-column label="序号" align="center" prop="id" /> -->
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+            <span>{{
+              (queryParams.pageNum - 1) * queryParams.pageSize +
+              scope.$index +
+              1
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单位" align="center" prop="unitName" />
@@ -109,17 +122,25 @@
         <el-table-column
           label="值班日期"
           align="center"
-          prop="blogDate"
+          prop="diaryTime"
           width="180"
           :editable="false"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.blogDate, "{y}-{m}-{d}") }}</span>
+            <span>{{ parseTime(scope.row.diaryTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="编制干部" align="center" prop="orgcadre" />
         <el-table-column label="编制战士" align="center" prop="orgsoldier" />
         <el-table-column label="编制文职" align="center" prop="orgcivilian" />
+        <el-table-column label="审批" align="center" prop="orgcivilian">
+          <template slot-scope="scope">
+            <span v-if="scope.row.examine == '1'" style="color: #13ce66"
+              >已审批</span
+            >
+            <span v-else style="color: #ff4949">未审批</span>
+          </template>
+        </el-table-column>
         <el-table-column
           width="250"
           label="操作"
@@ -319,6 +340,7 @@
                     placeholder="请输入内容"
                     v-model="item.contents"
                     :autosize="true"
+                    resize="none"
                   >
                     {{ item.contents }}
                   </el-input>
@@ -398,8 +420,8 @@
           <el-form-item label="值班组织人" prop="dutylead">
             <el-select
               v-model="form.dutylead"
-              placeholder="请输入单位"
               clearable
+              placeholder="请选择值班组织人"
             >
               <el-option
                 :label="item.name"
@@ -411,7 +433,11 @@
           </el-form-item>
           <el-form-item label="值班交班人" prop="dutya">
             <!-- <el-input v-model="form.dutya" placeholder="请输入值班交班人" /> -->
-            <el-select v-model="form.dutya" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutya"
+              clearable
+              placeholder="请选择值班交班人"
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -422,7 +448,11 @@
           </el-form-item>
           <el-form-item label="值班接班人" prop="dutyb">
             <!-- <el-input v-model="form.dutyb" placeholder="请输入值班接班人" /> -->
-            <el-select v-model="form.dutyb" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutyb"
+              placeholder="请选择值班接班人"
+              clearable
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -433,7 +463,11 @@
           </el-form-item>
           <el-form-item label="值日交班人" prop="dutyc">
             <!-- <el-input v-model="form.dutyc" placeholder="请输入值日交班人" /> -->
-            <el-select v-model="form.dutyc" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutyc"
+              clearable
+              placeholder="请选择值日交班人"
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -444,7 +478,11 @@
           </el-form-item>
           <el-form-item label="值日接班人" prop="dutyd">
             <!-- <el-input v-model="form.dutyd" placeholder="请输入值日接班人" /> -->
-            <el-select v-model="form.dutyd" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutyd"
+              clearable
+              placeholder="请选择值日接班人"
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -455,7 +493,11 @@
           </el-form-item>
           <el-form-item label="厨房交班人" prop="dutye">
             <!-- <el-input v-model="form.dutye" placeholder="请输入厨房交班人" /> -->
-            <el-select v-model="form.dutye" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutye"
+              clearable
+              placeholder="请选择厨房交班人"
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -465,7 +507,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="厨房接班人" prop="dutyf">
-            <el-select v-model="form.dutyf" placeholder="请输入单位" clearable>
+            <el-select
+              v-model="form.dutyf"
+              clearable
+              placeholder="请选择厨房接班人"
+            >
               <el-option
                 :label="item.name"
                 :value="item.name"
@@ -481,7 +527,7 @@
               v-model="form.dutyDate"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="选择交接时间"
+              placeholder="请选择交接时间"
             >
             </el-date-picker>
           </el-form-item>
@@ -564,13 +610,21 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="" prop="">
-                  <el-date-picker
+                  <!-- <el-date-picker
+                    type="datetime"
                     v-model="item1.examineDate"
-                    type="date"
                     :editable="false"
                     size="mini"
                     placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd-HH-mm"
+                    @change="chenge"
+                    :picker-options="pickerOptions"
+                  >
+                  </el-date-picker> -->
+                  <el-date-picker
+                    v-model="item1.examineDate"
+                    type="datetime"
+                    placeholder="选择日期时间"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -671,6 +725,7 @@
           <el-button type="primary" @click="submitForm(1)">确 定</el-button>
         </div>
       </el-dialog>
+      <!-- 查看 -->
       <el-dialog
         :visible.sync="menuRoleVisible"
         :title="title"
@@ -686,13 +741,26 @@
           <el-button type="primary" @click="queDing">通过</el-button>
         </div>
       </el-dialog>
+
+      <!-- <div id="dialoges">
+        <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+        </el-dialog>
+      </div> -->
+      <!-- 数据查看弹出层 -->
+      <el-dialog
+        :visible.sync="dialogVisible"
+        title="提示"
+        append-to-body
+        id="dialoges"
+      >
+        <div class="jiben">已登记部门</div>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 import bdgldiary from "@/components/look_word/bdgldiary.vue";
-
 import {
   listBdgldiary,
   getBdgldiary,
@@ -700,6 +768,8 @@ import {
   addBdgldiary,
   updateBdgldiary,
   exportBdgldiary,
+  exportBdgShuju,
+  updateBdglShenPi,
 } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
@@ -896,6 +966,14 @@ export default {
           percentage: null,
         },
       ],
+      // 数据时间
+      DataTime: "",
+      //  右边登记数据
+      registrationData: {},
+      // 搜索时间的保存
+      timeDate: "",
+      // 数据查看的弹出层
+      dialogVisible: false,
     };
   },
 
@@ -907,8 +985,13 @@ export default {
     this.getdict();
     // 获取外部部门树形
     this.treeselect();
+    this.getShuJu();
   },
   methods: {
+    // 点击数据盒子
+    dengJI() {
+      this.dialogVisible = true;
+    },
     //审批按钮操作
     handleChakans(row) {
       // 是否隐藏按钮
@@ -921,25 +1004,33 @@ export default {
         this.menuRoleVisible = true;
       });
     },
-
     // 审批页面确定
     queDing() {
-      console.log(1);
-      this.wordInfo.examine = "1";
-
+      this.wordInfo.x = "1";
       if (this.wordInfo.id != null) {
-        updateBdgldiary(this.wordInfo).then((response) => {
-          console.log(response);
+        updateBdglShenPi(this.wordInfo).then((response) => {
           this.menuRoleVisible = false;
           this.getList();
+          this.getShuJu(this.timeDate);
+          this.$forceUpdate();
         });
+        // this.wordInfo.blogDate = this.wordInfo.blogDate.substring(0, 10);
+        // this.getShuJu(this.wordInfo.blogDate);
       }
     },
+    // 获取部门数据
+    getShuJu(data) {
+      exportBdgShuju(data).then((res) => {
+        this.DataTime = data;
+        this.registrationData = res;
+      });
+    },
     // 搜索时间触发
     shiJian(data) {
-      console.log(data);
       this.queryParams.diaryTime = data;
+      this.timeDate = data;
       this.getList();
+      this.getShuJu(data);
     },
     // 应到人数失去焦点触发
     yinDao() {
@@ -950,17 +1041,6 @@ export default {
           item.percentage = str;
         }
       });
-      // if (
-      //   this.xunlian[0].shouldArrive != null &&
-      //   this.xunlian[0].realTo != null
-      // ) {
-      //   var str = (
-      //     (this.xunlian[0].realTo / this.xunlian[0].shouldArrive) *
-      //     100
-      //   ).toFixed(2);
-      //   str += "%";
-      //   this.xunlian[0].percentage = str;
-      // }
     },
     // 实到人数失去焦点触发
     shiDao() {
@@ -971,18 +1051,6 @@ export default {
           item.percentage = str;
         }
       });
-
-      // if (
-      //   this.xunlian[0].shouldArrive != null &&
-      //   this.xunlian[0].realTo != null
-      // ) {
-      //   var str = (
-      //     (this.xunlian[0].realTo / this.xunlian[0].shouldArrive) *
-      //     100
-      //   ).toFixed(2);
-      //   str += "%";
-      //   this.xunlian[0].percentage = str;
-      // }
     },
     // 获取训练
     XunLian(id, tiem) {
@@ -1269,7 +1337,9 @@ export default {
 
         this.open = true;
         this.checkShop = response.data.inspect;
-        this.relatives = response.data.kinsfolk;
+        if (response.data.kinsfolk[0].peopleId != null) {
+          this.relatives = response.data.kinsfolk;
+        }
         this.title = "修改要事日记";
       });
     },
@@ -1303,7 +1373,9 @@ export default {
             // 查铺查哨
             this.form.inspect = this.checkShop;
             // 来对亲属
-            this.form.kinsfolk = this.relatives;
+            if (this.relatives[0].peopleId !== null) {
+              this.form.kinsfolk = this.relatives;
+            }
             // 训练计划
             this.form.weekworkRegisters = this.xunlian;
             addBdgldiary(this.form).then((response) => {
@@ -1375,6 +1447,7 @@ export default {
   width: 200px !important;
   height: 36px;
   border: 1px solid white !important;
+  color: #fff !important;
 }
 ::v-deep .el-textarea__inner {
   width: 920px;
@@ -1403,7 +1476,7 @@ export default {
 }
 /* 表单背景 */
 ::v-deep .el-input__inner {
-  background-color: transparent;
+  background-color: none;
   color: #fff;
   /* border: 1px solid white !important; */
 }
@@ -1618,10 +1691,10 @@ export default {
 }
 /* 表单长度 */
 ::v-deep .box3 .el-form-item__content {
-  width: 116px;
+  width: 140px;
 }
 ::v-deep .box3 .el-input__inner {
-  width: 116px;
+  width: 138px;
   height: 37px;
 }
 /* 添加删除按钮 */
@@ -1694,4 +1767,48 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+.shuJu {
+  height: 16px;
+  margin-top: 13px;
+  margin-right: 90px;
+  float: right;
+  /* background-color: red; */
+  color: #fff;
+  font-size: 14px;
+}
+/* .public {
+  margin-right: 40px;
+} */
+
+.box44::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #1d96ff;
+  margin-left: 26px;
+}
+.box5::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #67c23a;
+  margin-left: 26px;
+}
+.box6::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #ff4949;
+  margin-left: 26px;
+}
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>