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

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -700,22 +700,22 @@ export default {
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
 
-        // var textarea = ""
-        // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-
-        var  textAreaList = this.textarea.split(",")
-          var textarea = ""
-          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-          var  parts = textarea.split(',')
-          for(let i=0;i<textAreaList.length;i++){
-            if(parts[parts.length-2] == textAreaList[i]){
-                this.$message.error("该条码已经存在,不能重复扫码")
-            }
-          }
+        var textarea = ""
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+
+          // var  textAreaList = this.textarea.split(",")
+          // var textarea = ""
+          // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+          // var  parts = textarea.split(',')
+          // for(let i=0;i<textAreaList.length;i++){
+          //   if(parts[parts.length-2] == textAreaList[i]){
+          //       this.$message.error("该条码已经存在,不能重复扫码")
+          //   }
+          // }
 
-          const uniqueStr = [...new Set(textarea.split(','))].join(',');
+          // const uniqueStr = [...new Set(textarea.split(','))].join(',');
 
-          var textarea = uniqueStr
+          // var textarea = uniqueStr
 
 
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10726){

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1350,21 +1350,21 @@ export default {
         // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
         if (event.key === 'Enter') {
 
-          // var textarea = ""
-          // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-          var  textAreaList = this.textarea.split(",")
           var textarea = ""
           textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-          var  parts = textarea.split(',')
-          for(let i=0;i<textAreaList.length;i++){
-            if(parts[parts.length-2] == textAreaList[i]){
-                this.$message.error("该条码已经存在,不能重复扫码")
-            }
-          }
+          // var  textAreaList = this.textarea.split(",")
+          // var textarea = ""
+          // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+          // var  parts = textarea.split(',')
+          // for(let i=0;i<textAreaList.length;i++){
+          //   if(parts[parts.length-2] == textAreaList[i]){
+          //       this.$message.error("该条码已经存在,不能重复扫码")
+          //   }
+          // }
 
-          const uniqueStr = [...new Set(textarea.split(','))].join(',');
+          // const uniqueStr = [...new Set(textarea.split(','))].join(',');
 
-          var textarea = uniqueStr
+          // var textarea = uniqueStr
         
 
           if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1902,6 +1902,22 @@ export default {
    this.complicationList = getDataConfig("hemodialysis", "complication");
     var search_mode = this.$store.getters.search_mode
     var search_value = this.$store.getters.search_value
+
+    var start_time = localStorage.getItem("start_time")
+
+    this.listQuery.start_time = ""
+    this.listQuery.start_time = start_time
+
+    var end_time =  localStorage.getItem("end_time")
+
+    this.listQuery.end_time = ""
+
+    this.listQuery.end_time = end_time
+
+    var keywords = localStorage.getItem("keywords")
+
+    this.listQuery.keywords = keywords 
+
     console.log('search_mode',search_mode)
     if(search_mode == 2){
       this.search_mode = search_mode
@@ -2719,6 +2735,9 @@ export default {
       this.getSchedualPatientList();
     },
     batchPrintAction: function() {
+      localStorage.setItem("start_time",this.listQuery.start_time);
+      localStorage.setItem("end_time",this.listQuery.end_time);
+      localStorage.setItem("keywords",this.listQuery.keywords);
       if (this.selecting_schs.length === 0) {
         this.$message.error("请至少选择一条需要打印的内容");
         return false;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1454,7 +1454,7 @@
                           <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>
                           <td width="50" v-if="org_id == 10490">碳酸氢钠<br />(ml)</td>
-                          <td width="50" v-if="org_id == 10598 || org_id == 10726">护士签名</td>
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726 || org_id == 10744">护士签名</td>
                           <td width="50" v-if="org_id == 9829">SpO₂<br />(%)</td>
                           <td width="200">病情变化及处理</td>
                         </tr>
@@ -1690,7 +1690,7 @@
                           <td width="50" v-if="org_id == 10490">
                             {{ monitor.dicarbonate ? monitor.dicarbonate : "" }}
                           </td>
-                          <td width="50" v-if="org_id == 10598 || org_id == 10726">
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726 || org_id == 10744">
                             <span v-if="monitor.creator == 0">
                               <span v-if="setAdminUserES(monitor.modify) == ''">{{ getAdminUser(monitor.modify)
                                 }}</span>

src/xt_pages/user/patients.vue

@@ -312,6 +312,18 @@
             />
         </el-select>
       </div>
+      <div  class="cell clearfix">
+        <label class="title"><span class="name">参保类型</span> : </label>
+        <el-select v-model="listQuery.insurance_type" style="width:200px"  @change="changeInsuranceType">
+            <el-option
+              placeholder="参保类型"
+              v-for="(item,index) in  insurance_type_list"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
+        </el-select>
+      </div>
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -943,6 +955,7 @@
           nurse:0,
           patient_type:"",
           insuplc_admdvs_name:"全部",
+          insurance_type:0
         },
         multipleSelection: [],
         bindWechatDialog: false,
@@ -982,7 +995,12 @@
         patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
                         {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
         ],
-        patientZoneList:[]
+        patientZoneList:[],
+        insurance_type_list:[
+          {id:0,name:"全部"},
+          {id:310,name:"职工"},
+          {id:390,name:"城乡"}
+        ]
       }
     },
     created() {
@@ -1590,6 +1608,9 @@
         this.listQuery.page = val
         this.getList()
       },
+      changeInsuranceType(){
+        this.getList()
+      },
       changeCategoryId(categoryId) {
         this.categoryId = categoryId
       },