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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -46,7 +46,7 @@
              衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
             </span>
 
-            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598">
               体重增长：
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1444,6 +1444,7 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">mg</span>
                     </span>
 
                     <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10460">
@@ -1458,6 +1459,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                     <span v-if="prescription.anticoagulant == 14">mg</span>
 
                     </span>
                     </div>
@@ -1499,6 +1501,7 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1512,6 +1515,7 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
                       </span>
                     </div>
                     <div
@@ -1580,6 +1584,7 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">mg</span>
                      </span>
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1593,6 +1598,7 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
+                      <span v-if="prescription.anticoagulant == 14">mg/h</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
@@ -1809,7 +1815,7 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
@@ -5375,8 +5381,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-
-        this.advice_jilurow = this.advices.length + 1;
+        
+        if(this.advices!=null && this.advices.length>0){
+          this.advice_jilurow = this.advices.length + 1;
+        }
+       
 
         var childMap = {};
         for (const index in this.advices) {

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -1270,66 +1270,136 @@ export default {
        this.$router.push("/drugs/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
     },
     exportStock() {
-      console.log("tablelist23322332",this.tableList)
-   
-      if(this.tableList!=null && this.tableList.length > 0){
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i +1
-          this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
-          this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
-          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
-          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
-          this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
-          this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
-          this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-        }
+      console.log("中共人家哈哈哈哈哈哈",this.tableList)
+
+      if(this.org_id!=0&&this.org_id!=10697){
+        if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i +1
+            this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
+            this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
+            this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+            this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          }
+       }
+ 
+        import("@/vendor/Export2Excel").then((excel) => {
+          const tHeader = [
+            "序号",
+            "药品类型",
+            "药品名称",
+            "规格&单位",
+            "生产厂商",
+            "经销商",
+            "批准文号",
+            "国家编码",
+            "入库数量",
+            "出库数量",
+            "退库数量",
+            "实际出库",
+            "剩余库存",
+            "总库存",
+          ];
+          const filterVal = [
+            "index",
+            "drug_type_name",
+            "drug_name",
+            "specification_name",
+            "manufacturer_name",
+            "dealer_name",
+            "number",
+            "medical_insurance_number",
+            "stock_in_count",
+            "stock_out_count",
+            "cancle_out_count",
+            "act_cout",
+            "over_count",
+            "sum_count",
+          ];
+
+          const data = this.formatJson(filterVal, this.tableList);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "药品查询",
+          });
+          this.downloadLoading = false;
+        });
       }
+
+      if(this.org_id == 0 || this.org_id == 10697){
+
+        if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i +1
+            this.tableList[i].medical_code = this.getMedicalInsuranceLeve(this.tableList[i].medical_insurance_level)
+            this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
+            this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
+            this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+            this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+            this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          }
+       }
  
-      import("@/vendor/Export2Excel").then((excel) => {
-        const tHeader = [
-          "序号",
-          "药品类型",
-          "药品名称",
-          "规格&单位",
-          "生产厂商",
-          "经销商",
-          "批准文号",
-          "国家编码",
-          "入库数量",
-          "出库数量",
-          "退库数量",
-          "实际出库",
-          "剩余库存",
-          "总库存",
-        ];
-        const filterVal = [
-          "index",
-          "drug_type_name",
-          "drug_name",
-          "specification_name",
-          "manufacturer_name",
-          "dealer_name",
-          "number",
-          "medical_insurance_number",
-          "stock_in_count",
-          "stock_out_count",
-          "cancle_out_count",
-          "act_cout",
-          "over_count",
-          "sum_count",
-        ];
+        import("@/vendor/Export2Excel").then((excel) => {
+          const tHeader = [
+            "序号",
+            '医保等级',
+            "药品类型",
+            "药品名称",
+            "规格&单位",
+            "零售价",
+            "生产厂商",
+            "经销商",
+            "批准文号",
+            "国家编码",
+            "入库数量",
+            "出库数量",
+            "退库数量",
+            "实际出库",
+            "剩余库存",
+            "总库存",
+          ];
+          const filterVal = [
+            "index",
+            "medical_code",
+            "drug_type_name",
+            "drug_name",
+            "specification_name",
+            "retail_price",
+            "manufacturer_name",
+            "dealer_name",
+            "number",
+            "medical_insurance_number",
+            "stock_in_count",
+            "stock_out_count",
+            "cancle_out_count",
+            "act_cout",
+            "over_count",
+            "sum_count",
+          ];
 
-        const data = this.formatJson(filterVal, this.tableList);
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: "药品查询",
+          const data = this.formatJson(filterVal, this.tableList);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "药品查询",
+          });
+          this.downloadLoading = false;
         });
-        this.downloadLoading = false;
-      });
+      }
+     
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));

src/xt_pages/stock/query/goodNewQuery.vue

@@ -879,7 +879,7 @@ export default {
    exportList(){
       import('@/vendor/Export2Excel').then(excel => {
       
-        if(this.org_id!=0 && this.org_id!=9956){
+        if(this.org_id!=0 && this.org_id!=9956 && this.org_id!=10697){
           if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
             this.tableList[i].index = i+1
@@ -911,7 +911,7 @@ export default {
           this.downloadLoading = false
         }
 
-        if(this.org_id == 0 || this.org_id == 9956){
+        if(this.org_id == 9956){
          
           if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
@@ -943,6 +943,41 @@ export default {
          })
           this.downloadLoading = false
         }
+
+
+        if(this.org_id == 0 || this.org_id == 10697){
+         
+         if(this.tableList!=null && this.tableList.length > 0){
+         for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].index = i+1
+           this.tableList[i].medical_code = this.getMedicalInsuranceLeve(this.tableList[i].medical_insurance_level)
+           this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+           this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+           this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+           this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+           this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+           this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+
+         }
+        }
+        
+
+        const tHeader = ['序号','医保等级','耗材编码','耗材类型', '耗材名称', '规格&单位','零售价','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+        const filterVal = ['index','medical_code','good_number','type_name', 'good_name', 'spec','packing_price','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+       
+        const data = this.formatJson(filterVal, this.tableList)
+        
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '库存查询'
+        })
+         this.downloadLoading = false
+       }
    
        })
       },

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -56,7 +56,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
-                                 <td v-if="org_id==9956">{{item.good_number}}</td>
+                                 <td v-if="org_id==9956 || org_id== 0">{{item.good_number}}</td>
                                  <td>{{item.social_security_directory_code}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
@@ -231,6 +231,7 @@ export default {
                 
                 }
                
+               
                var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
           
                 if(this.org_id == 0 || this.org_id == 10697){
@@ -255,6 +256,7 @@ export default {
                     list.push(obj)
                  }
                 }
+                this.tableList = list
                this.manufacturerList = response.data.data.manufacturerList
             
             }