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

src/xt_pages/data/components/project.vue

@@ -214,7 +214,7 @@ export default {
             total:0,
             tableData: [],
             is_start:0,
-            is_charge:0,
+            is_charge:'',
             selectDrug:[],
             optionOne: [
             {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -335,6 +335,7 @@
                                               @keyup.enter.native='searchProjectAction'
                                               v-model.trim="search_project_keyword"
                                               placeholder="请输入项目名称"></el-input>
+
                                     <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                                                @change="changeClass">
                                         <el-option
@@ -364,6 +365,14 @@
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                         </el-table-column>
+                                        <el-table-column label="库存" width="60">
+                                            <template slot-scope="scope">
+                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
+                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
+                                                {{(scope.row.total * (scope.row.dose /
+                                                scope.row.min_number))?scope.row.max_unit:''}}
+                                            </template>
+                                        </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
                                         </el-table-column>
@@ -571,7 +580,7 @@
         department: [],
         sick: [],
         diagnoses: [],
-        diagnose: 1,
+        diagnose: "",
         state1: '',
         curTotal: 0,
         prescription_id: 0,
@@ -702,6 +711,9 @@
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
+
+
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
               obj['drug'] = drug_month_prescriptions.advices[a].drug
@@ -1467,6 +1479,8 @@
         this.$refs.additionalCharges.hide()
 
       }, searchProjectAction() {
+        console.log("~~~~")
+        console.log(this.allProject)
 
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
@@ -1474,7 +1488,7 @@
         } else {
           let arr = []
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 || this.allProject[i].wubi.indexOf(this.search_project_keyword) != -1 || this.allProject[i].pinyin.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
           }
@@ -1821,6 +1835,7 @@
 
         this.diagnose = info.diagnosis
         if (this.diagnose == 0) {
+          this.diagnose = ""
           for (let i = 0; i < this.diagnoses.length; i++) {
             this.diagnose = this.diagnoses[0].id
           }
@@ -1912,6 +1927,10 @@
         } else {
           this.register_type = info.register_type
         }
+
+        if (this.diagnose == 0) {
+          this.diagnose = ""
+        }
       },
       moreState(tab, event) {
         if (tab == 'more') {

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -200,6 +200,14 @@
             let checkGroup = []
             let allPrescriptions = []
             let targetPrescriptions = []
+
+            let prescriptions = []
+            for (let i = 0; i < this.allPrescription.length; i++) {
+              for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
+                allPrescriptions.push(this.allPrescription[i].prescriptions[a])
+              }
+            }
+
             for (let i = 0; i < allPrescriptions.length; i++) {
                   targetPrescriptions.push(allPrescriptions[i])
             }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -771,6 +771,7 @@
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
               obj['drug'] = drug_month_prescriptions.advices[a].drug
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
 
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -35,7 +35,6 @@
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row
-                          ref="tab"
                 >
                     <el-table-column prop="name" label="模版名称">
                         <template slot-scope="scope">{{scope.row.name}}</template>
@@ -190,8 +189,8 @@
             this.all_data = response.data.data.list
 
             this.$refs.tab.setCurrentRow(this.data[0])
-            // this.patient_id = this.data[0].id
-            // this.GetPrescriptionTemplateList()
+            this.patient_id = this.data[0].id
+            this.GetPrescriptionTemplateList()
 
           }
         })

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2,9 +2,11 @@
     <div class="main-contain new-main-contain">
 
         <div style="height: calc(100% - 58px);display: flex;flex-direction: column;margin-top: 56px;">
-            <el-button size="small" @click="save" type="primary" style="margin-left:10px;width:60px;float: left">保存
-            </el-button>
+            <div class="position">
+                <bread-crumb :crumbs='crumbs'></bread-crumb>
+                <el-button type="primary" @click="save">保存</el-button>
 
+            </div>
             <div class="mainCenter" v-loading="loading">
                 <div class="centerLeft">
                     <el-form :model="tempForm" ref="tempForm" label-width="80px"
@@ -218,6 +220,7 @@
 
   import { uParseTime } from '@/utils/tools'
   import PrescriptionTemplateTable from './components/prescriptionTemplateTable'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
   const moment = require('moment')
   export default {
@@ -239,10 +242,16 @@
     },
     components: {
       PrescriptionTemplateTable,
-      prescriptionTable
+      prescriptionTable,
+      BreadCrumb
     },
     data() {
       return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '处方模版' },
+          { path: false, name: '模版详情' },
+        ],
         tempForm: {
           name: '',
           mode_id: ''