Merge remote-tracking branch 'origin/master'

src/assets/icons/svg/baocun.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16"><defs><style>.a,.c,.d{fill:none;}.b{isolation:isolate;clip-path:url(#a);}.c,.d{stroke:#000;}.c{stroke-linejoin:round;}.d{stroke-linecap:round;}</style><clipPath id="a"><rect class="a" x="1" y="1" width="16" height="16"/></clipPath></defs><g class="b" transform="translate(-1 -1)"><g transform="translate(-4 -4.5)"><path class="c" d="M18.95,6H7.05A1.089,1.089,0,0,0,6,7.125v12.75A1.089,1.089,0,0,0,7.05,21h11.9A1.089,1.089,0,0,0,20,19.875V7.125A1.089,1.089,0,0,0,18.95,6Z" transform="translate(0)"/><path class="c" d="M22.156,6v7.5H15V6Z" transform="translate(-5.758)"/><path class="d" d="M26,13v1.667" transform="translate(-12.222 -4.083)"/><path class="d" d="M11,6h9.417" transform="translate(-2.915)"/></g></g></svg>

src/assets/styles/btn.scss

@@ -336,6 +336,22 @@
     color: #C9C9C9!important;
   }
 }
+/*保存按钮*/
+.el-button--save--solid{
+  width: 53px !important;
+  border-radius: 6px 6px 6px 6px;
+  border: 1px solid rgb(255, 157, 78) !important;
+  &.is-disabled{
+    background: rgba(201,201,201,0.08)!important;
+    border: 1px solid #C9C9C9!important;
+    opacity: 1;
+    border-radius: 4px!important;
+    font-size: 12px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #C9C9C9!important;
+  }
+}
 .el-button--warning--solid{
   width: 53px!important;
   border-radius: 6px 6px 6px 6px;

src/views/medical-record-management/medical-edit.vue

@@ -652,13 +652,14 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.paymentStatus === '0'|| scope.row.isAdd ) && scope.row.inputShow"
-                    icon="el-icon-edit"
                     plain
+                    icon="el-icon-wallet"
                     size="mini"
-                    class="el-button--primary--solid"
-                    type="primary"
+                    class="el-button--save--solid"
+                    type="warning"
                     @click="handleSave('drugForm','stockDispenseOutboundList', scope.$index)"
-                  >保存
+                  >
+                    保存
                   </el-button>
                   <el-button
                     v-if="isEdit && scope.row.paymentStatus === '0' && !scope.row.inputShow"
@@ -853,11 +854,11 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.payType === '0'|| scope.row.isAdd ) && scope.row.inputShow"
-                    icon="el-icon-edit"
+                    icon="el-icon-wallet"
                     plain
                     size="mini"
-                    class="el-button--primary--solid"
-                    type="primary"
+                    class="el-button--save--solid"
+                    type="warning"
                     @click="handleSave('checkForm','checkManageBos', scope.$index)"
                   >保存
                   </el-button>
@@ -1039,11 +1040,11 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && (scope.row.payType === '0'|| scope.row.isAdd ) && scope.row.inputShow"
-                    icon="el-icon-edit"
+                    icon="el-icon-wallet"
                     plain
                     size="mini"
-                    class="el-button--primary--solid"
-                    type="primary"
+                    class="el-button--save--solid"
+                    type="warning"
                     @click="handleSave('treatForm','treatManageBo', scope.$index)"
                   >保存
                   </el-button>
@@ -1201,11 +1202,11 @@ color: #333333;"
                   </el-button>
                   <el-button
                     v-if="isEdit && !petInHospitalStatus && petInHospitalUpdateShow"
-                    icon="el-icon-document"
+                    icon="el-icon-wallet"
                     plain
                     size="mini"
-                    class="el-button--primary--solid"
-                    type="success"
+                    class="el-button--save--solid"
+                    type="warning"
                     @click="saveUpdatePetInHospital(scope.row)"
                   >保存
                   </el-button>