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

src/api/doctorSchedule.js

@@ -172,3 +172,12 @@ export function getchartlist(params) {
     params: params
   })
 }
+
+export function DeleteStaffScheduleById(id,params){
+  
+  return request({
+    url:"/api/deletestaffschedulebyid?id="+id,
+    methods:"get",
+    params:params
+  })
+}

src/api/drug/drug.js

@@ -652,3 +652,13 @@ export function getDrugInventoryWarehouseInfoList(params) {
     params: params
   })
 }
+
+
+export function getPurchaseStockQueryList(params){
+  
+  return request({
+    url:"/api/stock/getpurchasestockquerylist",
+    method:"Get",
+    params:params,
+  })
+}

src/utils/tools.js

@@ -21,13 +21,68 @@ export function jsGetAge(strBirthday, splitstr) {
   // debugger
   var returnAge
   var strBirthdayArr = strBirthday.split(splitstr)
+ 
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
+
+  
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
+  
+  if (nowYear == birthYear) {
+    returnAge = 0 // 同年 则为0岁
+  } else {
+    var ageDiff = nowYear - birthYear // 年之差
+    if (ageDiff > 0) {
+      if (nowMonth == birthMonth) {
+        var dayDiff = nowDay - birthDay // 日之差
+        if (dayDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      } else {
+        var monthDiff = nowMonth - birthMonth // 月之差
+        if (monthDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      }
+    } else {
+      returnAge = -1 // 返回-1 表示出生日期输入错误 晚于今天
+    }
+  }
+
+  return returnAge // 返回周岁年龄
+}
+
+
+export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
+ 
+  // debugger
+  var returnAge
+  var strBirthdayArr = strBirthday.split(splitstr)
+  console.log("strBirthdayArr",strBirthdayArr)
+  var birthYear = strBirthdayArr[0]
+  var birthMonth = strBirthdayArr[1]
+  var birthDay = strBirthdayArr[2]
+  // var d = new Date()
+  // var anowYear = d.getFullYear()
+  // var anowMonth = d.getMonth() + 1
+  // var anowDay = d.getDate()
+  
+  // console.log("anowYear",anowYear)
+  // console.log("anowMonth",anowMonth)
+  // console.log("anowDay",anowDay)
+  
+  console.log("brityYear666",strBirthdayArr[0])
+  console.log("birthMonth5656",strBirthdayArr[1])
+  console.log("birthDay5656",strBirthdayArr[2])
+  
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
   } else {

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -56,9 +56,8 @@
                <!-- <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date<=1672416000">{{record.patient.total_dialysis + record.patient.user_sys_before_count}}</span>  
                <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date>=1672502400">{{record.patient.total_dialysis}}</span>   -->
               <span>
-                            <!-- {{ record.Count ? record.Count:''}} -->
-                            {{ record.patient.total_dialysis }}
-                        </span>
+                 {{ record.Count ? record.Count:''}}  
+                </span>
               </span>
             </td>
                   <td style="text-align:center;">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1318,7 +1318,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[20, 40, 60, 80,100]"
+        :page-sizes="[20, 40, 60, 80,100,300,500]"
         :page-size="10"
         background
         style="margin-top:20px;"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -357,7 +357,7 @@
 
         <li v-if="isShow('维持时长')">
           <label>维持时长: </label>
-          <span class="content">{{this.prescription.anticoagulant_weichi_hour}}</span>
+          <span class="content">{{this.prescription.anticoagulant_weichi_hour?this.prescription.anticoagulant_weichi_hour:"0"}}</span>
         </li>
 
         <li
@@ -449,7 +449,7 @@
 
          <li v-if="isShow('葡萄糖')">
           <label>葡萄糖: </label>
-          <span class="content">{{this.prescription.amylaceum}}</span>
+          <span class="content">{{this.prescription.amylaceum?this.prescription.amylaceum:0}}</span>
         </li>
 
         <li v-if="isShow('单超时长')">

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -338,6 +338,11 @@
           <label>灌流器凝血: </label>
           <span class="content" >{{ this.record.condenser}}</span>
         </li>
+
+        <li v-if="isShow('上次透后体重')">
+          <label>上次透后体重: </label>
+          <span class="content" >{{ this.record.last_after_weight}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -206,6 +206,12 @@
              </template>
           </el-table-column>
 
+          <el-table-column align="center" label="穿刺针" v-if="gatherSetting.puncture_needle==1">
+             <template slot-scope="scope">
+               <span>{{ scope.row.assessment_befor_dislysis.puncture_needle }}</span>
+             </template>
+          </el-table-column>
+
           <el-table-column align="center" label="封管液" v-if="gatherSetting.tube==1">
              <template slot-scope="scope">
                <span v-if="getBloodAccessOption(scope.row.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -34,6 +34,7 @@
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">灌流器</td>
                   <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">滤过器</td>
                   <td width="100"  v-if="gatherSetting.change_nurse ==1">换药包/穿刺针</td>
+                  <td width="100"  v-if="gatherSetting.puncture_needle ==1">穿刺针</td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
                   <td width="200" v-if="gatherSetting.tube==1">封管液</td>
                   <td width="100" v-if="gatherSetting.kalium==1">钾</td>
@@ -126,6 +127,9 @@
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('内瘘')==-1">0</span>
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('内瘘')!=-1">1</span>
                   </td>
+                  <td  width="100"  v-if="gatherSetting.puncture_needle ==1">
+                    {{ item.assessment_befor_dislysis.puncture_needle }}
+                  </td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">
                   
 

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

@@ -58,6 +58,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('上次透后体重')">
+            <el-form-item label="上次透后体重(kg): " :prop="isName('上次透后体重')" :rules="isCheckmust('上次透后体重')">
+              <el-input v-model="form.last_after_weight"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('穿刺处血肿')">
             <el-form-item label="穿刺处血肿: " :prop="isName('穿刺处血肿')" :rules="isCheckmust('穿刺处血肿')">
               <el-radio-group v-model="form.puncture_point_haematoma">
@@ -879,7 +885,8 @@ export default {
         after_urea:"",
         accumulated_blood_volume:"",
         transfusion_volume:"",
-        condenser:""
+        condenser:"",
+        last_after_weight:""
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1221,6 +1228,12 @@ export default {
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
           data["condenser"] = this.form.condenser
+          if(this.form.last_after_weight >0){
+            data["last_after_weight"] = this.form.last_after_weight.toString()
+          }else{
+            data["last_after_weight"] = ""
+          }
+         
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)

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

@@ -475,6 +475,8 @@ export default {
         accepts.way =1
         accepts.posture=1
         accepts.condition =2
+        accepts.consciousness = 1
+        accepts.appetite =1
 
       }
       this.accepts = accepts;

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

@@ -2803,7 +2803,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -2815,7 +2815,6 @@ mu
           pre.mode_id == 7 ||
           pre.mode_id == 8 ||
           pre.mode_id == 9 ||
-          pre.mode_id == 10 ||
           pre.mode_id == 11 ||
           pre.mode_id == 13 ||
           pre.mode_id == 14 ||
@@ -2852,11 +2851,19 @@ mu
               this.dialysisPrescription.dialysate_flow = 500
             }
 
-            if(this.$store.getters.xt_user.org.id == 10598){
+            if(this.$store.getters.xt_user.org.id == 10598 || this.$store.getters.xt_user.org.id == 10612){
                if(this.dialysisPrescription.dialysis_duration_minute == ""){
                  this.dialysisPrescription.dialysis_duration_minute =0
 
                }
+
+               if(this.dialysisPrescription.anticoagulant_weichi == ""){
+                  this.dialysisPrescription.anticoagulant_weichi = 0
+               }
+
+               if(this.dialysisPrescription.amylaceum == ""){
+                this.dialysisPrescription.amylaceum = 0
+               }
             }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
@@ -3036,7 +3043,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0
@@ -4446,7 +4453,6 @@ mu
         id === 7 ||
         id === 8 ||
         id === 9 ||
-        id === 10 ||
         id === 11 ||
         id === 13 ||
         id === 14 ||

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

@@ -265,7 +265,8 @@
                 org_id == 10551 ||
                 org_id == 10599 ||
                 org_id == 10597 ||
-                org_id == 10599) &&
+                org_id == 10599 || 
+                org_id == 10612) &&
                 org_id!=10387
             "
           >
@@ -336,7 +337,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -392,7 +393,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -445,7 +446,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599 ) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 ) ||
               org_id == 10387
             "
           >
@@ -1176,7 +1177,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612) &&
                 org_id!=10387
             "
           >
@@ -1224,7 +1225,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -1287,7 +1288,8 @@
                 org_id == 10480 ||
                 org_id == 10551 ||
                 org_id == 10597||
-                org_id == 10599)
+                org_id == 10599 ||
+                org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -1350,7 +1352,8 @@
               org_id!=10480 &&
               org_id!=10551 &&
               org_id!=10597 &&
-              org_id!=10599
+              org_id!=10599 &&
+              org_id!=10612
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,10 +15,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1606,7 +1606,7 @@
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10587">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1735,7 +1735,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10587">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -3554,7 +3554,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";
@@ -3689,6 +3689,7 @@ export default {
       },
       org_id: 0,
       projectsOne: [],
+      ageDate:""
     };
   },
   methods: {
@@ -4209,6 +4210,7 @@ export default {
         } else {
           this.patientInfo.first_dialysis_date = "";
         }
+        this.ageDate = uParseTime(response.data.data.schedule.schedule_date,"{y}-{m}-{d}");
         this.check = response.data.data.check;
         this.xtdate = response.data.data.xtdate;
         this.predialysis = response.data.data.PredialysisEvaluation;
@@ -4707,15 +4709,28 @@ export default {
         } else {
           birth = val.id_card_no.substr(6, 8)
         }
-        var birthtwo =
-          birth.substr(0, 4) +
-          '-' +
-          birth.substr(4, 2) +
-          '-' +
-          birth.substr(6, 2)
-
-        var age = jsGetAge(birthtwo, '-')
-        return age
+      
+        if(this.org_id == 0){
+          console.log("this.ageDattewowow",this.ageDate)
+          var birthtwo = birth.substr(0, 4)  + birth.substr(4, 2)  + birth.substr(6, 2)
+          var year = birth.substr(0,4) 
+          var month = birth.substr(4, 2)
+          var day = birth.substr(6, 2)
+         
+          var age = jsGetAgeOne(birthtwo,"-",year,month,day)
+          return age
+        }else{
+            var birthtwo =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2)
+            console.log("brithwo3333",birthtwo)
+            var age = jsGetAge(birthtwo, '-')
+            return age
+        }
+       
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -169,9 +169,12 @@
           <div style="flex: 1;">
             透析机
            <span class="under-line" style="display: inline-block;width: 50%">
-            {{ dialysisOrder &&dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
+            {{
+              predialysis.machine_type ? predialysis.machine_type : ""
+           }}
+            <!-- {{ dialysisOrder &&dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number
-            }}
+            }} -->
            </span>
           </div>
           <div style="flex: 1;">
@@ -186,13 +189,14 @@
             灌流器
             <span class="under-line" style="display: inline-block;width: 50%;">
               {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
-            </span>L
+            </span>
           </div>
           <div style="flex: 1;display: flex">
             透析液：
             <div style="">
-              <check-box text="碳酸" :checked="prescription_dialyzate1"></check-box>&nbsp;
-              <check-box text="醋酸" :checked="prescription_dialyzate2"></check-box>
+              碳酸
+              <!-- <check-box text="碳酸" :checked="prescription_dialyzate1"></check-box>&nbsp;
+              <check-box text="醋酸" :checked="prescription_dialyzate2"></check-box> -->
               <!-- <check-box :checked="patientInfo_gender_2"></check-box>&nbsp; -->
             </div>
               <!-- <div class="under_line" style="width: 100px; text-align: center;display: inline-block;" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
@@ -243,7 +247,7 @@
         <table border="1" style="border-collapse: collapse;text-align: center;">
           <tr>
             <td style="width: 60px;text-align: center;" rowspan="2" >时间</td>
-            <td colspan="4" style="text-align: center;">透析参数</td>
+            <td colspan="6" style="text-align: center;">透析参数</td>
             <td colspan="5" style="text-align: center;">生命体征</td>
             <td colspan="2" style="text-align: center;">治疗中病情变化</td>
           </tr>
@@ -252,6 +256,10 @@
               <p style="height: 20px; line-height: 20px">TMP</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
             </th>
+            <th style="width: 70px; font-weight: normal">
+              <p style="height: 20px; line-height: 20px">动脉压</p>
+              <p style="height: 20px; line-height: 20px">mmHg</p>
+            </th>
             <th style="width: 70px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">静脉压</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
@@ -264,14 +272,18 @@
               <p style="height: 20px; line-height: 20px">脱水量</p>
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
-            <th style="width: 80px; font-weight: normal">
-              <p style="height: 20px; line-height: 20px">T</p>
+            <th style="width: 130px; font-weight: normal">
+              <p style="height: 20px; line-height: 30px">透析液温度</p>
               <p style="height: 20px; line-height: 20px">℃</p>
             </th>
             <th style="width: 60px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">HR</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
             </th>
+            <th style="width: 60px; font-weight: normal">
+              <p style="height: 20px; line-height: 30px">T</p>
+              <p style="height: 20px; line-height: 20px">℃</p>
+            </th>
             <th style="width: 60px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">R</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
@@ -282,12 +294,12 @@
             </th>
 
             <th style="width: 80px; font-weight: normal">
-              <p style="height: 20px; line-height: 20px">SpO₂</p>
-              <p style="height: 20px; line-height: 20px">%</p>
+              <p style="height: 20px; line-height: 20px">电导度</p>
+              <p style="height: 20px; line-height: 20px">mS/m</p>
             </th>
-            <th style="width: 70px; font-weight: normal">
+            <!-- <th style="width: 70px; font-weight: normal">
               时间
-            </th>
+            </th> -->
             <th style="width: 333px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">
                 记&nbsp;&nbsp;&nbsp;&nbsp;录
@@ -298,51 +310,72 @@
             <td style="min-width: 60px; height: 30px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
             </td>
+            
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{
                   monitor.transmembrane_pressure
                     ? monitor.transmembrane_pressure
-                    : ""
+                    : "/"
                 }}
               </span>
             </td>
+
+            <th style="width: 70px; font-weight: normal">
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{
+                  monitor.arterial_pressure
+                    ? monitor.arterial_pressure
+                    : "/"
+                }}
+              </span>
+            </th>
+            
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
+                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}
               </span>
             </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
+                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}
               </span>
             </td>
             <td style="min-width: 45px">
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{
+                <span v-if="monindex == 1">0</span>
+                <span v-if="monindex != 1">
+                  {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
-                    : " "
-                }}
+                    : ""
+                 }}
+                </span>
+              
               </span>
             </td>
             <!-- 生命体征 -->
             <!-- T -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
+                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}
               </span>
             </td>
             <!-- HR -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}
               </span>
             </td>
             <!-- R -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
+                {{ monitor.temperature ? monitor.temperature : "/" }}
+              </span>
+            </td>
+            <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}
               </span>
             </td>
             <!-- BP -->
@@ -351,11 +384,11 @@
                 {{
                   monitor.systolic_blood_pressure
                     ? monitor.systolic_blood_pressure
-                    : ""
+                    : "/"
                 }}/{{
                   monitor.diastolic_blood_pressure
                     ? monitor.diastolic_blood_pressure
-                    : ""
+                    : "/"
                 }}
               </span>
             </td>
@@ -363,25 +396,25 @@
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{
-                  monitor.blood_oxygen_saturation
-                    ? monitor.blood_oxygen_saturation
-                    : ""
+                  monitor.conductivity
+                    ? monitor.conductivity
+                    : "/"
                 }}
               </span>
             </td>
 
             <!-- 病情变化 -->
-            <td style="min-width: 60px; height: 30px">
+            <!-- <td style="min-width: 60px; height: 30px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
-            </td>
+            </td> -->
             <td>
               <template 
               v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)&&(org_id!=10414) "
               >
-                【开始透析】
+                开始上机，引血100ml/min
               </template>
-              <span v-if="monitor.symptom || monitor.dispose || monitor.result">
-                {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
+              <span v-if="monitor.symptom || monitor.dispose || monitor.result || monitor.end ">
+                {{ monitor.end }}  {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
                   monitor.result
                 }}
               </span>
@@ -411,7 +444,14 @@
                 <p style="height:15px;line-height:15px">上次透后体重</p>
               </td>
               <td style="width:8%;">
-                {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
+              
+                 <span v-if="assessmentafter.weight_after == 0">
+                  {{ afterdialysis.last_after_weight ? afterdialysis.last_after_weight : "0" }}kg
+                 </span>
+                 <span v-if="assessmentafter.weight_after>0">
+                  {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
+                 </span>
+                  
               </td>
             </tr>
 
@@ -421,7 +461,7 @@
                 <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
                 <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
+                <!-- <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span> -->
                 <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
@@ -437,7 +477,15 @@
               <td v-if="advice_index === 0">透前体重</td>
               <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
               <td v-if="advice_index === 1">体重增加量</td>
-              <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
+              <td v-if="advice_index === 1">
+                <span v-if="assessmentafter.weight_after == 0">
+                  {{ (predialysis.weight_before - afterdialysis.last_after_weight ).toFixed(1) }}kg
+                 </span>
+                 <span v-if="assessmentafter.weight_after>0">
+                   {{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg
+                 </span>
+                 
+              </td>
               <td v-if="advice_index === 2">干体重(DW)</td>
               <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
               <td v-if="advice_index === 3">较干体重增加量</td>
@@ -1223,6 +1271,25 @@ export default {
               this.monitors.push([]);
             }
           }
+
+          var tempmonitorflag = true;
+          for (let index = 0; index < this.monitors.length; index++) {
+            const monitor = this.monitors[index];
+            this.monitors[index].end = "";
+            if (Object.keys(monitor).length > 0 && index > 1) {
+              if (
+                (this.dialysisOrder &&
+                monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
+              ) {
+                this.monitors[index].end = "结束治疗，予下机";
+                tempmonitorflag = false;
+              }
+              if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
+                this.monitors[index].end = "结束治疗，予下机";
+              }
+            }
+          }
+
           this.jilurow = this.monitors.length + 1;
 
           this.advice_jilurow = this.advices.length + 1;
@@ -1456,11 +1523,13 @@ export default {
       }
     },
     "prescription.dialyzate": function() {
+      console.log("this.prescription",this.prescription.dialyzate)
       if(this.prescription.dialyzate !='undefined'){
-        if(prescription.dialyzate.indexOf('碳酸')>-1){
+        this.prescription.dialyzate="碳酸"
+        if(this.prescription.dialyzate.indexOf('碳酸')>-1){
           this.prescription_dialyzate1 =true
           this.prescription_dialyzate2 = false
-        }else if(prescription.dialyzate.indexOf('醋酸')>-1){
+        }else if(this.prescription.dialyzate.indexOf('醋酸')>-1){
           this.prescription_dialyzate1 =false
           this.prescription_dialyzate2 = true
         }else{

src/xt_pages/medicalScheduling/index.vue

@@ -42,7 +42,11 @@
             </div>
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
-                    <el-table :data="tableData" border :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle">
+                    <el-table :data="tableData" border 
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" 
+                    :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle"
+                    @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse">
+                    <!-- @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse" -->
                         <el-table-column prop="name" label="医护姓名" style="width:16%" align="center">
                             <template slot-scope="scope">
                                 <span>{{scope.row.user_name}}</span>
@@ -50,8 +54,15 @@
                         </el-table-column>
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
                             <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,1))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
-                                    <el-dropdown trigger="click" @command="changeSchedule">
+                                    <el-dropdown trigger="click" @command="changeSchedule" >
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,1) == 2' style="color:red">
                                             <span>{{ getClass(scope.row.user_name,1) }}</span><i v-if="getTimestamp(weekDayArr[0])>=timeNow && scope.row.admin_user_id!=1000000?true:false" class="el-icon-arrow-down el-icon--right"></i>
                                         </span>
@@ -67,6 +78,14 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周二\n(' + weekDayArr[1] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                              <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
+                                <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                  <el-button type="danger" size="mini" icon="el-icon-close" 
+                                    circle @click.stop="toClick(getClassId(scope.row.user_name,2))"   
+                                  ></el-button>
+                                </div>
+                              </div>
+                                
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
@@ -84,6 +103,13 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周三\n(' + weekDayArr[2] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,3))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,2)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,3) == 2' style="color:red">
@@ -101,6 +127,13 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周四\n(' + weekDayArr[3] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,4))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,3)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,4) == 2' style="color:red">
@@ -118,6 +151,13 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周五\n(' + weekDayArr[4] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,5))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,4)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,5) == 2' style="color:red">
@@ -135,6 +175,13 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周六\n(' + weekDayArr[5] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,6))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,5)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,6) == 2' style="color:red">
@@ -152,6 +199,13 @@
                         </el-table-column>
                         <el-table-column prop="name" :label="'周日\n(' + weekDayArr[6] + ')'" style="width:14%" align="center">
                              <template slot-scope="scope">
+                                <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
+                                  <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
+                                    <el-button type="danger" size="mini" icon="el-icon-close" 
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,0))"   
+                                    ></el-button>
+                                  </div>
+                                </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,6)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,0) == 2' style="color:red">
@@ -276,7 +330,7 @@
                                   {{scope.row.user_name}}
                               </template>
                              </el-table-column>
-                             <el-table-column align="center" prop="date" label="职称"width="180">
+                             <el-table-column align="center" prop="date" label="职称" width="180">
                                 <template slot-scope="scope">
                                     <span v-if="scope.row.user_title == 1">医士</span>
                                     <span v-if="scope.row.user_title == 2">医师</span>
@@ -342,11 +396,10 @@
     </div>
 </template>
 
-
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule,DeleteStaffScheduleById } from '@/api/doctorSchedule'
 import { constants } from 'crypto'
 export default {
     components:{
@@ -411,7 +464,9 @@ export default {
            nurseTableData:[],
            doctorTableData:[],
            exportDialogVisible:false,
-           month_time:""
+           month_time:"",
+           name:'',
+           column_lie:''
         }
     },
     methods:{
@@ -443,7 +498,7 @@ export default {
                     this.getStaffScheduleList()
 
                     var doctorlist =  response.data.data.doctorlist
-                  
+
                     for(let i=0;i<doctorlist.length;i++){
                         if(doctorlist[i].sort == 0){
                           doctorlist[i].sort = ""
@@ -691,7 +746,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
-                    
+
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -803,7 +858,7 @@ export default {
                         fourStr = strFour
                     }
 
-                    
+
                     if(staffList[i].schedule_week == 5){
                         staffList[i].class_index = 5
 
@@ -861,28 +916,30 @@ export default {
                         sixStr = strSix
                      }
                     }
+                   console.log("staffList",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
                             newArr.push({
+                                id:staffList[i].id,
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 user_type:staffList[i].doctor_type,
                                 is_sort:staffList[i].is_sort,
                                 sort:staffList[i].sort,
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributesk,id:staffList[i].id}]
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
                             console.log("staffList",staffList[i].user_name)
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
-                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes,id:staffList[i].id})
                                 }
                             }
                         }
                     }
-                    
+
                     let arrTen = [...newArr]
                     console.log("newArr22o2o2o2o2wo",arrTen)
                     let newNurse = []
@@ -914,7 +971,7 @@ export default {
                         }
                     })
                     newNurse.sort(this.compare('sort'))
-                  
+
                     // //医生
                     newDoctor.sort(this.compare('admin_user_id'))
                     let newDoctorTableData = []
@@ -935,7 +992,7 @@ export default {
 
 
                     let arr2 = []
-                    
+
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
                     arr2.push({class_name:threeStr,schedule_week:3})
@@ -951,12 +1008,12 @@ export default {
                     arr.push(obj)
 
                     let data = []
-                  
+
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
                     console.log("data2o2oo2o2o2o22o",data)
-                    
+
                     // this.tableData = this.distinct(data)
                     this.tableData = data
 
@@ -994,6 +1051,26 @@ export default {
                 return newClass
             }
 
+        },
+        getClassId(name,index){
+           
+            if(name != undefined){
+                let id = '';
+                this.tableData.map(item => {
+                if(item.user_name == name){
+                    if(item.list){
+                        item.list.map(it => {
+                            if(it.schedule_week == index){
+                                id = it.id
+                            }
+                        })
+                    }
+
+                }
+                })
+                return id
+            }
+
         },
         getClassAttributes(name,index){
             if(name != undefined){
@@ -1734,6 +1811,7 @@ export default {
                         data.push(...newNurse)
                         data.push(obj)
                         this.tableData = data
+                        console.log('cccccc',this.tableData);
                     }
 
             }
@@ -1993,7 +2071,39 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
 
+       toClick(id,index){
+          this.$confirm(
+            '是否要清除当前排班? <br>清除后,信息将无法恢复',
+            '删除提示',
+            {
+                dangerouslyUseHTMLString: true,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }
+            ).then(()=>{
+             console.log("rowwoowowow",id)
+           
+            DeleteStaffScheduleById(id).then(response=>{
+                if(response.data.state == 1){
+                    var msg =  response.data.data.msg
+                    this.$message.success("清除成功")
+                    this.getStaffScheduleList()
 
+                }
+            })
+         })
+       },
+
+
+       hoverMouse(row,column, cell, event){
+        this.name=row.user_name
+        this.column_lie= column.label.split('\n')[0]
+
+       },
+       leavemouse(row, column, cell, event){
+        this.name=''
+       }
     },
     created(){
         //获取医护人员
@@ -2086,5 +2196,16 @@ export default {
     max-height:96%;
     overflow-y: auto;
 }
+.del_table_btns {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    // visibility: hidden;
+  .el-button {
+    width: 15px;
+    height: 15px;
+    padding: 0px;
+  }
+}
 
 </style>

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-       <el-button
+       <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button>
+          @click="toJiaBan">首拼</el-button> -->
 
 
           <!-- <el-button

src/xt_pages/stock/drugs/cancelDrugStockOrderDetail.vue

@@ -64,6 +64,7 @@
           </template>
         </el-table-column>
 
+       
 
       </el-table>
     </el-row>

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

@@ -143,6 +143,11 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.unit}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{scope.row.total_price}}
@@ -472,10 +477,10 @@ export default {
     exportListOne(){
       // 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
+          this.tableList[i].unit_one = 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.tableList[i].drug_type == 1){
              this.tableList[i].drugtype = "西药"
           }
@@ -490,11 +495,13 @@ export default {
 
         }
     
-      console.log("@332322323232332",this.tableList)
+    
+
+  
       
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','单位','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','unit','total_price']
 
        const data = this.formatJson(filterVal, this.tableList)
 

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -21,6 +21,7 @@
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="80">单位</td>
               <td style="line-height:50px" width="80">单价</td>
               <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
@@ -43,6 +44,10 @@
               <td style="line-height: 50px">
                   {{item.count}}
                
+              </td>
+              <td style="line-height: 50px">
+                  {{item.unit}}
+               
               </td>
               <td style="line-height:50px">
                   {{item.price}}

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -14,9 +14,9 @@
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
             </el-tab-pane>
         
-            <el-tab-pane label="进销存查询" name="second">
+            <!-- <el-tab-pane label="进销存查询" name="second">
               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-            </el-tab-pane> 
+            </el-tab-pane>  -->
 
             <el-tab-pane label="有效期查询" name="third">
                 <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -152,6 +152,11 @@
              <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
         <!-- <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.batch_number}}</span>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1060,10 +1060,9 @@ export default {
            const filterVal = ['index','good_number', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
            const data = this.formatJson(filterVal, this.tableList)
-           
+        
            const filename = '进销存查询'
-     
-          
+            
             excel.export_json_to_excel({
               multiHeader,
               header,

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -53,6 +53,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
+       
            <el-button type="primary" size="small" @click="toPrint">打印</el-button>
            <el-button type="primary" size="small" @click="exportList">导出</el-button>
          </div>
@@ -68,16 +69,23 @@
             :class="signAndWeighBoxPatients"
             border
           >
+        
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                  {{getGoodTypeName(scope.row.good_type_id)}}
               </template>
             </el-table-column>
+            <el-table-column label="耗材编码" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="耗材名称" align="center">
               <template slot-scope="scope">
                 {{scope.row.good_name}}
               </template>
             </el-table-column>
+
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
@@ -88,6 +96,17 @@
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                 {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="单位" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.packing_unit}}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
                
                  <el-table-column prop="stockIn" label="数量" width="100">
@@ -157,7 +176,7 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getPurchaseStockQuery } from "@/api/drug/drug"
+import { getStorehouseList,getPurchaseStockQueryList,getGoodOverCount } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
@@ -201,9 +220,10 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
+     dealerList:[],
     }
   
   },
@@ -231,6 +251,7 @@ export default {
              this.goodTypeList.push(goodTypeList[i])
             }
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -244,35 +265,37 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
         }
-      getPurchaseStockQuery(params).then(response=>{
+      getPurchaseStockQueryList(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
+           
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
-              list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-              list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-              
+               list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+               list[i].stock_in_price = list[i].buy_price
+               list[i].stockMoney = (list[i].buy_price * list[i].GoodStartFlowInfo.over_count).toFixed(2)
+            
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-              list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
-              list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
+              list[i].addStockMoney = list[i].buy_price
+              list[i].saleStockMoney = (list[i].stockAdd * list[i].buy_price).toFixed(2)
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-              list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-              
-              // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-
+              list[i].stockOutprice = list[i].retail_price
+              list[i].saleOutMoney = (list[i].outStock * list[i].stockOutprice).toFixed(2)
+             
+             
               list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
-              list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-              list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+              list[i].overPrice = list[i].buy_price
+              list[i].overMoney = (list[i].overStock * list[i].buy_price).toFixed(2)
              
             }
+            console.log("listwowowoowowowow",list)
             this.tableList = list
             this.total = response.data.data.total
 
            this.manufacturerList = response.data.data.manufacturerList
+          
            
          }
       })
@@ -572,11 +595,7 @@ export default {
         countfive +=arr5[i].count
       }
     }
-    console.log("countOne",countOne)
-    console.log("countTwo",countTwo)
-    console.log("countthree",countthree)
-    console.log("countfour",countfour)
-    console.log("*********************")
+   
     count = countOne - countTwo + countthree - countfour + countfive
     if(count > 0 ){
       return count
@@ -610,10 +629,7 @@ export default {
      }
     }
     all_count = count + countOne
-    console.log("count2332323223232o2222222222wide",count)
-    console.log("countONE23232322323323223",countOne)
-    console.log("all_count9999999999999wode",all_count)
-    console.log("-------------------------------------------")
+   
     if(all_count > 0 ){
       return all_count
     }else{
@@ -674,7 +690,8 @@ export default {
     }
    },
    open(){
-    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
+    this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []
@@ -788,6 +805,7 @@ export default {
         count_two +=val3[i].count
       }
      }
+    
      all_count = count +count_one - count_two
      if(all_count >0){
        return all_count
@@ -920,11 +938,7 @@ export default {
          total_price_four +=val4[i].count * val4[i].buy_price
        }
      }
-     console.log("total_price",total_price)
-     console.log("total_price_three",total_price_three)
-     console.log("total_price_two",total_price_two)
-     console.log("total_price_one",total_price_one)
-     console.log("total_price_four",total_price_four)
+   
      all_price = total_price- total_price_three +total_price_one - total_price_two + total_price_four
      console.log("arrll_price",all_price)
      if(all_price >0){
@@ -976,24 +990,25 @@ export default {
     this.$router.push({path:"/purchase/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
    exportList: function() {
+
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
           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].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材编码','耗材名称','规格&单位','生产产商','经销商','单位', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+            const header = ['','','','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+            const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:I2', 'J1:L1', 'M1:O1', 'P1:R1','S1:U1']
+            const filterVal = ['index', 'query_date', 'good_type','good_number','good_name','specification_name_one','manufacturer_name','dealer_name','packing_unit','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
-           const data = this.formatJson(filterVal, this.tableList)
-           
-           const filename = '进销存查询'
-     
-          
+            const data = this.formatJson(filterVal, this.tableList)
+            console.log("datae3ooo2o2o2o",data)
+            const filename = '进销存查询'
+      
             excel.export_json_to_excel({
               multiHeader,
               header,
@@ -1002,17 +1017,30 @@ export default {
               filename
             })
         })
+
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
-     
+     toOverCount(){
+       getGoodOverCount().then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           this.$message.success("调试成功")
+         }
+       })
+     },
+     getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
-  // created(){
-  //   this.getStorehouseList()
-  //   this.getlist()
-  //   this.getStockDrugCount()
-  // }
+
 }
 </script>
 

src/xt_pages/stock/stockFlow.vue

@@ -154,6 +154,11 @@
              <span > {{scope.row.over_count}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/user/Sitemap.vue

@@ -830,14 +830,14 @@ export default{
 
       var fileType = file.type
       const isJPG = fileType.indexOf('image') > -1
-      const isLt2M = file.size / 1024 / 1024 < 5
+      const isLt2M = file.size / 1024 / 1024 < 20
 
       if (!isJPG) {
         this.$message.error('只能上传图片')
         return false
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 5MB!')
+        this.$message.error('上传头像图片大小不能超过 20MB!')
         return false
       }
 

src/xt_pages/user/physiqueprinting.vue

@@ -6,7 +6,7 @@
       </el-button>
     </div>
     <div class="app-container">
-      <div id="print_content" v-for="item in this.list">
+      <div id="print_content" v-for="item in this.list" style="font-family: Microsoft YaHei;font-size: 16px;">
         <div class="print_page_main_content">
           <h1 style="text-align: center; padding-top:12px;">{{ orgname }}血液净化治疗病历</h1>
           <div style="border-bottom: 1px solid black;display: flex;padding-bottom: 10px;padding-top: 10px;">
@@ -69,7 +69,7 @@
           </div>
           <h3 style="text-align: center; margin: 20px 0px;">病史内容</h3>
           <div style="word-break: break-all; word-wrap: break-word;">
-            <div v-html="item.content"></div>
+            <div v-html="item.content" style="font-family: Microsoft YaHei;"></div>
           </div>
           <h3 v-if="item.XtPatientPhysiqueCheck.id > 0" style="text-align: center; margin: 30px 0px 10px 0px;">体格检查</h3>
           <div v-if="item.XtPatientPhysiqueCheck.id > 0">
@@ -120,9 +120,18 @@
 
           <div style="margin-top: 30px;">
             <span style="font-weight: bold; display: block;">初步诊断：</span>
-            {{ patient.diagnose }}
-            <span style="font-weight: bold;">病历书写者：</span>
-            {{getDoctorName(item.doctor_id)}}
+            <div v-for="(item,index) in diagnosis" :key="index" style="line-height: 20px;" v-if="org_id==10612">
+              {{index+1}}.<span>{{ item }}</span><br/>
+            </div>
+            <span v-if="org_id!=10612">{{ patient.diagnose }}</span>
+            <div style="text-align: right;margin-bottom: 10px;">
+              <span style="font-weight: bold;">病历书写者：</span>
+              {{getDoctorName(item.doctor_id)}}
+            </div>
+            
+
+          </div>
+          <div style="float: right;">
             <span style="font-weight: bold;">日期：</span>
             {{getTime(item.record_time,'{y}-{m}-{d}')}}
           </div>
@@ -198,7 +207,8 @@ export default {
         abdomen: '',
         other: ''
       },
-      diagnosis: ''
+      diagnosis: [],
+      org_id:0
     }
   },
   components: {
@@ -668,6 +678,8 @@ export default {
       getSickhistoryCheckRecordsPrint(params).then(response => {
         if (response.data.state == 1) {
           this.patient = response.data.data.patient
+          this.diagnosis = this.patient.diagnose.split(',')
+          console.log('ttttttt',this.diagnosis);
           this.list = response.data.data.sickhistorys
         }
       })
@@ -684,6 +696,7 @@ export default {
     }
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     this.getPhysiquePrintList()
     this.fetchAllDoctorAndNurse()
   }