XMLWAN 4 years ago
parent
commit
2e3808175a

+ 2 - 23
src/xt_pages/data/components/consumables.vue View File

@@ -771,17 +771,7 @@
771 771
           val['id'] = this.goodInfo.editGoodId
772 772
           val['good_code'] = this.goodInfo.good_code
773 773
         
774
-          if(val.retail_price == ""){
775
-             val.retail_price = 0
776
-          }else{
777
-            val.retail_price = parseInt(val.retail_price)
778
-          }
779
-
780
-          if(val.buy_price == ""){
781
-             val.buy_price = 0
782
-          }else{
783
-             val.buy_price = parseInt(val.buy_price)
784
-          }
774
+          
785 775
 
786 776
 
787 777
           
@@ -817,18 +807,7 @@
817 807
           })
818 808
         } else if (val.isCreated == 1) {
819 809
          
820
-          if(val.retail_price == ""){
821
-             val.retail_price = 0
822
-          }else{
823
-            val.retail_price = parseInt(val.retail_price)
824
-          }
825
-
826
-          if(val.buy_price == ""){
827
-             val.buy_price = 0
828
-          }else{
829
-             val.buy_price = parseInt(val.buy_price)
830
-          }
831
-
810
+          
832 811
           if(val.is_reuse == ""){
833 812
              val.is_reuse = 0
834 813
           }else{

+ 3 - 47
src/xt_pages/data/components/drugs.vue View File

@@ -1267,36 +1267,9 @@
1267 1267
 
1268 1268
          }
1269 1269
          tableData.push(obj)
1270
-         console.log("表哥2222",tableData)
1271
-      
1272
-        var drugType =  this.getDictionaryDataConfig('system','drug_type')
1273
-        
1274
-       
1275
-        var drugDosageForm = this.getDictionaryDataConfig('system','drug_dosage_form')
1276
-       
1277
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
1278
-        
1279
-
1280
-        var drugClassify =  this.getDictionaryDataConfig('system','drug_classify')
1281
-       
1282
-        var drug_control =  this.getDictionaryDataConfig('system','drug_control')
1283
-        var goodUnit =  this.$store.getters.good_unit
1284
-        
1285
-        var pharmacology_category = this.getDictionaryDataConfig('system','pharmacology_category')
1286
-       
1287
-        var statistics_category = this.getDictionaryDataConfig('system','statistics_category')
1288
-      
1289
-         
1290
-        var drugCategory = this.getDictionaryDataConfig('system','drug_category')
1291
-        console.log("药品分类",drugCategory)
1292
-        
1270
+         console.log("表哥2222",tableData)    
1293 1271
         for(let i=0;i<tableData.length;i++){ 
1294 1272
           
1295
-         for(let j=0;j<drug_control.length;j++){
1296
-           if(tableData[i].drug_control == drug_control[j].name){
1297
-               tableData[i].drug_control_id = drug_control[j].id
1298
-            }
1299
-         } 
1300 1273
          if(tableData[i].is_special_diseases == ""){
1301 1274
             tableData[i].is_special_diseases = 0
1302 1275
          }
@@ -1344,27 +1317,10 @@
1344 1317
               tableData[i].hosp_appr_flag = 3
1345 1318
           }
1346 1319
 
1347
-        if(tableData[i].drug_category !="" && tableData[i].drug_category!=null){
1348
-           for(let j=0;j<drugCategory.length;j++){
1349
-
1350
-             if(tableData[i].drug_category == drugCategory[j].name  ){
1351
-                 tableData[i].drug_category_id = drugCategory[j].id
1352
-             }
1353
-
1354
-              if( tableData[i].drug_category != drugCategory[j].name  ){
1355
-                 tableData[i].drug_category_id = -1
1356
-             }
1357
-          }
1358
-         }  
1320
+      
1359 1321
         }
1360 1322
        }
1361
-       for(let i=0;i<tableData.length;i++){
1362
-          tableData[i].retail_price = parseInt(tableData[i].retail_price)
1363
-          tableData[i].last_price = parseInt(tableData[i].last_price)
1364
-       }
1365
-
1366
-
1367
-       
1323
+     
1368 1324
        let params = {
1369 1325
           'drugs':tableData 
1370 1326
         }

+ 7 - 58
src/xt_pages/data/components/project.vue View File

@@ -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_template.xlsx" :underline="false"
44
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/project_template1.xlsx" :underline="false"
45 45
                  style="margin-left:15px">
46 46
           <el-button
47 47
             class="filter-item"
@@ -49,9 +49,9 @@
49 49
             size="small"
50 50
           >下载模版
51 51
           </el-button>
52
-        </el-link>
52
+        </el-link> -->
53 53
 
54
-        <project-excel :on-success='handleSuccessOne'></project-excel>
54
+        <!-- <project-excel :on-success='handleSuccessOne'></project-excel>
55 55
      
56 56
         <el-button
57 57
           style="margin-left:10px;"
@@ -741,48 +741,8 @@ export default {
741 741
          tableData.push(obj)
742 742
          console.log("项目列表",tableData)
743 743
         
744
-        var costClassify =  this.getDictionaryDataConfig('system','cost_classify')
745
-        console.log("费用类别",costClassify)
746
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
747
-        console.log("医保等级",medicalInsuranceLevel)
748
-        
749
-        var statistical_classification = getDictionaryDataConfig('system','statistics_category')
750
-        console.log("统计分类",statistical_classification)
751
-
752
-        var tube_color = this.getDictionaryDataConfig('system','tube_color')
753
-        console.log("试管颜色",tube_color)
754
-
755 744
         for(let i=0;i<tableData.length;i++){ 
756
-          for(let j=0;j<costClassify.length;j++){
757
-          
758
-             if(tableData[i].cost_classify === costClassify[j].name){
759
-                 tableData[i].cost_classify_id = costClassify[j].id
760
-             }
761
-          }  
762
-
763
-          for(let j=0;j<medicalInsuranceLevel.length;j++){
764
-             if(tableData[i].medical_coverage == medicalInsuranceLevel[j].name ){
765
-                 tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
766
-             }
767
-          }
768
-
769
-         
770 745
           
771
-          for(let j=0;j<this.departMentList.length;j++){
772
-             if(tableData[i].executive_section == this.departMentList[j].name){
773
-                tableData[i].executive_section_id = this.departMentList[j].id
774
-             }
775
-          }
776
-
777
-
778
-          for(let j=0;j<statistical_classification.length;j++){
779
-             if(tableData[i].statistical_classification == statistical_classification[j].name){
780
-                 tableData[i].statistical_classification_id = statistical_classification[j].id
781
-             }
782
-          }
783
-
784
-       
785
-
786 746
           if(tableData[i].disease_directory == ""){
787 747
               tableData[i].disease_directory = 0
788 748
           }
@@ -805,11 +765,7 @@ export default {
805 765
              tableData[i].is_record = 2
806 766
           }
807 767
 
808
-          for(let j=0;j<tube_color.length;j++){
809
-             if(tableData[i].tube_color == tube_color[j].name){
810
-                tableData[i].tube_color_id = tube_color[j].id
811
-             }
812
-          }
768
+         
813 769
 
814 770
           if(tableData[i].category == ""){
815 771
              tableData[i].category = 0
@@ -845,25 +801,18 @@ export default {
845 801
           if(tableData[i].medical_status == "收费"){
846 802
             tableData[i].medical_status = 2
847 803
           }
848
-
849
-        
850 804
         }
851
-       }
852
-
853
-       for(let i=0;i<tableData.length;i++){
854
-          tableData[i].price = parseInt(tableData[i].price)
855
-       }
856
-       
805
+       }   
857 806
        let params = {
858 807
           'projects':tableData 
859 808
         }
860 809
        console.log("params2222",params)
861
-       
810
+        
862 811
         postProjectInformation(params).then(response=>{
863 812
            if(response.data.state == 1){
864 813
              var msg =  response.data.data.msg
865 814
              this.$message.success("导入成功!")
866
-             
815
+             this.getlist()
867 816
            }else{
868 817
              this.$message.error("导入失败")
869 818
            }