Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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

@@ -539,12 +539,12 @@ export default {
     if (this.form.washpipe_nurse == 0) {
       this.form.washpipe_nurse = this.$store.getters.xt_user.user.id;
     }
-    if (this.form.difficult_puncture_nurse == 0) {
-      this.form.difficult_puncture_nurse = this.$store.getters.xt_user.user.id;
-    }
-    if (this.form.new_fistula_nurse == 0) {
-      this.form.new_fistula_nurse = this.$store.getters.xt_user.user.id;
-    }
+    // if (this.form.difficult_puncture_nurse == 0) {
+    //   this.form.difficult_puncture_nurse = this.$store.getters.xt_user.user.id;
+    // }
+    // if (this.form.new_fistula_nurse == 0) {
+    //   this.form.new_fistula_nurse = this.$store.getters.xt_user.user.id;
+    // }
     // console.log("dialysis_order9999999999wo", this.dialysis_order);
     this.form.puncture_needle = this.dialysis_order.puncture_needle;
     this.form.puncture_way = this.dialysis_order.puncture_way;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3551,7 +3551,7 @@
 import CheckBox from "../batch_print/option_check_box";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
-import { jsGetAge, uParseTime } from "@/utils/tools";
+import { jsGetAge, uParseTime,jsGetAgeOne } from "@/utils/tools";
 
 import LabelBox from "../printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
@@ -4716,20 +4716,20 @@ export default {
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
-        if(this.org_id!=0){
+        if(this.org_id!=0&& this.org_id!=10460){
           var age = jsGetAge(birthtwo, '-')
           return age
         }
 
-        if(this.org_id == 0){
+        if(this.org_id == 0 || this.org_id ==10460){
           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)
+          var age = jsGetAgeOne(birthtwo, '-',yeaer,month,day)
+          // console.log("agesssss",age)
           return age
 
         }

src/xt_pages/role/admin.vue

@@ -30,7 +30,9 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button> -->
+          @click="toJiaBan">首拼</el-button> 
+
+           -->
 
 
           <!-- <el-button
@@ -225,12 +227,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/drugs/components/drugOutDetail.vue

@@ -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].in_retail_price = (this.tableData[i].last_price/this.tableData[i].min_number).toFixed(2)
             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/query/purchaseNewStockQuery.vue

@@ -823,6 +823,7 @@ export default {
      console.log("count_one222222",count_one)
      console.log("count_two222222",count_two)
      all_count = count +count_one - count_two
+     console.log("数据我哦我我",all_count)
      if(all_count >0){
        return all_count
      }else{

src/xt_pages/workforce/components/editTableData.vue

@@ -166,7 +166,7 @@
             height="calc(100% - 50px)"
             ref="table"
             style="table-layout: fixed;"
-           
+
         >
         <!-- :cell-style ='cellstyle'    :height="tableContainHeight" calc(100% - 50px) 600-->
           <el-table-column
@@ -1344,7 +1344,7 @@
                     :schedulMode="modename_value"
                   >
 
-                  
+
                   </schedule-item>
                 </div>
               </template>
@@ -2526,7 +2526,7 @@ export default {
 
         for(let i = 0; i < this.weeks.length; i++){
           for(let b = 0; b < this.first_weeks.length; b++){
-            if(this.weeks[i].week_type == this.first_weeks[b].week_type && this.first_weeks[b].order_id > 0){
+            if(this.weeks[i].week_type == this.first_weeks[b].week_type){
               console.log(this.weeks[i].week_type)
               console.log(this.first_weeks[b].week_type)
               console.log(this.first_weeks[b].order_id)