导出

src/xt_pages/components/DrugExcel/index.vue → src/xt_pages/components/GoodExcel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <input id="excel-drug-input" ref="excel-drug-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <input id="excel-good-input" ref="excel-good-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">导入模板
     </el-button>
   </div>
@@ -54,7 +54,7 @@
         e.dataTransfer.dropEffect = 'copy'
       },
       handleUpload() {
-        document.getElementById('excel-drug-input').click()
+        document.getElementById('excel-good-input').click()
       },
       handleClick(e) {
         const files = e.target.files
@@ -63,7 +63,7 @@
         this.upload(rawFile)
       },
       upload(rawFile) {
-        this.$refs['excel-drug-input'].value = null // fix can't select the same excel
+        this.$refs['excel-good-input'].value = null // fix can't select the same excel
 
         if (!this.beforeUpload) {
           this.readerData(rawFile)
@@ -127,7 +127,7 @@
 </script>
 
 <style scoped>
-  #excel-project-input {
+  #excel-good-input {
     display: none;
     z-index: -9999;
   }

src/xt_pages/data/components/consumables.vue

@@ -75,15 +75,15 @@
           >下载模版
           </el-button>
         </el-link>
-        <upload-excel :on-success='handleSuccess'></upload-excel>
+        <good-excel :on-success='handleSuccess'></good-excel>
         <el-button
           style="margin-left:10px;"
           @click="generateLog()"
           class="filter-item"
           type="primary"
           size="small"
-        >下载日志 -->
-        </el-button>
+        >下载日志
+        </el-button> -->
       </div>
 
     <el-table
@@ -244,12 +244,14 @@
     postGoodInformation
   } from '@/api/stock'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
+  import GoodExcel from '@/xt_pages/components/GoodExcel'
   import { generateLog } from '@/api/config'
   export default {
     components: {
       GoodInfoDailog,
       selfPayment,
       UploadExcel,
+      GoodExcel
     },
     data() {
       return {
@@ -531,8 +533,6 @@
               response.data.data.goodInfo.good_type_id
 
 
-
-
             this.goodInfo.goodInfoDialog.formValue.good_name =
               response.data.data.goodInfo.good_name
 
@@ -552,8 +552,6 @@
                 response.data.data.goodInfo.good_kind
             }
 
-
-
             if (response.data.data.goodInfo.medical_insurance_level <= 0) {
               this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = ''
             } else {
@@ -1117,30 +1115,26 @@
          this.getList()
       },
       handleSuccess({ results, header }) {
-        console.log("header",header)
-        var goods = []
+       
         if (header != undefined && header.length > 0) {
             
           var isHasMedicalInsuranceLevel = header.includes('*医保等级')
-          // console.log("医保等级",isHasMedicalInsuranceLevel)
+         
           var isHasGoodUnit = header.includes('*单位')
-          // console.log("单位",isHasGoodUnit)
+        
           var isHasStockWarnCount = header.includes('*库存警戒')
-          // console.log("库存警戒",isHasStockWarnCount)
+       
           var isHasManuFacturer =  header.includes('*生产厂商')
-          // console.log("生产厂商",isHasManuFacturer)
-          var isHasDealer =  header.includes('*经销商')
-          // console.log("经销商",isHasDealer)
+         
           var isHasGoodName = header.includes('*耗材名称')
-          // console.log("耗材名称",isHasGoodName)
+        
           var isHasGoodKand = header.includes('*耗材种类')
-          // console.log("耗材种类",isHasGoodKand)
+          
           var isHasSpecificationName = header.includes('*规格型号')
-          // console.log("规格型号",isHasSpecificationName)
+        
           var isHasBuyPrice = header.includes('*零价')
-          // console.log("零价",isHasBuyPrice)
-         
-          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer && isHasDealer && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
+                
+          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer  && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
             this.dialogVisible = true
             return
           }
@@ -1334,60 +1328,11 @@
 
          }
          tableData.push(obj)
-         console.log("表哥2222",tableData)
-         var goodKind  =  this.getDictionaryDataConfig('system','good_kind')
-         
-        //  console.log("耗材种类",goodKind)
-        //  console.log("耗材类型",this.goodType)
-        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
-        // console.log("医保等级",medicalInsuranceLevel)
-        // console.log("生产厂商",this.manufacturers)
-        // console.log("经销商",this.dealers)
-        var statisticsCategory = getDictionaryDataConfig('system','statistics_category')
-        // console.log("统计分类",statisticsCategory)
-       
         var goodUnit =  this.$store.getters.good_unit
        
 
         for(let i=0;i<tableData.length;i++){ 
-          for(let j=0;j<goodKind.length;j++){
-             
-             if(tableData[i].good_kind == goodKind[j].name){
-                tableData[i].good_kind_id = goodKind[j].id
-             }    
-          }
-
-       for(let z=0;z<this.goodType.length;z++){
-          if(tableData[i].type_name == this.goodType[z].type_name){
-             tableData[i].good_type_id = this.goodType[z].id
-           }
-        }
-        
-        for(let y=0;y<medicalInsuranceLevel.length;y++){
-           if(tableData[i].medical_insurance_level == medicalInsuranceLevel[y].name){
-               tableData[i].medical_insurance_id = medicalInsuranceLevel[y].id
-           }
-        }
-
-        
-        for(let a=0;a<this.manufacturers.length;a++){
-           if(tableData[i].manufacturer == this.manufacturers[a].manufacturer_name){
-               tableData[i].manufacturer_id = this.manufacturers[a].id
-           }
-        }
-       
-        for(let s=0;s<this.dealers.length;s++){
-           if(tableData[i].dealer == this.dealers[s].dealer_name){
-               tableData[i].dealer_id = this.dealers[s].id
-           }
-        }
-        
-        for(let h=0;h<statisticsCategory.length;h++){
-           if(tableData[i].statistics_category == statisticsCategory[h].name){
-               tableData[i].statistic_id = statisticsCategory[h].id
-           }
-         }
-
+      
          for(let c=0;c<goodUnit.length;c++){
             if(tableData[i].good_unit == goodUnit[c].name){
                tableData[i].unit_id = goodUnit[c].id
@@ -1458,8 +1403,9 @@
            if(response.data.state == 1){
              var msg =  response.data.data.msg
              this.$message.success("导入成功!")
+             this.getList()
            }else{
-             this.$message.error("导入失败")
+             this.$message.error("导入失败,请下载日志查看")
            }
         })
       },

src/xt_pages/data/components/drugs.vue

@@ -1270,7 +1270,7 @@
          console.log("表哥2222",tableData)
       
         var drugType =  this.getDictionaryDataConfig('system','drug_type')
-       
+        
        
         var drugDosageForm = this.getDictionaryDataConfig('system','drug_dosage_form')
        
@@ -1287,58 +1287,11 @@
         var statistics_category = this.getDictionaryDataConfig('system','statistics_category')
       
          
-        var drug_category = this.getDictionaryDataConfig('system','drug_category')
-        console.log("药品分类",drug_category)
+        var drugCategory = this.getDictionaryDataConfig('system','drug_category')
+        console.log("药品分类",drugCategory)
+        
         for(let i=0;i<tableData.length;i++){ 
-          for(let j=0;j<drugType.length;j++){
-            if(tableData[i].drug_type == drugType[j].name){
-                tableData[i].drug_type_id = drugType[j].id
-             }    
-          }
-
-          for(let j=0;j<drugDosageForm.length;j++){
-            if(tableData[i].drug_dosage_form == drugDosageForm[j].name){
-                tableData[i].drug_dosage_form_id = drugDosageForm[j].id
-            }
-          }
-
-          for(let j=0;j<medicalInsuranceLevel.length;j++){
-            if(tableData[i].medical_insurance_level == medicalInsuranceLevel[j].name){
-                tableData[i].medical_insurance_level_id = medicalInsuranceLevel[j].id
-            }
-          }
-
-          for(let j=0;j<drugClassify.length;j++){
-             if(tableData[i].drug_classify == drugClassify[j].name){
-                tableData[i].drug_classify_id = drugClassify[j].id
-             }
-          } 
-         
-         
-          for(let j=0;j<this.manufacturers.length;j++){
-            if(tableData[i].manufacturer == this.manufacturers[j].manufacturer_name){
-               tableData[i].manufacturer_id = this.manufacturers[j].id
-            }
-          }
-         
-          for(let j=0;j<this.dealer.length;j++){
-            if(tableData[i].dealer == this.dealer[j].dealer_name){
-               tableData[i].dealer_id = this.dealer[j].id
-            }
-          }
-
-          for(let j=0;j<pharmacology_category.length;j++){
-             if(tableData[i].pharmacology_category == pharmacology_category[j].name){
-                tableData[i].pharmacology_category_id = pharmacology_category[j].id  
-             }
-          }
-
-         for(let j=0;j<statistics_category.length;j++){
-            if(tableData[i].statistics_category == statistics_category[j].name){
-                tableData[i].statistics_category_id = statistics_category[j].id
-            }
-         } 
-
+          
          for(let j=0;j<drug_control.length;j++){
            if(tableData[i].drug_control == drug_control[j].name){
                tableData[i].drug_control_id = drug_control[j].id
@@ -1391,12 +1344,18 @@
               tableData[i].hosp_appr_flag = 3
           }
 
-          for(let j=0;j<drug_category.length;j++){
-             if(tableData[i].drug_category == drug_category[j].name  ){
-                 tableData[i].drug_category_id = drug_category[j].id
+        if(tableData[i].drug_category !="" && tableData[i].drug_category!=null){
+           for(let j=0;j<drugCategory.length;j++){
+
+             if(tableData[i].drug_category == drugCategory[j].name  ){
+                 tableData[i].drug_category_id = drugCategory[j].id
+             }
+
+              if( tableData[i].drug_category != drugCategory[j].name  ){
+                 tableData[i].drug_category_id = -1
              }
           }
-         
+         }  
         }
        }
        for(let i=0;i<tableData.length;i++){
@@ -1418,7 +1377,7 @@
              this.$message.success("导入成功!")
 
            }else{
-             this.$message.error("导入失败")
+             this.$message.error("导入失败,请下载日志查看")
            }
         })
       },