人力合并

src/assets/styles/global.css

@@ -406,7 +406,7 @@ color: #fff;
   color: #FFFFFF;
   width: 76px;
   height: 36px;
-  background-color: #0c477a;
+  background-color: #1263aa;
   border-radius: 4px;
   font-size: 14px;
   text-align: center;
@@ -1122,4 +1122,10 @@ input:-moz-placeholder {
 /* 树形结构合起来去掉选中背景色 */
 .el-tree-node:focus>.el-tree-node__content {
   background-color: transparent;
+}
+
+/* 左回右出图标 */
+.navbar .hamburger-container svg {
+  color: white;
+  fill: currentColor;
 }

src/components/look_word/personnelRoster.vue

@@ -154,42 +154,44 @@
             height="40"
             align="center"
             style="font-family: 'fangsong'"
+             v-for="(item, i) in message"
+            :key="i"
           >
-            <td class="JR_right">{{ message.name }}</td>
+            <td class="JR_right">{{ item.name }}</td>
             <td class="JR_right">
               <dict-tag
                 :options="dict.type.post_Level"
-                :value="message.postId"
+                :value="item.postId"
               />
             </td>
             <td class="JR_right">
               <dict-tag
                 :options="dict.type.post_Level"
-                :value="message.rankId"
+                :value="item.rankId"
               />
             </td>
             <td class="JR_right">
               <dict-tag
                 :options="dict.type.sys_familyName"
-                :value="message.nationId"
+                :value="item.nationId"
               />
             </td>
-            <td class="JR_right">{{ message.origin }}</td>
-            <td class="JR_right">{{ message.birthDate }}</td>
-            <td class="JR_right">{{ message.enlistDate }}</td>
-            <td class="JR_right">{{ message.partyDate }}</td>
+            <td class="JR_right">{{ item.origin }}</td>
+            <td class="JR_right">{{ item.birthDate }}</td>
+            <td class="JR_right">{{ item.enlistDate }}</td>
+            <td class="JR_right">{{ item.partyDate }}</td>
             <td class="JR_right">
               <dict-tag
                 :options="dict.type.Degree_level"
-                :value="message.educationId"
+                :value="item.educationId"
               />
             </td>
             <td class="JR_right">
               <dict-tag
                 :options="dict.type.marryList"
-                :value="message.marryList"
+                :value="item.marryList"
               /></td>
-            <td class="JR_right">{{ message.live }}{{ message.phone }}</td>
+            <td class="JR_right">{{ item.live }}{{ item.phone }}</td>
             <td class="JR_right"></td>
           </tr>
           <tr class="JR_tr" height="40" align="center">

src/views/PrintsLog/printlog/index.vue

@@ -363,7 +363,7 @@
         <el-button type="primary" @click="submitForm" v-if="flg != 1"
           >确 定</el-button
         >
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/PrintsManage/manage/index.vue

@@ -438,7 +438,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -531,7 +531,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dysubmitForm">打 印</el-button>
-        <el-button @click="dycancel">取 消</el-button>
+        <el-button @click="dycancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- <el-dialog

src/views/barracksManagement/barracks/index.vue

@@ -251,7 +251,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/barracksManagement/checkin/index.vue

@@ -235,7 +235,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/barracksManagement/flat/index.vue

@@ -207,6 +207,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="150px"
       >
         <template slot-scope="scope">
           <el-button
@@ -291,7 +292,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/barracksManagement/flats/index.vue

@@ -635,7 +635,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/bdglSecret/secret/index.vue

@@ -324,8 +324,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resertwo">重置</el-button>
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
+        
       </div>
     </el-dialog>
     <div class="fff">

src/views/bdglregular/regularinfo/index.vue

@@ -601,7 +601,7 @@
         <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
           >确 定</el-button
         >
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/bdglregular/specialinfo/index.vue

@@ -527,7 +527,7 @@
         <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
           >确 定</el-button
         >
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/RateOfTen/index.vue

@@ -376,7 +376,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     </div>
@@ -472,7 +472,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     </div>
@@ -573,7 +573,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     </div>

src/views/combatduty/basedutyinfo/index.vue

@@ -612,7 +612,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/grassdutyinfo/index.vue

@@ -530,7 +530,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/militarydutyinfo/index.vue

@@ -368,7 +368,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/regisdutyinfo/index.vue

@@ -332,7 +332,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/taskdutyinfo/index.vue

@@ -377,7 +377,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/combatduty/teamdutyinfo/index.vue

@@ -729,7 +729,7 @@
     </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/doormanManage/bdglVisit/index.vue

@@ -260,7 +260,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -685,7 +685,7 @@ export default {
     return {
       //查看页面
       menuRoleVisible: false,
-      wordInfo: {},
+      wordInfo: [],
       renshu: {},
       // 遮罩层
       loading: true,
@@ -1133,13 +1133,12 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      this.wordInfo = row;
       // 是否隐藏按钮
-      console.log(row);
       this.opens = false;
       const deptId = row.deptId;
       getRenYuanXiangQing(deptId).then((response) => {
         this.renshu = response.data[0];
+          this.wordInfo =  response.data[1];
         this.title = "查看人员名册";
         this.menuRoleVisible = true;
       });
@@ -1518,7 +1517,7 @@ export default {
 ::v-deep .el-input__suffix .el-input__suffix-inner .el-input__icon {
   margin-right: -45px !important;
 }
-::v-deep .el-pagination .el-input__suffix{
+::v-deep .el-pagination .el-input__suffix {
   right: 34px !important;
 }
 </style>

src/views/materialManagement/archives/index.vue

@@ -382,7 +382,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -669,4 +669,7 @@ export default {
 ::v-deep .vue-treeselect__single-value{
   color: #fff !important;
 }
+::v-deep .el-form .el-input__inner{
+  height: 36px !important;
+}
 </style>

src/views/materialManagement/distribution/index.vue

@@ -549,7 +549,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -777,7 +777,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
+::v-deep .el-dialog .el-input__inner {
   width: 200px !important;
   height: 36px;
   background: transparent;
@@ -805,4 +805,7 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 30px 0px 30px 26px !important;
 }
+::v-deep .el-form .el-input__inner{
+  height: 36px !important;
+}
 </style>

src/views/materialManagement/materialRegistration/index.vue

@@ -300,6 +300,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="150px"
       >
         <template slot-scope="scope">
           <el-button
@@ -449,7 +450,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -669,7 +670,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
+::v-deep .el-dialog .el-input__inner {
   width: 200px !important;
   height: 36px;
   background: transparent;
@@ -697,4 +698,7 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 30px 0px 30px 26px !important;
 }
+::v-deep .el-form .el-input__inner{
+  height: 36px !important;
+}
 </style>

src/views/materialManagement/propertyChange/index.vue

@@ -378,7 +378,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -596,7 +596,7 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
+::v-deep .el-dialog .el-input__inner {
   width: 200px !important;
   height: 36px;
   background: transparent;
@@ -624,4 +624,7 @@ export default {
 ::v-deep .el-dialog__body{
       padding: 30px 0px 30px 26px !important;
 }
+::v-deep .el-form .el-input__inner{
+  height: 36px !important;
+}
 </style>

src/views/medicalhealth/antiepidemicamount/index.vue

@@ -236,7 +236,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/medicalhealth/antiepidemicarchives/index.vue

@@ -305,7 +305,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -541,7 +541,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 920px;
+  width: 610px;
   height: 104px;
   margin: auto;
 }
@@ -593,7 +593,7 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
+  margin: 10px 60px 20px 73px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
@@ -665,11 +665,11 @@ export default {
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 18px 42px 30px 0px;
-  margin-right: 30px;
+  margin-right: 56px;
 }
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 800px !important;
 }
 ::v-deep .el-dialog__body {
   padding: none !important;

src/views/medicalhealth/antiepidemicputin/index.vue

@@ -246,7 +246,13 @@
     />
 
     <!-- 添加或修改防疫用品入库登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -301,7 +307,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -569,7 +575,7 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
+  margin: 21px 34px 20px 76px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
@@ -641,14 +647,16 @@ export default {
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 18px 42px 30px 0px;
-  margin-right: 30px;
+  margin-right: 82px;
 }
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 500px !important;
 }
 ::v-deep .el-dialog__body {
-  padding: none !important;
+  padding-left: 0px;
+  padding-right: 0px;
+  padding-bottom: 0px;
 }
 ::v-deep .box4 .el-textarea__inner {
   min-height: 120px !important;

src/views/medicalhealth/antiepidemicputout/index.vue

@@ -323,7 +323,13 @@
     />
 
     <!-- 添加或修改防疫用品发放登记对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -429,7 +435,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -690,12 +696,11 @@ export default {
 };
 </script>
 <style scoped>
-/* 对话框背景颜色 */
 ::v-deep .el-dialog {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 920px;
+  width: 610px;
   height: 104px;
   margin: auto;
 }
@@ -747,7 +752,7 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
+  margin: 10px 60px 20px 73px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */
@@ -778,10 +783,10 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
-  color: #111;
+  color: #fff;
 }
 .el-select-dropdown__item {
-  color: #111;
+  color: #fff;
 }
 /* 时间选择 */
 ::v-deep .el-input--small .el-input__inner {
@@ -819,11 +824,11 @@ export default {
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 18px 42px 30px 0px;
-  margin-right: 30px;
+  margin-right: 56px;
 }
 /* 增加按钮弹框 */
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 800px !important;
 }
 ::v-deep .el-dialog__body {
   padding: none !important;
@@ -842,4 +847,4 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-</style>
+</style>

src/views/medicalhealth/archives/index.vue

@@ -240,7 +240,13 @@
     />
 
     <!-- 添加或修改耗材库存档案对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="jiben">基本信息</div>
       <el-form
         ref="form"
@@ -317,7 +323,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -676,4 +682,10 @@ export default {
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+::v-deep .el-dialog__body {
+  padding: 30px 64px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 54px;
+}
 </style>

src/views/medicalhealth/bdgldurglingyong/index.vue

@@ -422,7 +422,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -405,7 +405,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -416,7 +416,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/medicalhealth/consumeputin/index.vue

@@ -447,7 +447,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -806,4 +806,10 @@ export default {
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }
+::v-deep .el-dialog__body {
+  padding: 30px 64px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 54px;
+}
 </style>

src/views/medicalhealth/consumeputout/index.vue

@@ -493,7 +493,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/medicalhealth/diagnose/index.vue

@@ -168,7 +168,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="人员" align="center" prop="peopleName" />
       <el-table-column label="地点" align="center" prop="address" />
       <el-table-column
@@ -192,9 +192,17 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="登记人" align="center" prop="adminId" />
-      <el-table-column label="登记时间" align="center" prop="createtime" />
-      <el-table-column label="更新时间" align="center" prop="updatetime" />
+      <el-table-column label="登记人" align="center" prop="userName" />
+      <el-table-column label="登记时间" align="center" prop="createtime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updatetime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatetime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="病情" align="center" prop="id" /> -->
       <el-table-column label="病情" align="center" prop="illness" />
       <el-table-column
@@ -331,7 +339,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -481,14 +489,12 @@ export default {
     },
     //点击单位触发
     shuxing(data) {
-      console.log(data);
       this.form.unitId = data.id;
       this.form.unitName = data.label;
       this.getRenYuan(this.form.unitId);
     },
     // 获取人员
     getRenYuan(id) {
-      console.log(id);
       getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });

src/views/medicalhealth/examine/index.vue

@@ -122,30 +122,35 @@
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="姓名" align="center" prop="peopleName" />
       <el-table-column label="工作岗位" align="center" prop="job" />
-      <el-table-column label="人员类别" align="center" prop="classId" />
+      <el-table-column label="人员类别" align="center" prop="classId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.personnel_type"
+            :value="scope.row.classId"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
       >
-        <template>
-          <!-- <template slot-scope="scope">-->
-          <el-button @click="tianJia"> 添加体检信息 </el-button>
-          <el-button @click="chaKan"> 查看 </el-button>
-          <!-- <el-button
-            size="btu"
+        <template slot-scope="scope">
+          <!-- <el-button @click="handleUpdate"> 添加体检信息 </el-button>
+          <el-button @click="chaKan"> 查看 </el-button> -->
+          <el-button
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['medicalhealth:examine:edit']"
-            >修改</el-button
+            >添加体检信息</el-button
           >
           <el-button
             size="btd"
             type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['medicalhealth:examine:remove']"
-            >删除</el-button
-          > -->
+            @click="handleUpdates(scope.row)"
+            v-hasPermi="['medicalhealth:examine:edit']"
+            >查看</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -183,21 +188,21 @@
               :key="i"
               :value="item.id"
               :label="item.name"
-              @click.native="xingMing(item.name)"
+              @click.native="xingMing(item)"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工作岗位" prop="job">
+        <!-- <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-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -209,34 +214,48 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      年份
-      <input type="text" />
-      <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 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>
     </el-dialog>
 
     <!-- 查看体检信息 -->
     <el-dialog
-      title="查看体检信息"
+      title="添加体检信息"
       :visible.sync="openes"
       width="700px"
       append-to-body
       :close-on-click-modal="false"
     >
-      年份
-      <input type="text" />
-      <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 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>
 </template>
@@ -268,6 +287,7 @@ export default {
     Treeselect,
     quillEditor,
   },
+  dicts: ["personnel_type"],
   data() {
     return {
       // 遮罩层
@@ -317,6 +337,25 @@ export default {
     this.getList();
   },
   methods: {
+    // // 添加人员体检信息
+    // submitForms() {
+    //   addExamine(this.form).then((response) => {
+    //     this.$modal.msgSuccess("新增成功");
+    //     this.opene = false;
+    //     this.getList();
+    //   });
+    // },
+    // 点击查看人员体检信息
+    handleUpdates(row) {
+      this.reset();
+      this.getTreeselect();
+      const id = row.id || this.ids;
+      getExamine(id).then((response) => {
+        this.form = response.data;
+        this.openes = true;
+        this.title = "查看人员体检信息";
+      });
+    },
     // 点击添加人员体检信息
     tianJia() {
       this.opene = true;
@@ -326,8 +365,11 @@ export default {
       this.openes = true;
     },
     // 点击人员触发
-    xingMing(name) {
-      this.form.peopleName = name;
+    xingMing(data) {
+      // console.log(data);
+      this.classId = data.classId;
+      this.job = data.job;
+      this.form.peopleName = data.name;
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -390,14 +432,13 @@ export default {
       const id = row.id || this.ids;
       getExamine(id).then((response) => {
         this.form = response.data;
-        this.getRenYuan(this.form.unitId);
-        this.open = true;
-        this.title = "修改人员体检信息";
+        // this.getRenYuan(this.form.unitId);
+        this.opene = true;
+        this.title = "新增人员体检信息";
       });
     },
     // 点击单位触发
     shuxing(data) {
-      console.log(data);
       this.form.unitId = data.id;
       this.form.unitName = data.label;
       this.getRenYuan(this.form.unitId);
@@ -413,9 +454,11 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            console.log(this.form);
             updateExamine(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.opene = false;
               this.getList();
             });
           } else {

src/views/medicalhealth/recuperate/index.vue

@@ -538,7 +538,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/militaryvehicleManagement/driver/index.vue

@@ -369,7 +369,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -340,7 +340,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -280,7 +280,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -521,7 +521,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -238,7 +238,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">重置</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -392,9 +392,10 @@ export default {
     },
     // 重置按钮
     cancel() {
-      // this.open = false;
+      this.open = false;
       this.reset();
     },
+    
     // 表单重置
     reset() {
       this.form = {

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -534,7 +534,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
 

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -238,7 +238,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取消</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
     <!-- 修改军车管理设置 -->
@@ -312,7 +312,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">重置</el-button>
+        <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -422,7 +422,9 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.opens = false;
       this.reset();
+      
     },
     // 表单重置
     reset() {
@@ -723,4 +725,16 @@ export default {
 .box{
   background-color: #ffba00 !important;
 }
+.el-button--btc{
+  width: 34px !important;
+}
+::v-deep .el-icon-plus:before {
+    margin-left: 6px !important;
+}
+.el-button--btd{
+  width: 34px !important;
+}
+::v-deep  .el-icon-delete:before {
+  margin-left: 5px !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -225,7 +225,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
 

src/views/militaryvehicleManagement/thebusThemplate/index.vue

@@ -195,7 +195,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/peopleChuRu/bdglLeave/index.vue

@@ -522,7 +522,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
       <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
         <el-button type="primary" @click="submitForms">通过</el-button>

src/views/peopleChuRu/leaveOne/index.vue

@@ -707,7 +707,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -257,7 +257,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/peopleManage/examination/index.vue

@@ -417,7 +417,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/peopleManage/people/index.vue

@@ -1231,8 +1231,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="btnflg" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/peopleManage/transfer/index.vue

@@ -520,7 +520,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/regulations/directoryinfo/index.vue

@@ -205,7 +205,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/regulations/fileinfo/index.vue

@@ -419,7 +419,7 @@
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
-            <el-button @click="cancel">取 消</el-button>
+            <el-button @click="cancel" size="btn">取 消</el-button>
           </div>
         </el-dialog>
       </div>
@@ -450,7 +450,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm1">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel" size="btn">取 消</el-button>
         </div>
       </el-dialog>
       <!-- 添加子分类弹框 -->
@@ -480,7 +480,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm2">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel" size="btn"> 取 消</el-button>
         </div>
       </el-dialog>
     </div>

src/views/system/config/index.vue

@@ -266,7 +266,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/dept/index.vue

@@ -249,7 +249,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/dict/data.vue

@@ -266,7 +266,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/dict/index.vue

@@ -268,7 +268,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/menu/index.vue

@@ -381,7 +381,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/notice/index.vue

@@ -265,7 +265,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -478,6 +478,10 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
+  
+}
+::v-deep .el-form .el-input__inner{
+  height: 36px !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -561,4 +565,7 @@ export default {
 ::v-deep .el-upload__tip {
   display: none;
 }
+::v-deep .el-input.is-disabled .el-input__inner{
+  background-color: transparent !important;
+}
 </style>

src/views/system/post/index.vue

@@ -229,7 +229,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/role/index.vue

@@ -300,7 +300,7 @@
     </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -362,7 +362,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
+        <el-button @click="cancelDataScope" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/system/user/index.vue

@@ -498,7 +498,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
 

src/views/workingArrangements/planTask/index.vue

@@ -357,7 +357,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 进度录入弹框 -->
@@ -451,7 +451,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 单人进度查看弹框 -->
@@ -559,7 +559,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 多人进度查看弹框 -->
@@ -696,7 +696,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/workingArrangements/workTask/index.vue

@@ -403,7 +403,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 进度录入弹框 -->
@@ -468,7 +468,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 单人进度查看弹框 -->
@@ -556,7 +556,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 多人进度查看弹框 -->
@@ -703,7 +703,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -810,7 +810,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 多人进度查看弹框 -->
@@ -857,7 +857,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm4">导 出</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>