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

src/api/his/his.js

@@ -653,3 +653,10 @@ export function getBatchPrint(params) {
   })
 }
 
+export function getPresciptionTemplateDetail(params) {
+  return request({
+    url: '/api/his/getprescriptiontemplatedetail',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/his_config.js

@@ -1,82 +1,123 @@
-import request from "@/utils/request";
-
-
+import request from '@/utils/request'
 
 export function getPatientList(params) {
   return request({
-    url: "/api/his/patient/list",
-    method: "get",
-    params:params
-  });
+    url: '/api/his/patient/list',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getPrescriptionTemplateList(params) {
   return request({
-    url: "/api/his/prescriptiontemplate/list",
-    method: "get",
-    params:params
-  });
+    url: '/api/his/prescriptiontemplate/list',
+    method: 'get',
+    params: params
+  })
 }
 
-
 export function getPrescriptionTemplateInfo(params) {
   return request({
-    url: "/api/his/prescriptiontemplate/info",
-    method: "get",
-    params:params
-  });
+    url: '/api/his/prescriptiontemplate/info',
+    method: 'get',
+    params: params
+  })
 }
 
-
-
-export function createdTemplate(params,data) {
+export function getPrescriptionModeTemplateInfo(params) {
   return request({
-    url: "/api/his/prescriptiontemplate/create",
-    method: "post",
-    data:data,
-    params:params,
-  });
+    url: '/api/his/prescriptionmodetemplate/info',
+    method: 'get',
+    params: params
+  })
 }
 
+export function createdTemplate(params, data) {
+  return request({
+    url: '/api/his/prescriptiontemplate/create',
+    method: 'post',
+    data: data,
+    params: params
+  })
+}
 
-
+export function createdModeTemplate(params, data) {
+  return request({
+    url: '/api/his/prescriptionmodetemplate/create',
+    method: 'post',
+    data: data,
+    params: params
+  })
+}
 
 export function delHisPrescriptionTemplate(params) {
   return request({
-    url: "/api/his/prescriptiontemplate/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/his/prescriptiontemplate/delete',
+    method: 'post',
+    params: params
+  })
 }
 
-
-
 export function delHisPrescriptionInfoTemplate(params) {
   return request({
-    url: "/api/his/prescriptioninfotemplate/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/his/prescriptioninfotemplate/delete',
+    method: 'post',
+    params: params
+  })
 }
 
+export function delHisPrescriptionAdviceTemplate(params) {
+  return request({
+    url: '/api/his/advicetemplate/delete',
+    method: 'post',
+    params: params
+  })
+}
 
+export function delHisPrescriptionProjectTemplate(params) {
+  return request({
+    url: '/api/his/projecttemplate/delete',
+    method: 'post',
+    params: params
+  })
+}
 
+export function getModeTempaleteName(params) {
+  return request({
+    url: '/api/his/getmodetemplatename',
+    method: 'get',
+    params: params
+  })
+}
 
-export function delHisPrescriptionAdviceTemplate(params) {
+export function delHisModePrescriptionTemplate(params) {
   return request({
-    url: "/api/his/advicetemplate/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/his/prescriptionmodetemplate/delete',
+    method: 'post',
+    params: params
+  })
 }
 
+export function delHisModePrescriptionProjectTemplate(params) {
+  return request({
+    url: '/api/his/projectmodetemplate/delete',
+    method: 'post',
+    params: params
+  })
+}
 
+export function delHisModePrescriptionAdviceTemplate(params) {
+  return request({
+    url: '/api/his/advicempdetemplate/delete',
+    method: 'post',
+    params: params
+  })
+}
 
-export function delHisPrescriptionProjectTemplate(params) {
+export function delHisModePrescriptionInfoTemplate(params) {
   return request({
-    url: "/api/his/projecttemplate/delete",
-    method: "post",
-    params:params,
-  });
+    url: '/api/his/prescriptioninfomodetemplate/delete',
+    method: 'post',
+    params: params
+  })
 }

src/api/his/his_tools.js

@@ -1,12 +1,24 @@
-import request from "@/utils/request";
-
+import request from '@/utils/request'
 
 export function GetAllPatients() {
   return request({
-    url: "/api/his/patient",
-    method: "get",
-  });
+    url: '/api/his/patient',
+    method: 'get'
+  })
 }
 
+export function getHisSummaryDetailList(params) {
+  return request({
+    url: '/api/gethissummarydetaillist',
+    method: 'get',
+    params: params
+  })
+}
 
-
+export function getGatherDetailList(params) {
+  return request({
+    url: '/api/his/getgatherdetailist',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -176,9 +176,9 @@ export default {
     selfPreparedMedicine: '自备药管理',
     wareHouseManage: '仓库管理',
     inventoryTransfer: '库存调拨',
-    wareHouseManage:'仓库管理',
+    wareHouseManage: '仓库管理',
 
-    inventoryTransfer:'库存调拨',
+    inventoryTransfer: '库存调拨',
 
     consumablesManagement: '耗材管理',
     warehouseReceipt: '出入库',
@@ -270,11 +270,12 @@ export default {
     pastInquiries: '既往查询',
 
     prescriptionTemplate: '处方模版',
+    modeTemplate: '透析模式模版',
     hospitalRecord: '住院登记',
     hisTool: 'HIS工具',
     hospitalCharges: '住院收费',
 
-    DepositManagement:'押金管理',
+    DepositManagement: '押金管理',
 
     summary_tool: '项目消费明细汇总',
     labelPrint: '标签打印',

src/router/modules/hisTool.js

@@ -12,6 +12,20 @@ export default {
     isChild: true
   },
   children: [
+    {
+      path: '/hisTool/modeTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/modeTemplate'),
+      name: 'modeTemplate',
+      meta: { title: 'modeTemplate', noCache: true }
+    },
+    {
+      path: '/hisTool/modeTemplateDetail',
+      component: () => import('@/xt_pages/outpatientDoctorStation/modeTemplateDetail'),
+      name: 'modeTemplateDetail',
+      meta: { title: 'modeTemplateDetail', noCache: true },
+      hidden: true,
+      is_menu: false
+    },
     {
       path: '/hisTool/prescriptionTemplate',
       component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
@@ -57,7 +71,8 @@ export default {
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
       name: 'yidiClear',
       meta: { title: 'yidiClear', noCache: true }
-    },{
+    },
+    {
       path: '/hisTool/statistics',
       component: () => import('@/xt_pages/outpatientTool/statistics'),
       name: 'statistics',
@@ -69,5 +84,6 @@ export default {
       name: 'zeroSummary',
       meta: { title: 'zeroSummary', noCache: true }
     }
+
   ]
 }

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -754,10 +754,12 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
+                        <span v-if="!prescription.dialysis_dialyszers&&!prescription.dialyzer_perfusion_apparatus">/</span>
+                        <span v-if="prescription.dialysis_dialyszers">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : "/"
+                            : ""
                         }}
                       </div>
                     </div>

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -132,6 +132,7 @@
 
       <el-form-item label="体格检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="physical_examination"
           placeholder="体格检查"
         ></el-input>
@@ -139,6 +140,7 @@
 
       <el-form-item label="专科检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="special_inspection"
           placeholder="专科检查"
         ></el-input>
@@ -146,6 +148,7 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input
+          type="textarea"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
@@ -180,13 +183,13 @@
         <el-input
           v-model="case_history.sbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         /
         <el-input
           v-model="case_history.dbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         mmHg
       </el-form-item>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -3878,27 +3878,29 @@
 
       },
 
-      opentwo(index) {
-        
-        if (index == 1) {
-          if (this.patientInfo.id == undefined) {
-            this.$message.error('请先选择病人')
-            return
-          }
-          this.$refs.child.createCaseHistory()
-        } else if (index == 2) {
-          this.recordVisible = true
-          this.$refs.recordPrint.show(this.patientid)
-
-          // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
-        } else if (index == 3) {
-          var mode_status = this.$refs.saveRecordTemplate.mode_status
-          this.$refs.medicalRecord.show(mode_status)
-        } else if (index == 4) {
-          this.$refs.saveRecordTemplate.show(this.case_history)
+    // 电子病历打印
+    opentwo(index) {
+      if (index == 1) {
+        if (this.patientInfo.id == undefined) {
+          this.$message.error('请先选择病人')
+          return
         }
+        this.$refs.child.createCaseHistory()
+      } else if (index == 2) {
+        this.recordVisible = true
+        this.$nextTick(() => {
+          this.$refs.recordPrint.show(this.patientid,this.org_id)
+        })
+        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+      } else if (index == 3) {
+        var mode_status = this.$refs.saveRecordTemplate.mode_status
+        this.$refs.medicalRecord.show(mode_status)
+      } else if (index == 4) {
+        this.$refs.saveRecordTemplate.show(this.case_history)
+      }
+
+    },
 
-      },
       // changePatient(val){
       //   console.log("患者val",val)
       //   this.hisPatientInfo = val.hisPatientInfo

src/xt_pages/hospitalStation/recordPrint.vue

@@ -70,10 +70,20 @@ export default {
       educationOptions:[],
       history:{},
       keyword:"",
-      org_id,
+      org_id:0,
     };
   },
   methods: {
+
+    show(val, id) {
+      this.org_id = id;
+      if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
+        this.$refs.printTwo.show(val);
+      } else {
+        this.$refs.printOne.show(val);
+      }
+    },
+
     getAdminUser(id) {
       if (id == 0) {
         return "";
@@ -106,14 +116,14 @@ export default {
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
       
       
-      if (this.org_id != 10217 && this.org_id != 0) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_id == 10217 || this.org_id == 0) {
+      } else if (this.org_id == 10217 || this.org_id == 0|| this.org_id == 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -173,11 +183,11 @@ export default {
 
   },
   created() {
-    // this.getPatientList()
-     this.org_id = this.$store.getters.xt_user.org.id;
-    console.log("=====", this.org_id);
-    this.$refs.printOne.show(this.patientid);
-    this.$refs.printTwo.show(this.patientid);
+    // // this.getPatientList()
+    //  this.org_id = this.$store.getters.xt_user.org.id;
+    // console.log("=====", this.org_id);
+    // this.$refs.printOne.show(this.patientid);
+    // this.$refs.printTwo.show(this.patientid);
 
   },
   // computed:{

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -14,7 +14,7 @@
       <div class="infoTitle" style="margin-top:20px;">
         <div class="name_slot">姓名：{{ patient.name ? patient.name : "" }}</div>
         <div class="address_slot">
-          家庭住址：{{ patient.home_address ? patient.home_address : "" }}深圳市南山区桃园街道新屋村东区三号楼303
+          家庭住址：{{ patient.home_address ? patient.home_address : "" }}
         </div>
       </div>
       <div class="infoTitle">
@@ -119,7 +119,7 @@
         <div>实验室及器械检查</div>
         <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
       </div>
-      <div style="display: flex; justify-content: end">
+      <div style="display: flex; justify-content:flex-end">
         <div class="endInfo">
           <div style="height: 100px">
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
@@ -270,9 +270,9 @@ export default {
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
-    this.getAllDoctorList();
-    this.getPatientCaseHistory();
-    this.getAccessList()
+    // this.getAllDoctorList();
+    // this.getPatientCaseHistory();
+    // this.getAccessList()
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -132,6 +132,7 @@
 
       <el-form-item label="体格检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="physical_examination"
           placeholder="体格检查"
         ></el-input>
@@ -139,6 +140,7 @@
 
       <el-form-item label="专科检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="special_inspection"
           placeholder="专科检查"
         ></el-input>
@@ -146,6 +148,7 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input
+          type="textarea"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
@@ -180,13 +183,13 @@
         <el-input
           v-model="case_history.sbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         /
         <el-input
           v-model="case_history.dbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         mmHg
       </el-form-item>

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateModeTable.vue

@@ -0,0 +1,698 @@
+<template>
+
+    <div class="prescriptionTable">
+        <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" width="70" label="序号">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="drug_name" label="名称">
+                <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
+                </template>
+            </el-table-column>
+
+          <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;">
+                <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)"
+                          style="width:50%;"></el-input>
+                <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+                <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                           @change="getAllChange(scope)">
+                  <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                  <el-option :label="scope.row.drug.dose_unit"
+                             v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
+                             :value="scope.row.drug.dose_unit"></el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+                        <el-option
+                                v-for="(item,index) in drugways"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.execution_frequency" placehold er="请选择" @change="getAllChange(scope)">
+                        <el-option
+                                v-for="item,index in efs"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-table-column>
+
+
+            <el-table-column align="center" prop="day" width="70" label="天数">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
+                        {{'天'}}
+                    </div>
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.prescribing_number" style="width:50%"
+                                  @input="changePrescribingNumber(scope)" placeholder=""></el-input>
+                        <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getAllChange(scope)">
+                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                            <el-option :label="scope.row.drug.max_unit"
+                                       v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
+                                       :value="scope.row.drug.max_unit"></el-option>
+                        </el-select>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                        <div>{{'元'}}</div>
+                    </div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="remark" width="50" label="备注">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
+
+
+            <el-table-column align="center" width="100" prop="name" label="操作">
+                <template slot-scope="scope">
+                    <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteDrug(scope.row,scope.$index)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" label="名称">
+                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+                <template slot-scope="scope">{{scope.row.type ==
+                    2?getGroup(scope.row.statistical_classification):'耗材'}}
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
+                                  placeholder=""></el-input>
+                        <div>{{scope.row.unit}}</div>
+                    </div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+                <template slot-scope="scope">
+                    <el-autocomplete
+                            style="width:100%;"
+                            class="inline-input"
+                            v-model="scope.row.delivery_way"
+                            :fetch-suggestions="querySearch2"
+                            placeholder="请输入内容"
+                    ></el-autocomplete>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="number_days" width="70" label="天数">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)"
+                                  placeholder=""></el-input>
+                        <div>{{'天'}}</div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="total" width="70" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
+                        <div>{{scope.row.unit}}</div>
+
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="70" label="单价">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                        <div>{{'元'}}</div>
+                    </div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="备注">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="remark" width="70" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" width="140" prop="name" label="操作">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteProject(scope.row,scope.$index)">删除
+                    </el-button>
+                    <!--<i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>-->
+                    <!--<button class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)">删除</>-->
+
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <div class="additionalBox">
+            <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+                <span :title="item.item_name">{{item.item_name}}</span>
+                <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+                共
+                <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+                次
+                <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+            </div>
+        </div>
+
+
+        <div>
+            <el-dialog title="推送频率设置" :visible.sync="templateFormVisible" width="854px">
+                <el-form
+                        ref="templateForm"
+                        label-width="90px"
+                >
+                    <el-row>
+                        <el-col :span="24" >
+                            <el-form-item label="周期提醒 :">
+                                <el-radio-group v-model="frequency_type">
+                                    <el-radio :label="1">每次必推</el-radio>
+                                    <el-radio :label="2">天数频率</el-radio>
+                                    <el-radio :label="3">星期频率</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12" v-if="frequency_type == 2">
+                            <el-form-item prop="day_count">
+                                <el-input style="width: 50px" v-model="day_count"></el-input>&nbsp;
+                                天/一次
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="24" v-if="frequency_type == 3">
+                            <el-form-item prop="weekday">
+                                <el-checkbox-group v-model="week_days">
+                                    <el-checkbox label="周一" name="周一" key="1">周一</el-checkbox>
+                                    <el-checkbox label="周二" name="周二" key="2">周二</el-checkbox>
+                                    <el-checkbox label="周三" name="周三" key="3">周三</el-checkbox>
+                                    <el-checkbox label="周四" name="周四" key="4">周四</el-checkbox>
+                                    <el-checkbox label="周五" name="周五" key="5">周五</el-checkbox>
+                                    <el-checkbox label="周六" name="周六" key="6">周六</el-checkbox>
+                                    <el-checkbox label="周日" name="周日" key="7">周日</el-checkbox>
+                                </el-checkbox-group>
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button @click="templateFormVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submitTemplate()">保 存</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
+
+    </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig } from '@/utils/data'
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
+  import { delHisModePrescriptionAdviceTemplate, delHisModePrescriptionProjectTemplate } from '@/api/his/his_config'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge: Array,
+      prescription: {
+        type: Object,
+        default: function() {
+          return {
+            name: '',
+            advices: [],
+            project: [],
+            drugways: [],
+            efs: []
+          }
+        }
+      }
+    },
+    data() {
+      return {
+        week_days: [],
+
+        current_row: null,
+        current_index: 0,
+        templateFormVisible: false,
+        frequency_type: 1,
+        day_count: 0,
+        advices: [],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1
+      }
+    },
+
+    methods: {
+      submitTemplate() {
+        console.log(this.current_index)
+
+        console.log( this.prescription.project[this.current_index])
+        if (this.prescription.advices && this.prescription.advices.length > 0 && this.prescription.project && this.prescription.project.length == 0) {
+          this.prescription.advices[this.current_index].frequency_type = this.frequency_type
+          this.prescription.advices[this.current_index].day_count = this.day_count
+          this.prescription.advices[this.current_index].week_day = this.week_days.join(",")
+
+        }
+
+        if (this.prescription.advices && this.prescription.advices.length == 0 && this.prescription.project && this.prescription.project.length > 0) {
+          this.prescription.project[this.current_index].frequency_type = this.frequency_type
+          this.prescription.project[this.current_index].day_count = this.day_count
+          this.prescription.project[this.current_index].week_day =this.week_days.join(",")
+        }
+        this.templateFormVisible = false
+      },
+      handleEdit(row, index) {
+        this.current_row = row
+        this.current_index = index
+        this.frequency_type = this.current_row.frequency_type
+        this.day_count = this.current_row.day_count
+        this.week_days = this.current_row.week_day.split(",")
+        this.templateFormVisible = true
+
+
+      },
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig('system', 'project_use')
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      delAddition(index, addition) {
+        this.$confirm('附加费删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          this.$nextTick(function() {
+            if (addition.id == 0) {
+              this.prescription.addition.splice(index, 1)
+            } else {
+              let params = {
+                'id': addition.id
+              }
+              delHisAddition(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.addition)
+                  temp2.splice(index, 1)
+                  this.prescription.addition = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+            }
+          })
+
+        })
+          .catch(() => {
+          })
+
+      },
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+
+      }, 
+      deleteDrug: function(row, index) {
+
+        this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          this.$nextTick(function() {
+            if (row.advice_id == 0) {
+              this.prescription.advices.splice(index, 1)
+            } else {
+              let params = {
+                'id': row.advice_id
+              }
+              console.log(row)
+
+              console.log(params)
+              delHisModePrescriptionAdviceTemplate(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.advices)
+                  temp2.splice(index, 1)
+                  this.prescription.advices = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+
+            }
+
+          })
+
+        })
+          .catch(() => {
+          })
+
+      }, deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+
+      setNewData: function(data) {
+        this.prescription = data
+
+        // this.prescription.advices = data.advices
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getGroup(id) {
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        console.log('2235', statistics_category)
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      deleteProject(row, i) {
+        if (this.prescription.order_status == 2) {
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm('项目删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          if (row.id == 0) {
+            this.prescription.project.splice(i, 1)
+
+          } else {
+            let params = {
+              'id': row.id
+            }
+            delHisModePrescriptionProjectTemplate(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i = 0; i < this.prescription.project.length; i++) {
+                  if (this.prescription.project[i].id == row.id) {
+                    this.prescription.project.splice(i, 1)
+                  }
+                }
+                this.$message.success(response.data.data.msg)
+              }
+            })
+          }
+        })
+          .catch(() => {
+          })
+
+      },
+      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
+          } else {
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+        //   if(scope.row.prescribing_number > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        //   // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        // }
+
+      },
+      changePrescribingNumber(scope) {
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }
+      },      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+          } else {
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          if (scope.row.prescribing_number > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+
+      },
+
+      getSingleDose(scope) {
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      },
+      getDay(scope) {
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      },
+      getProjectSingleDose(scope) {
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if (this.prescription.project[scope.$index].total == 0) {
+          this.prescription.project[scope.$index].total = 1
+        }
+      },
+      getProjectDay(scope) {
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if (this.prescription.project[scope.$index].total == 0) {
+          this.prescription.project[scope.$index].total = 1
+        }
+      }
+    }, mounted() {
+      this.getInitData()
+
+    },
+    watch: {
+      // "prescription.advices":{
+      //   handler(newVal,oldVal){
+      //     newVal.map(item => {
+      //       item.prescribing_number = item.single_dose * item.day
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+
+      //     })
+      //   },
+      //   deep:true
+      // },
+      // "prescription.project":{
+      //   handler(newVal,oldVal){
+      //     newVal.map((item,index) => {
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+
+      //     })
+      //   },
+      //   deep:true
+      // }
+    }
+
+  }
+</script>
+
+<style lang="scss">
+    .prescriptionTable {
+
+    .el-input__inner {
+        padding: 0 5px;
+    }
+
+    .additionalBox {
+        margin-top: 20px;
+        display: flex;
+        flex-wrap: wrap;
+
+    .additionalOne {
+        margin-right: 20px;
+        margin-bottom: 10px;
+        display: flex;
+        align-items: center;
+
+    > span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        width: 80px;
+        display: inline-block;
+        font-size: 14px;
+    }
+
+    }
+    .deleteIcon {
+        color: red;
+        margin-left: 5px;
+    }
+
+    }
+    .el-table th .cell, .el-table td .cell {
+        padding: 0 2px;
+        white-space: pre-line;
+    }
+
+    .el-icon-delete {
+        color: red;
+    }
+
+    }
+</style>

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -413,7 +413,8 @@
           }
         })
 
-      }, deleteDrug: function(row, index) {
+      }, 
+      deleteDrug: function(row, index) {
 
         this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -305,7 +305,6 @@
         class="centerDialog"
         width="600px"
         title="打印"
-        destroy-on-close
         :visible.sync="recordVisible">
       <recordPrint :patientid="patientid" ref="recordPrint">
     </recordPrint>
@@ -433,10 +432,35 @@ export default {
     changeTimeTwo() {
       this.getList()
     },
+    // 电子处方打印
     openPrint() {
       // this.centerDialogVisible = true
       this.getPrescriptionList(this.patientInfo.id, this.record_date)
     },
+
+    // 电子病历打印
+    opentwo(index) {
+      if (index == 1) {
+        if (this.patientInfo.id == undefined) {
+          this.$message.error('请先选择病人')
+          return
+        }
+        this.$refs.child.createCaseHistory()
+      } else if (index == 2) {
+        this.recordVisible = true
+        this.$nextTick(() => {
+          this.$refs.recordPrint.show(this.patientid,this.org_id)
+        })
+        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+      } else if (index == 3) {
+        var mode_status = this.$refs.saveRecordTemplate.mode_status
+        this.$refs.medicalRecord.show(mode_status)
+      } else if (index == 4) {
+        this.$refs.saveRecordTemplate.show(this.case_history)
+      }
+
+    },
+
     allCheck() {
       this.$refs.multipleTable1.toggleAllSelection()
       this.$refs.multipleTable2.toggleAllSelection()
@@ -4590,27 +4614,6 @@ export default {
 
     },
 
-    opentwo(index) {
-      if (index == 1) {
-        if (this.patientInfo.id == undefined) {
-          this.$message.error('请先选择病人')
-          return
-        }
-        this.$refs.child.createCaseHistory()
-      } else if (index == 2) {
-
-          this.recordVisible = true
-        this.$refs.recordPrint.show(this.patientid)
-        
-        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
-      } else if (index == 3) {
-        var mode_status = this.$refs.saveRecordTemplate.mode_status
-        this.$refs.medicalRecord.show(mode_status)
-      } else if (index == 4) {
-        this.$refs.saveRecordTemplate.show(this.case_history)
-      }
-
-    },
     // changePatient(val){
     //   console.log("患者val",val)
     //   this.hisPatientInfo = val.hisPatientInfo

src/xt_pages/outpatientDoctorStation/modeTemplate.vue

@@ -0,0 +1,437 @@
+<template>
+    <div class="main-contain new-main-contain">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+            <el-button type="primary" @click="add">新增</el-button>
+
+        </div>
+        <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+            <div class="mainLeft">
+                <!-- <div class="mainCell" style="margin-bottom:10px;">
+                    <el-input size="small" placeholder="请输入姓名或者透析号"
+                              v-model="search_input" class="filter-item" @input="searchAction"
+                              @keyup.enter.native='searchAction'/>
+                </div> -->
+                <div>
+                    <el-table :data="tablelist" :height="tableHeight"
+                               border style="width: 100%;"
+                              :row-style="{ color: '#303133' }"
+                              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                              highlight-current-row
+                              ref="singleTable"
+                              @current-change="handleCurrentChange"
+                             >
+                        <el-table-column prop="name" label="透析模式" align="center">
+                            <template slot-scope="scope">{{scope.row.name}}</template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+            <div class="mainRight">
+                <el-table :data="templates" :height="tableHeight"
+                           border style="width: 100%;"
+                          :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row
+                >
+                    <el-table-column prop="name" label="模版名称" align="center">
+                        <template slot-scope="scope" >
+                            {{scope.row.name}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="透析模式" align="center">
+                        <template slot-scope="scope">
+                            {{getModeName(scope.row.mode)}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="操作" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="primary" @click="jumpDetail(scope.row)">编辑</el-button>
+                            <el-button size="mini" type="danger" @click="deleteModeTemplate(scope.row,scope.$index)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getModeTempaleteName,delHisModePrescriptionTemplate} from '@/api/his/his_config'
+  import { uParseTime } from '@/utils/tools'
+
+  const moment = require('moment')
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '透析处方模版' }
+        ],
+        tablelist:[],
+        templates:[],
+        total:0,
+        id:0,
+        patient_id:0,
+        patient_name:"",
+        modes:"",
+        mode_id:0,
+        modeTeplate:{}
+      }
+    },
+    methods: {
+      searchAction() {
+      
+      },
+      handleSizeChange(val) {
+        this.limit = val
+      
+      },
+      getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },
+      add() {
+        this.$router.push('/hisTool/modeTemplateDetail?id='+this.id+"patient_name="+this.patient_name+"&modes="+this.modes)
+      },
+      getList(){
+        var params = {
+          mode_id:this.mode_id,
+        }
+       getModeTempaleteName(params).then(response=>{
+         if(response.data.state == 1){
+           var modeTeplate = response.data.data.modeTeplate
+           console.log("modeTeplate",modeTeplate)
+
+           this.templates = modeTeplate
+         }
+       })   
+      },
+      handleCurrentChange(row){
+        this.mode_id = row.id
+        this.getList()
+      },
+      getModeName(id){
+        var mode_name = ""
+        for(let i=0;i<this.tablelist.length;i++){
+          if(id == this.tablelist[i].id){
+            mode_name = this.tablelist[i].name
+          }
+        } 
+        return mode_name
+      },
+      deleteModeTemplate(row,index) {
+        this.$confirm('处方模版删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id: row.id
+          }
+          delHisModePrescriptionTemplate(params).then(response => {
+            if (response.data.state == 1) {
+              this.$message.success("删除成功!")
+              this.templates.splice(index,1)
+            }
+          })
+
+        }).catch(() => {
+
+        })
+      },
+       jumpDetail(row) {
+        this.$router.push('/hisTool/modeTemplateDetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name +"&modes="+this.mode_str)
+      },
+    },
+    created() {
+      this.tablelist =  Object.values(this.$store.getters.treatment_mode)
+      this.mode_id = this.tablelist[0].id
+      this.getList()
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
+
+    },
+    mounted() {
+     this.$refs.singleTable.setCurrentRow(this.tablelist[0])
+      const that = this
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight(val) {
+        if (!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 263
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function() {
+            that.timer = false
+          }, 400)
+        }
+      }
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+    .new-main-contain {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .app-container {
+        height: 100%;
+    }
+
+    .mainCell {
+        height: 36px;
+        display: flex;
+        align-items: center;
+    }
+
+    .mainLeft {
+        width: 200px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-radio {
+        margin-right: 5px;
+    }
+
+    }
+    .mainRight {
+        margin-left: 10px;
+        flex: 1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+
+    .cellSpan {
+        min-width: 80px;
+        display: inline-block;
+        margin-right: 10px;
+    }
+
+    }
+    .mainCenter {
+        display: flex;
+        flex: 1;
+    }
+
+    .centerLeft {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+    .el-form-item {
+        width: 32%;
+        margin-right: 1%;
+        float: left;
+    }
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .backColor {
+        background: #f6f8f9;
+        height: 5px;
+        margin-bottom: 5px;
+    }
+
+    .tabsBox {
+        position: relative;
+        height: 76%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    }
+    .preTabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-tabs__content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    }
+
+    .costBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+    }
+
+    .addTab {
+        position: absolute;
+        right: 0;
+        top: 14px;
+        z-index: 20;
+    }
+
+    .centerRight {
+        width: 300px;
+        margin-left: 10px;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+
+    .rightTab {
+        height: 40px;
+        width: 100%;
+        border: 1px solid #d2d2d2;
+        box-sizing: border-box;
+
+    p {
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+
+    > p:last-child {
+        border-left: 1px solid #d2d2d2;
+        float: right;
+    }
+
+    .activeP {
+        background: #409EFF;
+        color: #fff;
+    }
+
+    }
+    .comfirmBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .mainHeader {
+        width: 100%;
+        background: #fff;
+        position: fixed;
+        z-index: 100;
+        height: 36px;
+    }
+
+    .titleBox {
+        position: fixed;
+        z-index: 99;
+        background: #fff;
+    }
+
+    .fixedCell {
+        position: fixed;
+        z-index: 99;
+        right: 30px;
+        background: #fff;
+        width: 300px;
+        display: flex;
+        justify-content: space-between;
+    }
+</style>
+
+<style lang="scss">
+    .centerLeft {
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .tabsBox {
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+        padding: 0 10px;
+    }
+
+    .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+        padding: 0 10px;
+    }
+
+    }
+    .centerRight {
+
+    .el-tabs__nav-scroll {
+        display: flex;
+    }
+
+    .el-tabs__nav {
+        margin: 0 auto;
+    }
+
+    .el-table th .cell, .el-table td .cell {
+        padding: 0 2px;
+    }
+
+    }
+    .preTabs {
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .rightTabs {
+        height: 100%;
+
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .centerDialog {
+
+    .el-dialog__body {
+        max-height: calc(100vh - 100px) !important;
+        padding: 0 20px;
+    }
+
+    }
+</style>

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -179,6 +179,7 @@
         this.limit = 10
         this.patient_id = val.id
         this.patient_name = val.name
+        this.id = val.id
         sessionStorage.setItem('templateIndex', val.id)
         let params = {
           patient_id: val.id,

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -17,7 +17,8 @@
 
                         <el-form-item label="透析模式: " prop="mode_id" label-position="right">
                             <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择"
-                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id == 0">
+                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id == 0"
+                                       @change = "changeMode">
                                 <el-option
                                         v-for="item in modeOptions"
                                         :key="item.id"
@@ -26,7 +27,8 @@
                                 ></el-option>
                             </el-select>
                             <el-select v-model="tempForm.mode_id" style="width:100%;" placeholder="请选择"
-                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id > 0">
+                                       :disabled="this.$route.query.id > 0 ?true:false" v-if="this.$route.query.id > 0"
+                                        @change = "changeMode">>
                                 <el-option
                                         v-for="item in modeOptionsTwo"
                                         :key="item.id"
@@ -239,7 +241,8 @@
     getInitData,
     getNextOrLastHisPrescription,
     getPatientInfo,
-    getSchedulePatientList
+    getSchedulePatientList,
+    getPresciptionTemplateDetail
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './components/prescriptionTable'
@@ -389,8 +392,8 @@
         tempDrugs: [],
         dayorMonth: 'day',
 
-        hisList: []
-
+        hisList: [],
+        id:0,
       }
     },
     methods: {
@@ -441,15 +444,12 @@
             }
           }
         }
-
         let params = {
           name: this.tempForm.name,
           mode_id: this.tempForm.mode_id,
           patient_id: this.$route.query.patient_id,
-          id: this.$route.query.id
-
+          id:this.$route.query.id,
         }
-
         for (let i = 0; i < this.prescriptions.length; i++) {
 
           this.prescriptions[i].med_type = parseInt(this.prescriptions[i].med_type)
@@ -488,6 +488,7 @@
         let data = {
           'prescriptions': this.prescriptions
         }
+        
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$message.success('保存成功')
@@ -1926,6 +1927,140 @@
       },
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
+      },
+      changeMode(id){
+         var params = {
+           mode_id:id,
+         }
+        getPresciptionTemplateDetail(params).then(response=>{
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.prescriptions = []
+            // console.log(this.tempForm)
+
+            if (response.data.data.template.id > 0) {
+
+              this.tempForm.name = response.data.data.template.name
+              this.tempForm.mode_id = response.data.data.template.mode
+              this.id = response.data.data.template.id
+              for (let i = 0; i < response.data.data.prescriptions.length; i++) {
+                var prescription = response.data.data.prescriptions[i]
+                let tempAdvice = []
+                let tempProject = []
+                let tempAddition = []
+
+                //药品
+                for (let b = 0; b < prescription.advices.length; b++) {
+                  let obj = {
+                    advice_id: prescription.advices[b].id,
+                    drug_name: prescription.advices[b].advice_name,
+                    single_dose: prescription.advices[b].single_dose,
+                    delivery_way: prescription.advices[b].delivery_way,
+                    execution_frequency: prescription.advices[b].execution_frequency,
+                    retail_price: prescription.advices[b].price.toString(),
+                    remark: prescription.advices[b].remark,
+                    day: prescription.advices[b].day,
+                    prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                    single_dose_unit: prescription.advices[b].single_dose_unit,
+                    prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                    medical_insurance_number: prescription.advices[b].med_list_codg,
+                    id: prescription.advices[b].drug_id,
+                    drug: prescription.advices[b].drug,
+                    groupno: prescription.advices[b].groupno,
+                    frequency_type: prescription.advices[b].frequency_type,
+                    day_count: prescription.advices[b].day_count,
+                    week_day: prescription.advices[b].week_day
+
+                  }
+                  tempAdvice.push(obj)
+                }
+
+                //项目
+                for (let b = 0; b < prescription.project.length; b++) {
+                  let obj = {
+                    id: prescription.project[b].id,
+                    project_id: prescription.project[b].project_id,
+                    project_name: prescription.project[b].project.project_name,
+                    statistical_classification: prescription.project[b].project.statistical_classification,
+                    single_dose: prescription.project[b].single_dose,
+                    delivery_way: prescription.project[b].delivery_way,
+                    execution_frequency: prescription.project[b].execution_frequency,
+                    number_days: prescription.project[b].day,
+                    total: prescription.project[b].count.toString(),
+                    price: prescription.project[b].price,
+                    remark: prescription.project[b].remark,
+                    medical_code: prescription.project[b].project.medical_code,
+                    unit: prescription.project[b].project.unit,
+                    type: prescription.project[b].type,
+                    frequency_type: prescription.project[b].frequency_type,
+                    day_count: prescription.project[b].day_count,
+                    week_day: prescription.project[b].week_day
+
+                  }
+
+                  if (prescription.project[b].type == 2) {
+                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                    obj['medical_code'] = prescription.project[b].project.medical_code
+                    obj['project_name'] = prescription.project[b].project.project_name
+                    obj['project'] = prescription.project[b].project
+
+                  } else if (prescription.project[b].type == 3) {
+                    obj['statistical_classification'] = ''
+                    obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                    obj['project_name'] = prescription.project[b].good_info.good_name
+                    obj['good_info'] = prescription.project[b].good_info
+
+                  }
+                  tempProject.push(obj)
+                }
+
+                // var preTime = nowTime
+
+                let index = i + 1
+                let obj = {
+                  id: prescription.id,
+                  name: '处方' + index,
+                  advices: tempAdvice,
+                  project: tempProject,
+                  addition: tempAddition,
+                  order_status: 1
+                  // pre_time: preTime
+                }
+
+                if (prescription.med_type == '' || prescription.med_type == 0) {
+
+                  obj['med_type'] = ''
+                } else {
+
+                  obj['med_type'] = parseInt(prescription.med_type)
+
+                }
+
+                this.prescriptions.push(obj)
+              }
+              this.curPrescriptions = this.prescriptions[0]
+
+            } else {
+              let obj = {
+                id: 0,
+                name: '处方1',
+                advices: [],
+                project: [],
+                addition: [],
+                order_status: 0,
+                med_type: ''
+              }
+
+              obj.med_type = 14
+
+              this.prescriptions.push(obj)
+              this.curPrescriptions = this.prescriptions[0]
+            }
+
+          }
+        })
       }
     }, created() {
       for(let key in this.$store.getters.treatment_mode){

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 9675 && org_id != 9671 && org_id != 0"
+        v-if="org_id && org_id != 9675 && org_id != 9671 && org_id != 0"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -70,16 +70,18 @@ export default {
       educationOptions: [],
       history: {},
       keyword: "",
-      org_id,
+      org_id: 0,
     };
   },
 
-
   methods: {
-    show(val) {
-      console.log(val,'ooooooo')
-      this.$refs.printOne.show(val);
-      this.$refs.printTwo.show(val);
+    show(val, id) {
+      this.org_id = id;
+      if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
+        this.$refs.printTwo.show(val);
+      } else {
+        this.$refs.printOne.show(val);
+      }
     },
     getAdminUser(id) {
       if (id == 0) {
@@ -112,14 +114,18 @@ export default {
       const style1 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
-      if (this.org_id != 10217 && this.org_id != 0) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_id == 10217 || this.org_id == 0) {
+      } else if (
+        this.org_id == 10217 ||
+        this.org_id == 0 ||
+        this.org_id == 9675
+      ) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -177,7 +183,7 @@ export default {
   },
   created() {
     // this.getPatientList()
-    this.org_id = this.$store.getters.xt_user.org.id;
+    // this.org_id = this.$store.getters.xt_user.org.id;
     // console.log("=====", this.org_id);
     // this.$refs.printOne.show(this.patientid);
     // this.$refs.printTwo.show(this.patientid);

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -128,8 +128,11 @@
             >
             <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
           </div>
+           <div style="text-align:left;">
+          {{history.physical_examination}}
         </div>
-        <div></div>
+        </div>
+
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
@@ -141,7 +144,7 @@
           {{ history.lab_apparatus }}
         </div>
       </div>
-      <div style="display: flex; justify-content: end">
+      <div style="display: flex; justify-content: flex-end">
         <div class="endInfo">
           <div style="height: 100px">
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
@@ -298,9 +301,9 @@ export default {
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
-    this.getAllDoctorList();
-    this.getPatientCaseHistory();
-    this.getAccessList();
+    // this.getAllDoctorList();
+    // this.getPatientCaseHistory();
+    // this.getAccessList();
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -45,36 +45,64 @@
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              show-summary
               max-height="600"
               v-loading="detail_loading"
               highlight-current-row>
-      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center">
+        <template slot-scope="scope">
+          {{scope.row.index}}
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope">{{  }}</template>
+        <template slot-scope="scope">{{getTime(scope.row.record_date)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用编码">
-        <template slot-scope="scope">{{scope.row.code}}</template>
+        <template slot-scope="scope">
+          {{scope.row.number}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
-        <template slot-scope="scope">{{scope.row.item_name}}</template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.advice_id > 0">{{scope.row.advice.advice_name}}</span>
+          <span v-if="scope.row.project_id > 0">
+            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.project_name}}</span>
+            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.good_name}}</span>
+          </span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格">
-        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.advice_id > 0">{{scope.row.advice.drug.dose}}{{scope.row.advice.drug.dose_unit}}*{{scope.row.advice.drug.min_number}}{{scope.row.advice.drug.min_unit}}/{{scope.row.advice.drug.max_unit}}</span>
+          <span v-if="scope.row.project_id > 0">
+            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.project_name}}</span>
+            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.specification_name}}</span>
+          </span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="数量">
-        <template slot-scope="scope">{{scope.row.count}}</template>
+        <template slot-scope="scope">
+          {{scope.row.cnt}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="单价">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope">
+          {{scope.row.pric}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
-          <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+          <div>
+            {{scope.row.total_price}}
+          </div>
         </template>
       </el-table-column>
-
+     
     </el-table>
+     <div>总费用:{{getAllPice()}}</div>
+     <div>个人支付:</div>
+     <div>基金支付记账:</div>
+     <div>补充医疗支付记账:</div>
+    <div>救助支付金额:</div>
   </div>
 
   <!-- </div> -->
@@ -83,8 +111,9 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import {  } from '@/api/his/his'
+import { getHisSummaryDetailList } from '@/api/his/his_tools'
 const moment = require('moment')
+import { uParseTime } from '@/utils/tools'
 export default {
   components: {
     BreadCrumb
@@ -120,17 +149,27 @@ export default {
     }
   },
   methods: {
+    getTime(val) {
+      if(val <= 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
     searchAction(){
 
 
     },
     changeDate() {
-      this.getSummaryDetailList()
+      this.getHisSummaryDetailList()
     },
     changeItem() {
-      this.getSummaryDetailList()
+      this.getHisSummaryDetailList()
     },
-    getSummaryDetailList() {
+    getHisSummaryDetailList() {
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
       let params = {
@@ -140,14 +179,53 @@ export default {
         type: this.item_type,
         keyword: this.keywords
       }
-
-
-
+     getHisSummaryDetailList(params).then(response=>{
+       if(response.data.state == 1){
+          var list =  response.data.data.list
+          this.tableData = []
+          console.log("list23232332232322323",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].orders.length;j++){
+              for(let z=0;z<list[i].orders[j].order_info.length;z++){
+                  list[i].orders[j].order_info[z].record_date = list[i].orders[j].settle_accounts_date
+                  list[i].orders[j].order_info[z].number = list[i].orders[j].number
+                  this.tableData.push(list[i].orders[j].order_info[z])
+               }
+            }
+          }
+          var obj = {index:"合计",total_price:0,record_date:"0"}
+          for(let i=0;i<this.tableData.length;i++){
+            this.tableData[i].index = i+1
+            this.tableData[i].total_price = 0
+            this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+            obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
+          }
+          obj.total_price = (obj.total_price).toFixed(2)
+          this.tableData.push(obj)
+          
+          console.log("tabledata",this.tableData)
+       }
+     })
     },
+    getAllPice(){
+      console.log("hhhhh",this.tableData)
+      var total_price = 0
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].index =="合计"){
+          total_price = this.tableData[i].total_price
+        }
+      }
+      return total_price
+    }
   },
   created() {
-    this.getSummaryDetailList()
-
+   // this.getHisSummaryDetailList()
+  },
+  watch:{
+    "patient_id":function(){
+      this.patient_id = this.patient_id
+      this.getHisSummaryDetailList()
+    }
   }
 }
 </script>

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -51,26 +51,26 @@
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope">{{  }}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用分类">
-        <template slot-scope="scope">{{scope.row.code}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
-        <template slot-scope="scope">{{scope.row.item_name}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格型号">
-        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="数量">
-        <template slot-scope="scope">{{scope.row.count}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="单价">
-        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+        <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
-          <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+          <div></div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="医保类别">
@@ -79,14 +79,12 @@
 
     </el-table>
   </div>
-
-  <!-- </div> -->
 </template>
 
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import {  } from '@/api/his/his'
+import { getGatherDetailList } from '@/api/his/his_tools'
 const moment = require('moment')
 export default {
   components: {
@@ -133,7 +131,7 @@ export default {
     changeItem() {
       this.getSummaryDetailList()
     },
-    getSummaryDetailList() {
+    getGatherDetailList() {
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
       let params = {
@@ -143,13 +141,20 @@ export default {
         type: this.item_type,
         keyword: this.keywords
       }
-
+     getGatherDetailList(params).then(response=>{
+       if(response.data.state == 1){
+         var detailList = response.data.data.detailList
+         console.log("detailist232323322332",detailList)
+         var list = response.data.data.list
+         console.log("list233223232323",list)
+       }
+     })
 
 
     },
   },
   created() {
-    this.getSummaryDetailList()
+    this.getGatherDetailList()
 
   }
 }

src/xt_pages/outpatientTool/statistics.vue

@@ -10,8 +10,10 @@
           <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
                      :row-style="{ color: '#303133' }"
                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                     highlight-current-row ref="tab"
-                     @current-change="handleCurrentChange">
+                     highlight-current-row
+                     ref="singleTable"
+                     @current-change="handleCurrentChange"
+                   >
             <el-table-column align="center" prop="name" label="姓名" wdith='89'>
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
@@ -23,8 +25,8 @@
           <el-tab-pane label="明细" name="明细"></el-tab-pane>
           <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
         </el-tabs>
-        <detail-statistics v-if="titleType == '明细'" :patient_id="patient_id"></detail-statistics>
-        <gather-statistics v-if="titleType == '汇总'" :patient_id="patient_id"></gather-statistics>
+        <detail-statistics v-if="titleType == '明细'" :patient_id="patient_id" ref="child"></detail-statistics>
+        <gather-statistics v-if="titleType == '汇总'" :patient_id="patient_id" ref="childOne"></gather-statistics>
       </div>
     </div>
   </div>
@@ -68,12 +70,14 @@ export default {
         } else {
           this.patientTableData = response.data.data.list
           this.patient_id =  this.patientTableData[0].id
+          this.$refs.singleTable.setCurrentRow(this.patientTableData[0])
         }
       })
     },
     handleCurrentChange(row){
       this.patient_id =  row.id
-
+      this.$refs.child.getHisSummaryDetailList()
+     
     },
 
   },

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -441,7 +441,7 @@ export default {
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * order[i].price * order[i].min_number
-                   total_price += order[i].total_price
+                  //  total_price += order[i].total_price
                  }
                 
                }
@@ -456,7 +456,7 @@ export default {
                 if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
                    //total_price += order[i].count * this.getPrice(order[i].drug_id)
-                   order[i].total_price+=order[i].total_price
+                  //  order[i].total_price = order[i].total_price
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
                  

src/xt_pages/stock/stockBatchNumber.vue

@@ -5,9 +5,9 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-        耗材名称:{{this.$route.query.good_name}} &nbsp;
+        耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
         库存:{{this.$route.query.overCount}}{{packing_unit}} &nbsp;
-        规格:{{this.$route.query.specification_name}} &nbsp;
+        规格:{{getSpecName(this.$route.query.id)}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
@@ -189,6 +189,7 @@
         packing_unit:"",
         cancelCountList:[],
         houseList:[],
+        good:{}
       }
     },
     methods:{
@@ -259,6 +260,7 @@
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
+           this.good = response.data.data.good
          }
       })
      },
@@ -345,7 +347,21 @@
         }
         return storehouse_name
      },
-      
+     getGoodName(id){
+       
+       var good_name =  ""
+       if(id == this.good.id){
+         good_name = this.good.good_name
+       }
+       return good_name
+     },
+     getSpecName(id){
+       var specification_name = ""
+       if(id == this.good.id){
+         specification_name = this.good.specification_name
+       }
+       return specification_name
+     }
 
     }
   }

src/xt_pages/stock/stockFlow.vue

@@ -5,10 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}} &nbsp;
+       耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
        库存: {{this.$route.query.overCount}}{{packing_unit}} &nbsp;
        规格:{{this.$route.query.specification_name}} &nbsp;
-       厂家:{{this.$route.query.manufacturer}} 
+       厂家:{{getSpecName(this.$route.query.id)}}
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -451,6 +451,21 @@
         }
         return storehouse_name
      },
+     getGoodName(id){
+       
+       var good_name =  ""
+       if(id == this.good.id){
+         good_name = this.good.good_name
+       }
+       return good_name
+     },
+     getSpecName(id){
+       var specification_name = ""
+       if(id == this.good.id){
+         specification_name = this.good.specification_name
+       }
+       return specification_name
+     }
     }
   }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -575,7 +575,8 @@ export default {
       var overCount  = this.getOverplus(val.xt_warehouse_info)
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+      console.log("val3234243423324324234",val.id)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
        var manufacturer_name = ""
@@ -589,7 +590,7 @@ export default {
       var overCount  = this.getOverplus(val.xt_warehouse_info)
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     getStockDrugCount(){
         var params ={