518合并代码

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

@@ -2149,7 +2149,7 @@
         if (val > 2) {
           this.anticoagulant = this.anticoagulantsConfit[thismode - 2]
         }
-        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41) && val == 2) {
+        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6) && val == 2) {
            if(val == 2){
              this.anticoagulant.shouji_unit = 'mg'
            }else{
@@ -2165,7 +2165,7 @@
           this.anticoagulant.weichi_unit = 'ml'
           this.anticoagulant.zongliang_unit = 'ml'
         }
-        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.$store.getters.xt_user.template_info.template_id == 6 && this.dialysisPrescription.anticoagulant == 2){
           this.dialysisPrescription.anticoagulant_zongliang = ""
           this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
         }
@@ -2174,7 +2174,6 @@
       },
 
       handleCommit: function() {
-        console.log("触发了么2323323233223")
         if(!this.isLoading){
           if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
             this.dialysisPrescription.anticoagulant = 3

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -175,6 +175,7 @@ export default {
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
+            console.log(" 汇总order_info2332322323232323",order_info)
             if(order_info!=undefined&&order_info ==null){
                this.list = []
                return
@@ -281,12 +282,14 @@ export default {
                  med_chrgitm_types.push(order_info[i].med_chrgitm_type)
                }
               }
+             
               const obj = {}
               med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
                 obj[next] ? '' : obj[next] = true && cur.push(next)
                 return cur
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
               let tempOrderInfo = []
+              console.log("med_chrgitm_type323223322323233223",med_chrgitm_types)
               for (let i = 0; i < med_chrgitm_types.length; i++) {
                 let obj = {
                   total: 0,
@@ -298,10 +301,11 @@ export default {
                     tempDetails.push(order_info[b])
                   }
                 }
-               
+                console.log("tempDetails2332323232",tempDetails)
                 obj.details = this.setNewData(tempDetails)
-
+                console.log("2332233232322323",obj.details)
                 obj.total = this.getTotal(obj.details)
+
                 obj.details.push({
                   total: obj.total,
                   is_total: 1,
@@ -316,6 +320,7 @@ export default {
                   }
                  
                 }
+                console.log("list2323223232323",this.list)
                 var new_arr = []
                 if(this.keywords!=""){
        
@@ -390,6 +395,7 @@ export default {
      return project_name
     },
     setNewData(details) {
+      console.log("detail23332323232322332332322323232332",details)
         let drug_ids = []
         let project_ids = []
 
@@ -449,7 +455,7 @@ export default {
                  obj['name'] = details[a].project.project.project_name
                  obj['spec'] = ''
                  obj['unit'] = details[a].project.project.unit
-
+                
 
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
@@ -462,7 +468,7 @@ export default {
                 obj['price'] = parseFloat(details[a].pric)
                 obj['chrgitm_lv'] = details[a].chrgitm_lv
                 obj['is_total'] = 2
-
+                obj['record_date'] = details[a].record_date
                 count = count + details[a].cnt
               }
             }

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -7,48 +7,48 @@
         <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用发票</div>
         <div class="listTitle_1">{{$store.getters.xt_user.org.org_name}}发票联<span>收</span></div>
          <div class="listInfo">
-            <div>收费日期：{{$store.getters.xt_user.org.org_name}}</div>
-            <div style="width:400px">发票代码：{{$store.getters.xt_user.org.org_name}}</div>
+            <div>收费日期：{{this.$route.query.end_time}}</div>
+            <div style="width:400px">发票代码：</div>
         </div>
         <table class="listTable" table border rules=none cellspacing=0 align=center>
             <tr>
-                <td>姓名：</td>
-                <td>科室：</td>
+                <td>姓名：{{patient.name}}</td>
+                <td>科室：{{getDepartment(his_patient.departments)}}</td>
                 <td></td>
             </tr>
             <tr>
                 <td>费用类别：</td>
-                <td>金额（元）：</td>
+                <td>金额（元）：{{getAllPice()}}</td>
                 <td></td>
             </tr>
             <tr>
-                <td>西药</td>
-                <td>中成药</td>
-                <td>中草药</td>
+                <td>西药：</td>
+                <td>中成药：{{chineseTraditionalMedicineCostTotal}}</td>
+                <td>中草药：</td>
             </tr>
             <tr>
-                <td>检查费</td>
-                <td>输氧费</td>
-                <td>手术费</td>
+                <td>检查费：{{checkCostTotal}}</td>
+                <td>输氧费：</td>
+                <td>手术费：</td>
             </tr>
             <tr>
-                <td>化验费</td>
-                <td>输血费</td>
-                <td>诊断费</td>
+                <td>化验费：{{laboratoryCostTotal}}</td>
+                <td>输血费：</td>
+                <td>诊断费：{{zhenChaCostTotal}}</td>
             </tr>
             <tr>
-                <td>治疗费</td>
-                <td>护理费</td>
-                <td>床位费</td>
+                <td>治疗费：</td>
+                <td>护理费：</td>
+                <td>床位费：{{bedCostTotal}}</td>
             </tr>
             <tr>
-                <td>麻醉费</td>
-                <td>材料费</td>
-                <td>其他</td>
+                <td>麻醉费：</td>
+                <td>材料费：{{materialCostTotal}}</td>
+                <td>其他：{{otherCostTotal}}</td>
             </tr>
            <tr style="border: 1px solid;">
-               <td>合计金额（大写）：</td>
-               <td>人民币￥：</td>
+               <td>合计金额（大写）：{{smalltoBIG(getAllPice() +chineseTraditionalMedicineCostTotal + checkCostTotal + laboratoryCostTotal +zhenChaCostTotal + bedCostTotal + materialCostTotal + otherCostTotal)}}</td>
+               <td>人民币￥：{{getAllPice() +chineseTraditionalMedicineCostTotal + checkCostTotal + laboratoryCostTotal +zhenChaCostTotal + bedCostTotal + materialCostTotal + otherCostTotal}}</td>
                <td></td>
             </tr>
             <tr style="height: 65px;">
@@ -65,7 +65,7 @@
                 收费员：
             </div>
             <div style="width:300px">
-                年 月 日
+               {{printDate}}
             </div>
         </div>
         </div>
@@ -93,6 +93,7 @@
           operationCostTotal:"",//材料费
           zhenChaCostTotal:"",//诊查费
           otherCostTotal:"",//其他费用
+          printDate:"",
         }
     },
     methods:{
@@ -125,7 +126,7 @@
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d}')
       },
-    getGatherDetailList() {
+      getGatherDetailList() {
       let start_time = this.$route.query.start_time
       let end_time = this.$route.query.end_time
       let params = {
@@ -152,9 +153,12 @@
             if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
-              for (let i = 0; i < order_info.length; i++) {
-                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              if(order_info!=undefined && order_info.length > 0){
+                for (let i = 0; i < order_info.length; i++) {
+                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+                }
               }
+            
               const obj = {}
               med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
                 obj[next] ? '' : obj[next] = true && cur.push(next)
@@ -187,12 +191,75 @@
               newobj['is_total'] = 1
               
               this.list.push(newobj)
+
+              var new_arr = []
+              if(this.$route.query.keyword!=""){
+       
+                   for(let i=0;i<this.list.length;i++){
+                     if(this.list[i].is_total == 2){
+                        if(this.list[i].name.indexOf(this.$route.query.keyword)>-1){
+                           new_arr.push(this.list[i])
+                       }
+                     }
+                   
+                  }
+                  var new_arr_two = []
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.$route.query.keyword) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
+                  }
+                   this.list = []
+                
+                   
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                 
+                    this.list = obj.details
+                    this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
+                    this.checkCostTotal = response.data.data.checkCostTotal
+                    this.materialCostTotal = response.data.data.materialCostTotal
+                    this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
+                    this.bedCostTotal = response.data.data.bedCostTotal
+                    this.operationCostTotal = response.data.data.operationCostTotal
+                    this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
+                    this.otherCostTotal = response.data.data.otherCostTotal
+
+                }
             }else{
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
-              for (let i = 0; i < order_info.length; i++) {
-                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              if(order_info!=undefined && order_info.length > 0){
+                for (let i = 0; i < order_info.length; i++) {
+                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+               }
               }
+            
              
               const obj = {}
               med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
@@ -221,18 +288,70 @@
                 })
                
                 this.list =  this.list.concat(obj.details)
-                console.log("oh2323232323233223232323233",this.list)
+              
                 for(let i=0;i<this.list.length;i++){
                   this.list[i].index = i+1
                 }
-                 this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
-                  this.checkCostTotal = response.data.data.checkCostTotal
-                  this.materialCostTotal = response.data.data.materialCostTotal
-                  this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
-                  this.bedCostTotal = response.data.data.bedCostTotal
-                  this.operationCostTotal = response.data.data.operationCostTotal
-                  this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
-                  this.otherCostTotal = response.data.data.otherCostTotal
+              var new_arr = []
+              if(this.$route.query.keyword!=""){
+                console.log("锦鲤3332232332233223322332",this.list)
+                for(let i=0;i<this.list.length;i++){
+                     if(this.list[i].is_total == 2){
+                        if(this.list[i].name.indexOf(this.$route.query.keyword)>-1){
+                           new_arr.push(this.list[i])
+                       }
+                     }
+                   
+                  }
+                  var new_arr_two = []
+                  for(let i=0;i<tempDetails.length;i++){
+                    if(tempDetails[i].advice_id >0){
+                       tempDetails[i].name = tempDetails[i].advice.advice_name
+                    }
+                    if(tempDetails[i].project_id > 0){
+                       if(tempDetails[i].type == 2 ){
+                         tempDetails[i].name = tempDetails[i].project.project_name
+                       }
+                       if(tempDetails[i].type == 3){
+                         tempDetails[i].name = tempDetails[i].good_info.good_name
+                       }
+                    }
+                    if(tempDetails[i].name.indexOf(this.$route.query.keyword) > -1){
+                       new_arr_two.push(tempDetails[i])
+                    }
+                  }
+                  this.list = []
+                  console.log("new_arr2323232333333232",new_arr)
+                   
+                   this.list = new_arr
+                    obj.details = []
+                    obj.details = this.setNewData(new_arr_two)
+
+                    obj.total = this.getTotal(obj.details)
+                    obj.details.push({
+                      total: obj.total,
+                      is_total: 1,
+                    })
+                    for(let i=0;i<obj.details.length;i++){
+                       if(obj.details[i].is_total == 1){
+                          obj.details[i].index = "合计"
+                       }else{
+                         obj.details[i].index = i+1
+                       }
+                    }
+                    console.log("obj23323232323232323232",obj.details)
+                    this.list = obj.details
+              }
+                this.chineseTraditionalMedicineCostTotal = response.data.data.chineseTraditionalMedicineCostTotal
+                this.checkCostTotal = response.data.data.checkCostTotal
+                this.materialCostTotal = response.data.data.materialCostTotal
+                this.laboratoryCostTotal = response.data.data.laboratoryCostTotal
+                this.bedCostTotal = response.data.data.bedCostTotal
+                this.operationCostTotal = response.data.data.operationCostTotal
+                this.zhenChaCostTotal = response.data.data.zhenChaCostTotal
+                this.otherCostTotal = response.data.data.otherCostTotal
+
+              
              }
           }
         }
@@ -512,7 +631,6 @@
       return name
     },
     getAllPice(){
-      console.log("liust23322332323223",this.list)
       var total_price = 0
       for(let i=0;i<this.list.length;i++){
         if(this.list[i].is_total ==2){
@@ -525,10 +643,58 @@
         return total_price
       }
      
-    }
+    },
+     smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+
+            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            return this.zhongwen
+        },
     },
     created(){
       this.getGatherDetailList()   
+      var data = new Date();
+      var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+      var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+      this.printDate = data.getFullYear() + "-" + month + "-" + date;
     }
 
   }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -82,7 +82,7 @@
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
 
-        <span>&nbsp;&nbsp;</span>
+        <!-- <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -91,7 +91,7 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>  -->
       </div>
 
       <el-table

src/xt_pages/stock/stockOutOrder.vue

@@ -82,7 +82,7 @@
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
-        <span>&nbsp;&nbsp;</span>
+        <!-- <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -91,7 +91,7 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select> 
+        </el-select>  -->
       </div>
 
       <el-table