完成了弹出框多出页面显示滚动条

src/assets/styles/global.css

@@ -1039,4 +1039,27 @@ margin-right: 34px;
   margin-left: 0px;} 
   .el-form-item__error {
     left: 0 !important;
-  }
+  }
+    /* 添加内部滚动条 */
+ .el-dialog__body .userAgree {
+  height: 600px;
+  overflow: auto;
+}
+/*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
+.userAgree::-webkit-scrollbar {
+  width: 14px;
+  /* height: 2px !important; */
+  background: #3d83b8;
+}
+/*定义滑块，内阴影及圆角*/
+.userAgree::-webkit-scrollbar-thumb {
+  /* border-radius: 20px; */
+  /* height: 1px;
+  width: 3px; */
+  background: rgba(144, 206, 252, 1);
+}
+/*定义滚动条的轨道，内阴影及圆角*/
+/* .userAgree::-webkit-scrollbar-track {
+  border-radius: 0;
+  background: rgba(0, 0, 0, 0);
+} */

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1577,7 +1577,7 @@ export default {
   color: #fff !important;
 } */
 ::v-deep .el-dialog__body {
-  margin: 10px 0px 20px 50px;
+  margin: 10px 0px 20px 68px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
@@ -1595,7 +1595,7 @@ export default {
   width: 200px;
 }
 .el-dialog__body .roll-dialog {
-  padding: 3px, 30px;
+  padding: 3px, 0px;
   overflow-y: auto;
 }
 .box {
@@ -1779,7 +1779,7 @@ export default {
   border: 1px solid white;
   border-radius: 5px;
   /* background: #409eff; */
-  margin-bottom: 30px;
+  /* margin-bottom: 30px; */
   padding-top: 15px;
   padding-left: 15px;
 }
@@ -1856,7 +1856,9 @@ export default {
   width: 1060px !important;
 }
 ::v-deep .el-dialog__body {
-  padding: none !important;
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  padding-bottom: 0px !important;
 }
 ::v-deep .box4 .el-textarea__inner {
   min-height: 120px !important;
@@ -1945,8 +1947,4 @@ export default {
 ::v-deep .box .el-input__inner {
   border: none !important;
 }
-::v-deep .el-dialog__body .userAgree {
-  height: 600px;
-  overflow: auto;
-}
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -179,116 +179,120 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <!-- @close="close" -->
-      <div class="jiben">基本信息</div>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo"
-            @open="blurSelect"
-          />
-        </el-form-item>
-        <el-form-item label="召开时间" prop="convokeTime" class="convokeTime">
-          <el-date-picker
-            class="item"
-            clearable
-            size="mini"
-            v-model="form.convokeTime"
-            type="date"
-            :editable="false"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择召开时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="召开地点" prop="address" class="address">
-          <el-input v-model="form.address" placeholder="请输入召开地点" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="compereId">
-          <el-select
-            ref="headerSearchSelect"
-            v-model="form.compereId"
-            placeholder="请选择主持人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="compere(item.name)"
+      <div class="userAgree">
+        <div class="jiben">基本信息</div>
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
+          </el-form-item>
+          <el-form-item label="召开时间" prop="convokeTime" class="convokeTime">
+            <el-date-picker
+              class="item"
+              clearable
+              size="mini"
+              v-model="form.convokeTime"
+              type="date"
+              :editable="false"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择召开时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="召开地点" prop="address" class="address">
+            <el-input v-model="form.address" placeholder="请输入召开地点" />
+          </el-form-item>
+          <el-form-item label="主持人" prop="compereId">
+            <el-select
+              ref="headerSearchSelect"
+              v-model="form.compereId"
+              placeholder="请选择主持人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="compere(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <el-form-item label="记录人" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请选择记录人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :value="item.id"
-              :label="item.name"
-              @click.native="people(item.name)"
+          <el-form-item label="记录人" prop="peopleId">
+            <el-select
+              v-model="form.peopleId"
+              placeholder="请选择记录人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="会议议题" prop="title">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :value="item.id"
+                :label="item.name"
+                @click.native="people(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item> -->
-        <el-form-item label="出席人" prop="joinId" class="joinId">
-          <el-select
-            ref="abc"
-            v-model="form.joinId"
-            multiple
-            placeholder="请选择出席人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.name"
+          <el-form-item label="出席人" prop="joinId" class="joinId">
+            <el-select
+              ref="abc"
+              v-model="form.joinId"
+              multiple
+              placeholder="请选择出席人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <div class="jiben">会议议题</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.title"
-          style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
+          <div class="jiben">会议议题</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.title"
+            style="
+              height: 150px;
+              width: 920px;
+              margin-left: 0px;
+              margin-bottom: 60px;
+            "
+          ></quill-editor>
 
-        <div class="jiben">会议内容</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          v-model="form.contents"
-          style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-        ></quill-editor>
-      </el-form>
+          <div class="jiben">会议内容</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            v-model="form.contents"
+            style="height: 150px; width: 920px; margin-left: 0px"
+          ></quill-editor>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer" v-if="opens">
         <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -459,19 +463,10 @@ export default {
     },
     // 转义视图不加标签
     onEditor(str) {
-      // console.log(str);
       //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
       var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
       str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
-      //str = str.replace(/\n[\s| | ]*\r/g,'\n'); //去除多余空行
-      // str = str.replace(/ /gi, ""); //去掉
       return str;
-      // this.bdglevenList.forEach(item=>{
-      //   if(item.title){
-      //     console.log(item.title);
-      //     // item.title=str
-      //   }
-      // })
     },
     // 重置表单人员
     ChongZhiRen() {
@@ -751,16 +746,6 @@ export default {
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
 }
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
 /*调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
@@ -778,9 +763,9 @@ export default {
   font-size: 12px;
 }
 ::v-deep .el-dialog__body {
-  margin: 0px 20px;
+  /* margin: 0px 20px; */
   box-sizing: border-box;
-  padding: 30px 12px 30px 28px;
+  padding: 30px 0px 30px 42px;
 }
 /* 刷新图标 */
 /* .el-icon-refresh {
@@ -828,7 +813,6 @@ export default {
 ::v-deep .ql-snow .ql-picker {
   color: #fff !important;
 }
-
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
@@ -876,7 +860,7 @@ export default {
 
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
-  padding: 30px 50px;
+  padding: 30px 54px;
 }
 ::v-deep .fff .el-dialog {
   background: #fff !important;

src/views/grassrootsregistration/bdglparty/index.vue

@@ -175,153 +175,153 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <div class="jiben">基本信息</div>
-
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-            @select="selectPeo"
-            @open="blurSelect"
-          />
-        </el-form-item>
-        <el-form-item label="召开时间" prop="convokeTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.convokeTime"
-            type="date"
-            :editable="false"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择召开时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="召开地点" prop="address" class="address">
-          <el-input v-model="form.address" placeholder="请输入召开地点" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="compereId">
-          <el-select
-            ref="headerSearchSelect"
-            v-model="form.compereId"
-            placeholder="请选择主持人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              :disabled="item.status == 1"
-              @click.native="ZhuChiRen(item.name)"
+      <div class="userAgree">
+        <div class="jiben">基本信息</div>
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          :inline="true"
+        >
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              placeholder="请选择单位"
+              @select="selectPeo"
+              @open="blurSelect"
+            />
+          </el-form-item>
+          <el-form-item label="召开时间" prop="convokeTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.convokeTime"
+              type="date"
+              :editable="false"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择召开时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="召开地点" prop="address" class="address">
+            <el-input v-model="form.address" placeholder="请输入召开地点" />
+          </el-form-item>
+          <el-form-item label="主持人" prop="compereId">
+            <el-select
+              ref="headerSearchSelect"
+              v-model="form.compereId"
+              placeholder="请选择主持人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1"
+                @click.native="ZhuChiRen(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <el-form-item label="记录人" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请选择记录人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="peoples(item.name)"
+          <el-form-item label="记录人" prop="peopleId">
+            <el-select
+              v-model="form.peopleId"
+              placeholder="请选择记录人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="会议议题" prop="title">
+              <el-option
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :label="item.name"
+                :value="item.id"
+                @click.native="peoples(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
         </el-form-item> -->
 
-        <el-form-item label="参加人" prop="joinId" class="joinId">
-          <el-select
-            ref="abc"
-            v-model="form.joinId"
-            multiple
-            placeholder="请选择参加人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
+          <el-form-item label="参加人" prop="joinId" class="joinId">
+            <el-select
+              ref="abc"
+              v-model="form.joinId"
+              multiple
+              placeholder="请选择参加人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="列席人" prop="peopleIds" class="joinId">
-          <el-select
-            ref="abcd"
-            v-model="form.peopleIds"
-            multiple
-            placeholder="请选择列席人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="列席人" prop="peopleIds" class="joinId">
+            <el-select
+              ref="abcd"
+              v-model="form.peopleIds"
+              multiple
+              placeholder="请选择列席人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="缺席人" prop="absentIds" class="joinId">
-          <el-select
-            ref="abcde"
-            v-model="form.absentIds"
-            multiple
-            placeholder="请选择缺席人"
-            class="input_xiala"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.name"
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="缺席人" prop="absentIds" class="joinId">
+            <el-select
+              ref="abcde"
+              v-model="form.absentIds"
+              multiple
+              placeholder="请选择缺席人"
               class="input_xiala"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-        <div class="jiben">会议议题</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          style="height: 150px; width: 920px; 
+          <div class="jiben">会议议题</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            style="height: 150px; width: 920px; 
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          v-model="form.title"
-        ></quill-editor>
+            v-model="form.title"
+          ></quill-editor>
 
-        <div class="jiben">会议内容</div>
-        <quill-editor
-          class="quill-editor"
-          ref="myTextEditor"
-          style="height: 150px; width: 920px; 
-           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
-          v-model="form.contents"
-        ></quill-editor>
-      </el-form>
+          <div class="jiben">会议内容</div>
+          <quill-editor
+            class="quill-editor"
+            ref="myTextEditor"
+            style="height: 150px; width: 920px; margin-left: 0px"
+            v-model="form.contents"
+          ></quill-editor>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
@@ -768,9 +768,10 @@ export default {
   line-height: 32px;
 }
 ::v-deep .el-dialog__body {
-  margin: 0px 20px;
+  /* margin: 0px 20px; */
   box-sizing: border-box;
-  padding: 30px 12px 30px 28px;
+  /* padding: 30px 12px 30px 28px; */
+  padding: 30px 0px 30px 46px;
 }
 /* 调整表单间距 */
 ::v-deep .el-form-item__content {

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -196,127 +196,129 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <div class="jiben">基本信息</div>
-
-      <el-form
-        ref="refform"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        append-to-body
-        :inline="true"
-      >
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            :options="deptOptions"
-            :show-count="true"
-            placeholder="请选择单位"
-            @select="department"
-            @open="blurSelect"
-          />
-          <!-- @input="department" -->
-        </el-form-item>
-        <el-form-item label="连值班领导" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择值连值班领导">
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              @click.native="zhiBan(item.name)"
-              class="input_xiala"
+      <div class="userAgree">
+        <div class="jiben">基本信息</div>
+        <el-form
+          ref="refform"
+          :model="form"
+          :rules="rules"
+          label-width="80px"
+          append-to-body
+          :inline="true"
+        >
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              :options="deptOptions"
+              :show-count="true"
+              placeholder="请选择单位"
+              @select="department"
+              @open="blurSelect"
+            />
+            <!-- @input="department" -->
+          </el-form-item>
+          <el-form-item label="连值班领导" prop="peopleId">
+            <el-select v-model="form.peopleId" placeholder="请选择值连值班领导">
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click.native="zhiBan(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="电话" prop="phone">
+            <el-input v-model="form.phone" placeholder="请输入电话" />
+          </el-form-item>
+          <el-form-item label="军事长官" prop="peopleId1">
+            <el-select
+              ref="aa"
+              v-model="form.peopleId1"
+              placeholder="请选择军事长官"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入电话" />
-        </el-form-item>
-        <el-form-item label="军事长官" prop="peopleId1">
-          <el-select
-            ref="aa"
-            v-model="form.peopleId1"
-            placeholder="请选择军事长官"
-          >
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              @click.native="junShi(item.name)"
-              class="input_xiala"
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click.native="junShi(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="政治长官" prop="peopleId2">
+            <!-- <el-input v-model="form.peopleId2" placeholder="请输入政治长官" /> -->
+            <el-select v-model="form.peopleId2" placeholder="请选择政治长官">
+              <el-option
+                v-for="item in renYuan"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click.native="zhengZhi(item.name)"
+                class="input_xiala"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工作标题" prop="name">
+            <el-input v-model="form.name" placeholder="请输入工作标题" />
+          </el-form-item>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              clearable
+              size="small"
+              :editable="false"
+              v-model="form.startTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择开始时间"
+              @change="startTimes"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="政治长官" prop="peopleId2">
-          <!-- <el-input v-model="form.peopleId2" placeholder="请输入政治长官" /> -->
-          <el-select v-model="form.peopleId2" placeholder="请选择政治长官">
-            <el-option
-              v-for="item in renYuan"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-              @click.native="zhengZhi(item.name)"
-              class="input_xiala"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              clearable
+              size="small"
+              :editable="false"
+              v-model="form.endTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择结束时间"
+              @change="endTimes"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工作标题" prop="name">
-          <el-input v-model="form.name" placeholder="请输入工作标题" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker
-            clearable
-            size="small"
-            :editable="false"
-            v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间"
-            @change="startTimes"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker
-            clearable
-            size="small"
-            :editable="false"
-            v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束时间"
-            @change="endTimes"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <!-- 文本对话框--工作登记表单 -->
-        <div class="jiben">工作登记</div>
-        <div class="box1" v-for="(item, i) in tomList" :key="i">
-          <el-form
-            ref="form"
-            :model="form"
-            :rules="rules"
-            label-width="80px"
-            :inline="true"
-          >
-            <el-form-item label="" prop="daytime">
-              <el-date-picker
-                v-model="item.time"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择时间"
-                @change="(val)=>{
-                  change_time(val,i)
-                }"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="" prop="week">
-              <!-- <el-select v-model="item.week" placeholder="星期">
+            </el-date-picker>
+          </el-form-item>
+          <!-- 文本对话框--工作登记表单 -->
+          <div class="jiben">工作登记</div>
+          <div class="box1" v-for="(item, i) in tomList" :key="i">
+            <el-form
+              ref="form"
+              :model="form"
+              :rules="rules"
+              label-width="80px"
+              :inline="true"
+            >
+              <el-form-item label="" prop="daytime">
+                <el-date-picker
+                  v-model="item.time"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择时间"
+                  @change="
+                    (val) => {
+                      change_time(val, i);
+                    }
+                  "
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="" prop="week">
+                <!-- <el-select v-model="item.week" placeholder="星期">
                 <el-option
                   v-for="item in week"
                   :key="item.value"
@@ -326,121 +328,122 @@
                 >
                 </el-option>
               </el-select> -->
-              <el-input v-model="item.week" disabled/> 
-            </el-form-item>
-            <el-form-item label="" prop="day">
-              <el-select v-model="item.dateline" placeholder="早晨">
-                <el-option
-                  v-for="item in day"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                  class="input_xiala"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
+                <el-input v-model="item.week" disabled />
+              </el-form-item>
+              <el-form-item label="" prop="day">
+                <el-select v-model="item.dateline" placeholder="早晨">
+                  <el-option
+                    v-for="item in day"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.label"
+                    class="input_xiala"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-time-select
-             class="b1"
-              placeholder="起始时间"
-              v-model="item.startTime"
-              :picker-options="{
-                start: '00:00',
-                step: '00:15',
-                end: '24:45',
-              }"
-            >
-            </el-time-select>
-            <el-time-select
-            class="b1"
-              placeholder="结束时间"
-              v-model="item.endTime"
-              :picker-options="{
-                start: '00:00',
-                step: '00:15',
-                end: '24:45',
-                minTime: startTime,
-              }"
-            >
-            </el-time-select>
-            <el-form-item label="" prop="unitId5">
-              <!-- <treeselect
+              <el-time-select
+                class="b1"
+                placeholder="起始时间"
+                v-model="item.startTime"
+                :picker-options="{
+                  start: '00:00',
+                  step: '00:15',
+                  end: '24:45',
+                }"
+              >
+              </el-time-select>
+              <el-time-select
+                class="b1"
+                placeholder="结束时间"
+                v-model="item.endTime"
+                :picker-options="{
+                  start: '00:00',
+                  step: '00:15',
+                  end: '24:45',
+                  minTime: startTime,
+                }"
+              >
+              </el-time-select>
+              <el-form-item label="" prop="unitId5">
+                <!-- <treeselect
                 v-model="item.unitId1"
                 :options="deptOptions"
                 :show-count="true"
                 placeholder="请选择单位"
               /> -->
-              <el-input v-model="item.unitId1" placeholder="单位" readonly />
-              <!-- <el-input v-model="item.unitId1" placeholder="单位" /> -->
-            </el-form-item>
-            <div class="box2">
-              <el-form-item label="" prop="personnel">
-                <el-input
-                  v-model="item.peopleIds"
-                  placeholder="参加人员"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-              <el-form-item label="" prop="place">
-                <el-input
-                  v-model="item.address"
-                  placeholder="地点"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </div>
-            <div class="box3">
-              <el-form-item label="" prop="content">
-                <el-input
-                  v-model="item.contents"
-                  placeholder="内容"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="item.unitId1" placeholder="单位" readonly />
+                <!-- <el-input v-model="item.unitId1" placeholder="单位" /> -->
               </el-form-item>
-            </div>
-            <!-- 工作登记-添加删除按钮 -->
-            <div class="btn">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                @click="tianJia"
-                v-if="i == tomList.length - 1"
-              ></el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-delete"
-                @click="jtDelete(i)"
-                v-if="i != 0"
-              ></el-button>
-            </div>
-          </el-form>
-        </div>
-
-        <div class="jiben">备注</div>
-        <div class="box4">
-          <el-input
-            type="textarea"
-            :rows="5"
-            placeholder="请输入内容"
-            v-model="form.remark"
-            autosize
-          >
-          </el-input>
-        </div>
-      </el-form>
+              <div class="box2">
+                <el-form-item label="" prop="personnel">
+                  <el-input
+                    v-model="item.peopleIds"
+                    placeholder="参加人员"
+                    clearable
+                    size="small"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item label="" prop="place">
+                  <el-input
+                    v-model="item.address"
+                    placeholder="地点"
+                    clearable
+                    size="small"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+              </div>
+              <div class="box3">
+                <el-form-item label="" prop="content">
+                  <el-input
+                    v-model="item.contents"
+                    placeholder="内容"
+                    clearable
+                    size="small"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+              </div>
+              <!-- 工作登记-添加删除按钮 -->
+              <div class="btn">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  @click="tianJia"
+                  v-if="i == tomList.length - 1"
+                ></el-button>
+                <el-button
+                  type="primary"
+                  icon="el-icon-delete"
+                  @click="jtDelete(i)"
+                  v-if="i != 0"
+                ></el-button>
+              </div>
+            </el-form>
+          </div>
 
+          <div class="jiben">备注</div>
+          <div class="box4">
+            <el-input
+              type="textarea"
+              :rows="5"
+              placeholder="请输入内容"
+              v-model="form.remark"
+              autosize
+            >
+            </el-input>
+          </div>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
       :title="title"
@@ -643,14 +646,14 @@ export default {
       this.getList();
     },
 
-    change_time(date,i) {
+    change_time(date, i) {
       console.log(`data${date}${i}`);
       // console.log(this.getNowWeek(date));
-      if(date){
-         this.tomList[i].week = this.getNowWeek(date)
-         console.log(this.getNowWeek(date))
-      }else {
-         this.tomList[i].week = ""
+      if (date) {
+        this.tomList[i].week = this.getNowWeek(date);
+        console.log(this.getNowWeek(date));
+      } else {
+        this.tomList[i].week = "";
       }
     },
 
@@ -982,9 +985,13 @@ export default {
   width: 200px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 30px;
+  /* margin: 10px 30px 20px 30px; */
+  margin: 10px 0px 20px 52px;
   padding-top: 20px !important;
   box-sizing: border-box;
+  padding-bottom: 0px !important;
+  padding-left: 0px !important;
+  padding-right: 0px !important;
 }
 .contents {
   padding: 0px 40px !important;
@@ -1067,7 +1074,7 @@ export default {
 .btn {
   position: absolute;
   bottom: 31px;
-  right: 170px;
+  right: 200px;
 }
 /* 新增工作登记开始结束时间 */
 .box1 .el-date-editor.el-input {
@@ -1110,15 +1117,13 @@ export default {
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 18px 50px;
-  margin-right: 42px;
+  /* margin-right: 42px; */
+  margin-right: 36px;
 }
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
   width: 1060px !important;
 }
-::v-deep .el-dialog__body {
-  padding: none !important;
-}
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
@@ -1136,7 +1141,7 @@ export default {
 ::v-deep .el-picker-panel .el-scrollbar .time-select-item {
   color: #fff !important;
 }
-::v-deep .el-input.is-disabled .el-input__inner{
+::v-deep .el-input.is-disabled .el-input__inner {
   background-color: transparent !important;
   color: #fff;
 }