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

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
+     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

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/dialysis/template/DialysisPrintOrderForty.vue

@@ -881,7 +881,7 @@
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
           <td>
             <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
-            &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+            {{ monitor.end }}&nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
           <td>
             <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
@@ -2097,13 +2097,7 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 6) {
-              var nl = 6 - this.monitors.length
-              for (let index = 0; index < nl; index++) {
-                this.monitors.push([])
-              }
-            }
-
+            var tempmonitorflag = true;
             for (let index = 0; index < this.monitors.length; index++) {
               const monitor = this.monitors[index]
               this.monitors[index].end = ''
@@ -2117,6 +2111,15 @@ export default {
                 }
               }
             }
+            if (this.monitors.length < 6) {
+              var nl = 6 - this.monitors.length
+              for (let index = 0; index < nl; index++) {
+                this.monitors.push([])
+              }
+            }
+
+            
+            console.log('this.monitors',this.monitors)
             this.jilurow = this.monitors.length + 1
 
             this.advice_jilurow = this.advices.length + 1

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -44,23 +44,25 @@
 
       <el-table-column align="center" prop="day" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
+            <span>{{'天'}}</span>
+          </div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>
-            <div> {{scope.row.prescribing_number_unit}}</div>
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>{{scope.row.prescribing_number_unit}}
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+      <el-table-column align="center" prop="retail_price" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>{{'元'}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -105,8 +107,10 @@
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -117,10 +121,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <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="备注">

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/prescriptionTemplateTable.vue

@@ -7,11 +7,15 @@
                 <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="90" label="单次用量">
+            <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="getSingleDose(scope)" style="width:65%;"></el-input>
-                        <div>{{scope.row.single_dose_unit}}</div>
+                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(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" :value="scope.row.drug.dose_unit"></el-option>
+                        </el-select>
                     </div>
                 </template>
             </el-table-column>
@@ -29,7 +33,7 @@
             </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="请选择">
+                    <el-select v-model="scope.row.execution_frequency" placehold er="请选择" @change="getAllChange(scope)">
                         <el-option
                                 v-for="item,index in efs"
                                 :key="index"
@@ -44,16 +48,20 @@
             <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="getDay(scope)" placeholder=""></el-input>{{'天'}}
+                        <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="80" label="总量">
+            <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:60%" placeholder=""></el-input>
-                        <div> {{scope.row.prescribing_number_unit}}</div>
+                        <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" :value="scope.row.drug.max_unit"></el-option>
+                        </el-select>
                     </div>
                 </template>
             </el-table-column>
@@ -89,8 +97,10 @@
             </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>
@@ -127,10 +137,12 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="70" label="单价">
                 <template slot-scope="scope">
-                    <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-                    <div>{{'元'}}</div>
+                    <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>
@@ -375,6 +387,51 @@
           .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 + '库存不足')
+          }
+        }
+      },
       getSingleDose(scope){
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },

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>
@@ -95,7 +94,8 @@
         page: 1,
         limit: 10,
         patient_id: 0,
-        total:0
+        total:0,
+        patient_name:''
       }
     },
     methods: {
@@ -133,7 +133,7 @@
         })
       },
       jumpDetail(row) {
-        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id)
+        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name)
       },
       getMode(id) {
         let name = ''
@@ -171,6 +171,7 @@
         this.page = 1
         this.limit = 10
         this.patient_id = val.id
+        this.patient_name = val.name
         let params = {
           patient_id: val.id,
           page: this.page,
@@ -190,8 +191,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

@@ -1,11 +1,13 @@
 <template>
     <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 style="height: calc(100% - 0px);display: flex;flex-direction: column;">
+            <div style="display:flex;justify-content: space-between;align-items:center;margin-bottom:10px;padding:0 10px;color:#606266;">
+              <div>姓名：{{ $route.query.patient_name }}</div>
+              <el-button size="small" @click="save" type="primary">保存</el-button>
+            </div>
 
-            <div class="mainCenter" v-loading="loading">
+            <div class="mainCenter" style="padding:0 10px;" v-loading="loading">
                 <div class="centerLeft">
                     <el-form :model="tempForm" ref="tempForm" label-width="80px"
                              style="display: flex;flex-wrap: wrap;justify-content: space-between;">
@@ -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: ''
@@ -1313,8 +1322,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  medical_insurance_number: temp[b].medical_insurance_number
-
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b]
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {