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

src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue

                   <div style="flex: 1;">
                     <div style="display: inline-block;margin-right: 120px;">
                       <span style="display: inline-block;">医生签名:</span>杨能华/
-                      <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">
-                        {{ getAdminUser(record.prescription, 'prescription_doctor') }}
+                      <span v-if="record.advices.length>0">
+                        <span v-if="setAdminUserES(record.advices[0][0],'advice_doctor') == ''">
+                          {{ getAdminUser(record.advices[0][0],'advice_doctor') }}
+                        </span>
+                        <img class="es-img" :src="setAdminUserES(record.advices[0][0],'advice_doctor')" alt=""
+                          srcset="" v-else style="height: 30px;" />
                       </span>
-                      <img class="es-img" :src="setAdminUserES(record.prescription, 'prescription_doctor')" alt=""
-                        srcset="" v-else style="height: 30px;" />
                     </div>
                   </div>
                   <div style="flex: 1;">  

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

             <td style="text-align:center;">
               机器号:
               <span style="display:inline-block;margin-left:10px;">
-                {{
+                <!-- {{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number > 0
                 ? dialysisOrder.DeviceNumber.number
                 : patientInfo.DialysisSchedule.device_number.number
-                }}
+                }} -->
               </span>
             </td>
           </tr>
 import LabelBox from '../printItem/LabelBox'
 import CheckBox from '../batch_print/option_check_box'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-// import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
-// import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
+
 
 export default {
   name: 'dialysisPrintOrderOne',
     }
   },
   methods: {
-    checkData(){
-      if(this.receiverTreatmentAccess.condition == 0){
-        this.$message.error('门诊或住院未填')
-      }else if(this.receiverTreatmentAccess.condition == 1 && this.receiverTreatmentAccess.admission_number == ''){
-        this.$message.error('住院号未填')
-      }else if(this.receiverTreatmentAccess.condition == 2 && this.patientInfo.admission_number == ''){
-        this.$message.error('门诊号未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('治疗方式未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.monitors[0].ktv == 0){
-        this.$message.error('ktv未填')
-      }else if(this.monitors[0].urr == 0){
-        this.$message.error('urr未填')
-      }else if(this.prescription.calcium == 0){
-        this.$message.error('钙未填')
-      }else if(this.prescription.sodium == 0){
-        this.$message.error('钠未填')
-      }else if(this.prescription.kalium == 0){
-        this.$message.error('钾未填')
-      }else if(this.prescription.dialysate_temperature == 0){
-        this.$message.error('透析液温度未填')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('透前体重未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('设定脱水量未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('抗凝剂未填')
-      }else if(this.afterdialysis.weight_after == 0){
-        this.$message.error('透后体重未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('净脱水量未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('透析时间未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析器型号未填')
-      }else if(this.prescription.displace_liqui_part == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换方式未填')
-      }else if(this.prescription.displace_liqui_value == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换量未填')
-      }else if(this.orderForm.start_nurse == ""){
-        this.$message.error('责任护士未填')
-      }else if(this.orderForm.start_nurse == ""){
-        this.$message.error('上机护士未填')
-      }else if(this.orderForm.start_nurse == ""){
-        this.$message.error('抗凝剂执行护士未填')
-      }else if(this.prescription.prescription_doctor == 0 && this.prescription.creater == 0){
-        this.$message.error('医生签名未填')
-      }else if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('入科方式未填')
-      }else if(this.receiverTreatmentAccess.consciousness == 0){
-        this.$message.error('意识未填')
-      }else if(this.receiverTreatmentAccess.appetite == 0){
-        this.$message.error('食欲未填')
-      }else if(this.predialysis.temperature == 0){
-        this.$message.error('透前体温未填')
-      }else if(this.receiverTreatmentAccess.posture == 0){
-        this.$message.error('体位未填')
-      }else if(this.predialysis.blood_access_part_opera_id == 0){
-        this.$message.error('内瘘波动及震颤未填')
-      }else if(this.predialysis.blood_access_part_id == 0){
-        this.$message.error('中心静脉导管部位未填')
-      }else if(this.predialysis.venous_catheterization == 0){
-        this.$message.error('中心静脉导管未填')
-      }else if(this.predialysis.catheter == ''){
-        this.$message.error('中心静脉导管感染未填')
-      }else if(this.predialysis.internal_fistula_skin == ''){
-        this.$message.error('血管通路皮肤情况未填')
-      }else if(this.predialysis.skin == ''){
-        this.$message.error('皮肤未填')
-      }else if(this.predialysis.is_hemorrhage == 0){
-        this.$message.error('是否出血未填')
-      }else if(this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == ""){
-        this.$message.error('出血影响因素未填')
-      }else if(this.predialysis.special_medicine_other == ''){
-        this.$message.error('使用特殊药物未填')
-      }else if(this.receiverTreatmentAccess.danger_level == 0){
-        this.$message.error('跌倒风险未填')
-      }else if(this.receiverTreatmentAccess.precaution == ''){
-        this.$message.error('跌倒风险预防措施未填')
-      }else if(this.nursing_record == ''){
-        this.$message.error('透析护理记录未填')
-      }else if(this.afterdialysis.dialysis_process == 0){
-        this.$message.error('透析过程未填')
-      }else if(this.afterdialysis.complication == ""){
-        this.$message.error('透后并发症未填')
-      }else if(this.afterdialysis.actual_displacement == 0){
-        this.$message.error('实际置换量未填')
-      }else if(this.afterdialysis.internal_fistula == ""){
-        this.$message.error('内瘘搏动及震颤音未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器及管路凝血情况未填')
-      }else if(this.afterdialysis.is_eat == 0){
-        this.$message.error('透析中进食未填')
-      }else if(this.afterdialysis.patient_gose == 0){
-        this.$message.error('患者去向未填')
-      }else if(this.finshForm.finish_nurse == ""){
-        this.$message.error('下机护士未填')
-      }else if(this.special_record == ""){
-        this.$message.error('特殊记录未填')
-      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
-        let num = 0
-        if(this.monitors.length > 0){
-          this.monitors.map(item => {
-            if(item.id > 0 && item.operate_time){
-              this.users.map(it => {
-                if(it.id == item.monitoring_nurse){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士保存的监测')
-                  }
-                }
-              })
-            }
-          })
-        }
-        if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
-            if(item.id > 0 && (item.created_time || item.start_time)){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.user_type == 3){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士执行的医嘱')
-                    }
-                  }else if(it.id == item.checker && item.checker > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士核对的医嘱')
-                    }
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              })
+    checkData() {
+      var checkdata = []
+      if (this.prescription.mode_id == "") {
+        const obj = '治疗方式'
+        checkdata.push(obj)
+      } if (this.predialysis.dry_weight == 0) {
+        const obj1 = '干体重'
+        checkdata.push(obj1)
+      } if (this.monitors[0].ktv == 0) {
+        const obj2 = 'ktv'
+        checkdata.push(obj2)
+      } if (this.monitors[0].urr == 0) {
+        const obj3 = 'URR'
+        checkdata.push(obj3)
+      } if (this.prescription.calcium == 0) {
+        const obj4 = '钙'
+        checkdata.push(obj4)
+      } if (this.prescription.sodium == 0) {
+        const obj5 = '钠'
+        checkdata.push(obj5)
+      } if (this.prescription.kalium == 0) {
+        const obj6 = '钾'
+        checkdata.push(obj6)
+      } if (this.prescription.dialysate_temperature == 0) {
+        const obj7 = '透析液温度'
+        checkdata.push(obj7)
+      } if (this.predialysis.weight_before == 0) {
+        const obj8 = '透前体重'
+        checkdata.push(obj8)
+      } if (this.prescription.target_ultrafiltration == 0) {
+        const obj9 = '设定脱水量'
+        checkdata.push(obj9)
+      } if (this.prescription.anticoagulant == 0) {
+        const obj10 = '抗凝剂'
+        checkdata.push(obj10)
+      } if (this.afterdialysis.weight_after == 0) {
+        const obj11 = '透后体重'
+        checkdata.push(obj11)
+      } if (this.afterdialysis.actual_ultrafiltration == 0) {
+        const obj12 = '净脱水量'
+        checkdata.push(obj12)
+      } if (this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0) {
+        const obj13 = '透析时间'
+        checkdata.push(obj13)
+      } if (this.prescription.dialyzer_perfusion_apparatus == "") {
+        const obj14 = '透析器型号'
+        checkdata.push(obj14)
+      } if (this.prescription.displace_liqui_part == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)) {
+        const obj14 = '置换方式'
+        checkdata.push(obj14)
+      } if (this.prescription.displace_liqui_value == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)) {
+        const obj15 = '置换量'
+        checkdata.push(obj15)
+      } if (this.orderForm.start_nurse == "") {
+        const obj16 = '责任护士'
+        checkdata.push(obj16)
+      } if (this.orderForm.start_nurse == "") {
+        const obj17 = '上机护士'
+        checkdata.push(obj17)
+      } if (this.orderForm.start_nurse == "") {
+        const obj18 = '抗凝剂执行护士'
+        checkdata.push(obj18)
+      } if (this.prescription.prescription_doctor == 0 && this.prescription.creater == 0) {
+        const obj19 = '医生签名'
+        checkdata.push(obj19)
+      } if (this.receiverTreatmentAccess.way == 0) {
+        const obj20 = '入科方式'
+        checkdata.push(obj20)
+      } if (this.receiverTreatmentAccess.consciousness == 0) {
+        const obj21 = '意识'
+        checkdata.push(obj21)
+      } if (this.receiverTreatmentAccess.appetite == 0) {
+        const obj22 = '食欲'
+        checkdata.push(obj22)
+      } if (this.predialysis.temperature == 0) {
+        const obj23 = '透前体温'
+        checkdata.push(obj23)
+      } if (this.receiverTreatmentAccess.posture == 0) {
+        const obj24 = '体位'
+        checkdata.push(obj24)
+      } if (this.predialysis.blood_access_part_opera_id == 0) {
+        const obj25 = '内瘘波动及震颤'
+        checkdata.push(obj25)
+      } if (this.predialysis.blood_access_part_id == 0) {
+        const obj26 = '中心静脉导管部位'
+        checkdata.push(obj26)
+      } if (this.predialysis.venous_catheterization == 0) {
+        const obj27 = '中心静脉导管'
+        checkdata.push(obj27)
+      } if (this.predialysis.catheter == '') {
+        const obj28 = '中心静脉导管感染'
+        checkdata.push(obj28)
+      } if (this.predialysis.internal_fistula_skin == '') {
+        const obj29 = '血管通路皮肤情况'
+        checkdata.push(obj29)
+      } if (this.predialysis.skin == '') {
+        const obj30 = '皮肤'
+        checkdata.push(obj30)
+      } if (this.predialysis.is_hemorrhage == 0) {
+        const obj31 = '是否出血'
+        checkdata.push(obj31)
+      } if (this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == "") {
+        const obj32 = '出血影响因素'
+        checkdata.push(obj32)
+      } if (this.predialysis.special_medicine_other == '') {
+        const obj33 = '使用特殊药物'
+        checkdata.push(obj33)
+      } if (this.receiverTreatmentAccess.danger_level == 0) {
+        const obj34 = '跌倒风险'
+        checkdata.push(obj34)
+      } if (this.receiverTreatmentAccess.precaution == '') {
+        const obj35 = '跌倒风险预防措施'
+        checkdata.push(obj35)
+      } if (this.nursing_record == '') {
+        const obj36 = '透析护理记录'
+        checkdata.push(obj36)
+      } if (this.afterdialysis.dialysis_process == 0) {
+        const obj37 = '透析过程'
+        checkdata.push(obj37)
+      } if (this.afterdialysis.complication == "") {
+        const obj38 = '透后并发症'
+        checkdata.push(obj38)
+      } if (this.afterdialysis.actual_displacement == 0) {
+        const obj39 = '实际置换量'
+        checkdata.push(obj39)
+      } if (this.afterdialysis.internal_fistula == "") {
+        const obj40 = '内瘘搏动及震颤音'
+        checkdata.push(obj40)
+      } if (this.afterdialysis.cruor == "") {
+        const obj41 = '透析器及管路凝血情况'
+        checkdata.push(obj41)
+      } if (this.afterdialysis.is_eat == 0) {
+        const obj42 = '透析中进食'
+        checkdata.push(obj42)
+      } if (this.afterdialysis.patient_gose == 0) {
+        const obj43 = '患者去向'
+        checkdata.push(obj43)
+      } if (this.finshForm.finish_nurse == "") {
+        const obj44 = '下机护士'
+        checkdata.push(obj44)
+      } if (this.special_record == "") {
+        const obj45 = '特殊记录'
+        checkdata.push(obj45)
+      } if (this.tableAdvice.length > 0) {
+        this.tableAdvice.map(item => {
+          if (item.id > 0 && (item.created_time || item.start_time)) {
+            if(item.execution_staff ==0 || item.advice_doctor==0){
+              const obj46 = '执行人员,医生签名'
+              checkdata.push(obj46)
             }
+          }
         })
+      }
+      if (this.monitors.length > 0) {
+        for(let i in this.monitors){
+          if(this.monitors[i].systolic_blood_pressure=='' || this.monitors[i].diastolic_blood_pressure==''){
+            const obj47='监测第'+((i*1)+1)+'行血压'
+            checkdata.push(obj47)
+          }
+          if(this.monitors[i].pulse_frequency==''){
+            const obj48='监测第'+((i*1)+1)+'行心率'
+            checkdata.push(obj48)
+          }
+          
+          if(this.monitors[i].blood_flow_volume==''){
+            const obj49='监测第'+((i*1)+1)+'行血流量'
+            checkdata.push(obj49)
+          }
+          if(this.monitors[i].venous_pressure==''){
+            const obj50='监测第'+((i*1)+1)+'行静脉压'
+            checkdata.push(obj50)
+          }
+          if(this.monitors[i].arterial_pressure==''){
+            const obj51='监测第'+((i*1)+1)+'行动脉压'
+            checkdata.push(obj51)
+          }
+          if(this.monitors[i].transmembrane_pressure==''){
+            const obj52='监测第'+((i*1)+1)+'行TMP'
+            checkdata.push(obj52)
+          }
+          if(this.monitors[i].ultrafiltration_rate==''){
+            const obj53='监测第'+((i*1)+1)+'行超滤率'
+            checkdata.push(obj53)
+          }
+          if(this.monitors[i].ultrafiltration_volume==''){
+            const obj54='监测第'+((i*1)+1)+'行超滤量'
+            checkdata.push(obj54)
+          }
+          
+          
+          // if(this.monitors[i].conductivity==''){
+          //   const obj50='监测第'+((i*1)+1)+'行电导度'
+          //   checkdata.push(obj50)
+          // }
+          // if(this.monitors[i].dialysate_temperature==''){
+          //   const obj51='监测第'+((i*1)+1)+'行液温'
+          //   checkdata.push(obj51)
+          // }
         }
-        
-        if(num == 0){
-          this.$message.success('核对完成')
-        }
-      }else{
-        this.$message.success('核对完成')
       }
+      this.getcheckData(checkdata)
     },
     getAdminUser(id) {
       if (id == 0) {
           return this.vascularAccess[i].name
         }
       }
+    },
+    getcheckData(val){
+      if(val.length >0){
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        });
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
                 <span style="display: inline-block;">医生签名:</span>杨能华/
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
-                  {{ getAdminUser(prescription.creater)}}
-                </span>
-                <span style="display: inline-block;" v-else>
-                  <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
+                <span v-if="tableAdvice.length>0">
+                  <span style="display: inline-block;" v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">
+                    {{ getAdminUser(tableAdvice[0].advice_doctor)}}
+                  </span>
+                  <span style="display: inline-block;" v-else>
+                    <img style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt srcset />
+                  </span>
                 </span>
               </div>
             </div>

src/xt_pages/role/components/AdminInfoForm.vue

         { index: 2, name: '医生' },
         { index: 3, name: '护士' },
         { index: 4, name: '行政' },
-        { index: 5, name: '其他' }
+        { index: 5, name: '其他' },
+        { index: 6, name: '药师' }
       ],
       user_titles: [
         { index: 1, name: '医士' },
         { index: 10, name: '副主任护师' },
         { index: 11, name: '主任护师' },
         { index: 12, name: '运营专员' },
-        { index: 13, name: '运营主管' }
+        { index: 13, name: '运营主管' },
+        { index: 14, name: '其他' }
       ],
       roles: [], // [{id, name, intro, status}]
       loading: true,

src/xt_pages/role/components/EditAdminInfo.vue

                 { index: 11, name: '主任护师' },
                 { index: 12, name: '运营专员' },
                 { index: 13, name: '运营主管' },
+                {  index:14, name:  "其他"}
             ],
             roles: [], // [{id, name, intro, status}]
             loading: true,

src/xt_pages/stock/drugs/drugStockFlow.vue

             }
 
            
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
-            
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7 ) && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
+             
+              console.log("hhhhhhhhhhhhhhhhhhhhhh1111")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
               
             }
 
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
-             
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7)  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
+              console.log("hhhhhhhhhhhhhhhhhhhhhh2222")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
              
             }
 
-            
-
-
 
             if(this.tableList[i].price>0){
               this.tableList[i].total_price = this.tableList[i].price