Merge remote-tracking branch 'origin/master'

src/assets/icons/svg/xinzengguahao_guahaohui.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13.001" viewBox="0 0 13 13.001"><defs><style>.a{fill:#2aada2;}</style></defs><path class="a" d="M94.467,82.237l-5.029-5.029a1.472,1.472,0,0,0-2.082,0l-5.029,5.029a1.473,1.473,0,0,0,0,2.081l5.029,5.029a1.472,1.472,0,0,0,2.082,0l5.029-5.029a1.473,1.473,0,0,0,0-2.081Zm-4.266,1.6H88.951v1.249a.515.515,0,1,1-1.031,0V83.832H86.672a.515.515,0,1,1,0-1.031H87.92V81.553a.515.515,0,0,1,1.031,0V82.8H90.2a.515.515,0,1,1,0,1.031Z" transform="translate(-81.897 -76.777)"/></svg>
\ No newline at end of file

src/components/ImageUpload/index.vue

@@ -30,7 +30,7 @@
         || $refs.imageUpload && $refs.imageUpload.uploadFiles.length >= limit
         || number >= limit}"
     >
-      <i slot="default" class="el-icon-plus"/>
+      <i slot="default" class="el-icon-plus" />
       <div slot="file" slot-scope="{file}" class="customer-upload-area">
         <el-image
           v-show="fileList.length > 0"
@@ -49,26 +49,26 @@
                 class="inner_style"
                 :src="baseURL+'/tmt-pic/business/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
                 alt="加载失败"
-              />
+              >
               <div>加载失败</div>
             </div>
           </div>
         </el-image>
         <label class="el-upload-list__item-status-label">
-          <i class="el-icon-upload-success el-icon-check"/>
+          <i class="el-icon-upload-success el-icon-check" />
         </label>
         <span class="el-upload-list__item-actions">
           <span
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
           >
-            <i class="el-icon-zoom-in"/>
+            <i class="el-icon-zoom-in" />
           </span>
           <span
             class="el-upload-list__item-delete"
             @click="handleDelete(file)"
           >
-            <i class="el-icon-delete"/>
+            <i class="el-icon-delete" />
           </span>
         </span>
       </div>

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

@@ -876,8 +876,7 @@ color: #333333;"
             <el-table
               :data="treatManageBo"
               :header-cell-style="{ background:'#F4F4F4'}"
-
-            >
+>
               <el-table-column align="left" label="治疗类型" prop="treatItemsType">
                 <template slot-scope="scope">
                   <el-form-item
@@ -1064,8 +1063,7 @@ color: #333333;"
               ref="inHospitalForm"
               :data="petInHospitalList"
               :header-cell-style="{ background:'#F4F4F4'}"
-
-            >
+>
               <el-table-column align="left" label="病情等级" prop="diseaseLevel">
                 <template slot-scope="scope">
                   <sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn>

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

@@ -216,7 +216,7 @@
               class="el-button--primary--solid"
               type="primary"
               @click="handleUpdate(scope.row)"
-            ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;"/>编辑
+            ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
             </el-button>
           </template>
         </el-table-column>

src/views/service-management/medical-record-management/check-subscribe.vue

@@ -7,7 +7,7 @@
         font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
         font-weight: bold;
         color: #333333;"
-      >立即预约</span>·
+      >立即预约</span>
     </div>
     <el-form ref="form" :model="checkDetail" label-width="5.3rem">
       <div class="title-paragraph">

src/views/service-management/registration-queue/components/doctor-card.vue

@@ -5,7 +5,7 @@
     <div v-if="docList.length>0" class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
-        <div class="tip-green"/>
+        <div class="tip-green" />
         <div
           class="tip-content"
         >挂号信息
@@ -71,7 +71,7 @@
               </div>
             </div>
             <!--分割线-->
-            <div class="divider"/>
+            <div class="divider" />
             <!--卡片中间部分-->
             <div class="mid-bottom-framework">
               <div
@@ -132,7 +132,7 @@
             >
               <div class="detail" @click="doctorDetail(item.id)">
                 <div class="detail-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/>
+                  <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
                 </div>
                 <el-button
                   type="text"
@@ -142,14 +142,14 @@
               <!--给它传一个userId,一个类型-->
               <div class="register" @click="registration(item.userId,'0',item,0)">
                 <div class="register-img">
-                  <el-image :src="item.registered === '0' ? require('@/assets/register/xinzengguahao_guahaohui@2x.png') : require('@/assets/register/xinzengguahao_guahaolan@2x.png')"/>
+                  <el-image :src="item.plusSign === '0' ? require('@/assets/register/xinzengguahao_guahaohui.png') : require('@/assets/register/xinzengguahao_guahaolan@2x.png')" />
                 </div>
-                <el-button type="text" :disabled="item.registered === '0'">挂号</el-button>
+                <el-button type="text" :class="item.plusSign === '0'?'add_show':'add_hidden'">挂号</el-button>
               </div>
               <!--给它传一个userId,一个类型和一个默认页数-->
               <div class="add">
                 <div class="add-img">
-                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/>
+                  <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
                 </div>
                 <el-button v-if="item.plusSign === '0'" type="text" :disabled="item.plusSign === '1'" @click="registration(item.userId, '1',item,0)">
                   加号
@@ -163,7 +163,7 @@
     <div v-else class="doctor-card">
       <!--标签-->
       <div class="progress-tip">
-        <div class="tip-green"/>
+        <div class="tip-green" />
         <div
           class="tip-content"
         >挂号信息
@@ -185,7 +185,7 @@ border: 1px solid #E5E5E5;
           flex-direction: column;margin-top: 9%;"
           >
             <div style=" width:115px;height: 74px;">
-              <el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')"/>
+              <el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')" />
             </div>
             <div
               style="font-size: 14px;
@@ -505,16 +505,6 @@ export default {
             height: 13px;
             margin-top: 11px;
           }
-
-          ::v-deep .el-button--text {
-            font-size: 12px;
-            font-family: Microsoft YaHei-Regular, Microsoft YaHei;
-            font-weight: 400;
-            color: #3490CE;
-          }
-          ::v-deep .is-disabled {
-            color: #C9C9C9;
-          }
         }
 
         //加号
@@ -545,4 +535,18 @@ export default {
   padding: unset !important;
 }
 
+/*加号的样式-加号显示*/
+.add_show{
+  font-size: 12px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+  font-weight: 400;
+  color: #2AADA2;
+}
+/*加号的样式-加号隐藏*/
+.add_hidden{
+  font-size: 12px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+  font-weight: 400;
+  color: #3490CE;
+}
 </style>

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -182,7 +182,7 @@
                   </div>
                 </el-form-item>
                 <el-tooltip class="item" effect="dark" :content="getSallNum(singleItem)" placement="top">
-                  <img :src="questIcon" />
+                  <img :src="questIcon" >
                 </el-tooltip>
               </div>
               <div>