Browse Source

集中文印、工作安排、战备值班、检查督导、人员进出、人力资源、系统管理取消按钮

liangjiahao 3 years ago
parent
commit
fe2e122e66
32 changed files with 53 additions and 46 deletions
  1. 1 1
      src/views/PrintsLog/printlog/index.vue
  2. 2 2
      src/views/PrintsManage/manage/index.vue
  3. 1 1
      src/views/bdglregular/regularinfo/index.vue
  4. 1 1
      src/views/bdglregular/specialinfo/index.vue
  5. 3 3
      src/views/combatduty/RateOfTen/index.vue
  6. 1 1
      src/views/combatduty/basedutyinfo/index.vue
  7. 1 1
      src/views/combatduty/grassdutyinfo/index.vue
  8. 1 1
      src/views/combatduty/militarydutyinfo/index.vue
  9. 1 1
      src/views/combatduty/regisdutyinfo/index.vue
  10. 1 1
      src/views/combatduty/taskdutyinfo/index.vue
  11. 1 1
      src/views/combatduty/teamdutyinfo/index.vue
  12. 1 1
      src/views/doormanManage/bdglVisit/index.vue
  13. 1 1
      src/views/militaryvehicleManagement/thebusConfig/index.vue
  14. 1 1
      src/views/peopleChuRu/bdglLeave/index.vue
  15. 1 1
      src/views/peopleChuRu/leaveOne/index.vue
  16. 1 1
      src/views/peopleChuRu/peopleBorrow/index.vue
  17. 1 1
      src/views/peopleManage/examination/index.vue
  18. 1 1
      src/views/peopleManage/people/index.vue
  19. 1 1
      src/views/peopleManage/transfer/index.vue
  20. 1 1
      src/views/regulations/directoryinfo/index.vue
  21. 3 3
      src/views/regulations/fileinfo/index.vue
  22. 1 1
      src/views/system/config/index.vue
  23. 1 1
      src/views/system/dept/index.vue
  24. 1 1
      src/views/system/dict/data.vue
  25. 1 1
      src/views/system/dict/index.vue
  26. 1 1
      src/views/system/menu/index.vue
  27. 8 1
      src/views/system/notice/index.vue
  28. 1 1
      src/views/system/post/index.vue
  29. 2 2
      src/views/system/role/index.vue
  30. 1 1
      src/views/system/user/index.vue
  31. 4 4
      src/views/workingArrangements/planTask/index.vue
  32. 6 6
      src/views/workingArrangements/workTask/index.vue

+ 1 - 1
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>

+ 2 - 2
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

+ 1 - 1
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>

+ 1 - 1
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>

+ 3 - 3
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -734,7 +734,7 @@ export default {
 .el-button--btd{
   width: 34px !important;
 }
-::v-deep .el-icon-delete:before {
+::v-deep  .el-icon-delete:before {
   margin-left: 5px !important;
 }
 </style>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
src/views/peopleManage/people/index.vue

@@ -1225,7 +1225,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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 3 - 3
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 8 - 1
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>

+ 1 - 1
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>

+ 2 - 2
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>

+ 1 - 1
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>
 

+ 4 - 4
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>

+ 6 - 6
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>