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

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/anticoagulant.vue

@@ -322,6 +322,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        console.log('抗凝剂params',params);
         Getdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.prescriptions
@@ -352,7 +353,9 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
+        this.currentPage =1
         this.getGetdetail(this.dialyze_value)
+       
       },
       //导出excel
       exportExcel(){

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue

@@ -223,11 +223,11 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        // status_options:[],
+        status_options:[],
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
+        // status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -272,14 +272,14 @@ import html2canvas from "html2canvas"
               yAxis.push(key)
             }
             const status = []
-            // for(let i in yAxis){
-            //   const obj ={
-            //     value:(i*1)+1,
-            //     label:yAxis[i]
-            //   }
-            //   status.push(obj)
-            // }
-            // this.status_options = status
+            for(let i in yAxis){
+              const obj ={
+                value:(i*1)+1,
+                label:yAxis[i]
+              }
+              status.push(obj)
+            }
+            this.status_options = status
             console.log('this.status_options',this.status_options);
             const option = {
                 title:{
@@ -340,13 +340,14 @@ import html2canvas from "html2canvas"
             myChart.setOption(option);
             myChart.on('click',params =>{
               this.complete_dialog = true
-              console.log('bbbb',params);
+              console.log('bbbb完成率',params);
               var status_id =''
               for(let i in this.status_options){
                 if(params.data.name == this.status_options[i].label){
                   status_id = this.status_options[i].value
                 }
               }
+              this.status_value = status_id
               this.getdetail(status_id)
             })
           }
@@ -359,6 +360,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       detil_click(){
+        this.currentPage = 1
         this.getdetail(this.status_value)
       },
        // 下载
@@ -446,7 +448,7 @@ import html2canvas from "html2canvas"
             this.tableData = table
             this.total = response.data.data.total
           }
-          console.log('55555',response);
+          console.log('55555',params);
         })
       },
       // 选择日期

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/dialyzer.vue

@@ -282,7 +282,7 @@ import html2canvas from "html2canvas"
             const options = []
             for(let i in xAxis){
               const arr ={
-                id:i+1,
+                id:(i*1)+1,
                 name:xAxis[i]
               }
               options.push(arr)
@@ -375,6 +375,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
+        this.currentPage =1
         this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
        // 下载 
@@ -646,6 +647,7 @@ import html2canvas from "html2canvas"
       },
       getdialyze(val){
         const option = this.dialyze_options
+        console.log('透析器option',option);    
         for(let i in option){
           if(val == option[i].id){
             return option[i].name

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1783,7 +1783,14 @@
                           >
                           碳酸氢钠<br />(ml)
                           </td>
-
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 0 || org_id == 9829
+                            "
+                          >
+                            SpO₂<br />(%)
+                          </td>
                           <td width="200">病情变化及处理</td>
                         </tr>
 
@@ -2041,6 +2048,17 @@
                           >
                            {{ monitor_record.dicarbonate  }}<br />
                           </td>
+                          <td
+                            v-if="
+                              org_id == 0 || org_id == 9829
+                            "
+                          >
+                            {{
+                              monitor_record.blood_oxygen_saturation
+                                ? monitor_record.blood_oxygen_saturation
+                                : ""
+                            }}
+                          </td>
 
                           <td style="line-height: 16px; padding: 0px">
                             <div

src/xt_pages/dialysis/details/index.vue

@@ -568,6 +568,12 @@
                   </div>
                   <div></div>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析器:
+                   <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
+                  </div>
+                 
+                </div>
               </div>
             </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1836,6 +1836,7 @@
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 ">碳酸氢钠<br />(ml)</td>
                         <td width="50" v-if="org_id == 10598">护士签名</td>
+                        <td width="50" v-if="org_id == 9829 || org_id == 0">SpO₂<br />(%)</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -2021,6 +2022,10 @@
                           />
                           </span>
                         </td>
+                        <td v-if="org_id == 0||org_id == 9829">
+                          {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
+                        </td>
+                       
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,7 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 
+          org_id==10537 || org_id == 0
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -72,14 +72,14 @@
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 && org_id != 9504 && org_id != 10028 &&
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 && 
-            org_id != 10210 &&org_id != 10485 &&org_id != 10480 && 
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&
+            org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&
             org_id != 10510 &&org_id != 10088 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && 
-            org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 && 
+            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
+            org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
             org_id != 10510 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
@@ -512,7 +512,7 @@ export default {
             scanStyles: false
           })
         }else if (
-          this.$store.getters.xt_user.org_id == 10633 || this.$store.getters.xt_user.org_id == 0
+          this.$store.getters.xt_user.org_id == 10633
         ) {
           const style =
             '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable {border-collapse: collapse;} table tr td {padding: 2px;line-height: 30px;border: 1px solid black;}'
@@ -525,7 +525,8 @@ export default {
 
         } else {
           const style =
-            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable{border-collapse: collapse;} table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
+            // '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable{border-collapse: collapse;} table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
+            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;} .statementTable{border-collapse: collapse;} table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 69%;}}}'
           printJS({
             printable: 'statement-print',
             type: 'html',

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -653,6 +653,13 @@
                   </div>
                 </div>
 
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析器:
+                   <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
+                  </div>
+                 
+                </div>
+
 
               </div>
             </div>

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -256,13 +256,17 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             start_time:this.$route.query.start_time,
             end_time:this.$route.query.end_time,
           }
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           console.log("params-------",params)
           getDrugInventroyModePrintList(params).then(response=>{
               if(response.data.state == 1){
+                 loading.close()
                  var list  =  response.data.data.list
-
-                 console.log("list===============998",list)
-
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {

src/xt_pages/stock/drugs/inventoryRecordPrint.vue

@@ -130,8 +130,15 @@ export default {
               start_time:this.$route.query.start_time,
               end_time:this.$route.query.end_time,
             }
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+           })
           getInventoryRecordPrintList(params).then(response=>{
              if(response.data.state == 1){
+              loading.close()
               this.total =  response.data.data.total
               this.tableData = response.data.data.list
               this.houseList = response.data.data.houseList

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -770,11 +770,15 @@ export default {
             arr.push(this.tableData[i])
          }
        }
-     if(arr.length == 0){
-       this.$message.error("请修改数据后保存!")
-       loading.close()
-       return false
+
+      if(this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10697){
+        if(arr.length == 0){
+          this.$message.error("请修改数据后保存!")
+          loading.close()
+          return false
+        }
       }
+   
        var params = {
          tableData:arr,
          newTableData:this.tableData

src/xt_pages/stock/newInventory.vue

@@ -406,11 +406,15 @@ export default {
           arr.push(this.tableData[i])
         }
       }
-      if(arr.length == 0){
-       this.$message.error("请修改数据后保存!")
-       loading.close()
-       return false
+
+      if(this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10697){
+        if(arr.length == 0){
+        this.$message.error("请修改数据后保存!")
+        loading.close()
+        return false
+       }
       }
+     
       var params = {
          tableData:arr,
          storehouse_id:this.storehouse_id,

src/xt_pages/stock/stockInventoryModePrint.vue

@@ -260,10 +260,16 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
             end_time:this.$route.query.end_time,
           }
           console.log("params-------",params)
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           getStockInventroyModePrintList(params).then(response=>{
               if(response.data.state == 1){
                  var list  =  response.data.data.list
-
+                  loading.close()
                  console.log("list===============",list)
 
                 if(list!=null && list.length > 0){

src/xt_pages/stock/stockInventoryPrint.vue

@@ -113,8 +113,15 @@ export default {
             page:this.$route.query.page,
             ids:this.$route.query.ids,
           }
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
          getStockInventoryPrintList(params).then(response=>{
            if(response.data.state == 1){
+             loading.close()
              var list = response.data.data.list
              console.log("list232332232323",response.data.data.list)
              this.tableList = list
@@ -122,6 +129,7 @@ export default {
              this.houseList = response.data.data.storeHouseList
 
              this.docList = response.data.data.doclist
+            
            }
          })
         },

src/xt_pages/user/components/PatientDetail.vue

@@ -121,7 +121,7 @@
                 label="身份证号 : "
                 class="is-required"
               >
-                <el-input v-model="form.idCardNo" disabled></el-input>
+                <el-input v-model="form.idCardNo" disabled   @blur="checkIdCardNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8" style="height: 59px">
@@ -2098,7 +2098,7 @@ export default {
             } else {
               this.patientPrint.hospital_first_dialysis_date = "";
             }
-            this.checkIdCardNo();
+            // this.checkIdCardNo();
           } else {
             console.log("patient get err state");
             this.$notify.error({

src/xt_pages/user/components/PatientForm.vue

@@ -131,6 +131,7 @@
                   label="身份证号 : "
                 >
                   <el-input
+                    @blur="checkIdCardNo"
                     v-model="form.idCardNo"
                   ></el-input><!---->
                 </el-form-item>
@@ -2122,7 +2123,7 @@ export default {
             this.form.infectious_remark = patietInfo.infectious_remark
 
 
-            this.checkIdCardNo();
+            // this.checkIdCardNo();
           } else {
             this.$notify.error({
               title: "错误",

src/xt_pages/user/inspection.vue

@@ -1330,7 +1330,7 @@ export default {
               
               if (item.item_id > 0) {
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
-                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id == 0 || this.org_id ==10278 || this.org_id == 10702){
+                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id == 0 || this.org_id ==10278 || this.org_id == 10702 || this.org_id == 10191){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{

src/xt_pages/user/lapsoSummary.vue

@@ -124,7 +124,7 @@
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
-                <el-col :span="24" v-if="lapseto == 2">
+                <el-col :span="24" v-if="lapseto == 2 || lapseto == 3 || lapseto == 4">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
                             <el-radio  label="1">转入</el-radio>