Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -114,7 +114,7 @@
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
         <template slot-scope="scope">
-          <i class="el-icon-delete" @click="deleteProject(scope.row)"></i>
+          <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
         </template>
       </el-table-column>
     </el-table>
@@ -268,7 +268,7 @@
           }
          return name
       },
-      deleteProject(row){
+      deleteProject(row,i){
         if(this.curPrescriptions.order_status >= 2){
           this.$message.error('该处方已经结算或者退费，无法删除')
           return

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -83,7 +83,7 @@
         </div>
         <div class="otherInfo">
             <p class="otherName">门诊医嘱：</p>
-            <p style="flex:1;"></p>
+            <p style="flex:1;">{{history.doctor_advice}}</p>
         </div>
         <div style="margin-top:20px;text-align:right;">
             医生签名：{{getDoctor(history.doctor)}}