Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/PatientBox.vue

@@ -407,10 +407,10 @@ export default {
         background: #5bd18b;
       }
       .green1 {
-        background: #e6a23c;
+        background: #258ffc;
       }
       .green2 {
-        background: #7930c3;
+        background: #e6a23c;
       }
       .gray {
         background: #a8b3ba;

src/pages/main/dialog/AcceptsDialog.vue

@@ -473,8 +473,8 @@ export default {
 <style lang="scss">
 .acceptsForm {
   .el-radio {
-    margin-right: 20px;
-    width: 2.2rem;
+    margin-right: 14px;
+    width: 2.4rem;
   }
 }
 

src/pages/main/dialog/DoubleDialog.vue

@@ -11,9 +11,9 @@
           :inline="true"
           class="demo-form-inline doubleForm"
           :model="doubleReview"
-          label-width="3.4rem"
+          label-width="3.5rem"
         >
-          <el-form-item label="透析物品核查 : ">
+          <el-form-item label="透析物品核查 :">
             <el-radio v-model="doubleReview.dialysis_item_check" label="1"
               >正确</el-radio
             >
@@ -21,7 +21,7 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="3.5rem">
+          <el-form-item label="差错描述 :" label-width="3.5rem">
             <el-input
               class="doubleInput"
               v-model="doubleReview.dialysis_item_desc"
@@ -34,7 +34,7 @@
           :model="doubleReview"
           label-width="3.5rem"
         >
-          <el-form-item label="透析参数核查 : ">
+          <el-form-item label="透析参数核查 :">
             <el-radio v-model="doubleReview.dialysis_parameter_check" label="1"
               >正确</el-radio
             >
@@ -42,7 +42,7 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="3.5rem">
+          <el-form-item label="差错描述 :" label-width="3.5rem">
             <el-input
               class="doubleInput"
               v-model="doubleReview.dialysis_parameter_desc"
@@ -55,7 +55,7 @@
           :model="doubleReview"
           label-width="3.5rem"
         >
-          <el-form-item label="血管通路核查 : ">
+          <el-form-item label="血管通路核查 :">
             <!--<el-radio-group v-model="form.appetite">-->
             <!--<el-radio label="正确"></el-radio>-->
             <!--<el-radio label="整改"></el-radio>-->
@@ -71,7 +71,7 @@
               >错误</el-radio
             >
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="3.5rem">
+          <el-form-item label="差错描述 :" label-width="3.5rem">
             <el-input
               class="doubleInput"
               v-model="doubleReview.vascular_access_desc"
@@ -84,7 +84,7 @@
           :model="doubleReview"
           label-width="3.5rem"
         >
-          <el-form-item label="管道连接核查 : ">
+          <el-form-item label="管道连接核查 :">
             <!--<el-radio-group v-model="form.condition">-->
             <el-radio v-model="doubleReview.pipeline_connection_check" label="1"
               >正确</el-radio
@@ -94,7 +94,7 @@
             >
             <!--</el-radio-group>-->
           </el-form-item>
-          <el-form-item label="差错描述 : " label-width="3.5rem">
+          <el-form-item label="差错描述 :" label-width="3.5rem">
             <el-input
               class="doubleInput"
               v-model="doubleReview.pipeline_connection_desc"

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -446,7 +446,7 @@ export default {
   .cell {
     .inputBox {
       @media only screen and (max-width: 767px) {
-        padding: 0.32rem 0 !important;
+        padding: 0.34rem 0 !important;
         padding-left: 5px !important;
         font-size: 0.45rem !important;
       }