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

src/xt_pages/data/components/consumables.vue

         })
       },
       goodInfoDialogComfirm: function(val) {
+       
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId
           val['good_code'] = this.goodInfo.good_code
+        
+          if(val.retail_price == ""){
+             val.retail_price = 0
+          }else{
+            val.retail_price = parseInt(val.retail_price)
+          }
 
+          if(val.buy_price == ""){
+             val.buy_price = 0
+          }else{
+             val.buy_price = parseInt(val.buy_price)
+          }
+
+
+          
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
             }
           })
         } else if (val.isCreated == 1) {
+         
+          if(val.retail_price == ""){
+             val.retail_price = 0
+          }else{
+            val.retail_price = parseInt(val.retail_price)
+          }
+
+          if(val.buy_price == ""){
+             val.buy_price = 0
+          }else{
+             val.buy_price = parseInt(val.buy_price)
+          }
+
+          if(val.is_reuse == ""){
+             val.is_reuse = 0
+          }else{
+            val.is_reuse = parseInt(val.is_reuse)
+          }
+          
+          if(val.stock_warn_count == ""){
+             val.stock_warn_count = 0
+          }else{
+            val.stock_warn_count = parseInt(val.stock_warn_count)
+          }
+         
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {

src/xt_pages/data/components/drugs.vue

      },
 
       handleSuccessTwo({ results, header }) {
-       console.log("hhhhhhhh",results)
+     
         if (header != undefined && header.length > 0) {
             
           var isHasDrugName = header.includes('*药品名称')
 
          var isHasManufacturer = header.includes('*生产厂商')
 
-          var isHasDealer =  header.includes('*经销商')
-          if (!(isHasDrugName && isHasDrugAlias && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDealer)) {
+     
+          if (!(isHasDrugName && isHasDrugAlias && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer)) {
             this.dialogVisible = true
             return
           }
        
        var tableData = []
        for(let i=0;i<results.length;i++){
-         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}
+         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}
          for (var key in results[i]) {
 
            if (results[i]['*药品名称'] === undefined) {
               }
            }
 
-            if (results[i]['药品别名'] === undefined) {
-                obj['drug_alias'] = ''
+          
+
+            if (results[i]['别名拼音'] === undefined) {
+                obj['drug_alias_pinyin'] = ''
               } else {
-            if (key == '药品别名') {
-                obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+            if (key == '别名拼音') {
+                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
               }
            }
 
               }
            }
 
+            if (results[i]['别名五笔'] === undefined) {
+                obj['drug_alias_wubi'] = ''
+              } else {
+            if (key == '别名五笔') {
+                obj['drug_alias_wubi'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+             if (results[i]['药品类别'] === undefined) {
+                obj['drug_category'] = ''
+              } else {
+            if (key == '药品类别') {
+                obj['drug_category'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
            if (results[i]['开药控制'] === undefined) {
                 obj['drug_control'] = ''
               } else {
         var goodUnit =  this.$store.getters.good_unit
         
         var pharmacology_category = this.getDictionaryDataConfig('system','pharmacology_category')
-        console.log("药理分类",pharmacology_category)
-
+       
         var statistics_category = this.getDictionaryDataConfig('system','statistics_category')
-        console.log("统计分类",statistics_category)
+      
          
-       
+        var drug_category = this.getDictionaryDataConfig('system','drug_category')
+        console.log("药品分类",drug_category)
         for(let i=0;i<tableData.length;i++){ 
           for(let j=0;j<drugType.length;j++){
             if(tableData[i].drug_type == drugType[j].name){
              }
           } 
          
-          console.log("生产",this.manufacturers)
+         
           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
             }
           }
-          console.log("经销商",this.dealer)
+         
           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
           if(tableData[i].hosp_appr_flag == "审批不通过"){
               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
+             }
+          }
          
         }
        }
        let params = {
           'drugs':tableData 
         }
-       console.log("params2222",params)
+       console.log("导入数据",params)
     
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg
+             this.getList()
              this.$message.success("导入成功!")
+
            }else{
              this.$message.error("导入失败")
            }