同步

src/assets/styles/global.css

@@ -781,11 +781,7 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 }
 
 /* 工作任务表格 */
-<<<<<<< HEAD
 /* .workTask .el-table__empty-block{
-=======
-.workTask .el-table__empty-block {
->>>>>>> 14aebc6a2f95bfe7a1a581d07b85167c1def7ef9
   border-bottom: 2px solid white !important;
 }
 .el-time-panel__content .el-scrollbar__wrap .el-scrollbar__view{

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -53,7 +53,7 @@
           >
         </el-col>
         <div class="shuJu">
-          <span class="box4 public"> 当前数据为 : {{ DataTime }}</span>
+          <span class="box44 public"> 当前数据为 : {{ DataTime }}</span>
           <span class="box5 public">
             已登记部门 : {{ registrationData.yiShenPi }}</span
           >
@@ -411,8 +411,8 @@
           <el-form-item label="值班组织人" prop="dutylead">
             <el-select
               v-model="form.dutylead"
-              placeholder="请输入单位"
               clearable
+              placeholder="请选择值班组织人"
             >
               <el-option
                 :label="item.name"
@@ -424,7 +424,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"
@@ -435,7 +439,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"
@@ -446,7 +454,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"
@@ -457,7 +469,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"
@@ -468,7 +484,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"
@@ -478,7 +498,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"
@@ -494,7 +518,7 @@
               v-model="form.dutyDate"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="选择交接时间"
+              placeholder="请选择交接时间"
             >
             </el-date-picker>
           </el-form-item>
@@ -577,13 +601,22 @@
                   ></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="选择日期时间"
+                    @change="chenge"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -714,6 +747,7 @@ import {
   updateBdgldiary,
   exportBdgldiary,
   exportBdgShuju,
+  updateBdglShenPi,
 } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
@@ -915,7 +949,7 @@ export default {
       //  右边登记数据
       registrationData: {},
 
-      timeDate:""
+      timeDate: "",
     };
   },
 
@@ -927,8 +961,12 @@ export default {
     this.getdict();
     // 获取外部部门树形
     this.treeselect();
+    this.getShuJu();
   },
   methods: {
+    chenge(data) {
+      console.log(data);
+    },
     //审批按钮操作
     handleChakans(row) {
       // 是否隐藏按钮
@@ -941,19 +979,18 @@ export default {
         this.menuRoleVisible = true;
       });
     },
-
     // 审批页面确定
     queDing() {
-      console.log(1);
       this.wordInfo.examine = "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.getShuJu(this.timeDate);
+          this.$forceUpdate();
         });
+        // this.wordInfo.blogDate = this.wordInfo.blogDate.substring(0, 10);
+        // this.getShuJu(this.wordInfo.blogDate);
       }
     },
     // 获取部门数据
@@ -966,7 +1003,7 @@ export default {
     // 搜索时间触发
     shiJian(data) {
       this.queryParams.diaryTime = data;
-      this.timeDate = data
+      this.timeDate = data;
       this.getList();
       this.getShuJu(data);
     },
@@ -1077,7 +1114,6 @@ export default {
     },
     // 当点击完成值班时间的选择发起请求
     blogDate() {
-      console.log(this.form.blogDate);
       // 判断是否全部选择
       if (this.form.unitId !== null && this.form.blogDate !== null) {
         this.XunLian(this.form.unitId, this.form.blogDate);
@@ -1276,7 +1312,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 = "修改要事日记";
       });
     },
@@ -1310,7 +1348,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) => {
@@ -1382,6 +1422,7 @@ export default {
   width: 200px !important;
   height: 36px;
   border: 1px solid white !important;
+  color: #fff !important;
 }
 ::v-deep .el-textarea__inner {
   width: 920px;
@@ -1625,10 +1666,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;
 }
 /* 添加删除按钮 */
@@ -1714,7 +1755,7 @@ export default {
   margin-right: 40px;
 } */
 
-.box4::before {
+.box44::before {
   display: inline-block;
   content: "";
   width: 8px;