Merge branch 'syf-scale1220' into test

src/common/Toast.vue

@@ -11,7 +11,7 @@
                 <span @click="cancel" class="canc" v-if="type!=1">{{title2}}</span>
               </div>
             </div>
-            <div class="mask" @click="cancel"></div>
+            <div class="mask"></div>
       </div>
     </portal>
 </template>

src/components/MainPage.vue

@@ -196,7 +196,7 @@
     <TipWarning v-if="wrong" :text="waring" @close="closeTip" />
 
     <Toast
-      message="预问诊填写成功,是否需要填写量表?"
+      message="预问诊填写成功，是否需要填写量表?"
       :show="showToast"
       title="去填写"
       title2="提交并预览病历"

src/components/Preview.vue

@@ -11,7 +11,7 @@
           </p>
           <table>
             <tr>
-              <td><span>挂号科室：</span>{{ pathInfo.selfDeptName }}</td>
+              <td><span>挂号科室：</span>{{ pathInfo.hospitalDeptName }}</td>
             </tr>
             <tr v-if="pathInfo.recordId">
               <td><span>排队号：</span>{{ pathInfo.recordId }}</td>