XMLWAN 3 年前
父节点
当前提交
40e69ed2da

+ 8 - 0
src/api/stock.js 查看文件

@@ -602,4 +602,12 @@ export function postDrugInformation(params){
602 602
     method:"post",
603 603
     data:params
604 604
   })
605
+}
606
+
607
+export function getInitializtion(params){
608
+  return request({
609
+    url:"/api/good/initializtion",
610
+    method:"get",
611
+    params:params
612
+  })
605 613
 }

+ 66 - 25
src/xt_pages/data/components/addDrugs.vue 查看文件

@@ -37,10 +37,10 @@
37 37
                         <el-form-item label="药品类别 : " prop="drug_category">
38 38
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
39 39
                                 <el-option
40
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_category')"
40
+                                        v-for="(item,index) in drugCategoryList"
41 41
                                         :key="index"
42 42
                                         :label="item.name"
43
-                                        :value="item.id">
43
+                                        :value="item.value">
44 44
                                 </el-option>
45 45
                             </el-select>
46 46
                         </el-form-item>
@@ -51,10 +51,10 @@
51 51
                         <el-form-item label="药品类型 : " prop="drug_type">
52 52
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
53 53
                                 <el-option
54
-                                        v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
54
+                                        v-for="(item,index) in drugTypeList"
55 55
                                         :key="index"
56 56
                                         :label="item.name"
57
-                                        :value="item.id">
57
+                                        :value="item.value">
58 58
                                 </el-option>
59 59
                             </el-select>
60 60
                         </el-form-item>
@@ -69,20 +69,20 @@
69 69
                         <el-form-item label="药品剂型 : " prop="drug_dosage_form">
70 70
                             <el-select v-model="form.drug_dosage_form" style="width:160px;" placeholder="请选择">
71 71
                                 <el-option
72
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_dosage_form')"
72
+                                        v-for="(item,index) in drugDosageFormList"
73 73
                                         :key="index"
74 74
                                         :label="item.name"
75
-                                        :value="item.id">
75
+                                        :value="item.value">
76 76
                                 </el-option>
77 77
                             </el-select>
78 78
                         </el-form-item>
79 79
                         <el-form-item label="医保等级 : ">
80 80
                             <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
81 81
                                 <el-option
82
-                                        v-for="item,index in getDictionaryDataConfig('system','medical_insurance_level')"
82
+                                        v-for="(item,index) in medicalInsuranceLevelList"
83 83
                                         :key="index"
84 84
                                         :label="item.name"
85
-                                        :value="item.id">
85
+                                        :value="item.value">
86 86
                                 </el-option>
87 87
                             </el-select>
88 88
                         </el-form-item>
@@ -121,10 +121,10 @@
121 121
                         <el-form-item label="开药控制 : " prop="drug_control">
122 122
                             <el-select v-model="form.drug_control" style="width:160px;" placeholder="请选择">
123 123
                                 <el-option
124
-                                        v-for="item,index in getDictionaryDataConfig('system','drug_control')"
124
+                                        v-for="(item,index) in drugControlList"
125 125
                                         :key="index"
126 126
                                         :label="item.name"
127
-                                        :value="item.id">
127
+                                        :value="item.value">
128 128
                                 </el-option>
129 129
                             </el-select>
130 130
                         </el-form-item>
@@ -135,10 +135,10 @@
135 135
                         <el-form-item label="药物分类 : " prop="drug_classify">
136 136
                             <el-select v-model="form.drug_classify" style="width:160px;" placeholder="请选择">
137 137
                                 <el-option
138
-                                        v-for="item, index in getDictionaryDataConfig('system','drug_classify')"
138
+                                        v-for="(item, index) in drugTypeList"
139 139
                                         :key="index"
140 140
                                         :label="item.name"
141
-                                        :value="item.id">
141
+                                        :value="item.value">
142 142
                                 </el-option>
143 143
                             </el-select>
144 144
                         </el-form-item>
@@ -207,20 +207,20 @@
207 207
                         <el-form-item label="药理分类 : " prop="pharmacology_category">
208 208
                             <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
209 209
                                 <el-option
210
-                                        v-for="item,index  in getDictionaryDataConfig('system','pharmacology_category')"
210
+                                        v-for="(item,index)  in pharmacologyCategoryList"
211 211
                                         :key="index"
212 212
                                         :label="item.name"
213
-                                        :value="item.id">
213
+                                        :value="item.value">
214 214
                                 </el-option>
215 215
                             </el-select>
216 216
                         </el-form-item>
217 217
                         <el-form-item label="统计分类 : " prop="statistics_category">
218 218
                             <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
219 219
                                 <el-option
220
-                                        v-for="item,index  in getDictionaryDataConfig('system','statistics_category')"
220
+                                        v-for="(item,index)  in statisticsCategoryList"
221 221
                                         :key="index"
222 222
                                         :label="item.name"
223
-                                        :value="item.id">
223
+                                        :value="item.value">
224 224
                                 </el-option>
225 225
                             </el-select>
226 226
                         </el-form-item>
@@ -423,7 +423,7 @@
423 423
 <script>
424 424
   import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
425 425
   import { getAdviceConfig } from '@/api/advice'
426
-  import { GetAllConfig, getManufacturerList } from '@/api/stock'
426
+  import { GetAllConfig, getManufacturerList,getInitializtion } from '@/api/stock'
427 427
 
428 428
   export default {
429 429
     data() {
@@ -552,7 +552,15 @@
552 552
         page: 1,
553 553
         limit: 500,
554 554
         manufacturerList: [],
555
-        dealer: []
555
+        dealer: [],
556
+        drugTypeList:[],
557
+        drugCategoryList:[],
558
+        drugDosageFormList:[],
559
+        medicalInsuranceLevelList:[],
560
+        drugControlList:[],
561
+        drugClassifyList:[],
562
+        statisticsCategoryList:[],
563
+        pharmacologyCategoryList:[]
556 564
       }
557 565
     },
558 566
     props: {
@@ -569,7 +577,8 @@
569 577
       isCreated: {
570 578
         type: Number,
571 579
         default: 1
572
-      }
580
+      },
581
+     
573 582
 
574 583
     },
575 584
     methods: {
@@ -602,9 +611,11 @@
602 611
         this.form.intro = ''
603 612
       },
604 613
       show(id, obj) {
605
-        console.log("obj3333333",obj)
614
+        console.log("obj333333333",obj)
615
+        this.getInitializtion()
606 616
         this.getlist()
607 617
         this.GetAllConfig()
618
+        obj.drug_classify = parseInt(obj.drug_classify)
608 619
         if(obj.dealer == 0){
609 620
            obj.dealer = ""
610 621
         }
@@ -730,7 +741,7 @@
730 741
 
731 742
         getManufacturerList(params).then(response => {
732 743
           var manufacturerList = response.data.data.manufacturer
733
-          console.log('列表2222222', manufacturerList)
744
+         
734 745
           this.manufacturerList = manufacturerList
735 746
         })
736 747
       },
@@ -741,9 +752,39 @@
741 752
             return false
742 753
           } else {
743 754
             this.dealer = response.data.data.dealer
744
-            console.log('经销商', this.dealer)
755
+            // console.log('经销商', this.dealer)
745 756
           }
746 757
         })
758
+      },
759
+      getInitializtion(){
760
+        getInitializtion().then(response=>{
761
+           if(response.data.state ==1){
762
+             var drugCategoryList =  response.data.data.drugCategoryList
763
+             console.log("药品类别",drugCategoryList) 
764
+             this.drugCategoryList = drugCategoryList
765
+             var drugTypeList = response.data.data.drugTypeList
766
+              console.log("药物分类",drugTypeList)
767
+              this.drugTypeList = drugTypeList
768
+             var drugDosageFormList =  response.data.data.drugDosageFormList
769
+             console.log("药品剂型",drugDosageFormList) 
770
+             this.drugDosageFormList = drugDosageFormList
771
+             var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
772
+             console.log("医保等级",medicalInsuranceLevelList)
773
+             this.medicalInsuranceLevelList = medicalInsuranceLevelList
774
+             var drugControlList = response.data.data.drugControlList
775
+             console.log("开药控制",drugControlList)
776
+             this.drugControlList = drugControlList
777
+             var drugClassifyList = response.data.data.drugClassifyList
778
+             console.log("药物分类",drugClassifyList)
779
+             this.drugClassifyList = drugClassifyList
780
+             var statisticsCategoryList =  response.data.data.statisticsCategoryList
781
+             console.log("统计分类",statisticsCategoryList)
782
+             this.statisticsCategoryList = statisticsCategoryList
783
+             var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
784
+             console.log("药理分类",pharmacologyCategoryList)
785
+             this.pharmacologyCategoryList = pharmacologyCategoryList
786
+           }
787
+        })
747 788
       }
748 789
     }, watch: {
749 790
       visible(val) {
@@ -752,12 +793,12 @@
752 793
       }
753 794
     },
754 795
     created() {
796
+      this.getInitializtion()
755 797
        //获取所有经销商
756 798
       this.GetAllConfig()
757 799
       this.getlist()
758
-
759
-      var drug_type =  this.getDictionaryDataConfig('system','drug_type')
760
-      console.log("药品类型333333",drug_type)
800
+      
801
+      
761 802
      
762 803
     }
763 804
   }

+ 28 - 11
src/xt_pages/data/components/consumables.vue 查看文件

@@ -66,7 +66,7 @@
66 66
      <div style="display:flex; align-items:center;margin-bottom:10px;">
67 67
         <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
68 68
         <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
69
-        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/stock_template2.xlsx" :underline="false"
69
+        <el-link target="_blank" href="https://kuyi.shengws.com/stockTemplate.xlsx" :underline="false"
70 70
                  style="margin-left:15px">
71 71
           <el-button
72 72
             class="filter-item"
@@ -83,7 +83,7 @@
83 83
           type="primary"
84 84
           size="small"
85 85
         >下载日志
86
-        </el-button> -->
86
+        </el-button>
87 87
       </div>
88 88
 
89 89
     <el-table
@@ -241,7 +241,8 @@
241 241
     GetGoodInfoByGoodId,
242 242
     getGoodInfoList,
243 243
     modifyGoodInfo,
244
-    postGoodInformation
244
+    postGoodInformation,
245
+    getInitializtion
245 246
   } from '@/api/stock'
246 247
   import UploadExcel from '@/xt_pages/components/UploadExcel'
247 248
   import GoodExcel from '@/xt_pages/components/GoodExcel'
@@ -352,6 +353,7 @@
352 353
         dealers:[],
353 354
         exportLogVisible:false,
354 355
         logs: [],
356
+        goodKindList:[]
355 357
       }
356 358
     },
357 359
     methods: {
@@ -460,10 +462,12 @@
460 462
         return ""
461 463
       },
462 464
       getGoodKind(id){
463
-        var data = this.getDictionaryDataConfig('system','good_kind')
465
+        // var data = this.getDictionaryDataConfig('system','good_kind')
466
+        var data = this.goodKindList
467
+       
464 468
         var name = ""
465 469
         for(let i = 0; i < data.length; i++){
466
-          if(id == data[i].id){
470
+          if(id == data[i].value){
467 471
             name = data[i].name
468 472
           }
469 473
 
@@ -721,7 +725,7 @@
721 725
           is_mark:this.is_record,
722 726
           manufacturer:this.manufacturer,
723 727
         }
724
-        console.log("222222",params)
728
+      
725 729
         getGoodInfoList(params).then(response => {
726 730
           if (response.data.state == 0) {
727 731
             this.goodInfo.loading = false
@@ -898,7 +902,7 @@
898 902
               )
899 903
               this.manufacturers.push(response.data.data.manufacturer[i])
900 904
             }
901
-            console.log("生产厂商888222",this.manufacturers)
905
+           
902 906
           }
903 907
         })
904 908
       },
@@ -1034,13 +1038,13 @@
1034 1038
               ids.push(this.selectDrug[index].id);
1035 1039
               idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
1036 1040
             }
1037
-            console.log('ids222222222',ids)
1041
+          
1038 1042
             var idss = ids.join(',')
1039 1043
             let params = {
1040 1044
               ids:idss,
1041 1045
               admin_user_id:this.$store.getters.xt_user.user.id
1042 1046
             }
1043
-            console.log("paramsw2",params)
1047
+          
1044 1048
 
1045 1049
             var that = this
1046 1050
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
@@ -1123,7 +1127,7 @@
1123 1127
         }
1124 1128
        
1125 1129
        var tableData = []
1126
-       for(let i=0;i<results.length;i++){
1130
+       for(let i=1;i<results.length;i++){
1127 1131
          let obj = {"good_kind_id":0,"good_type_id":0,"medical_insurance_id":0,"dealer_id":0,"statistic_id":0,"manufacturer_id":0,"unit_id":0}
1128 1132
          for (var key in results[i]) {
1129 1133
 
@@ -1368,7 +1372,7 @@
1368 1372
        let params = {
1369 1373
           'goods':tableData 
1370 1374
         }
1371
-       console.log("params22229999999",params)
1375
+     
1372 1376
        
1373 1377
        
1374 1378
         postGoodInformation(params).then(response=>{
@@ -1432,6 +1436,18 @@
1432 1436
         )
1433 1437
 
1434 1438
       },
1439
+      getInitializtion(){
1440
+       getInitializtion().then(response=>{
1441
+         if(response.data.state == 1){
1442
+           var goodKindList = response.data.data.goodKindList
1443
+          
1444
+           this.goodKindList = goodKindList
1445
+         
1446
+
1447
+         }
1448
+       })
1449
+      }
1450
+
1435 1451
     }, 
1436 1452
     created() {
1437 1453
       this.getList()
@@ -1439,6 +1455,7 @@
1439 1455
       this.getAllManufacturer()
1440 1456
       this.getAllGoodType()
1441 1457
       this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit
1458
+      this.getInitializtion()
1442 1459
     }
1443 1460
   }
1444 1461
 </script>

+ 15 - 10
src/xt_pages/data/components/drugs.vue 查看文件

@@ -64,7 +64,7 @@
64 64
     <div style="display:flex; align-items:center;margin-bottom:10px;">
65 65
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
66 66
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
67
-        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template2.xlsx" :underline="false"
67
+        <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.xlsx" :underline="false"
68 68
                  style="margin-left:15px">
69 69
           <el-button
70 70
             class="filter-item"
@@ -81,7 +81,7 @@
81 81
           type="primary"
82 82
           size="small"
83 83
         >下载日志
84
-        </el-button> -->
84
+        </el-button>
85 85
       </div>
86 86
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
87 87
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -505,7 +505,7 @@
505 505
           })
506 506
         } else if (val.id == 0) {
507 507
           //新增
508
-          console.log("vale222222",val)
508
+         
509 509
 
510 510
           createBaseDrugLib(val).then(response => {
511 511
             if (response.data.state == 0) {
@@ -560,7 +560,7 @@
560 560
               this.$message.error(response.data.msg)
561 561
               return false
562 562
             } else {
563
-              console.log("数据", response.data.data.drug)
563
+           
564 564
               for (let key in response.data.data.drug) {
565 565
                 this.formValue[key] = response.data.data.drug[key]
566 566
               }
@@ -687,7 +687,7 @@
687 687
       },
688 688
 
689 689
        deleteDurg(id,index){
690
-         console.log("id",id)
690
+      
691 691
             this.$confirm('确认删除吗?', '删除', {
692 692
             confirmButtonText: '确 定',
693 693
             cancelButtonText: '取 消',
@@ -804,7 +804,7 @@
804 804
       //   })
805 805
       // },
806 806
       toReturn(id,isMark){
807
-        console.log("id2222",id)
807
+     
808 808
          var that = this
809 809
          let params = {
810 810
              'id':id,
@@ -949,7 +949,7 @@
949 949
         }
950 950
        
951 951
        var tableData = []
952
-       for(let i=0;i<results.length;i++){
952
+       for(let i=1;i<results.length;i++){
953 953
          let obj = {"drug_type_id":0,"drug_dosage_form_id":0,"medical_insurance_level_id":0,"drug_classify_id":0,"manufacturer_id":0,"dealer_id":0,"statistics_category_id":0,"drug_control_id":0,"pharmacology_category_id":0,"drug_category_id":0}
954 954
          for (var key in results[i]) {
955 955
 
@@ -1292,8 +1292,9 @@
1292 1292
 
1293 1293
 
1294 1294
          }
1295
+         var newArr = []
1295 1296
          tableData.push(obj)
1296
-         console.log("表哥2222",tableData)    
1297
+       
1297 1298
         for(let i=0;i<tableData.length;i++){ 
1298 1299
           
1299 1300
          if(tableData[i].is_special_diseases == ""){
@@ -1361,12 +1362,13 @@
1361 1362
        let params = {
1362 1363
           'drugs':tableData 
1363 1364
         }
1364
-       console.log("导入数据",params)
1365
-    
1365
+   
1366 1366
         postDrugInformation(params).then(response=>{
1367 1367
            if(response.data.state == 1){
1368 1368
              var msg =  response.data.data.msg
1369 1369
              this.getList()
1370
+             this.getAllManufacturer()
1371
+             this.GetAllConfig()
1370 1372
              this.$message.success("导入成功!")
1371 1373
 
1372 1374
            }else{
@@ -1427,11 +1429,14 @@
1427 1429
       getDictionaryDataConfig(module,filed_name){
1428 1430
         return getDictionaryDataConfig(module,filed_name)
1429 1431
       },
1432
+     
1430 1433
     },
1431 1434
     created() {
1435
+     
1432 1436
       this.getList()
1433 1437
       this.getAllManufacturer()
1434 1438
       this.GetAllConfig()
1439
+      
1435 1440
     }
1436 1441
   }
1437 1442
 </script>

+ 12 - 12
src/xt_pages/data/components/project.vue 查看文件

@@ -41,7 +41,7 @@
41 41
         <div style="display:flex; align-items:center;margin-bottom:10px;">
42 42
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
43 43
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
44
-        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/project_template1.xlsx" :underline="false"
44
+        <el-link target="_blank" href="https://kuyi.shengws.com/projectTemplate.xlsx" :underline="false"
45 45
                  style="margin-left:15px">
46 46
           <el-button
47 47
             class="filter-item"
@@ -60,7 +60,7 @@
60 60
           type="primary"
61 61
           size="small"
62 62
         >下载日志
63
-        </el-button> -->
63
+        </el-button>
64 64
       </div>
65 65
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
66 66
             <el-table-column
@@ -379,10 +379,10 @@ export default {
379 379
           getProjectList(params).then(response=>{
380 380
              if(response.data.state == 1){
381 381
                var projecList = response.data.data.projecList
382
-               console.log('projectlist',projecList)
382
+              
383 383
                this.tableData = projecList
384 384
                var total = response.data.data.total
385
-               console.log("total",total)
385
+            
386 386
                this.total = total
387 387
              }
388 388
           })
@@ -422,7 +422,7 @@ export default {
422 422
       },
423 423
 
424 424
      toReturn(id,isMark){
425
-        console.log("id2222",id)
425
+      
426 426
          var that = this
427 427
          let params = {
428 428
              'id':id,
@@ -430,7 +430,7 @@ export default {
430 430
              'is_mark':isMark,
431 431
              'admin_user_id':this.$store.getters.xt_user.user.id,
432 432
           }
433
-          console.log("params22222222",params)
433
+      
434 434
 
435 435
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
436 436
           if (response.data.state == 0) {
@@ -483,7 +483,7 @@ export default {
483 483
           ids:idss,
484 484
           admin_user_id:this.$store.getters.xt_user.user.id
485 485
         }
486
-       console.log("prams22",params)
486
+      
487 487
         var that = this
488 488
         axios.get('http://127.0.0.1:9532/sz/api/treatment/get',{ params: params }).then(function(response) {
489 489
          if (response.data.state == 0) {
@@ -512,7 +512,7 @@ export default {
512 512
         getDePartmentList(params).then(response=>{
513 513
             if(response.data.state == 1){
514 514
             var department =   response.data.data.departMentList
515
-            console.log("科室列表",department)
515
+           
516 516
             this.departMentList = department
517 517
             }
518 518
         })
@@ -543,7 +543,7 @@ export default {
543 543
         }
544 544
 
545 545
        var tableData = []
546
-       for(let i=0;i<results.length;i++){
546
+       for(let i=1;i<results.length;i++){
547 547
          let obj = {"cost_classify_id":0,"medical_insurance_level_id":0,"executive_section_id":0,"tube_color_id":0,"statistical_classification_id":0,"category":0,"specail_project":0,"medical_status":0}
548 548
          for (var key in results[i]) {
549 549
            if (results[i]['*项目名称'] === undefined) {
@@ -739,7 +739,7 @@ export default {
739 739
           }
740 740
          }
741 741
          tableData.push(obj)
742
-         // console.log("项目列表",tableData)
742
+         
743 743
 
744 744
         for(let i=0;i<tableData.length;i++){
745 745
 
@@ -806,7 +806,7 @@ export default {
806 806
        let params = {
807 807
           'projects':tableData
808 808
         }
809
-       console.log("params2222",params)
809
+
810 810
 
811 811
         postProjectInformation(params).then(response=>{
812 812
            if(response.data.state == 1){
@@ -841,7 +841,7 @@ export default {
841 841
 
842 842
       },
843 843
       getContent(log) {
844
-         console.log("日志",log)
844
+       
845 845
         return '您导入的文档共' + log.total_num + '条患者数据' + ',' + '已成功导入' + log.success_num + '条,导入失败' + log.fail_num + '条,'
846 846
       },
847 847
       timestampToTime(timestamp) {

+ 3 - 2
src/xt_pages/qcd/basicInformationAnalysis.vue 查看文件

@@ -842,10 +842,11 @@ export default {
842 842
          if(response.data.state == 1){
843 843
 
844 844
           var modetype =  response.data.data.modetype
845
+         
845 846
           this.modetype = modetype
846 847
           var total =  response.data.data.total
847
-          console.log("total22222222",total)
848
-          // this.total = total[0].count
848
+          
849
+          // this.total = total.count
849 850
           this.total = total
850 851
           // console.log("数据",this.modetype)
851 852
           var modedate = response.data.data.modetype

+ 33 - 11
src/xt_pages/stock/Dialog/goodInfoDailog.vue 查看文件

@@ -23,10 +23,10 @@
23 23
             <el-form-item label="耗材种类 : " prop="good_kind">
24 24
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
25 25
                 <el-option
26
-                  v-for="item,index in getDictionaryDataConfig('system','good_kind')"
26
+                  v-for="(item,index) in goodKindList"
27 27
                   :key="index"
28 28
                   :label="item.name"
29
-                  :value="item.id">
29
+                  :value="item.value">
30 30
                 </el-option>
31 31
               </el-select>
32 32
             </el-form-item>
@@ -43,10 +43,10 @@
43 43
             <el-form-item label="医保等级 : " prop="medical_insurance_level">
44 44
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
45 45
                 <el-option
46
-                  v-for="item, index in getDictionaryDataConfig('system','medical_insurance_level')"
46
+                  v-for="(item, index) in medicalInsuranceLevelList"
47 47
                   :key="index"
48 48
                   :label="item.name"
49
-                  :value="item.id">
49
+                  :value="item.value">
50 50
                 </el-option>
51 51
               </el-select>
52 52
             </el-form-item>
@@ -116,10 +116,10 @@
116 116
             <el-form-item label="统计分类:" prop="statistics_category">
117 117
               <el-select v-model="form.statistics_category" style="width:160px;" placeholder="请选择">
118 118
                 <el-option
119
-                  v-for="item,index in getDictionaryDataConfig('system','statistics_category')"
119
+                  v-for="(item,index) in statisticsCategoryList"
120 120
                   :key="index"
121 121
                   :label="item.name"
122
-                  :value="item.id">
122
+                  :value="item.value">
123 123
                 </el-option>
124 124
               </el-select>
125 125
             </el-form-item>
@@ -273,7 +273,7 @@
273 273
 
274 274
 <script>
275 275
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
276
-  import { getManufacturerList,GetAllConfig } from "@/api/stock";
276
+  import { getManufacturerList,GetAllConfig,getInitializtion } from "@/api/stock";
277 277
 
278 278
   export default {
279 279
     name: 'goodInfoDailog',
@@ -372,7 +372,10 @@
372 372
             {required:true,message:"请填写特殊医院材料标志",trigger:"blur"}
373 373
           ]
374 374
         },
375
-        dealer:[]
375
+        dealer:[],
376
+        goodKindList:[],
377
+        medicalInsuranceLevelList:[],
378
+        statisticsCategoryList:[]
376 379
       }
377 380
     },
378 381
     props: {
@@ -401,8 +404,10 @@
401 404
       show(id,form) {
402 405
         this.visible = true
403 406
         this.good_status =[]
407
+        this.getlist()
408
+        this.GetAllConfig()
409
+        this.getInitializtion()
404 410
         if (id == 0) {
405
-
406 411
           var tempform = {
407 412
               good_id: '',
408 413
               specification_name: '',
@@ -516,10 +521,10 @@
516 521
              page:this.page,
517 522
              limit:this.limit
518 523
           }
519
-          console.log("params2222222",params)
524
+        
520 525
         getManufacturerList(params).then(response=>{
521 526
            var manufacturerList =   response.data.data.manufacturer
522
-           console.log("列表2222222",manufacturerList)
527
+         
523 528
            this.manufacturerList = manufacturerList
524 529
         })
525 530
       },
@@ -533,6 +538,22 @@
533 538
           
534 539
         }
535 540
        });
541
+      },
542
+      getInitializtion(){
543
+       getInitializtion().then(response=>{
544
+         if(response.data.state == 1){
545
+           var goodKindList = response.data.data.goodKindList
546
+           console.log("耗材种类",goodKindList)
547
+           this.goodKindList = goodKindList
548
+           var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
549
+           console.log("医保等级",medicalInsuranceLevelList)
550
+           this.medicalInsuranceLevelList = medicalInsuranceLevelList
551
+           var statisticsCategoryList = response.data.data.statisticsCategoryList
552
+           console.log("统计分类",statisticsCategoryList)
553
+           this.statisticsCategoryList = statisticsCategoryList
554
+
555
+         }
556
+       })
536 557
       }
537 558
     },
538 559
     watch: {
@@ -549,6 +570,7 @@
549 570
       this.getlist()
550 571
       //获取所有经销商
551 572
       this.GetAllConfig()
573
+      this.getInitializtion()
552 574
     }
553 575
   }
554 576
 

+ 1 - 1
src/xt_pages/user/patients.vue 查看文件

@@ -846,7 +846,7 @@
846 846
 
847 847
       },
848 848
       handleSuccess({ results, header }) {
849
-        console.log("header22222",results)
849
+       
850 850
         if (header != undefined && header.length > 0) {
851 851
           var isHasName = header.includes('*姓名')
852 852
           var isHasGender = header.includes('*性别')

+ 4 - 3
src/xt_pages/workforce/appointment.vue 查看文件

@@ -663,12 +663,13 @@
663 663
         return isShow
664 664
       },
665 665
        handleSuccess({ results, header }) {
666
-        
666
+       
667 667
         let headers = []
668 668
         for (let key in results[0]) {
669 669
           headers.push(key)
670 670
         }
671
-        if (results.length > 20) {
671
+        if (header.length == 65) {
672
+          console.log("进来了吗")
672 673
           var isHas_1 = headers.includes('区号')
673 674
           console.log("1"+isHas_1)
674 675
           var isHas_2 = headers.includes('机号')
@@ -893,7 +894,7 @@
893 894
             this.dialogVisible = true
894 895
             return
895 896
           }
896
-        }else if(results.length == 20){
897
+        }else if(header.length == 23){
897 898
             var isHas_1 = headers.includes('区号')
898 899
           console.log("1"+isHas_1)
899 900
           var isHas_2 = headers.includes('机号')