ソースを参照

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

see999 3 年 前
コミット
56dd55e6fb

+ 2 - 2
config/index.js ファイルの表示

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

+ 1 - 1
src/xt_pages/data/components/project.vue ファイルの表示

@@ -214,7 +214,7 @@ export default {
214 214
             total:0,
215 215
             tableData: [],
216 216
             is_start:0,
217
-            is_charge:0,
217
+            is_charge:'',
218 218
             selectDrug:[],
219 219
             optionOne: [
220 220
             {

+ 21 - 2
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue ファイルの表示

@@ -335,6 +335,7 @@
335 335
                                               @keyup.enter.native='searchProjectAction'
336 336
                                               v-model.trim="search_project_keyword"
337 337
                                               placeholder="请输入项目名称"></el-input>
338
+
338 339
                                     <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
339 340
                                                @change="changeClass">
340 341
                                         <el-option
@@ -364,6 +365,14 @@
364 365
                                         <el-table-column label="规格" width="60">
365 366
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
366 367
                                         </el-table-column>
368
+                                        <el-table-column label="库存" width="60">
369
+                                            <template slot-scope="scope">
370
+                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
371
+                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
372
+                                                {{(scope.row.total * (scope.row.dose /
373
+                                                scope.row.min_number))?scope.row.max_unit:''}}
374
+                                            </template>
375
+                                        </el-table-column>
367 376
                                         <el-table-column label="单价" width="40">
368 377
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
369 378
                                         </el-table-column>
@@ -571,7 +580,7 @@
571 580
         department: [],
572 581
         sick: [],
573 582
         diagnoses: [],
574
-        diagnose: 1,
583
+        diagnose: "",
575 584
         state1: '',
576 585
         curTotal: 0,
577 586
         prescription_id: 0,
@@ -702,6 +711,9 @@
702 711
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
703 712
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
704 713
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
714
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
715
+
716
+
705 717
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
706 718
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
707 719
               obj['drug'] = drug_month_prescriptions.advices[a].drug
@@ -1467,6 +1479,8 @@
1467 1479
         this.$refs.additionalCharges.hide()
1468 1480
 
1469 1481
       }, searchProjectAction() {
1482
+        console.log("~~~~")
1483
+        console.log(this.allProject)
1470 1484
 
1471 1485
         if (this.search_project_keyword.length == 0) {
1472 1486
           this.tabProject = this.allProject
@@ -1474,7 +1488,7 @@
1474 1488
         } else {
1475 1489
           let arr = []
1476 1490
           for (let i = 0; i < this.allProject.length; i++) {
1477
-            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) {
1491
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
1478 1492
               arr = arr.concat(this.allProject[i])
1479 1493
             }
1480 1494
           }
@@ -1821,6 +1835,7 @@
1821 1835
 
1822 1836
         this.diagnose = info.diagnosis
1823 1837
         if (this.diagnose == 0) {
1838
+          this.diagnose = ""
1824 1839
           for (let i = 0; i < this.diagnoses.length; i++) {
1825 1840
             this.diagnose = this.diagnoses[0].id
1826 1841
           }
@@ -1912,6 +1927,10 @@
1912 1927
         } else {
1913 1928
           this.register_type = info.register_type
1914 1929
         }
1930
+
1931
+        if (this.diagnose == 0) {
1932
+          this.diagnose = ""
1933
+        }
1915 1934
       },
1916 1935
       moreState(tab, event) {
1917 1936
         if (tab == 'more') {

+ 8 - 0
src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue ファイルの表示

@@ -199,6 +199,14 @@
199 199
             let checkGroup = []
200 200
             let allPrescriptions = []
201 201
             let targetPrescriptions = []
202
+
203
+            let prescriptions = []
204
+            for (let i = 0; i < this.allPrescription.length; i++) {
205
+              for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
206
+                allPrescriptions.push(this.allPrescription[i].prescriptions[a])
207
+              }
208
+            }
209
+
202 210
             for (let i = 0; i < allPrescriptions.length; i++) {
203 211
                   targetPrescriptions.push(allPrescriptions[i])
204 212
             }

+ 1 - 0
src/xt_pages/outpatientDoctorStation/doctorDesk.vue ファイルの表示

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

+ 2 - 3
src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue ファイルの表示

@@ -35,7 +35,6 @@
35 35
                           :row-style="{ color: '#303133' }"
36 36
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
37 37
                           highlight-current-row
38
-                          ref="tab"
39 38
                 >
40 39
                     <el-table-column prop="name" label="模版名称">
41 40
                         <template slot-scope="scope">{{scope.row.name}}</template>
@@ -192,8 +191,8 @@
192 191
             this.all_data = response.data.data.list
193 192
 
194 193
             this.$refs.tab.setCurrentRow(this.data[0])
195
-            // this.patient_id = this.data[0].id
196
-            // this.GetPrescriptionTemplateList()
194
+            this.patient_id = this.data[0].id
195
+            this.GetPrescriptionTemplateList()
197 196
 
198 197
           }
199 198
         })

+ 9 - 2
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue ファイルの表示

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
     <div class="main-contain new-main-contain">
3
-        
3
+
4 4
         <div style="height: calc(100% - 0px);display: flex;flex-direction: column;">
5 5
             <div style="display:flex;justify-content: space-between;align-items:center;margin-bottom:10px;padding:0 10px;color:#606266;">
6 6
               <div>姓名:{{ $route.query.patient_name }}</div>
@@ -220,6 +220,7 @@
220 220
 
221 221
   import { uParseTime } from '@/utils/tools'
222 222
   import PrescriptionTemplateTable from './components/prescriptionTemplateTable'
223
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
223 224
 
224 225
   const moment = require('moment')
225 226
   export default {
@@ -241,10 +242,16 @@
241 242
     },
242 243
     components: {
243 244
       PrescriptionTemplateTable,
244
-      prescriptionTable
245
+      prescriptionTable,
246
+      BreadCrumb
245 247
     },
246 248
     data() {
247 249
       return {
250
+        crumbs: [
251
+          { path: false, name: '门诊医生站' },
252
+          { path: false, name: '处方模版' },
253
+          { path: false, name: '模版详情' },
254
+        ],
248 255
         tempForm: {
249 256
           name: '',
250 257
           mode_id: ''