Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/template/printFive.vue

@@ -2,10 +2,10 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-        <div  style="float: right" v-if="prescriptions[0].med_type == '1111'">精一</div>
-        <div  style="float: right" v-if="prescriptions[0].med_type == '1112'">精二</div>
+        <div  style="float: right" v-if="item.med_type == '1111'">精一</div>
+        <div  style="float: right" v-if="item.med_type == '1112'">精二</div>
         <div  style="float: right"
-             v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">普通
+             v-if="item.med_type != '1111' && item.med_type != '1112'">普通
         </div>
 
         <div class="printTitle">{{ orgname }}处方笺</div>

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -114,9 +114,9 @@
                             <span @click="putOnRecord(1,scope.row)">备案</span>
                         </el-button>
 
-<!--                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >-->
-<!--                            <span @click="putOnRecord(2,scope.row)">撤消</span>-->
-<!--                        </el-button>-->
+                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                            <span @click="putOnRecord(2,scope.row)">撤消</span>
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>