修改要是日记重置按钮，医疗人员体检弹框

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -37,7 +37,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery" 
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -38,7 +38,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -24,7 +24,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -37,7 +37,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -44,7 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery" 
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -34,7 +34,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglfood/index.vue

@@ -42,7 +42,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -54,7 +54,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -43,7 +43,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -33,7 +33,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -34,7 +34,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
+        <el-button  size="btr" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -41,7 +41,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-refresh" size="btr " @click="resetQuery"
+        <el-button  size="btr " @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -38,7 +38,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
+        <el-button size="btr" @click="resetQuery"  
           >重置</el-button
         >
       </el-form-item>

src/views/medicalhealth/archives/index.vue

@@ -684,9 +684,12 @@ export default {
   cursor: pointer !important;
 }
 ::v-deep .el-dialog__body {
-  padding: 30px 64px;
+  padding: 30px 0px 0px 70px;
 }
 ::v-deep .el-dialog__footer {
-  margin-right: 54px;
+  margin-right: 50px;
+}
+.el-form--inline .el-form-item{
+  margin-right: 62px;
 }
 </style>

src/views/medicalhealth/examine/index.vue

@@ -171,35 +171,37 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form.unitId"
-            placeholder="请输入单位"
-            :options="deptOptions"
-            @select="shuxing"
-          />
-        </el-form-item>
-        <el-form-item label="姓名" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请输入姓名">
-            <el-option
-              class="input_xiala"
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :value="item.id"
-              :label="item.name"
-              @click.native="xingMing(item)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="工作岗位" prop="job">
+      <div class="qq">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form.unitId"
+              placeholder="请输入单位"
+              :options="deptOptions"
+              @select="shuxing"
+            />
+          </el-form-item>
+          <el-form-item label="姓名" prop="peopleId">
+            <el-select v-model="form.peopleId" placeholder="请输入姓名">
+              <el-option
+                class="input_xiala"
+                v-for="(item, i) in renYuan"
+                :key="i"
+                :value="item.id"
+                :label="item.name"
+                @click.native="xingMing(item)"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="工作岗位" prop="job">
           <el-input v-model="form.job" placeholder="请输入工作岗位" />
         </el-form-item>
         <el-form-item label="人员类别" prop="classId">
           <el-input v-model="form.classId" placeholder="请输入人员类别" />
         </el-form-item> -->
-      </el-form>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
@@ -207,57 +209,64 @@
     </el-dialog>
 
     <!-- 添加体检信息 -->
+
     <el-dialog
       title="添加体检信息"
       :visible.sync="opene"
-      width="700px"
+      width="1016px"
       append-to-body
       :close-on-click-modal="false"
-    >
-      <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item label="年份" prop="yeardate">
-          <el-input v-model="form.yeardate" />
-        </el-form-item>
-        <div class="jiben">体检信息</div>
-        <el-form-item>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.checkInformation"
-            style="height: 150px; width: 920px; margin-left: 0px"
-          ></quill-editor>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
-      </div>
+      >
+      <div class="ww">
+        <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-left: 30px;">
+          <el-form-item label="年份" prop="yeardate">
+            <el-input v-model="form.yeardate" />
+          </el-form-item>
+          <div class="jiben">体检信息</div>
+          <el-form-item>
+            <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.checkInformation"
+              style="height: 150px; width: 920px; margin-left: 0px"
+            ></quill-editor>
+          </el-form-item>
+        </el-form>
+         </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel" size="btn">取 消</el-button>
+        </div>
+     
     </el-dialog>
 
     <!-- 查看体检信息 -->
-    <el-dialog
-      title="添加体检信息"
-      :visible.sync="openes"
-      width="700px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item label="年份" prop="yeardate">
-          <el-input v-model="form.yeardate" />
-        </el-form-item>
-        <div class="jiben">体检信息</div>
-        <el-form-item>
-          <quill-editor
-            class="quill-editor"
-            ref="myTextEditor"
-            v-model="form.checkInformation"
-            style="height: 150px; width: 920px; margin-left: 0px"
-          ></quill-editor>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
+   
+      <el-dialog
+        title="添加体检信息"
+        :visible.sync="openes"
+        width="1016px"
+        append-to-body
+        :close-on-click-modal="false"
+      > <div class="ee">
+        <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-left: 30px;">
+          <el-form-item label="年份" prop="yeardate">
+            <el-input v-model="form.yeardate" />
+          </el-form-item>
+          <div class="jiben">体检信息</div>
+          <el-form-item>
+            <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.checkInformation"
+              style="height: 150px; width: 920px; margin-left: 0px"
+            ></quill-editor>
+          </el-form-item>
+        </el-form>
+        </div>
+      </el-dialog>
+    </div>
+  
 </template>
 
 <script>
@@ -511,14 +520,21 @@ export default {
 </script>
 <style scoped>
 /* 对话框背景颜色 */
+.qq {
+  padding: 30px 30px 20px 30px !important;
+}
+::v-deep .qq .vue-treeselect__control {
+  width: 280px !important;
+}
+::v-deep .qq .el-input__inner {
+  width: 280px !important;
+}
+.qq .el-dialog__footer {
+  margin-right: 70px !important;
+}
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
-::v-deep .el-textarea__inner {
-  width: 920px;
-  height: 104px;
-  margin: auto;
-}
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
 }
@@ -527,19 +543,28 @@ export default {
   font: 18px;
 }
 ::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
+  width: 200px !important;
+  height: 36px;
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
 }
+/* 添加体检信息 */
+.ww .el-form  {
+  margin-bottom: 70px !important;
+}
+::v-deep .el-dialog__footer {
+    margin-right: 27px !important;}
 /*调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-::v-deep .el-dialog__body {
-  margin-left: 70px !important;
+.ee .el-form  {
+  margin-bottom: 70px !important;
 }
+
+
+
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
@@ -548,7 +573,40 @@ export default {
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
-::v-deep .el-input__inner {
-  height: 36px !important;
+::v-deep .qq > .el-form-item__content > .vue-treeselect__control {
+  width: 175% !important;
+}
+/* 富文本删除功能 */
+::v-deep .ql-blockquote {
+  display: none !important;
+}
+::v-deep .ql-strike {
+  display: none !important;
+}
+::v-deep .ql-script {
+  display: none !important;
+}
+::v-deep .ql-code-block {
+  display: none !important;
+}
+::v-deep .ql-direction {
+  display: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-formats {
+  margin-right: 7px;
+}
+/* 富文本 */
+::v-deep .ql-snow .ql-fill,
+.ql-snow .ql-stroke.ql-fill {
+  fill: #fff !important;
+}
+::v-deep .ql-snow .ql-stroke {
+  stroke: #fff !important;
+}
+::v-deep .ql-snow .ql-picker {
+  color: #fff !important;
+}
+::v-deep .ql-editor ql-blank {
+  color: #fff !important;
 }
 </style>

src/views/regulations/fileinfo/index.vue

@@ -484,7 +484,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm2">确 定</el-button>
-          <el-button @click="cancel" size="btn"> 取 消</el-button>
+          <el-button @click="cancel" size="" class="aa1"> 取 消</el-button>
         </div>
       </el-dialog>
     </div>
@@ -1455,4 +1455,8 @@ body,
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+.aa1{
+  background-color: #1263aa !important;
+  color: #fff !important;
+}
 </style>

src/views/system/notice/index.vue

@@ -225,6 +225,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="" prop="">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="附件上传" label-width="0px" prop="filename">
               <fileUpload
                 v-model="form.filename"

src/views/system/user/index.vue

@@ -917,7 +917,9 @@ export default {
     handleDelete(row) {
       const userIds = row.userId || this.ids;
       this.$modal
-        .confirm("是否确认删除用户的数据项？")
+        .confirm("是否确认删除用户的数据项？", {
+          cancelButtonClass: "btn-custom-cancel",
+        })
         .then(function () {
           return delUser(userIds);
         })

src/views/workingArrangements/planTask/index.vue

@@ -174,7 +174,7 @@
             <span class="chakan">查看</span>
           </el-button>
           <el-button
-            size="btlook"
+            size="btn"
             type="text"
             @click="handleChakan1(scope.row)"
             v-if="scope.row.common == 2 || scope.row.common == 0"

src/views/workingArrangements/workTask/index.vue

@@ -204,7 +204,7 @@
       >
         <template slot-scope="scope">
           <el-button
-            size="btlook"
+            size="btn"
             type="text"
             @click="ViewProgress(scope.row)"
             v-if="scope.row.common == 1 && scope.row.taskProgress != '100'"