Parcourir la source

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

陈少旭 il y a 1 mois
Parent
révision
31fcd7ee37

+ 9 - 0
src/api/stock.js Voir le fichier

@@ -1160,4 +1160,13 @@ export function getDrugInventroyModePrintList(params){
1160 1160
     method:"Get",
1161 1161
     params:params,
1162 1162
   })
1163
+}
1164
+
1165
+export function getGoodWarehosueInPrintList(params){
1166
+
1167
+  return request({
1168
+    url:"/api/patient/getgoodwarehouseinprintlist",
1169
+    method:"get",
1170
+    params:params,
1171
+  })
1163 1172
 }

+ 8 - 5
src/xt_pages/Pharmacy/DrugDispensing.vue Voir le fichier

@@ -703,7 +703,7 @@ export default {
703 703
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
704 704
 
705 705
       
706
-        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 == 0){
706
+        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){
707 707
           
708 708
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
709 709
          
@@ -755,13 +755,16 @@ export default {
755 755
                    this.$message.error("药品追溯码长度没有满足20位!")
756 756
                    is_err_check = true
757 757
                  }
758
-                 if(drugindentificaitoncode>0){
759
-                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
760
-                    this.$message.error("药品标识码格式不正确,请重新扫码")
761
-                    is_err_check = true
758
+                 if(this.$store.getters.xt_user.org.id!=10726){
759
+                  if(drugindentificaitoncode>0){
760
+                    if(arr[i].substring(0,7)!= drugindentificaitoncode){
761
+                      this.$message.error("药品标识码格式不正确,请重新扫码")
762
+                      is_err_check = true
763
+                    }
762 764
                   }
763 765
                  }
764 766
                 
767
+                
765 768
 
766 769
                }
767 770
 

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue Voir le fichier

@@ -157,8 +157,8 @@
157 157
           <label>目标超滤量 : </label>
158 158
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
159 159
           
160
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723 &&  this.$store.getters.xt_user.template_info.org_id != 10731 &&  this.$store.getters.xt_user.template_info.org_id != 10727 &&  this.$store.getters.xt_user.template_info.org_id != 10751"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
161
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
160
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723 &&  this.$store.getters.xt_user.template_info.org_id != 10731 &&  this.$store.getters.xt_user.template_info.org_id != 10727 &&  this.$store.getters.xt_user.template_info.org_id != 10751 && this.$store.getters.xt_user.template_info.org_id != 10768"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
161
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10768" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
162 162
         </li>
163 163
 
164 164
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

+ 2 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Voir le fichier

@@ -136,7 +136,7 @@
136 136
                     </el-col>
137 137
 
138 138
                     <el-col :span="8"
139
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751)">
139
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10768)">
140 140
                         <el-form-item label="目标超滤量(ml):"
141 141
                         prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
142 142
                             <el-input
@@ -150,7 +150,7 @@
150 150
 
151 151
 
152 152
                     <el-col :span="8"
153
-                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723 && this.$store.getters.xt_user.template_info.org_id != 10731 && this.$store.getters.xt_user.template_info.org_id != 10727&& this.$store.getters.xt_user.template_info.org_id != 10751">
153
+                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723 && this.$store.getters.xt_user.template_info.org_id != 10731 && this.$store.getters.xt_user.template_info.org_id != 10727&& this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10768">
154 154
                         <el-form-item
155 155
                         label="目标超滤量(L):" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
156 156
                             <el-input

+ 4 - 4
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Voir le fichier

@@ -784,7 +784,7 @@
784 784
                 org_id!=10558 &&
785 785
                 org_id!=10517 && 
786 786
                 org_id!=10414 && 
787
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731 && org_id!=10744&& org_id!=10766) ||
787
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731 && org_id!=10744&& org_id!=10766&& org_id!=10768) ||
788 788
                 org_id == 9779 ||
789 789
                 template_id == 11 ||
790 790
                 template_id == 20 ||
@@ -820,7 +820,7 @@
820 820
             width="100"
821 821
             v-if="
822 822
               isShow('置换量') &&
823
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731 || org_id == 10731 || org_id == 10744 || org_id == 10766) &&
823
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768) &&
824 824
               template_id != 9779 &&
825 825
               template_id != 11 &&
826 826
               template_id != 20 &&
@@ -2014,7 +2014,7 @@
2014 2014
             :span="8"
2015 2015
             v-if="
2016 2016
               isShow('置换量') &&
2017
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766) &&
2017
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768) &&
2018 2018
               org_id != 9779 &&
2019 2019
               template_id != 11 &&
2020 2020
               template_id != 20 &&
@@ -2048,7 +2048,7 @@
2048 2048
                 org_id != 9919 &&
2049 2049
                 org_id != 10191 &&
2050 2050
                 org_id != 10551 &&
2051
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206 && org_id!=10731 && org_id!=10744&& org_id!=10766) ||
2051
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206 && org_id!=10731 && org_id!=10744&& org_id!=10766&& org_id!=10768) ||
2052 2052
                 org_id == 9779 ||
2053 2053
                 template_id == 11 ||
2054 2054
                 template_id == 20 ||

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue Voir le fichier

@@ -34,8 +34,8 @@
34 34
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
35 35
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
36 36
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
37
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766" width="92px"  > 置换量(ml)  </th>
38
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731 || org_id == 10744 || org_id == 10766" width="92px" > 置换量(L) </th>
37
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766&& org_id!=10768" width="92px"  > 置换量(ml)  </th>
38
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768" width="92px" > 置换量(L) </th>
39 39
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
40 40
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
41 41
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

+ 1 - 1
src/xt_pages/dialysis/details/index.vue Voir le fichier

@@ -468,7 +468,7 @@
468 468
                 </div>
469 469
                 <div class="printCell" style="display:flex;">
470 470
                   <span style="display: block;width: 45%;" v-if="org_id !=10757">目标脱水量:{{ main_collection.prescription.target_ultrafiltration }}
471
-                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138 || $store.getters.xt_user.org.id == 10460">ml</span>
471
+                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138 || $store.getters.xt_user.org.id == 10460  || $store.getters.xt_user.org.id == 10345">ml</span>
472 472
                     <span v-else>L</span>
473 473
                   </span>
474 474
                   <div style="width: 45%;" v-if="org_id ==10757 ">

+ 1 - 1
src/xt_pages/stock/detail/cancelStockDetail.vue Voir le fichier

@@ -98,7 +98,7 @@
98 98
           :trigger-on-focus="true"
99 99
           placeholder="请输入耗材名称"
100 100
           @select="handleSelect"
101
-          style="width:300px;"
101
+          style="width:500px;"
102 102
           :popper-append-to-body="true"
103 103
         >
104 104
           <i class="el-icon-search el-input__icon" slot="suffix"></i>

+ 313 - 7
src/xt_pages/stock/detail/stockInDetail.vue Voir le fichier

@@ -9,6 +9,9 @@
9 9
       >打印
10 10
     </el-button>
11 11
 
12
+  
13
+
14
+
12 15
     <el-button
13 16
       style="float: right;margin-right:10px"
14 17
       size="small"
@@ -52,7 +55,7 @@
52 55
         >搜索</el-button
53 56
       >
54 57
     
55
-    
58
+   
56 59
       
57 60
 
58 61
 
@@ -104,7 +107,7 @@
104 107
         :trigger-on-focus="true"
105 108
         placeholder="请输入耗材名称"
106 109
         @select="handleSelect"
107
-        style="width:300px;"
110
+        style="width:500px;"
108 111
         :popper-append-to-body="true"
109 112
       >
110 113
         <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -112,6 +115,15 @@
112 115
         <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
113 116
       </template>
114 117
     </el-autocomplete>
118
+
119
+    <!-- <el-button
120
+      style="float: right"
121
+      size="small"
122
+      icon="el-icon-printer"
123
+      @click="BatchPrintAction"
124
+      type="primary"
125
+      >批量打印
126
+    </el-button> -->
115 127
     </div>
116 128
 
117 129
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
@@ -221,11 +233,180 @@
221 233
         :total="total"
222 234
       >
223 235
       </el-pagination>
224
-    <!-- </el-row> -->
236
+   
237
+    <div>
238
+
239
+    <el-dialog
240
+      title="入库记录"
241
+      :visible.sync="dialogVisible"
242
+      width="80%"
243
+      top="5vh"
244
+      :close-on-click-modal="false"
245
+    >
246
+      <!-- 查询条件区域 -->
247
+      <div class="filter-container">
248
+        <el-row :gutter="20">
249
+          <el-col :span="8">
250
+            <span class="demonstration">日期查询:</span>
251
+            <el-date-picker
252
+              size="small"
253
+              v-model="listQuery.start_time"
254
+              prefix-icon="el-icon-date"
255
+              @change="changeTime"
256
+              :editable="false"
257
+              style="width: 196px;"
258
+              type="date"
259
+              placeholder="选择日期时间"
260
+              align="right"
261
+              :picker-options="pickerOptions"
262
+              format="yyyy-MM-dd"
263
+              value-format="yyyy-MM-dd"
264
+           ></el-date-picker>
265
+            -
266
+            <el-date-picker
267
+              size="small"
268
+              v-model="listQuery.end_time"
269
+              prefix-icon="el-icon-date"
270
+              @change="changeTime"
271
+              :editable="false"
272
+              style="width: 196px;"
273
+              type="date"
274
+              placeholder="选择日期时间"
275
+              align="right"
276
+              :picker-options="pickerOptions"
277
+              format="yyyy-MM-dd"
278
+              value-format="yyyy-MM-dd"
279
+            ></el-date-picker>
280
+          </el-col>
281
+          <el-col  :span="8">
282
+            <el-autocomplete
283
+                class="checkSearch"
284
+                popper-class="my-autocomplete"
285
+                v-model="good_name"
286
+                :fetch-suggestions="querySearchAsync"
287
+                :trigger-on-focus="true"
288
+                placeholder="请输入耗材名称"
289
+                @select="handleSelect"
290
+                style="width:500px;"
291
+                :popper-append-to-body="true"
292
+              >
293
+                <i class="el-icon-search el-input__icon" slot="suffix"></i>
294
+              <template slot-scope="{ item }">
295
+                <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
296
+              </template>
297
+           </el-autocomplete>
298
+
299
+          </el-col>
300
+          <el-col :span="2">
301
+            <el-button type="primary" @click="handleQuery" style="width: 100%">查询</el-button>
302
+          </el-col>
303
+        </el-row>
304
+      </div>
305
+      
306
+      <!-- 操作按钮区域 -->
307
+      <div class="operation-buttons">
308
+        <el-button type="primary" @click="toGoodPrint">打印</el-button>
309
+        <!-- <el-button type="primary" @click="toPrint">导出</el-button> -->
310
+      </div>
311
+      
312
+      <!-- 表格区域 -->
313
+      <el-table
314
+        :data="tablePrintData"
315
+        border
316
+        style="width: 100%"
317
+        height="60vh"
318
+        v-loading="loading"
319
+        @selection-change="batchSelect"
320
+        element-loading-text="数据加载中"
321
+      >
322
+      <el-table-column align="center" type="selection" width="55">
323
+      </el-table-column>
324
+        <el-table-column prop="index" label="序号" width="60" align="center">
325
+          <template slot-scope="scope">
326
+              {{ scope.$index+1 }}  
327
+          </template>
328
+        </el-table-column>
329
+          
330
+        <el-table-column prop="medicalCode" label="医保编码" width="200" align="center">
331
+          <template slot-scope="scope">
332
+             {{ getSocialSecurityDirectoryCode(scope.row.good_id) }}
333
+          </template>
334
+        </el-table-column>
335
+        <el-table-column prop="name" label="耗材名称" width="180" align="center">
336
+          <template slot-scope="scope">
337
+            {{ getGoodName(scope.row.good_id) }}
338
+          </template>
339
+        </el-table-column>
340
+        <el-table-column prop="specification" label="耗材规格" width="200" align="center">
341
+          <template slot-scope="scope">
342
+            {{ getSpecificationName(scope.row.good_id) }}
343
+          </template>
344
+        </el-table-column>
345
+        <el-table-column prop="unit" label="单位" width="80" align="center">
346
+          <template slot-scope="scope">
347
+              {{ getPackingUnit(scope.row.good_id) }}
348
+           </template>
349
+        </el-table-column>
350
+        <el-table-column prop="batchNumber" label="批号" width="120" align="center">
351
+          <template slot-scope="scope">
352
+              {{ scope.row.number }}
353
+           </template>
354
+        </el-table-column>
355
+        <el-table-column prop="productionDate" label="生产日期" width="120" align="center">
356
+          <template slot-scope="scope">
357
+             {{ getTime(scope.row.product_date) }}
358
+          </template>
359
+        </el-table-column>
360
+        <el-table-column prop="expiryDate" label="有效日期" width="120" align="center">
361
+          <template slot-scope="scope">
362
+             {{ getTime(scope.row.expiry_date) }}
363
+          </template>
364
+        </el-table-column>
365
+        <el-table-column prop="purchasePrice" label="进货单价" width="100" align="center">
366
+          <template slot-scope="scope">
367
+             {{ scope.row.price }}
368
+          </template>
369
+        </el-table-column>
370
+
371
+        <el-table-column prop="stockQuantity" label="入库数量" width="100" align="center">
372
+           <template slot-scope="scope">
373
+            {{ scope.row.warehousing_count }}
374
+           </template>
375
+        </el-table-column>
376
+        <el-table-column prop="stockAmount" label="入库金额" width="120" align="center">
377
+          <template slot-scope="scope">
378
+             {{ (scope.row.price * scope.row.warehousing_count).toFixed(2) }}
379
+          </template>
380
+        </el-table-column>
381
+
382
+        <el-table-column prop="purchasePrice" label="零售价" width="100" align="center">
383
+          <template slot-scope="scope">
384
+             {{ scope.row.packing_price }}
385
+          </template>
386
+        </el-table-column>
387
+      </el-table>
388
+      
389
+      <div slot="footer" class="dialog-footer">
390
+        <el-button @click="dialogVisible = false">关闭</el-button>
391
+      </div>
392
+    </el-dialog>
393
+    </div>
394
+
395
+    <good-print
396
+      ref="goodPrint"
397
+      :visibility="isVisibility"
398
+      :propsTable="propsTable"
399
+    >
400
+    </good-print>
401
+
225 402
   </div>
403
+
404
+  
226 405
 </template>
227 406
 
228 407
 <script>
408
+import goodPrint from "../goodPrint.vue";
409
+const moment = require('moment')
229 410
 import { uParseTime } from "@/utils/tools";
230 411
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
231 412
 import {
@@ -234,12 +415,15 @@ import {
234 415
   getStockDetail,
235 416
   getPrintStockGood,
236 417
   getGoodDetailPrintList,
237
-  postSearchGoodList
418
+  postSearchGoodList,
419
+  getGoodWarehosueInPrintList
238 420
 } from "@/api/stock";
239 421
 
240 422
 export default {
241 423
   name: "stockInDetail",
242
-
424
+  components: {
425
+    goodPrint,
426
+  },
243 427
   created() {
244 428
 
245 429
     var nowDate = new Date();
@@ -322,12 +506,134 @@ export default {
322 506
       dealerList:[],
323 507
       currentIndex:0,
324 508
       good_id:0,
325
-      goodKindList:[]
509
+      goodKindList:[],
510
+      dialogVisible:false,
511
+      loading: false,
512
+      queryParams: {
513
+        dateRange: [],
514
+        itemType: '',
515
+        stockType: '',
516
+        keyword: ''
517
+      },
518
+      listQuery:{
519
+       start_time: moment().startOf('month').format('YYYY-MM-DD'),
520
+       end_time:moment().endOf('month').format('YYYY-MM-DD')
521
+      },
522
+      tableData: [],
523
+      pagination: {
524
+        currentPage: 1,
525
+        pageSize: 20,
526
+        total: 0
527
+      },
528
+      tablePrintData:[],
529
+      goodList:[],
530
+      goodsType:[],
531
+      idsList:[],
532
+      printData:[],
533
+      isVisibility: "",
534
+      propsTable: "",
535
+
326 536
     };
327 537
   },
328 538
   methods: {
539
+    changeTime(){
540
+
541
+    },
542
+    pickerOptions(){
543
+
544
+    },
545
+    toGoodPrint() {
546
+      // if (this.state == 1 && this.multipleSelection.length == 0) {
547
+      //   this.$message.error("未选择任何数据");
548
+      //   return;
549
+      // }
550
+      // if (this.state == 2 && this.tableData == null) {
551
+      //   this.$message.error("未选择任何数据");
552
+      //   return;
553
+      // }
554
+      this.$refs.goodPrint.show(
555
+        this.printData,
556
+      );
557
+    },
558
+    batchSelect(selection){
559
+
560
+      this.printData = []
561
+      for(let i=0;i<selection.length;i++){
562
+        for(let j=0;j<this.tablePrintData.length;j++){
563
+           if(selection[i].id == this.tablePrintData[j].id){
564
+               this.printData.push(this.tablePrintData[j])
565
+           }
566
+        } 
567
+      }
568
+      console.log("打印数据=====",this.printData)
569
+    },
570
+    BatchPrintAction(){
571
+      this.dialogVisible = true
572
+    },
573
+    getSocialSecurityDirectoryCode(good_id){
574
+       var social_security_directory_code = ""
575
+       for(let i=0;i<this.goodList.length;i++){
576
+         if(good_id == this.goodList[i].id){
577
+           social_security_directory_code = this.goodList[i].social_security_directory_code
578
+         }
579
+       }
580
+       return social_security_directory_code
581
+    },
582
+    getGoodName(good_id){
583
+      var good_name = ""
584
+       for(let i=0;i<this.goodList.length;i++){
585
+         if(good_id == this.goodList[i].id){
586
+           good_name = this.goodList[i].good_name
587
+         }
588
+       }
589
+       return good_name
590
+    },
591
+    getSpecificationName(good_id){
592
+      var specification_name = ""
593
+       for(let i=0;i<this.goodList.length;i++){
594
+         if(good_id == this.goodList[i].id){
595
+          specification_name = this.goodList[i].specification_name
596
+         }
597
+       }
598
+       return specification_name
599
+    },
600
+    getPackingUnit(good_id){
601
+      var packing_unit = ""
602
+       for(let i=0;i<this.goodList.length;i++){
603
+         if(good_id == this.goodList[i].id){
604
+          packing_unit = this.goodList[i].packing_unit
605
+         }
606
+       }
607
+       return packing_unit
608
+    },
609
+    handleQuery(){
610
+      var params = {
611
+        start_time:this.listQuery.start_time,
612
+        end_time:this.listQuery.end_time,
613
+        good_id:this.good_id,
614
+      }
615
+      console.log("param===",params)
616
+      getGoodWarehosueInPrintList(params).then(response=>{
617
+        if(response.data.state == 1){
618
+          var list = response.data.data.list
619
+          this.tablePrintData = list
620
+          var manufacturerList = response.data.data.manufacturerList
621
+          this.manufacturerList = []
622
+          this.manufacturerList = manufacturerList
623
+          var dealerList = response.data.data.dealerList
624
+          this.dealerList = []
625
+          this.dealerList = dealerList
626
+          var goodList = response.data.data.goodList
627
+          this.goodList = []
628
+          this.goodList= goodList
629
+          var goodsType = response.data.data.goodsType
630
+          this.goodsType = []
631
+          this.goodsType = goodsType
632
+
633
+        }
634
+      })
635
+    },
329 636
     getGoodKandName(id){
330
-     
331 637
       var name = ""
332 638
       for(let i=0;i<this.goodKindList.length;i++){
333 639
        if(id == this.goodKindList[i].value){

+ 1 - 1
src/xt_pages/stock/detail/stockOutDetail.vue Voir le fichier

@@ -107,7 +107,7 @@
107 107
         :trigger-on-focus="true"
108 108
         placeholder="请输入耗材名称"
109 109
         @select="handleSelect"
110
-        style="width:300px;"
110
+        style="width:500px;"
111 111
         :popper-append-to-body="true"
112 112
       >
113 113
         <i class="el-icon-search el-input__icon" slot="suffix"></i>

+ 1 - 1
src/xt_pages/stock/drugs/components/drugCancelDetail.vue Voir le fichier

@@ -86,7 +86,7 @@
86 86
           :trigger-on-focus="true"
87 87
           placeholder="请输入药品名称"
88 88
           @select="handleSelect"
89
-          style="width: 300px"
89
+          style="width: 500px"
90 90
         >
91 91
           <i class="el-icon-search el-input__icon" slot="suffix"></i>
92 92
           <template slot-scope="{ item }">

+ 1 - 1
src/xt_pages/stock/drugs/components/drugInOrder.vue Voir le fichier

@@ -96,7 +96,7 @@
96 96
         :trigger-on-focus="true"
97 97
         placeholder="请输入药品名称"
98 98
         @select="handleSelect"
99
-        style="width: 300px"
99
+        style="width: 500px"
100 100
       >
101 101
         <i class="el-icon-search el-input__icon" slot="suffix"></i>
102 102
         <template slot-scope="{ item }">

+ 1 - 1
src/xt_pages/stock/drugs/components/drugOutDetail.vue Voir le fichier

@@ -112,7 +112,7 @@
112 112
           :trigger-on-focus="true"
113 113
           placeholder="请输入药品名称"
114 114
           @select="handleSelect"
115
-          style="width: 300px"
115
+          style="width: 500px"
116 116
         >
117 117
           <i class="el-icon-search el-input__icon" slot="suffix"></i>
118 118
           <template slot-scope="{ item }">

+ 220 - 0
src/xt_pages/stock/goodPrint.vue Voir le fichier

@@ -0,0 +1,220 @@
1
+<template>
2
+    <el-dialog
3
+      title="打印"
4
+      :visible.sync="visibility"
5
+      :close-on-click-modal="isClose"
6
+      :close-on-press-escape="isClose"
7
+    >
8
+      <el-button type="primary" @click="print" class="print_style"
9
+        >打印</el-button
10
+      >
11
+      <div id="dialysis-print-box-1" class="dialysis-print-box-1">
12
+        <div class="list_title" style="border-bottom:none;">
13
+          <div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">
14
+            {{org_name}} <span v-if="state=='待发药'">发药单</span> <span v-if="state=='已发药'">领药单</span>
15
+          </div>
16
+        </div>
17
+        <div style="display: flex;">
18
+          <div style="margin-right: 20px;">日期:{{times}}</div>
19
+          <div>单据号:00013756</div>
20
+        </div>
21
+        <div>
22
+          <table class="table" border="1" 
23
+            style="border-collapse: collapse;border-left: none;border-right: none;width: 100%;text-align: center;border: 1;">
24
+            <tr>
25
+              <td>药品名称</td>
26
+              <td>规格</td>
27
+              <td>用量</td>
28
+              <td>用法</td>
29
+              <td>天数</td>
30
+              <td>总量</td>
31
+              <td>单价</td>
32
+              <td>金额</td>
33
+              <td>执行时间</td>
34
+            </tr>
35
+            <tr v-for="item in tableData" >
36
+              <td></td>
37
+              <td></td>
38
+              <td></td>
39
+              <td></td>
40
+              <td></td>
41
+              <td></td>
42
+              <td></td>
43
+              <td></td>
44
+              <td></td>
45
+            </tr>
46
+          </table>
47
+        </div>
48
+        <div style="display: flex;margin: 10px 0;">
49
+          <div style="flex: 1;">数量合计:</div>
50
+          <div style="flex: 1;">金额合计:</div>
51
+          <div style="flex: 1;">操作人:</div>
52
+          <div style="flex: 1;">核对人:</div>
53
+        </div>
54
+       
55
+      </div>
56
+    </el-dialog>
57
+  </template>
58
+  <script>
59
+  import Vue from "vue";
60
+  import print from "print-js";
61
+  import printutils from "./print.js";
62
+  import{todaynumber} from '@/api/pharmacy'
63
+  const moment = require("moment");
64
+  import { uParseTime } from "@/utils/tools";
65
+  export default {
66
+    
67
+    data() {
68
+      return {
69
+        visibility: false,
70
+        tableData: [],
71
+        isClose:false,
72
+        name:"",
73
+        DialysisNo:'',
74
+        state:null,
75
+        times:"",
76
+        start_time:moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
77
+        org_name: this.$store.getters.xt_user.org.org_name,
78
+        baseList:[],
79
+        Doctor:'',
80
+        patients:{},
81
+        doctors:[],
82
+        Price_zong:0,
83
+        diagnosearr:[],
84
+        diagnosis:'',
85
+      };
86
+    },
87
+    props: {
88
+      propForm: {
89
+        type: Object,
90
+      },
91
+    },
92
+    created(){
93
+      this.init();
94
+    },
95
+    methods: {
96
+     
97
+      init(){
98
+      
99
+      },
100
+  
101
+      hide: function () {
102
+        this.visibility = false;
103
+        for (let i = 0; i < this.propForm.goods.length; i++) {
104
+          for (let key in this.propForm.goods[i]) {
105
+            if (key != "index") {
106
+              this.propForm.goods[i][key].isSelected = false;
107
+            }
108
+          }
109
+        }
110
+      },
111
+      show: function (val) {
112
+        this.tableData = []
113
+        this.tableData = val
114
+        this.visibility = true;
115
+      },
116
+   
117
+      comfirm: function (formName) {
118
+        this.goodInfo = [];
119
+        this.goodInfoTableData = [];
120
+        this.$emit("dialog-comfirm", this.getValue());
121
+        this.$refs.multipleTable.clearSelection();
122
+        this.$refs.table.setCurrentRow(null);
123
+      },
124
+      getValue() {},
125
+  
126
+      // 打印
127
+      print() {
128
+        console.log(this.org_name,'this.org_name')
129
+        Vue.prototype.printJson = printutils.printJson;
130
+          const style =
131
+            '@media print {.list_title{width:940px;border-bottom:1px solid;display:flex;margin:20px auto} .table tr td{border:1px solid black;padding: 5px 0;border-left: none;border-right: none;}}';
132
+          printJS({
133
+            printable: "dialysis-print-box-1",
134
+            type: "html",
135
+            style: style,
136
+            scanStyles: false,
137
+          });
138
+      },
139
+      getSpecaiName(drug_id){
140
+         var spc =""
141
+         for(let i=0;i<this.baseList.length;i++){
142
+           if(drug_id == this.baseList[i].id){
143
+             spc = this.baseList[i].dose + this.baseList[i].dose_unit +"*"+this.baseList[i].min_number+this.baseList[i].min_unit+"/"+this.baseList[i].max_unit
144
+           }
145
+         }
146
+         return spc
147
+      },
148
+      getTime(val) {
149
+          if(val < 0){
150
+            return ""
151
+          }
152
+          if(val == ""){
153
+          return ""
154
+          }else {
155
+          return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
156
+          }
157
+      }, 
158
+      getdoctors(id){
159
+        for(let i in this.doctors){
160
+          if(this.doctors[i].id == id){
161
+            return this.doctors[i].user_name
162
+          }
163
+        }
164
+      }
165
+    },
166
+  };
167
+  </script>
168
+  
169
+  <style lang="scss" scoped>
170
+  /deep/ .el-dialog{
171
+    width: 60%;
172
+  }
173
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar {
174
+    width: 10px;
175
+    height: 10px;
176
+  }
177
+  .print_style {
178
+    position: absolute;
179
+    right: 65px;
180
+    top: 50px;
181
+  }
182
+  
183
+  .list_title {
184
+    width: 940px;
185
+    border-bottom: 1px solid;
186
+    display: flex;
187
+  }
188
+  .table tr td{
189
+   border:1px solid black;
190
+   padding: 5px 0;
191
+   border-left: none;
192
+   border-right: none;
193
+  }
194
+  </style>
195
+  
196
+  <style>
197
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
198
+    font-size: 12px;
199
+  }
200
+  
201
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
202
+    background: #6fb5fa;
203
+  }
204
+  
205
+  .count {
206
+    color: #bd2c00;
207
+  }
208
+  .el-table td,
209
+  .el-table th.is-leaf,
210
+  .el-table--border,
211
+  .el-table--group {
212
+    border-color: #d0d3da;
213
+  }
214
+  .el-table--border::after,
215
+  .el-table--group::after,
216
+  .el-table::before {
217
+    background-color: #d0d3da;
218
+  }
219
+  </style>
220
+  

+ 53 - 0
src/xt_pages/stock/print.js Voir le fichier

@@ -0,0 +1,53 @@
1
+import printJS from "print-js";
2
+/**
3
+ * 
4
+ * @param {
5
+ *      title:"", // 表名
6
+ *      serial:false, // 是否需要序号
7
+ *      data:[], // 要打印的数据
8
+ *      fields:[], // 需要打印的字段
9
+ *      properties:[
10
+ *          {
11
+ *              field:"字段名(对应fields)",
12
+ *              displayName:"打印时展⽰的中⽂表头名字",
13
+ *              columnSize:"定义列宽,⽤百分⽐来表⽰⼤⼩,可不传"
14
+ *          }
15
+ *      ],
16
+ * } args
17
+ *  
18
+ */
19
+function printJson(args = {}) {
20
+    let data = [];
21
+    for (let di = 0; di < args.data.length; di++) {
22
+        var obj = {}
23
+        // 如果需要序列号则是列表index+1
24
+        if (args.serial) {
25
+            obj.serial = di + 1
26
+        }
27
+        // 遍历需要打印的字段与列表字段⼀⼀对应,形成键值对
28
+        for (let fi = 0; fi < args.fields.length; fi++) {
29
+            obj[args.fields[fi]] = args.data[di][args.fields[fi]]
30
+        }
31
+        data.push(obj)
32
+    }
33
+    let properties = args.properties;
34
+    if (args.serial) {
35
+        properties.unshift({
36
+            field: "serial",
37
+            displayName: "序号",
38
+        })
39
+    }
40
+    printJS({
41
+        printable: data,
42
+        properties: properties || [],
43
+        header: args.title || "",
44
+        // 样式设置
45
+        type: 'json',  // 打印的格式
46
+        headerStyle:'display:flex;  .list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;}',
47
+        gridStyle: 'border: 1px solid #000;text-align:center;padding:5px 0;', // 表格样式
48
+        gridHeaderStyle: 'border: 1px solid #000;text-align:center;padding:5px 0;',//表头样式
49
+    });
50
+}
51
+export default {
52
+    printJson
53
+}

+ 1 - 1
src/xt_pages/user/patientInfo.vue Voir le fichier

@@ -36,7 +36,7 @@ export default {
36 36
     const id = this.$route.params && this.$route.params.id
37 37
     this.patientID = parseInt(id)
38 38
     this.org_id = this.$store.getters.xt_user.template_info.org_id
39
-    console.log("总共============================",this.org_id)
39
+    
40 40
     if (isNaN(this.patientID) || this.patientID <= 0) {
41 41
       console.log('patient info not had id')
42 42
       this.$notify.error({

+ 5 - 1
src/xt_pages/workforce/remind_print_setting.vue Voir le fichier

@@ -144,6 +144,9 @@
144 144
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
145 145
                    </span>
146 146
                   </span>
147
+                  <span v-if="org_id!=0&& org_id!=10610">
148
+                    <span>{{getAnticoagulant(main_collection.dialysissolution.anticoagulant)}}</span>
149
+                  </span>
147 150
                 </div>
148 151
                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675||org_id ==10571">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
149 152
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675 || org_id ==10571">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
@@ -217,7 +220,7 @@
217 220
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
218 221
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
219 222
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
220
-                <div v-if="org_id!=10278 && org_id!=10600 && org_id!=0">用法:静脉注射</div>
223
+                <div v-if="org_id!=10278 && org_id!=10600 && org_id!=0&& org_id!=10610">用法:静脉注射</div>
221 224
                 <!-- 透析器灌流器 -->
222 225
                
223 226
                  <div>
@@ -396,6 +399,7 @@
396 399
   import { uParseTime } from '@/utils/tools'
397 400
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
398 401
   import print from 'print-js'
402
+import org from '../../router/modules/org'
399 403
   const moment = require('moment')
400 404
   export default {
401 405
     name: 'SchedulePrint',