518合并代码

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -159,6 +159,7 @@ import { min } from 'moment'
     },
     methods:{
       changeDate(){
+        this.tableData = []
         this.getlist()
        },
        getlist(){
@@ -183,9 +184,11 @@ import { min } from 'moment'
                
               for(let j=0;j<drug.length;j++){
                 if(list[i].drug_id == drug[j].id){
-                  for(let z=0;z<list[i].child.length;z++){
-                    if(list[i].child[z].prescribing_number_unit == drug[j].max_unit){
-                       list[i].child[z].prescribing_number = parseInt(list[i].child[z].prescribing_number) * drug[j].min_number
+                  if(list[i].child!=null && list[i].child.length > 0){
+                    for(let z=0;z<list[i].child.length;z++){
+                      if(list[i].child[z].prescribing_number_unit == drug[j].max_unit){
+                        list[i].child[z].prescribing_number = parseInt(list[i].child[z].prescribing_number) * drug[j].min_number
+                      }
                     }
                   }
                 }
@@ -207,7 +210,6 @@ import { min } from 'moment'
                }
              }
             }
-            console.log("tabl2323323232",this.tableData)
           }
         })  
       },
@@ -240,6 +242,7 @@ import { min } from 'moment'
        return specification_name    
      },
      searchAction(){
+       this.tableData = []
        this.getlist()  
      },
      getDrugTypeName(drug_id){
@@ -259,11 +262,11 @@ import { min } from 'moment'
        return type_name
      },
      getCount(val,min_number,max_unit,min_unit){
-   
+      
        var total = 0
        var min_str = ""
        var max_str = ""
-       if(val.length > 0){
+       if(val!=null && val!=undefined  && val.length > 0){
          for(let i=0;i<val.length;i++){
            total += parseInt(val[i].prescribing_number)
          }

src/xt_pages/outpatientTool/components/goodDetail.vue

@@ -154,7 +154,8 @@ import {getGoodDetailSummary} from "@/api/stock"
     },
     methods:{
      changeDate(){
-         
+      this.tableData = []
+      this.getlist()
      },
      getlist(){
        let start_time = this.chargeDate[0]
@@ -245,7 +246,7 @@ import {getGoodDetailSummary} from "@/api/stock"
       getCount(val){
         var total = 0
         for(let i=0;i<val.length;i++){
-           total +=val[i].count
+           total += parseInt(val[i].count)
         }
         return total
       },
@@ -259,6 +260,7 @@ import {getGoodDetailSummary} from "@/api/stock"
         return packing_unit
       },
       searchAction(){
+        this.tableData = []
         this.getlist()
       }
     },

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

@@ -23,18 +23,9 @@
       >汇总导出
     </el-button>
     <div class="cell clearfix">
-     <label class="title"><span class="name">仓库</span> :</label>
-      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
-          <el-option
-            v-for="(option, index) in houseList"
-            :key="index"
-            :label="option.storehouse_name"
-            :value="option.id">
-          </el-option>
-      </el-select>  
       <el-input
         size="small"
-        style="width: 200px;"
+        style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -47,7 +38,7 @@
         @click="search"
         >搜索</el-button
       >
-    
+      <div style="margin-left:10px;">
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -76,7 +67,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-     
+      </div>
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -137,11 +128,6 @@
           {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
-       <el-table-column label="仓库名称" align="center">
-          <template slot-scope="scope">
-          {{getStorehouseName(scope.row.storehouse_id)}}
-          </template>
-        </el-table-column>
         <el-table-column label="退货价" align="center">
           <template slot-scope="scope">
           {{scope.row.price}}
@@ -249,8 +235,6 @@ export default {
       tableList:[],
       tableDataList:[],
       drugTypeList:[],
-      storehouse_id:0,
-      houseList:[],
     };
   },
   methods: {
@@ -288,7 +272,7 @@ export default {
    
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-     
+        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -359,18 +343,12 @@ export default {
         keyword:this.searchKey,
         limit:this.limit,
         page:this.page,
-        storehouse_id:this.storehouse_id,
        }
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
-           var obj = {id:0,storehouse_name:"全部"}
-            this.houseList = []
-            this.houseList.push(obj)
-            for(let i=0;i<response.data.data.houseList.length;i++){
-            this.houseList.push(response.data.data.houseList[i])
-            }
+           //this.drugTypeList = response.data.data.drugTypeList
            for(let i=0;i<list.length;i++){
              list[i].child = []
             for(let j=0;j<order.length;j++){
@@ -391,6 +369,7 @@ export default {
             order_number: "合计",
             is_total: 1,
             specification_name:"",
+            unit:"",
             ctime:"",
             total_price:total_price.toFixed(2),
           });
@@ -430,7 +409,7 @@ export default {
         //  if(this.tableDataList[i].drug_type == 3){
         //     this.tableDataList[i].drug_type == "成药"
         //   }
-          this.tableList[i].drug_type = this.getTypeList(scope.row.drug_type)
+          this.tableDataList[i].drug_type = this.getTypeList(this.tableDataList[i].drug_type)
           this.tableDataList[i].index = i+1
           this.tableDataList[i].unit = this.tableDataList[i].dose + this.tableDataList[i].dose_unit + "*"+this.tableDataList[i].min_number + this.tableDataList[i].min_unit+"/"+this.tableDataList[i].max_unit
           this.tableDataList[i].user_name = this.getAdminUser(this.tableDataList[i].creater)
@@ -440,7 +419,7 @@ export default {
         }
        import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量','退库价','总价']
-        const filterVal = ['index','order_number','drug_name', 'unit', 'drug_type','ctime','user_name','total_count','price','total_price']
+        const filterVal = ['index','order_number','drug_name', 'specification_name', 'drug_type','ctime','user_name','total_count','price','total_price']
         
         const data = this.formatJson(filterVal, this.tableDataList)
 
@@ -456,33 +435,35 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
     exportListOne(){
-      let obj = {'index':'合计','total_price':0}
+      // let obj = {'index':'合计','total_price':0}
+      console.log("@332322323232332",this.tableList)
+      
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
-          if(this.tableData[i].drug_type == 1){
-             this.tableData[i].drugtype = "西药"
+          if(this.tableList[i].drug_type == 1){
+             this.tableList[i].drugtype = "西药"
           }
-          if(this.tableData[i].drug_type == 2){
-             this.tableData[i].drugtype = "草药"
+          if(this.tableList[i].drug_type == 2){
+             this.tableList[i].drugtype = "草药"
           }
-          if(this.tableData[i].drug_type == 3){
-             this.tableData[i].drugtype = "成药"
+          if(this.tableList[i].drug_type == 3){
+             this.tableList[i].drugtype = "成药"
           }
-          this.tableData[i].time = this.getTime(this.tableData[i].ctime)
-          this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+          this.tableList[i].time = this.getTime(this.tableList[i].ctime)
+          this.tableList[i].user_name = this.getAdminUser(this.tableList[i].creater)
           
-          this.tableData[i].total_price = this.tableData[i].count * this.tableData[i].price
-           obj.total_price += this.tabelePrintList[i].count * this.tabelePrintList[i].price
+          //this.tableList[i].total_price = this.tableList[i].count * this.tableList[i].price
+          //  obj.total_price += this.tableList[i].count * this.tableList[i].price
         }
-        obj.total_price = obj.total_price.toFixed(2)
-       this.tableData.push(obj)
-       for(let i=0;i<this.tableData.length;i++){
-         this.tableData[i].total_price = this.tableData[i].total_price.toFixed(2)
-       }
+      //   obj.total_price = obj.total_price.toFixed(2)
+      //  this.tableList.push(obj)
+      //  for(let i=0;i<this.tableData.length;i++){
+      //    this.tableData[i].total_price = (this.tableData[i].total_price).toFixed(2)
+      //  }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'unit', 'time','user_name','price','count','total_price']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name', 'time','user_name','price','count','total_price']
        
        const data = this.formatJson(filterVal, this.tableList)
        
@@ -511,24 +492,7 @@ export default {
         }
       }
       return name
-    },
-    getStorehouseName(id){
-       var storehouse_name = ""
-       for(let i=0;i<this.houseList.length;i++){
-         if(id == this.houseList[i].id){
-           storehouse_name = this.houseList[i].storehouse_name
-         }
-       }
-       if(storehouse_name == "全部"){
-          return ""
-       }else{
-         return storehouse_name
-       }
-     },
-     changeHouseList(){
-       this.houseList = []
-       this.getlist()
-     }  
+    } 
   }
 };
 </script>

src/xt_pages/workforce/remind_print_setting.vue

@@ -36,8 +36,8 @@
                    <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
                   </span>
                 </div>
-               <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
-                <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
+               <div v-if="org_id == 10188 || org_id == 10217">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
@@ -74,9 +74,9 @@
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
-                <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
-                <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
-                <div v-if="org_id == 10188">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
@@ -294,7 +294,7 @@
       printAction: function() {
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
         const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
-        if(this.org_id == 10188){
+        if(this.org_id == 10188 || this.org_id == 10217){
           printJS({
             printable: 'print_content',
             type: 'html',