新分支

src/api/role/admin.js

@@ -282,4 +282,4 @@ export function UploadPrintOrder(data){
     method:"Post",
     data:data,
   })
-}
+}

src/xt_pages/outpatientCharges/summary.vue

@@ -124,10 +124,10 @@
           <!--          </el-button-->
           <!--          >-->
 
-           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -2677,6 +2677,7 @@ export default {
               治疗费:0,
               材料费:0,
               中成药费:0,
+              护理费:0,
               备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
             }
             let xiyaoPrice = 0
@@ -2685,6 +2686,8 @@ export default {
             let zhiLiaoPrice = 0
             let cailiaoPrice = 0
             let zhongchengyaoPrice = 0
+            let huliPrice = 0
+
 
               for (let b = 0; b < order.info.length; b++) {
                 if(order.info[b].med_chrgitm_type ==  '09'){
@@ -2705,6 +2708,10 @@ export default {
                 if(order.info[b].med_chrgitm_type ==  '11'){
                   zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
                 }
+
+                if(order.info[b].med_chrgitm_type ==  '07'){
+                  huliPrice = huliPrice + order.info[b].det_item_fee_sumamt
+                }
               }
             obj.西药费 = xiyaoPrice
             obj.化验费 = huaYanPrice
@@ -2712,6 +2719,8 @@ export default {
             obj.治疗费 = zhiLiaoPrice
             obj.材料费 = cailiaoPrice
             obj.中成药费 = zhongchengyaoPrice
+            obj.护理费 = huliPrice
+
 
 
             list.push(obj)
@@ -2727,6 +2736,8 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
+
               "备注",
             ];
             const filterVal = [
@@ -2738,6 +2749,7 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
               "备注",
             ];
             const data = this.formatJson(filterVal, list);

src/xt_pages/role/admin.vue

@@ -177,7 +177,7 @@
           style="float:left"
           @click="toEnd">结束签署</el-button> -->
            
-         
+       
           
      </div>
     
@@ -1013,7 +1013,8 @@ export default {
           this.$message.success("保存成功")
         }
       })
-    }
+    },
+   
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/user/Sitemap.vue

@@ -2,14 +2,14 @@
   <div>
     <div class='content_top' style="width: 100%;margin-bottom: 20px;border-bottom:1px solid #DCDFE6;padding-bottom:10px">
       <div style="font-size: 20px;">血管通路位点标记</div>
-      <div>
+      <!-- <div>
         <el-button type="primary">操作说明</el-button>
-      </div>
+      </div> -->
     </div>
 
     <div style="width:80%;margin:auto;">
       <div style="margin-bottom:30px;width: 100%; position: relative;">
-        <!-- <el-button type="primary" style="margin-right:20px;" @click="open">更换图片</el-button> -->
+        <el-button type="primary" style="margin-right:20px;" @click="open">更换图片</el-button>
         <el-button type="primary" style="margin-right:20px;" @click="add" v-show="!append">添加/修改位点标记</el-button>
         <el-button type="primary" @click="printtup">打印</el-button>
         <div style="display: inline-block;position: absolute;right: 10px;">
@@ -405,9 +405,9 @@ export default{
       this.append = false
       this.centerDialogVisible = false
     },
-    // open(){
-    //   this.imgDialogVisible = true
-    // },
+    open(){
+      this.imgDialogVisible = true
+    },
    
     a_item(e,val){
       console.log('asdfasdf222',this.Aarr);
@@ -1025,7 +1025,11 @@ export default{
         }
       }
    
-
+      
+       var img_url = ""
+       if(this.fileList!=null && this.fileList.length>0){
+          img_url = this.fileList[0].img_url
+       }
        var params = {
          id:this.id,
          is_append:is_append,
@@ -1067,6 +1071,7 @@ export default{
          left_v:0,
          aarr:this.Aarr,
          varr:this.Varr,
+         img_url:img_url,
        }
        console.log("paramswowwo",params)
 
@@ -1215,7 +1220,7 @@ export default{
               }
              }
           
-             
+             this.fileList[0].img_url =  sitemap.img_url
             }
 
          }

src/xt_pages/workforce/Patientshift.vue

@@ -600,12 +600,12 @@ export default {
      // 替换
      coverSch(){
       this.tipDialogVisible=false
-      this.currentData={
-        currentData_id:this.cur_drag_info.id,
-        currentData_name:this.cur_drag_info.name,
-        currentData_quhao:this.cur_drag_info.quhao,
-        currentData_chaung:this.cur_drag_info.chaung,
-      }
+      // this.currentData={
+      //   currentData_id:this.cur_drag_info.id,
+      //   currentData_name:this.cur_drag_info.name,
+      //   currentData_quhao:this.cur_drag_info.quhao,
+      //   currentData_chaung:this.cur_drag_info.chaung,
+      // }
       let params={
         id_one:this.cur_drag_info.id,
         id_two:this.currentData.currentData_id
@@ -619,7 +619,7 @@ export default {
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
-          this.getSchedulesOne();
+          this.getlist();
         }
       });
     },