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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           >
                           碳酸氢钠<br />(ml)
                           </td>
-
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 0 || org_id == 9829
+                            "
+                          >
+                            SpO₂<br />(%)
+                          </td>
                           <td width="200">病情变化及处理</td>
                         </tr>
 
                           >
                            {{ 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

                   </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

                         <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>
 
                           />
                           </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/outpatientDoctorStation/doctorDesk.vue

                   </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

             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

               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

             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

           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

             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

             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
              this.houseList = response.data.data.storeHouseList
 
              this.docList = response.data.data.doclist
+            
            }
          })
         },

src/xt_pages/user/components/PatientDetail.vue

                 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">
             } 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

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

src/xt_pages/user/inspection.vue

               
               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

                       </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>