样式bug

src/api/config.js

@@ -118,7 +118,7 @@ export default {
         "key":2
     },
     {
-        "name":"手术/操作",
+        "name":"手术和操作",
         "key":6
     },
     // {
@@ -140,7 +140,7 @@ export default {
         "key":3
     },
     {
-        "name":"治疗方案",
+        "name":"一般治疗",
         "key":4
     },
     

src/components/icss/AddMedicinePrompt.vue

@@ -658,22 +658,22 @@ export default {
   /deep/ .el-message-box__message {
     margin: 24px 0px;
   }
-  /deep/ .confirmBtn {
-    position: relative;
-    right: 240px !important;
-    top: 0px;
-    background-color: #fff !important;
-    span {
-      color: #48c5d7 !important;
-    }
-  }
+  // /deep/ .confirmBtn {
+  //   // position: relative;
+  //   // right: 240px !important;
+  //   // top: 0px;
+  //   background-color: #fff !important;
+  //   span {
+  //     color: #48c5d7 !important;
+  //   }
+  // }
   /deep/ .cancel {
-    background-color: #48c5d7;
+    background-color: #d7d7d7;
+    border-color: transparent !important;
     span {
       color: #fff;
     }
   }
 }
-
 </style>
 

src/components/icss/MedicinePrompt.vue

@@ -219,13 +219,13 @@ export default {
           loading.close();
           if (res.data.code == '0') {
             const data = res.data.data;
-            // 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作
+            // 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-手术和操作
             let temp = [
               '',
               '诊断',
               '药品',
               '检验套餐',
-              '检验明细',
+              '检验细项',
               '检查',
               '手术和操作'
             ];

src/components/icss/dept/AddDept.vue

@@ -208,7 +208,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/dept/DeptManage.vue

@@ -209,9 +209,10 @@ export default {
     },
     showConfirmDialog(msg, resolve) {
       this.$confirm(msg, '提示', {
-        confirmButtonText: '确定',
+        confirmButtonText: '删除',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -313,6 +314,10 @@ export default {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC{
+    background-color: #FF545B !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/disease/AddChemicalAndCommonMapping.vue

@@ -284,7 +284,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/disease/ChemicalAndCommonMapping.vue

@@ -218,6 +218,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -314,11 +315,15 @@ export default {
 .pagination {
   min-width: 1010px;
 }
-.el-message-box{
-  /deep/.cancelBtn{
+.el-message-box {
+  /deep/.cancelBtn {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/drug/AddDrug.vue

@@ -234,7 +234,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/drug/DrugManage.vue

@@ -213,6 +213,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -309,11 +310,15 @@ export default {
 .pagination {
   min-width: 1010px;
 }
-.el-message-box{
-  /deep/.cancelBtn{
+.el-message-box {
+  /deep/.cancelBtn {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/fusion/AddFusion.vue

@@ -204,7 +204,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/fusion/Fusion.vue

@@ -213,6 +213,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -314,6 +315,10 @@ export default {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/lis/AddLis.vue

@@ -229,7 +229,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/lis/Lis.vue

@@ -219,6 +219,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -315,11 +316,15 @@ export default {
 .pagination {
   min-width: 1010px;
 }
-.el-message-box{
-  /deep/.cancelBtn{
+.el-message-box {
+  /deep/.cancelBtn {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/operation/AddOperation.vue

@@ -229,7 +229,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/operation/Operation.vue

@@ -218,6 +218,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -319,6 +320,10 @@ export default {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/pacs/AddPacs.vue

@@ -229,7 +229,7 @@ export default {
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
             //   this.saveLisMapping(params, '关联建立成功', 'success');
             // });
-            this.warning('该条关联已存在,请重新编辑!');
+            this.warning('该条关联已存在，无法添加');
             this.saveDisable = false;
           }
         })

src/components/icss/pacs/Pacs.vue

@@ -213,6 +213,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: 'confirmC',
         type: 'warning'
       })
         .then(() => {
@@ -309,11 +310,15 @@ export default {
 .pagination {
   min-width: 1010px;
 }
-.el-message-box{
-  /deep/.cancelBtn{
+.el-message-box {
+  /deep/.cancelBtn {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/.confirmC {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {

src/components/icss/plan/AddPlan.vue

@@ -134,6 +134,22 @@ import api from '@api/icss.js';
 export default {
   name: 'AddPlan',
   data() {
+    var numreg = /^[a-zA-Z0-9_\u4e00-\u9fa5]+$/;
+    var numreg1 = /^[0-9a-zA-Z_]{1,}$/;
+    var validatePass = (rule, value, callback) => {
+      if (!numreg.test(value)) {
+        callback(new Error('汉字、字母、数字和下划线'));
+      } else {
+        callback();
+      }
+    };
+    var validatePass1 = (rule, value, callback) => {
+      if (!numreg1.test(value)) {
+        callback(new Error('字母、数字和下划线'));
+      } else {
+        callback();
+      }
+    };
     return {
       form: {
         planName: '',
@@ -142,10 +158,14 @@ export default {
       saveDisable: false, //保存按钮禁止点击
       rules: {
         planName: [
-          { required: true, message: '方案名称不能为空', trigger: 'change' }
+          { required: true, message: '方案名称不能为空', trigger: 'change' },
+          { min: 2, max: 30, message: '长度2-30位', trigger: 'blur' },
+          { required: true, validator: validatePass, trigger: 'blur' }
         ],
         planCode: [
-          { required: true, message: '方案编码不能为空', trigger: 'change' }
+          { required: true, message: '方案编码不能为空', trigger: 'change' },
+          { min: 4, max: 10, message: '长度4-10位', trigger: 'blur' },
+          { required: true, validator: validatePass1, trigger: 'blur' }
         ]
       },
       planDefaultList: [],
@@ -399,7 +419,7 @@ export default {
             if (res.data.code === '0') {
               this.$message({
                 showClose: true,
-                message:  this.isEdit ? '编辑成功' : '添加成功',
+                message: this.isEdit ? '编辑成功' : '添加成功',
                 type: 'success',
                 duration: 1000
               });

src/components/icss/plan/Plan.vue

@@ -120,8 +120,8 @@ export default {
     },
 
     // 获取列表数据
-     async getDataList(isTurnPage) {
-      let params = await this.getFilterItems(isTurnPage)
+    async getDataList(isTurnPage) {
+      let params = await this.getFilterItems(isTurnPage);
       this.searched = true;
       const loading = this.$loading({
         lock: true,
@@ -148,7 +148,7 @@ export default {
       if (isTurnPage && !this.searched) {
         this.clearFilter();
       }
-      let res = await api.getHospitalInfo()
+      let res = await api.getHospitalInfo();
       if (res.data.code === '0') {
         this.hospitalId = res.data.data.id;
       }
@@ -220,11 +220,22 @@ export default {
         type: type || 'warning'
       });
     },
-    showConfirmDialog(msg, resolve) {
+    showConfirmDialog(msg, resolve, type) {
+      let showInfo = '启用';
+      let btnNameClass = 'confirmBtn2';
+      if (type === 'Del') {
+        showInfo = '禁用';
+        btnNameClass = 'delBtn';
+      }else if(type === 'Del1'){
+        showInfo = '删除';
+        btnNameClass = 'delBtn';
+      }
+
       this.$confirm(msg, '提示', {
-        confirmButtonText: '确定',
+        confirmButtonText: showInfo,
         cancelButtonText: '取消',
         cancelButtonClass: 'cancelBtn',
+        confirmButtonClass: btnNameClass,
         type: 'warning'
       })
         .then(() => {
@@ -246,7 +257,8 @@ export default {
         this.$confirm(`${info}正在启用中，无法删除。`, '', {
           confirmButtonText: '确定',
           // cancelButtonText: '取消',
-          cancelButtonClass: 'makeSure',
+          cancelButtonClass: 'cancelSure',
+          confirmButtonClass: 'sure',
           customClass: 'exportBox'
         })
           .then(() => {})
@@ -281,7 +293,7 @@ export default {
           .catch(error => {
             this.warning(error);
           });
-      });
+      },'Del1');
     },
 
     // 启用/禁用 数据请求
@@ -312,14 +324,15 @@ export default {
         // 启用
         this.showConfirmDialog(`确定要启用${row.planName}吗？`, () => {
           this.sendAbleOrEn(row, type);
-        });
+        },'Reuse');
       } else {
         // 禁用
         this.showConfirmDialog(
           `方案禁用后前端页面将无法正常显示内容，确定要禁用${row.planName}吗？`,
           () => {
             this.sendAbleOrEn(row, type);
-          }
+          },
+          'Del'
         );
       }
     }
@@ -339,24 +352,32 @@ export default {
 .pagination {
   min-width: 1010px;
 }
-.disable{
-  border-color: transparent
+.disable {
+  border-color: transparent;
 }
 .el-message-box {
   /deep/.cancelBtn {
     background-color: #d7d7d7;
     border-color: transparent;
   }
+  /deep/ .delBtn {
+    background-color: #ff545b !important;
+    border-color: transparent !important;
+  }
+  /deep/ .confirmBtn2 {
+    position: relative;
+    right: 0px !important;
+  }
 }
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;
   }
   /deep/ .el-message-box__message {
-    text-align: center;
+    // text-align: center;
   }
   /deep/ .el-message-box__btns {
-    text-align: center;
+    // text-align: center;
     margin-bottom: 24px;
   }
   /deep/ .leftbtn {
@@ -364,10 +385,13 @@ export default {
     background-color: #d7d7d7;
     border-color: transparent;
   }
-  /deep/ .makeSure {
+  /deep/ .cancelSure {
     // text-align: center;
     display: none;
   }
+  /deep/ .sure {
+    float: right;
+  }
 }
 .contents {
   .is-plain {
@@ -378,9 +402,9 @@ export default {
   }
 }
 
-.el-table__row{
-  /deep/ .is-disabled{
-    border-color: transparent !important
+.el-table__row {
+  /deep/ .is-disabled {
+    border-color: transparent !important;
   }
 }
 </style>