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

src/router/modules/dialysis.js

         noCache: true
       }
     },
+    
     {
       path: '/dialysis/print/batch/thirtyTwo',
       component: () =>
         noCache: true
       }
     },
-    {//80
+    {//81
       path: '/dialysis/print/batch/eightyone',
       component: () =>
         import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyone'),
         noCache: true
       }
     },
+    {//82
+      path: '/dialysis/print/batch/eightyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_eightyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/Pharmacy/drugCode.vue

         <el-table-column align="center" prop="name" label="操作" width="200">
           <template slot-scope="scope">
             <div>
-             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>
-            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
+<!--             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>-->
+<!--            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>-->
+
+              <el-button v-if="scope.row.is_upload == 1" type="primary" @click="revokeDrugCode(scope.row)">撤销</el-button>
+              <el-button type="primary" v-if="scope.row.is_upload == 0" @click="toUpload(scope.row)">上传</el-button>
             <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
             </div>
           </template>
       }
     },
     methods: {
+      toUpload(row){
+        if(row.drug_code.length == 0){
+          this.$message.error("追溯码不能为空");
+          return
+        }
+        let ids  = row.id
+        var that = this;
+        let params = {
+          id:ids,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        };
+
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+
+            //有打开则调用接口
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.getlist()
+                }
+              }
+            }).catch(function(error) {
+            })
+          }
+        }).catch(function(error) {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
+        })
+
+
+      },
+
+      revokeDrugCode(row){
+        let ids  = row.id
+        var that = this;
+        let params = {
+          id:ids,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        };
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+          if (response.data.state == 0) {
+            // that.$message.error(response.data.data.msg);
+            that.$confirm("请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.getlist()
+                }
+              }
+            }).catch(function(error) {
+            })
+          }
+        }).catch(function(error) {
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
+        })
+
+
+
+      },
+
         changeText(event){
         // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
         if (event.key === 'Enter') {
       changeEndTime(val){
         this.end_time = val
       },
-      toUpload(row){
-        if(row.is_medicine == 0 || row.is_is_medicine == 2){
-          this.$message.error("该药品未发药,请先发药")
-          this.faShow = true
-          return
-        }
-        var params = {
-          drug_id:row.drug_id,
-          patient_id:row.patient_id,
-         advice_date:row.advice_date,
-        }
-        createUploadDrugCode(params).then(response=>{
-          if(response.data.state == 1){
-            this.$message.success("上传成功!")
-          }
-        })
-      },
       toFaYao(row){
 
         if(this.is_open == 1){

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

                               : ""
                           }}
                         </div>
-                        
+                        /
                         <div class="under_line" style="width: 50px; text-align: center">
                           {{
                             record.assessment_before_dislysis.diastolic_blood_pressure
                           <td>
                             {{
                               monitor_record.systolic_blood_pressure
-                                ? monitor_record.systolic_blood_pressure + ""
+                                ? monitor_record.systolic_blood_pressure + "/"
                                 : ""
                             }}
                             {{
                           </span>
                           <span v-else></span>
                         </div>
-                        
+                        /
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >

src/xt_pages/dialysis/bloodPresssWatch.vue

             >批量打印</el-button
           >
         </template>
-        
+
         <template v-if="template_id == 27">
           <el-button
             style=""
             >批量打印</el-button
           >
         </template>
+        
         <template v-if="this.template_id == 32">
           <el-button
             size="small"
             type="primary"
             >批量打印</el-button>
         </template>
+        <template v-if="this.template_id == 82">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            :disabled="selecting_schs.length == 0"
+            @click="batchPrintAction"
+            type="primary"
+            >批量打印</el-button
+          >
+        </template>
       </div>
     </div>
     <div class="app-container">
       this.getSchedualPatientList()
     },
     changeEndTime(){
-
       this.getSchedualPatientList()
     },
     getAllZone: function() {
         this.listQuery.schedul_time = "";
 
       }
-
-
       console.log("params332322332323232",this.listQuery.start_time)
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
         } else {
           this.loading = false;
           this.total = response.data.data.total;
-          console.log("世界文化遗产",response.data.data.schedule)
+          console.log("世界文化遗产",response.data.data)
+          // const schedualpatientsTableData2=[]
           for (let i = 0; i < response.data.data.schedule.length; i++) {
 
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
                 SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
               }
 
-
-
-
               if(response.data.data.schedule[i].monitoring_record!=null &&response.data.data.schedule[i].monitoring_record.length >0 ){
                  SchedualPatientsTable["monitoring_record"]  = response.data.data.schedule[i].monitoring_record
               }
                }
               }
 
-
               // 体温
               SchedualPatientsTable.tp = [];
 
                 SchedualPatientsTable["after_pressure_name"] =response.data.data.schedule[i].assessment_after_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_after_dislysis.diastolic_blood_pressure;
               }
 
-
-
+              // schedualpatientsTableData2.push(SchedualPatientsTable)
+              // this.SchedualPatientsTableData = schedualpatientsTableData2
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
               // console.log("wode数据",(-100).toString())
               // console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
         this.$router.push({ path: "/dialysis/print/batch/eighty" });
       }else if (this.template_id == 81) {
         this.$router.push({ path: "/dialysis/print/batch/eightyone" });
+      } else if (this.template_id == 82) {
+        this.$router.push({ path: "/dialysis/print/batch/eightyTwo" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

     },
     getcheckData(val){
       if(val.length >0){
-        let message = `记录单未填数据:<br/><br/>&nbsp;&nbsp;${val.join("<br/><br/>&nbsp;&nbsp;")}`;
-        this.$message({
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
           dangerouslyUseHTMLString: true,
-          message:message,
-          duration:0,
-          showClose:true,
-          type:'error'
-        })
+        });
         return message
       }else{
         this.$message.success('核对完成')

src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue

       ) {
         const obj30 = '首剂'
         checkDate.push(obj30);
-      } if (
-        this.prescription.anticoagulant_weichi == "" &&
-        this.prescription.anticoagulant != 1
-      ) {
-        const obj31 = '维持'
-        checkDate.push(obj31);
-      } if (
+      } 
+      // if (
+      //   this.prescription.anticoagulant_weichi == "" &&
+      //   this.prescription.anticoagulant != 1
+      // ) {
+      //   const obj31 = '维持'
+      //   checkDate.push(obj31);
+      // } 
+      if (
         this.prescription.anticoagulant_zongliang == "" &&
         this.prescription.anticoagulant != 1 &&
         this.prescription.anticoagulant != 5
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$message.error(a +" 未填");
-        return a
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+          
+        });
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

                           style="padding-left: 7px"
                         >
                           <div >
-                            <template v-if="advice.children!=undefined && (org_id==10551||org_id == 0)">
+                            <template v-if="advice.children!=undefined && (org_id==10551)">
                               <div v-for="(item,index) in advice.children" :key="index">
                                 {{ item.advice_name }}
                                 <span v-if="item.advice_desc">
                                 <span v-if="item.single_dose !=''">
                                   {{ item.single_dose}}{{ item.single_dose_unit }}
                                 </span>
-                                
+
                               </div>
                             </template>
                             <span v-if="advice.parent_id > 0">---></span>
         this.users = response.data.data.users;
         this.patientInfo = response.data.data.patientInfo;
         console.log('response.data.data',response.data.data);
-        
+
         this.patientInfo.birth = uParseTime(
           this.patientInfo.birthday,
           "{y}-{m}-{d}"
           }
         }
 
-        if(this.org_id ==10551 ||this.org_id ==0){
+        if(this.org_id ==10551){
           for(let i in this.doctor_advices){
             if(this.doctor_advices[i].parent_id >0){
               this.doctor_advices.splice(i,1)
             }
           }
         }
-        
+
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
               doctor_advices_2.push(element);
             }
           }
-          
+
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

                     <label-box :isChecked="predialysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
                     <label-box :isChecked="predialysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
                   <!-- </span> -->
-                  
+
                   <!-- <span>{{predialysis.symptom_before_dialysis}}</span> -->
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
                 </div>
                             predialysis.blood_access_part_opera_name!='临时静脉导管' &&
                             predialysis.blood_access_part_opera_name!=''?true :false" showValue="其它">
                 </label-box>
+
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">
                 穿刺者:
         (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
           const obj3 = "置换量"
           checkDate.push(obj3)
-      } if(this.afterdialysis.actual_treatment_hour == '' && 
+      } if(this.afterdialysis.actual_treatment_hour == '' &&
           this.afterdialysis.actual_treatment_minute == ''
       ){
         const obj4 = "治疗时间"
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$message.error(a +" 未填");
-        return a
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+          
+        });
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

                             : ""
                         }}
                       </div>
-                      
+                      /
                       <div class="under_line" style="width: 50px; text-align: center">
                         {{
                           predialysis.diastolic_blood_pressure
                       </tr>
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + " ": ""}}
+                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                           </span>
                            <span v-else></span>
                       </div>
-                      
+                      /
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       导管:
                       <div class="under_line"
                         style="width: 75%; text-align: center;white-space: normal;"
-                      >
-                        {{
-                          afterdialysis.catheter ? afterdialysis.catheter : ""
-                        }}
+                      > 
+
+                          {{ afterdialysis.catheter ? afterdialysis.catheter : ""}}
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 2">
                       <div class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
-                          afterdialysis.dialysis_intakes
+                        <span>
+                          {{ afterdialysis.dialysis_intakes
                             ? afterdialysis.dialysis_intakes
                             : ""
-                        }}
+                          }}
+                        </span>
+                        
                       </div>
 
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

         const obj0 = '血液净化方式'
         checkDate.push(obj0)
       }
-      if(this.prescription.dialyzer_perfusion_apparatus ==''){
+      if(this.prescription.dialysis_dialyszers =='' && this.prescription.dialysis_irrigation == ''){
         const obj = '血液净化器类型'
         checkDate.push(obj)
       } if(this.prescription.dialysate_formulation_name ==''){
       } if(this.predialysis.blood_access_part_opera_name ==''){
         const obj3 = '血管通路'
         checkDate.push(obj3)
-      } if(this.predialysis.catheter == ''){
+      } if(this.predialysis.catheter == '' && this.predialysis.internal_fistula ==''){
         const obj4 = '透前导管'
         checkDate.push(obj4)
-      } if(this.predialysis.internal_fistula ==''){
+      } if(this.predialysis.internal_fistula =='' && this.predialysis.catheter == ''){
         const obj5 = '透前内瘘'
         checkDate.push(obj5)
       } if(this.prescription.anticoagulant == 0){
       ){
         const obj31 = '透后血压'
         checkDate.push(obj31)
-      } if(this.afterdialysis.symptom_after_dialysis == ""){
-        const obj32 = '透后症状'
-        checkDate.push(obj32)
-      } if(this.afterdialysis.actual_displacement == 0){
+      } 
+      if(this.afterdialysis.actual_displacement == 0){
         const obj33 = '实际置换量'
         checkDate.push(obj33)
-      } if(this.afterdialysis.is_eat == 0){
-        const obj34 = '透析期间进食'
-        checkDate.push(obj34)
       } if(this.predialysis.is_eat == 1 && this.predialysis.dialysis_during == 0){
         const obj35 = '透析进食'
         checkDate.push(obj35)
       } if(this.summary.dialysis_summary == ""){
         const obj41 = '透析小结'
         checkDate.push(obj41)
-      } if(this.summary.special_record == ""){
-        const obj42 = '病情记录'
-        checkDate.push(obj42)
       } if(this.tableAdvice.length > 0){
         this.tableAdvice.map((item) =>{
           if(item.id > 0 && (item.created_time || item.start_time)){
     },
     getcheckData(val){
       if(val.length >0){
-        let message = `记录单未填数据:<br/><br/>&nbsp;&nbsp;${val.join("<br/><br/>&nbsp;&nbsp;")}`;
-        this.$message({
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
           dangerouslyUseHTMLString: true,
-          message:message,
-          duration:0,
-          showClose:true,
-          type:'error'
-        })
-        return message
+          
+        });
+        // return message
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/eleFaPiao/settleDetail.vue

           </template>
         </el-table-column>
 
+
+        <el-table-column
+          align="center"
+          width="100"
+          prop="name"
+          label="医疗费总额"
+        >
+          <template slot-scope="scope">
+            {{scope.row.medfee_sumamt}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column
           align="center"
           width="100"