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

src/xt_pages/outpatientRecord/outpatientRecord.vue

                             <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>