Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/data.js

@@ -219,6 +219,50 @@ export function GetMZSick(params) {
 
 
 
+export function createAddition(params) {
+  return request({
+    url: '/api/addition/create',
+    method: 'post',
+    params: params
+  })
+}
+
+export function modifyAddition(params) {
+  return request({
+    url: '/api/addition/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getAdditionList(params) {
+  return request({
+    url: '/api/addition/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteAddition(params) {
+  return request({
+    url: '/api/addition/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetAddition(params) {
+  return request({
+    url: '/api/addition/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+
 
 
 

src/api/project/project.js

@@ -434,4 +434,13 @@ export function changePatient(id,params){
       method:"get",
       params:params
     })
+  }
+
+  export function getHisPatientDetail(params){
+    console.log("params99999",params)
+    return request({
+      url:"/api/hispatient/gethispatientdetail",
+      method:"Get",
+      params:params
+    })
   }

src/xt_pages/data/printTemplate/chargePrint.vue

@@ -6,12 +6,12 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
     <p style="margin-top: 10px;margin-bottom: 30px">
-        请选择你需要打印的血液透析护理记录单样式
+        请选择你需要打印的门诊收费模板
     </p>
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
         <div
-            @click="imgClick('https://images.shengws.com/fangji.jpg')"
+            @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606985484284.png')"
         >
             <el-tooltip
             class="item"
@@ -20,15 +20,11 @@
             content="点击查看大图"
             placement="top-start"
             >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/1.jpg')"-->
-                <!--:preview-src-list="imgs_one"-->
-            <!--&gt;</el-image>-->
+          
 
             <el-image
                 style="width: 200px; height: 200px"
-                :src="require('@/assets/home/1.jpg')"
+                :src="require('@/assets/home/100.png')"
             ></el-image>
 
             </el-tooltip>

src/xt_pages/data/printTemplate/prescriptionPrint.vue

@@ -6,12 +6,12 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
     <p style="margin-top: 10px;margin-bottom: 30px">
-        请选择你需要的处方模板记录单样式
+        请选择你需要的电子处方模板记录单样式
     </p>
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
         <div
-            @click="imgClick('https://images.shengws.com/fangji.jpg')"
+            @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606984919688.png')"
         >
             <el-tooltip
             class="item"
@@ -22,7 +22,7 @@
             >
             <el-image
                 style="width: 200px; height: 200px"
-                :src="require('@/assets/home/1.jpg')"
+                :src="require('@/assets/home/88.png')"
             ></el-image>
 
             </el-tooltip>

src/xt_pages/data/printTemplate/recordPrint.vue

@@ -11,7 +11,7 @@
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
         <div
-            @click="imgClick('https://images.shengws.com/fangji.jpg')"
+            @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606996536109.png')"
         >
             <el-tooltip
             class="item"
@@ -22,7 +22,7 @@
             >
             <el-image
                 style="width: 200px; height: 200px"
-                :src="require('@/assets/home/1.jpg')"
+                :src="require('@/assets/home/102.png')"
             ></el-image>
 
             </el-tooltip>
@@ -68,7 +68,6 @@ export default {
       imgs:[],
 
       imgs_one: [
-        // 'https://images.shengws.com/template_one.jpg'
         "https://images.shengws.com/fangji.jpg"
       ],
       imgs_two: ["https://images.shengws.com/template_two.jpg"],

src/xt_pages/data/printTemplate/treatPrint.vue

@@ -11,7 +11,7 @@
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
         <div
-            @click="imgClick('https://images.shengws.com/fangji.jpg')"
+            @click="imgClick('https://images.shengws.com/2020/12/3/admin_avatar_1606984919688.png')"
         >
             <el-tooltip
             class="item"
@@ -23,7 +23,7 @@
 
             <el-image
                 style="width: 200px; height: 200px"
-                :src="require('@/assets/home/1.jpg')"
+                :src="require('@/assets/home/99.png')"
             ></el-image>
 
             </el-tooltip>

src/xt_pages/data/specialDictionary.vue

@@ -31,16 +31,15 @@
           <diagnosis></diagnosis>
         </el-tab-pane>
 
-        <el-tab-pane label="医疗类别" name="8">
-          <!--<manufacturer></manufacturer>-->
-          <diagnosis></diagnosis>
+        <!--<el-tab-pane label="医疗类别" name="8">-->
+          <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
+          <!--<diagnosis></diagnosis>-->
+        <!--</el-tab-pane>-->
+        <el-tab-pane label="附加收费配置" name="8">
+          <addtion></addtion>
         </el-tab-pane>
 
-        <el-tab-pane label="附加收费配置" name="9">
-          <!--<manufacturer></manufacturer>-->
-          <diagnosis></diagnosis>
-        </el-tab-pane>
-        <el-tab-pane label="配置项字典" name="10">
+        <el-tab-pane label="配置项字典" name="9">
           <configure></configure>
         </el-tab-pane>
       </el-tabs>
@@ -59,10 +58,12 @@
   import configure from './components/configure'
   import Dealer from '../stock/config/dealer'
   import Diagnosis from './components/diagnosis'
+  import Addtion from './components/addtion'
 
   export default {
     name: 'specialDictionary',
     components: {
+      Addtion,
       Diagnosis,
       Dealer,
       BreadCrumb,

src/xt_pages/outpatientCharges/components/additionalCharges.vue

@@ -5,33 +5,33 @@
         :visible.sync="visible"
         :before-close="_close"
     >
-        <el-table :data="tableData" border style="width: 100%;" height="300" 
-         :row-style="{ color: '#303133' }" 
-         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        <el-table :data="addtions_charge" border style="width: 100%;" height="300"
+         :row-style="{ color: '#303133' }"
+         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
           highlight-current-row
-          @selection-change="handleSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="40"></el-table-column>
             <el-table-column align="center" prop="name" label="名称" width="100">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
+                <template slot-scope="scope">{{ scope.row.item_name }}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="金额(元)">
                 <template slot-scope="scope">
-                    <el-input v-model="scope.row.money"></el-input>
+            {{ scope.row.price }}
                 </template>
             </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
 import { saveCharges } from "@/api/project/project"
 export default {
- 
+  props: {
+    addtions_charge: Array
+
+  },
     data(){
         return{
             visible:false,
@@ -39,9 +39,7 @@ export default {
                 name:''
             },
             tableData:[
-              {id:1,name:"工本费",money:""},
-              {id:2,name:"挂号费",money:""},
-              {id:3,name:"诊疗费",money:""}  
+
             ],
             patient_id:0,
             chargeTable:[]
@@ -56,34 +54,16 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-           this.patient_id = id
+        show() {
            this.visible = true
         },
         hide() {
            this.visible = false
         },
-        handleSelectionChange(val){
-          console.log("val",val)
-          this.chargeTable = val
-        },
-        submitAction(){
-           var params = {
-             patient_id:this.patient_id,
-             medicineData:this.chargeTable
-           }
-           console.log("params",params)
-          saveCharges(params).then(response=>{
-             if(response.data.state == 1){
-               var additionalCharge =  response.data.data.additionalCharge
-               console.log("additionalchar",additionalCharge)
-               this.visible = false
-               this.$message.success("保存成功")
-             }
-          })  
-        }
+
+
     },
-   
+
 }
 </script>
 

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -11,7 +11,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>
-            <div> {{scope.row.min_unit}}</div>
+            <div> {{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -67,7 +67,7 @@
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
-                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
                     <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"
@@ -206,7 +206,7 @@
         </div>
       </div>
     </div>
-    <!--<additionalCharges ref='additionalCharges'></additionalCharges>-->
+    <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
   </div>
 </template>
 
@@ -274,6 +274,7 @@
         prescription_id: 0,
         all_table_data:[],
         order:{},
+        addtions_charge:[],
       }
     },
     created() {
@@ -294,6 +295,9 @@
       this.getPatientList()
     },
     methods: {
+      addCharges() {
+        this.$refs.additionalCharges.show()
+      },
       changeDate(val) {
         if (this.patientInfo.id == 0) {
           this.$message.error('请先选择患者')
@@ -311,6 +315,8 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
+            this.addtions_charge = response.data.data.addtions_charge
+
             this.prescriptions = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
@@ -330,7 +336,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -343,7 +348,7 @@
                   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].statistical_classification,
+                  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,
@@ -445,8 +450,13 @@
               total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
             }
           }
+
         }
-        return total
+        for (let i = 0; i < this.addtions_charge.length; i++){
+          total = total +  this.addtions_charge[i].price
+        }
+        return Math.floor(total * 100) / 100
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -679,6 +689,7 @@
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
             this.order = response.data.data.order
+            this.addtions_charge = response.data.data.addtions_charge
 
             this.prescriptions = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
@@ -699,7 +710,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -712,7 +722,7 @@
                   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].statistical_classification,
+                  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,

src/xt_pages/outpatientCharges/summary.vue

@@ -44,17 +44,17 @@
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="患者类型">
-          <template slot-scope="scope">{{'医保'}}</template>
-        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope"></template>-->
+        <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="应收金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="舍入金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt - scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
           <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -26,8 +26,12 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
-                      <span>{{ state }}</span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt }}元</span></span>
+                      <span v-if="order.order_status == 1">待结算</span>
+                      <span v-if="order.order_status == 2">已结算</span>
+                      <span v-if="order.order_status == 3">已退费</span>
+
+
                     </div>
                 </div>
                 <div class="centerRight">
@@ -42,17 +46,17 @@
                     </ul>
                     <p class="centerRightTitle">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：0.00元</li>
-                        <li style="width:50%;">实收金额：0.00元</li>
-                        <li style="width:50%;">舍入金额：0.00元</li>
+                        <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
+                        <li style="width:50%;">实收金额：{{order.medfee_sumamt}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.medfee_sumamt}}元</li>
                         <li style="width:50%;">优惠金额：0.00元</li>
                         <li style="width:50%;">总金额</li>
-                        <li style="width:50%;">0.00元</li>
-                    </ul>
-                    <p class="centerRightTitle">发票费用</p>
-                    <ul class="basicUl">
-                        <li style="width:100%;">西药费：0.00元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
                     </ul>
+                    <!--<p class="centerRightTitle">发票费用</p>-->
+                    <!--<ul class="basicUl">-->
+                        <!--<li style="width:100%;">西药费：0.00元</li>-->
+                    <!--</ul>-->
                 </div>
             </div>
         </div>
@@ -102,6 +106,7 @@ export default {
           radio: 1,
           radioStatus: 1,
           search_input: '',
+          order:{},
         }
     },created(){
       this.GetOrderDetail()
@@ -164,6 +169,8 @@ export default {
           this.patientInfo = response.data.data.order.patient
           this.hisPatientInfo = response.data.data.order.his_patient
           this.info = response.data.data.p_info
+          this.order = response.data.data.order
+
           this.prescriptions = []
           for (let i = 0; i < response.data.data.prescription.length; i++) {
             var prescription = response.data.data.prescription[i]
@@ -196,7 +203,7 @@ export default {
                 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].statistical_classification,
+                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,

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -1,95 +1,116 @@
 <template>
-    <el-dialog
-        title="附加收费"
-        width="300px"
-        :visible.sync="visible"
-        :before-close="_close"
-    >
-        <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" 
-        :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
-          @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="40"></el-table-column>
-            <el-table-column align="center" prop="name" label="名称" width="100">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="金额(元)">
-                <template slot-scope="scope">
-                    <el-input v-model="scope.row.money" placeholder=""></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-            <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction()">保 存</el-button>
-        </div>
-    </el-dialog>         
+  <el-dialog
+    title="附加收费"
+    width="300px"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-table :data="chargeTable" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+              @select-all="handleSelectionChange"
+              @select='selectDrugs'>
+      <el-table-column align="center" type="selection" width="40"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称" width="100">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="金额(元)">
+        <template slot-scope="scope">
+          <el-input type="number" v-model="scope.row.price" placeholder="请输入金额"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction()">保 存</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
- import { saveCharges } from "@/api/project/project"
-export default {
-   props: {
+  import { saveCharges } from '@/api/project/project'
+
+  export default {
+    props: {
       hisPatientInfo: Object,
-      patientInfo:Object,
+      patientInfo: Object,
+      additions: Array,
+      addtions_charge: Array
+
     },
-    data(){
-        return{
-            visible:false,
-            form:{
-                name:''
-            },
-            tableData:[
-              {id:1,name:"工本费",money:""},
-              {id:2,name:"挂号费",money:""},
-              {id:3,name:"诊疗费",money:""}  
-            ],
-            chargeTable:[]
-        }
+    data() {
+      return {
+        visible: false,
+        chargeTable: [],
+        charges: []
+      }
     },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show() {
-            // this.clear()
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
-        },
-        handleSelectionChange(val){
-          console.log("val",val)
-          this.chargeTable = val
-        },
-        submitAction(){
-          var params = {
-             his_patient_id:this.hisPatientInfo.id,
-             patient_id:this.patientInfo.id,
-             medicineData:this.chargeTable
-           }
-        //    console.log("params",params)
-          saveCharges(params).then(response=>{
-             if(response.data.state == 1){
-               var additionalCharge =  response.data.data.additionalCharge
-               console.log("additionalchar",additionalCharge)
-               this.visible = false
-               this.$message.success("保存成功")
-             }
-          })      
+    methods: {
+      selectDrugs(selection, row) {
+        this.charges = selection
+      },
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show() {
+        this.chargeTable = []
+        this.visible = true
+        if (this.addtions_charge == null || this.addtions_charge.length == 0) {
+          for (let i = 0; i < this.additions.length; i++) {
+            let obj = {
+              id: '0',
+              item_id: this.additions[i].id.toString(),
+              name: this.additions[i].name,
+              price: this.additions[i].price.toString()
+            }
+            this.chargeTable.push(obj)
+          }
+        } else {
+
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            let obj = {
+              id: this.addtions_charge[i].id.toString(),
+              item_id: this.addtions_charge[i].item_id.toString(),
+              name: this.addtions_charge[i].item_name,
+              price: this.addtions_charge[i].price.toString()
+            }
+            this.chargeTable.push(obj)
+          }
+        }
+      },
+      hide() {
+        this.visible = false
+      },
+      handleSelectionChange(val) {
+        this.charges = val
+      },
+      submitAction() {
+        var params = {
+          his_patient_id: this.hisPatientInfo.id,
+          patient_id: this.patientInfo.id,
+          medicineData: this.charges
         }
+        saveCharges(params).then(response => {
+          if (response.data.state == 1) {
+            var data = response.data.data.additional_charges
+            this.$emit('setData', data)
+            this.$message.success('保存成功')
+            this.visible = false
+
+          }
+        })
+      }
     },
-    watch:{
-       hisPatientInfo:function(val){
-         console.log("患者ID",this)  
-       }
+    watch: {
+      hisPatientInfo: function(val) {
+        console.log('患者ID', this)
+      }
     }
-}
+  }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -32,16 +32,16 @@
             </el-select>
           </el-form-item>
           <!--<el-form-item label="医疗类型: " prop="name">-->
-            <!--<el-select style="margin-right:5px;" v-model="register_type" placeholder="">-->
-              <!--<el-option-->
-                <!--v-for="(item,index) in getDictionaryDataConfig('system','register_type')"-->
-                <!--:key="index"-->
-                <!--:label="item.name"-->
-                <!--:value="item.name">-->
-              <!--</el-option>-->
-            <!--</el-select>-->
+          <!--<el-select style="margin-right:5px;" v-model="register_type" placeholder="">-->
+          <!--<el-option-->
+          <!--v-for="(item,index) in getDictionaryDataConfig('system','register_type')"-->
+          <!--:key="index"-->
+          <!--:label="item.name"-->
+          <!--:value="item.name">-->
+          <!--</el-option>-->
+          <!--</el-select>-->
           <!--</el-form-item>-->
-          <el-form-item label="诊断:" prop="name">
+          <el-form-item label="疾病类型:" prop="name">
 
             <el-select style="margin-right:5px;" v-model="state1" placeholder="">
               <el-option
@@ -65,7 +65,7 @@
         </el-form>
         <div class="tabsBox">
 
-          <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+          <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
           <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
                    :before-leave="moreState" @tab-click="tabclickEvent">
             <el-tab-pane
@@ -104,9 +104,9 @@
             </el-option>
           </el-select>
           <span>当前处方总价：</span>
-          <span style="color:red;">{{curTotal}}</span>元
+          <span style="color:red;">{{getTotalOne()?getTotalOne():''}}</span>元
           <span style="margin-left:10px;">总价：</span>
-          <span style="color:red;">{{ getTotal() }}</span>元
+          <span style="color:red;">{{ getTotal()?getTotal():''}}</span>元
           <span>{{order_status}}</span>
 
         </div>
@@ -121,7 +121,8 @@
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
                 <div style="margin-bottom:5px;display:flex;">
-                  <el-input style="width:50%;"  @input="searchAction" @keyup.enter.native='searchAction' v-model.trim="search_keyword"
+                  <el-input style="width:50%;" @input="searchAction" @keyup.enter.native='searchAction'
+                            v-model.trim="search_keyword"
                             placeholder="请输入药品名字"></el-input>
                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
                     <el-option
@@ -247,8 +248,8 @@
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
-                       :patientInfo="patientInfo"></additionalCharges>
+    <additionalCharges   v-on:setData="setCharge" ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
+                       :patientInfo="patientInfo" :additions="additions" :addtions_charge="addtions_charge"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -277,6 +278,7 @@
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
+      addtions_charge:Array,
 
       other_sick: {
         type: Array,
@@ -303,7 +305,7 @@
         drugs: [],
         allDrugs: [],
         advices_template: [],
-
+        additions:[],
         editableTabsValue: '处方1',
         editableTabs: [{
           title: '处方1',
@@ -342,19 +344,27 @@
           { id: 2, name: '自费' }
 
         ],
-        department:[],
-        sick:[],
-        curTotal:0,
+        department: [],
+        sick: [],
+        curTotal: 0,
+        prescription_id: 0
       }
     },
     methods: {
+      setCharge(additional_charges){
+        console.log("111122222")
+        this.addtions_charge = additional_charges
+        console.log(this.addtions_charge )
+
+
+      },
       searchAction() {
-        if(this.search_keyword.length == 0){
+        if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
-        }else{
+        } else {
           let arr = []
-          for (let i = 0; i < this.drugs.length; i++){
-            if(this.drugs[i].drug_name.indexOf(this.search_keyword) != -1){
+          for (let i = 0; i < this.drugs.length; i++) {
+            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1) {
               arr = arr.concat(this.drugs[i])
             }
           }
@@ -362,31 +372,42 @@
 
         }
 
-
-      },getTotalOne() {
+      }, getTotalOne() {
         var total = 0
-        if (this.curPrescriptions.type == 1) {
-          if (this.curPrescriptions.advices != null) {
-            for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              console.log(this.curPrescriptions.advices[a].retail_price)
-              console.log(this.curPrescriptions.advices[a].prescribing_number)
+        console.log(this.prescriptions)
+        for (let i = 0; i < this.prescriptions.length; i++) {
 
-              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
-            }
-          }
-          return total
+          if(this.prescriptions[i].name == this.editableTabsValue) {
 
-        } else {
-          var total = 0
-          if (this.curPrescriptions.project != null) {
-            for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              console.log(this.curPrescriptions.project[b].price)
-              console.log(this.curPrescriptions.project[b].total)
-              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
+              }
             }
+            if (this.prescriptions[i].project != null) {
+              for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+                total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
+              }
+            }
+            total =  Math.floor(total * 100) / 100
           }
-          return total
+        }
+        return total
 
+      }, getCurTotal() {
+        var total = 0
+        console.log(this.editableTabsValue)
+
+        if(this.curPrescriptions.type == 1) {
+          for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+            total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
+          }
+          return Math.floor(total * 100) / 100
+        }else{
+          for (let a = 0; a < this.curPrescriptions.project.length; a++) {
+            total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
+          }
+          return Math.floor(total * 100) / 100
         }
 
       },
@@ -404,6 +425,9 @@
             }
           }
         }
+        for (let i = 0; i < this.addtions_charge.length; i++){
+          total = total +  this.addtions_charge[i].price
+        }
         return Math.floor(total * 100) / 100
       },
       createFilter(queryString) {
@@ -461,17 +485,52 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
             this.sick = response.data.data.sick
+            this.additions = response.data.data.additions
+
+            var info = response.data.data.info
 
+            if (this.$store.getters.xt_user.user.user_type == 2 || this.$store.getters.xt_user.user.user_type == 1) {
+              console.log('11111')
+              this.doctorValue = this.$store.getters.xt_user.user.id
+            } else {
+              console.log('222222')
 
+              this.doctorValue = this.doctors[0].admin_user_id
+            }
+
+            if (info.user_type == 2 || info.user_type == 1) {
+              if (info.department_id == 0) {
+                console.log('33333')
+
+                if (this.department.length > 0) {
+                  console.log('6666666666')
+
+                  this.departmentValue = this.department[0].id
+                } else {
+                  console.log('7777777777')
+
+                  this.departmentValue = ''
+                }
+              } else {
+                console.log('5555555')
+
+                this.departmentValue = info.department_id
+              }
+            }
 
           }
         })
 
       },
       tabclickEvent(val) {
+        console.log(this.editableTabsValue)
+
         for (let i = 0; i < this.prescriptions.length; i++) {
           console.log(this.prescriptions[i].name)
           if (this.prescriptions[i].name == val.name) {
+            console.log('2323323', this.prescriptions)
+            this.prescription_id = this.prescriptions[i].id
+            this.$emit('event1', this.prescription_id)
             this.curPrescriptions = this.prescriptions[i]
             this.teamList = []
             this.curDrugs = []
@@ -505,8 +564,6 @@
 
         }
 
-        this.total = 0
-        this.total = this.getTotalOne()
       },
       clearData() {
         this.curPrescriptions = []
@@ -516,10 +573,16 @@
         this.teamList = []
 
       },
-      setData(data, info) {
+      setData(data, info,addition_charge) {
+        this.addition_charge = addition_charge
+        this.prescription_id = data[0].id
+
+        console.log('99999999', data[0].id)
+        this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
+
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -556,8 +619,6 @@
           this.order_status = '已退费'
         }
 
-        this.total = 0
-        this.total = this.getTotalOne()
         // console.log(this.$refs)
         // this.$nextTick(() => {
         //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
@@ -888,7 +949,6 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  min_unit: temp[b].min_unit,
                   medical_insurance_number: temp[b].medical_insurance_number
 
                 }
@@ -1002,11 +1062,11 @@
             this.teamList = project
           }
         })
-      },changeDoctor(val){
+      }, changeDoctor(val) {
         console.log(val)
         console.log(this.doctors)
-        for (let i = 0; i < this.doctors.length;i++){
-          if(this.doctors[i].admin_user_id == this.doctorValue){
+        for (let i = 0; i < this.doctors.length; i++) {
+          if (this.doctors[i].admin_user_id == this.doctorValue) {
             this.departmentValue = this.doctors[i].department_id
           }
         }
@@ -1020,6 +1080,7 @@
       this.getAllProjectTeam()
 
     }
+
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -106,6 +106,7 @@
 
 
 <script>
+  import { getDictionaryDataConfig} from "@/utils/data";
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
   import { uParseTime } from '@/utils/tools'
@@ -218,7 +219,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -230,7 +230,7 @@
                   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].statistical_classification,
+                  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,
@@ -251,6 +251,8 @@
                 type: response.data.data.prescription[i].type
               }
               this.prescriptions.push(obj)
+              console.log(this.prescriptions)
+
               this.curPrescriptions = this.prescriptions[0]
             }
           }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -10,7 +10,7 @@
       <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" readonly></el-input>
-          <div> {{scope.row.min_unit}}</div>
+          <div> {{scope.row.single_dose_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
@@ -29,7 +29,7 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -10,7 +10,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -66,9 +66,9 @@
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription  :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
+        <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
-                           :hisPatientInfo="hisPatientInfo"
+                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
                            v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                      :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
@@ -130,6 +130,9 @@
         info:{},
         templatedetail:{},
         detalid:0,
+        prescription_id:0,
+        addtions_charge:[],
+
       }
     },
     methods: {
@@ -160,12 +163,14 @@
       change(val) {
         this.getList()
 
+
       },
       getList() {
         let params = {
           'record_date': this.record_date,
           'type': this.radio
         }
+        this.patientTableData = []
         getSchedulePatientList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -173,24 +178,15 @@
           } else {
             this.patientTableData = response.data.data.list
             this.patientTableDataTwo = response.data.data.list
-
-            console.log('222', this.patientTableData)
+            this.cal_one = response.data.data.total_one
+            this.cal_two =  response.data.data.total_two
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            let cal_one = 0
-            let cal_two = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
-                cal_one = cal_one + 1
-              }
-              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-                cal_two = cal_two + 1
-              }
+
+            if(this.patientTableData.length > 0) {
+              this.$refs.tab.setCurrentRow(this.patientTableData[0])
+              this.choosePatient(this.patientTableData[0])
             }
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            console.log(this.patientTableData[0])
-            this.choosePatient(this.patientTableData[0])
-            this.cal_one = cal_one
-            this.cal_two = cal_two
+
           }
         })
       },
@@ -212,6 +208,9 @@
 
             this.info = response.data.data.info
 
+            this.addtions_charge = response.data.data.addtions_charge
+
+
 
 
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
@@ -263,7 +262,6 @@
                     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,
-                    min_unit:prescription.advices[b].single_dose_unit,
                     medical_insurance_number:prescription.advices[b].med_list_codg,
                     id:prescription.advices[b].drug_id
                   }
@@ -276,7 +274,7 @@
                   console.log(prescription.project[b].project)
                   let obj = {
                     id: prescription.project[b].id,
-                    project_id: prescription.project[b].project.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,
@@ -313,26 +311,28 @@
               }
               this.prescriptions.push(obj)
             }
-            console.log(this.prescriptions)
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+
+
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.addition_charge)
           }
         })
       },
       open(index) {
+        console.log("index",index)
         if (index == 1) {
           this.$refs.prescriptions.open(1)
         } else if (index == 2) {
-          this.$router.push("/outpatientDoctorStation/print?record="+this.record_date)
+          this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
         } else if (index == 4) {
           this.$refs.prescriptions.open(4)
         }else if(index == 6){
-          this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date)
-          
+          this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
+
         }
-        
+
       },
 
       opentwo(index) {
@@ -362,6 +362,10 @@
         console.log("id----------",id)
         this.detalid = id
       },
+      changetwo(data){
+        console.log("data000000",data)
+        this.prescription_id = data
+      }
       //  getTemplateDetail(id){
       //     getTemplateDetail(id).then(response=>{
       //         if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
        <template>
         <el-button
           :loading="loading"
@@ -32,7 +32,7 @@
             </div>
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient"></printOne>
+              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
             </div>
         </el-container>
     </div>
@@ -63,7 +63,12 @@ export default {
        patientTableData:[],
        advicePrint:[],
        hisPatient:{},
-       patient:{}
+       patient:{},
+       doctorPorject:{},
+       search_input:"",
+       loading:false,
+       patient_id:"",
+       prescription_id:""
     };
   },
   methods:{
@@ -128,26 +133,34 @@ export default {
     },
 
     changePatient(row){
+      this.patient_id = row.patient_id
+      this.record_date = this.record_date
+      this.prescription_id = this.prescription_id
       console.log("row",row)
-        var params = {
-          patient_id:row.patient_id,
-          record_date:this.record_date,
-        }
-      getPrescriptionPrint(params).then(response=>{
-          if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
-            this.advicePrint = advicePrint
-            // var hisPatient =  response.data.data.hisPatient
-            // console.log("hispatient",hisPatient)
-            // this.hisPatient = hisPatient
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            var doctorPorject = response.data.data.doctorPorject
-            console.log("doctorporject",doctorPorject)
-          }
-      })
+        // var params = {
+        //   patient_id:row.patient_id,
+        //   record_date:this.record_date,
+        //   prescription_id:this.prescription_id,
+        // }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       //  var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //       this.doctorPorject = doctorPorject
+      //     }
+      // })
+    },
+    searchAction(){
+
     }
     
   },
@@ -157,6 +170,8 @@ export default {
     var record_date = this.$route.query.record
     this.record_date = record_date
     console.log("record_date",record_date)
+    var prescription_id = this.$route.query.prescription_id
+    this.prescription_id = prescription_id
     this.getAllHisPatientList(record_date)
   },
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -10,9 +10,9 @@
             <p>年龄：{{patient.age}}岁</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;">门诊号：</p>
-            <p style="margin-bottom: 10px;">科室：</p>
-            <p style="margin-bottom: 10px;">医保卡号：</p>
+            <p style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</p>
+            <p style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</p>
+            <p style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</p>
             <p style="margin-bottom: 10px;">电话：{{patient.phone}}</p>
             <p>地址：{{patient.home_address}}</p>
             <p>临床诊断：{{patient.diagnose}}</p>
@@ -20,35 +20,42 @@
         <div class="prescriptionBox">
             <p class="Rp">Rp:</p>
             <div class="drugsBox" v-for="(item,index) in advicePrint" :key="index">
-                <p class="drugsOne">{{item.advice_name}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</p>
+                <p class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</p>
                 <p style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></p>
             </div>
         </div>
         <div class="doctorBox">
-            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>日期：{{getTime(advicePrint[0].advice_date)}}</p>
+            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>日期：{{getTime(advicePrint[0].advice_date)?getTime(advicePrint[0].advice_date):""}}</p>
         </div>
         <div class="actionBar">
-            <p>审核：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)}}</p>
-            <p>核对：{{getDoctor(advicePrint[0].checker)}}</p>
-            <p>发药：{{getDoctor(advicePrint[0].execution_staff)}}</p>
-            <p>药费：{{advicePrint[0].price}}</p>
+            <p>审核：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
+            <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
+            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
         </div>
     </div>
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
-  import {getAllDoctorList} from "@/api/project/project"
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
 export default {
     props:{
-      patient:Object,
-      advicePrint:Array,
-      hisPatient:Object,
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number
     }, 
     data(){
-      return{
-        doctorList:[]
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[]
       }
     },
    methods:{
@@ -78,9 +85,76 @@ export default {
         }
         return ''
      },
+       getPrescriptionPrint(){
+         var params = {
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+        }
+        console.log("params---",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint",advicePrint)
+            this.advicePrint = advicePrint
+            var patient =  response.data.data.patient
+            console.log("patient",patient)
+            this.patient = patient
+            var doctorPorject = response.data.data.doctorPorject
+          
+            var arr = doctorPorject.project
+              console.log("我的中谷歌",arr)
+            for(let i=0;i<arr.length;i++){
+              console.log("arr",arr[i].project_name)
+            }
+            this.tableData = arr
+            console.log("3333",this.tableData)
+            var prescriptioninfo = response.data.data.prescriptionInfo
+            console.log("prescriptioninfo",prescriptioninfo)
+            this.prescriptionInfo = prescriptioninfo
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+           
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     }
    },
    created(){
       this.getAllDoctorList()
+      this.getInitData()
+   },
+   watch:{
+     patient_id:function(val){
+       console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
+       this.getPrescriptionPrint()
+       this.getHisPatientDetail()
+     }
    }
 }
 </script>

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
        <template>
         <el-button
           :loading="loading"
@@ -32,7 +32,7 @@
             </div>
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient"></printOne>
+              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
             </div>
         </el-container>
     </div>
@@ -63,7 +63,11 @@ export default {
        patientTableData:[],
        advicePrint:[],
        hisPatient:{},
-       patient:{}
+       patient:{},
+       search_input:"",
+       loading:false,
+       patient_id:0,
+       prescription_id:0
     };
   },
   methods:{
@@ -129,25 +133,32 @@ export default {
 
     changePatient(row){
       console.log("row",row)
-        var params = {
-          patient_id:row.patient_id,
-          record_date:this.record_date,
-        }
-      getPrescriptionPrint(params).then(response=>{
-          if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
-            this.advicePrint = advicePrint
-            // var hisPatient =  response.data.data.hisPatient
-            // console.log("hispatient",hisPatient)
-            // this.hisPatient = hisPatient
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            var doctorPorject = response.data.data.doctorPorject
-            console.log("doctorporject",doctorPorject)
-          }
-      })
+      this.patient_id = row.patient_id
+      this.record_date = this.record_date
+      this.prescription_id = this.prescription_id
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //     prescription_id:this.prescription_id,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
+    },
+    searchAction(){
+
     }
     
   },
@@ -157,6 +168,7 @@ export default {
     var record_date = this.$route.query.record
     this.record_date = record_date
     console.log("record_date",record_date)
+    this.prescription_id = this.$route.query.prescription_id
     this.getAllHisPatientList(record_date)
   },
 

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -8,7 +8,7 @@
                 <span>保险</span>
                 <span>其他</span>
             </p>
-            <p>就诊日期：2020-11-01 09:22:12</p>
+            <p>就诊日期：{{this.$route.query.record}}</p>
         </div>
         <div class="printTitle">血液透析中心</div>
         <div class="printTitle">处方、治疗单</div>
@@ -17,13 +17,18 @@
             <p>电脑号：</p>
         </div>
         <div class="infoMain">
-            <p style="margin-bottom: 10px;width:25%">姓名：阿萨德</p>
-            <p style="margin-bottom: 10px;width:25%">性别：男</p>
-            <p style="margin-bottom: 10px;width:25%">年龄：12</p>
+            <p style="margin-bottom: 10px;width:25%">姓名：{{patient.name}}</p>
+            <p style="margin-bottom: 10px;width:25%">性别：
+                <span v-if="patient.gender == 1">男</span>
+                <span v-if="patient.gender == 2">女</span>
+            </p>
+            <p style="margin-bottom: 10px;width:25%">年龄：
+                <span>{{patient.age}}</span>
+            </p>
             <p style="margin-bottom: 10px;width:25%">参保类型：</p>
-            <p style="margin-bottom: 10px;width:50%;">联系电话</p>
-            <p style="width:50%;">地址：</p>
-            <p style="width:50%;">诊断：</p>
+            <p style="margin-bottom: 10px;width:50%;">联系电话：{{patient.phone}}</p>
+            <p style="width:50%;">地址：{{patient.unit_address}}</p>
+            <p style="width:50%;">诊断：{{patient.diagnose}}</p>
         </div>
         <div class="prescriptionBox">
             <table style="width:100%;text-align:center;line-height:25px;">
@@ -37,24 +42,25 @@
                     <td>备注</td>
                     <td>天数</td>
                 </tr>
-                <tr v-for='item in 4'>
-                    <td>1</td>
-                    <td>啊势均力敌框架爱实力坑爹就爱上了肯德基</td>
-                    <td>1</td>
-                    <td>1</td>
-                    <td>1</td>
-                    <td>1</td>
-                    <td>1</td>
-                    <td>1</td>
+                <tr v-for="(item,index) in this.tableData" :key="index">
+                    <td>{{index+1}}</td>
+                    <td>{{item.project_name}}</td>
+                    <td>{{item.single_dose}}</td>
+                    <td>{{item.unit}}</td>
+                    <td>{{item.price}}</td>
+                    <td></td>
+                    <td>{{item.remark}}</td>
+                    <td>{{item.day}}</td>
+                   
                 </tr>
             </table>
         </div>
         <div class="infoTitle">
-            <p>开单医生：就看见</p>
-            <p>签章：2020-11-01 09:22:12</p>
+            <p>开单医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
+            <p>签章：</p>
         </div>
         <div class="actionBar">
-            <p>执行医生：</p>
+            <p>执行医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
             <p>费用：</p>
         </div>
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
@@ -87,16 +93,20 @@
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
-  import {getAllDoctorList} from "@/api/project/project"
+import {getAllDoctorList,getPrescriptionPrint} from "@/api/project/project"
 export default {
     props:{
-      patient:Object,
-      advicePrint:Array,
-      hisPatient:Object,
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number
     }, 
     data(){
-      return{
-        doctorList:[]
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[]
       }
     },
    methods:{
@@ -138,9 +148,45 @@ export default {
         }
         return ''
      },
+     getPrescriptionPrint(){
+         var params = {
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+        }
+        console.log("params---",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint",advicePrint)
+            this.advicePrint = advicePrint
+            var patient =  response.data.data.patient
+            console.log("patient",patient)
+            this.patient = patient
+            var doctorPorject = response.data.data.doctorPorject
+          
+            var arr = doctorPorject.project
+              console.log("我的中谷歌",arr)
+            for(let i=0;i<arr.length;i++){
+              console.log("arr",arr[i].project_name)
+            }
+            this.tableData = arr
+            console.log("3333",this.tableData)
+            var prescriptioninfo = response.data.data.prescriptionInfo
+            console.log("prescriptioninfo",prescriptioninfo)
+            this.prescriptionInfo = prescriptioninfo
+          }
+       })
+     }
    },
    created(){
-    //   this.getAllDoctorList()
+      this.getAllDoctorList()
+   },
+   watch:{
+     patient_id:function(val){
+       console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
+       this.getPrescriptionPrint()
+     }
    }
 }
 </script>