Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -73,10 +73,17 @@
                 class="under_line"
                 style="width: 70px; text-align: center"
               >
-                {{
+                <!-- {{
                    record.patient.total_dialysis + record.patient.user_sys_before_count
                     ? record.patient.total_dialysis + record.patient.user_sys_before_count : "/"
-                }}
+                }} -->
+              {{
+                          record.Count +
+                          record.patient.user_sys_before_count
+                            ?  record.Count +
+                              record.patient.user_sys_before_count
+                            : "/"
+                 }}
               </div>
             </div>
           </div>

src/xt_pages/stock/selfPreparedMedicine/warehouseOut.vue

@@ -551,7 +551,7 @@ export default {
     },
     handleDelete: function (index, row) {
 
-        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+        this.$confirm('确定删除吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'