3月1日

src/xt_pages/data/components/consumables.vue

@@ -810,7 +810,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-        
+
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -958,11 +958,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
-           
+
             for(let i=0;i<response.data.data.goodType.length;i++){
               this.goodTypeList.push(response.data.data.goodType[i])
             }
- 
+
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1498,7 +1498,7 @@
        getInitializtion().then(response=>{
          if(response.data.state == 1){
            var goodKindList = response.data.data.goodKindList;
-           
+
            this.goodKindList = goodKindList
            var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
            console.log("医保等级",medicalInsuranceLevelList)
@@ -1509,16 +1509,16 @@
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
          console.log("this.table",this.goodInfo.goodInfoData)
-         
+
          for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
            for(let j=0;j<this.goodKindList.length;j++){
               if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
-                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[i].name
+                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[j].name
               }
            }
-           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType;z++){
-              if(this.goodInfo.goodInfoDialog.formValue[z].id == this.goodInfo.goodInfoData[i].good_type_id){
-                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue[z].name
+           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
+              if(this.goodInfo.goodInfoDialog.formValue.goodType[z].id == this.goodInfo.goodInfoData[i].good_type_id){
+                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue.goodType[z].type_name
               }
            }
 
@@ -1533,26 +1533,26 @@
                 this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
              }
            }
-          
+
           for(let a=0;a<this.dealers.length;a++){
              if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
-                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
-             } 
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name
+             }
           }
          }
-        
+
          const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '耗材信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/data/components/drugs.vue

@@ -97,7 +97,7 @@
           </div>
         </template>
       </el-table-column>
-  
+
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
@@ -699,7 +699,7 @@
                  this.formValue.drug_classify = ""
               }
 
-              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -964,7 +964,7 @@
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
-        
+
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -973,14 +973,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-         
+
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
           var isHasPackingPrice= header.includes('*包装零售价');
           console.log("isHasLastPrice",isHasPackingPrice)
           var isHasLastPrice = header.includes('*进货价');
           console.log("进货价",isHasLastPrice)
-          
+
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -991,7 +991,7 @@
          console.log("isDrugDoseUnit",isDrugDoseUnit)
           if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
           isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-           
+
             this.dialogVisible = true;
             return
           }
@@ -1031,7 +1031,7 @@
            }
 
 
-  
+
           if (results[i]['*拆零'] === undefined) {
                 obj['min_number'] = ''
               } else {
@@ -1409,7 +1409,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1479,15 +1479,15 @@
 
       exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         
-        
+
+
          console.log("this.table",this.list)
 
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
                  this.list[i].drug_category_name = this.drugCategoryList[j].name
-              }  
+              }
           }
            for(let z=0;z<this.drugDosageFormList.length;z++){
               if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
@@ -1509,21 +1509,27 @@
                this.list[i].dealer_name = this.dealer[s].dealer_name
              }
            }
+           for(let b=0;b<this.getDataConfig('hemodialysis','units').length;b++){
+             if(this.list[i].drug_dose_unit == this.getDataConfig('hemodialysis','units')[b].id){
+               this.list[i].drug_dose_unit_name = this.getDataConfig('hemodialysis','units')[b].name
+
+             }
+           }
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
          }
 
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.list)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '药品信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {