新分支

src/utils/tools.js

@@ -25,12 +25,19 @@ export function jsGetAge(strBirthday, splitstr) {
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
-
+ 
+  console.log("birthYear",birthYear)
+  console.log("birthMonth",birthMonth)
+  console.log("birthDay",birthDay)
   
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
+
+  console.log("nowYear",nowYear)
+  console.log("nowMonth",nowMonth)
+  console.log("nowDay",nowDay)
   
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1111,8 +1111,9 @@
                             </tr>
 
                             <tr v-for="(item,index) in tableData" :key="index">
-                                <td>{{item.storey }}</td>
+                               
                                 <td>{{getTimes(item.record_date) }}</td>
+                                <td>{{item.storey }}</td>
                                 <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_time)  }}</td>
                                 <td>
                                 <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3686,6 +3686,7 @@ export default {
       },
       org_id: 0,
       projectsOne: [],
+      schedule_date_one:"",
     };
   },
   methods: {
@@ -4189,6 +4190,11 @@ export default {
       if (response.data.state == 1) {
         this.adminUser = response.data.data.users;
         console.log('3333333wwwwww',response.data.data);
+       var schedule_date  =  response.data.data.schedule.schedule_date
+       this.schedule_date_one =  uParseTime(
+          schedule_date,
+          "{y}-{m}-{d}"
+        );
         this.users = response.data.data.users;
         this.patientInfo = response.data.data.patientInfo;
 
@@ -4710,9 +4716,24 @@ export default {
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
+        if(this.org_id!=0){
+          var age = jsGetAge(birthtwo, '-')
+          return age
+        }
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+        if(this.org_id == 0){
+          console.log("日期搜哦",this.schedule_date_one)
+          var strBirthdayArr = this.schedule_date_one.split("-")
+          console.log("strBirthdayArr",strBirthdayArr)
+          var yeaer = strBirthdayArr[0]
+          var month = strBirthdayArr[1]
+          var day = strBirthdayArr[2]
+          var age = jsGetAge(birthtwo, '-',yeaer,month,day)
+          console.log("agesssss",age)
+          return age
+
+        }
+      
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/role/admin.vue

@@ -225,12 +225,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>  -->
+          @click="toAutoDiagnose">自动脚本</el-button> 
      </div>
 
 

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -13,7 +13,7 @@
       size="small"
       @click="exportListDetail"
       type="primary"
-      v-if="orgId !=10480 && orgId!=0"
+      v-if="orgId !=10480"
       >明细导出
      
     </el-button>
@@ -22,7 +22,7 @@
       size="small"
       @click="exportListDetailOne"
       type="primary"
-      v-if="orgId ==10480 || orgId == 0"
+      v-if="orgId ==10480"
       >明细导出
      
     </el-button>
@@ -933,7 +933,7 @@ export default {
         })
      },
      exportListDetail(){
-
+        console.log("hahhdhafhhahdf",this.tableDataList)
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){

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

@@ -17,7 +17,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10265"
+      v-if="org_id == 10265 || org_id == 0"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiOne"
@@ -25,7 +25,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10480 || org_id == 0"
+      v-if="org_id == 10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiTwo"
@@ -782,7 +782,7 @@ export default {
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
             this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
-       
+            this.tableData[i].in_retail_price = this.tableData[i].infor_price
             this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
             if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -363,7 +363,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210">
+                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
@@ -371,7 +371,7 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210">
+                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>