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

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -16,7 +16,7 @@
                         
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>医嘱内容:{{ it.advice_name }} 
                             </div>  

src/xt_pages/dialysis/longSignPrint.vue

@@ -15,7 +15,7 @@
                        
                         <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1548,11 +1548,11 @@ export default {
           name = ""
        }
 
-       if(this.org_id == 9671 || this.org_id == 10340){
+       if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 
-       if(this.org_id != 9671 && this.org_id != 10340){
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 

src/xt_pages/dialysis/signPrint.vue

@@ -15,7 +15,7 @@
                        
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -657,7 +657,7 @@
                   <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>
 
 
@@ -2109,7 +2109,7 @@ export default {
               if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206 || this.org_id == 10598){
                       preTime = this.record_date + ' ' + '6:00'
@@ -2130,13 +2130,14 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                   // preTime = nowTime
+                  if(this.org_id == 10510  || this.org_id == 0){
+                    preTime = nowTime
+                  }
+
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
 
-                if(this.$store.getters.xt_user.org.id == 10510){
-                  preTime = nowTime
-                }
 
               } else {
 
@@ -2145,7 +2146,7 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                      if(this.org_id == 10206   || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
@@ -2164,7 +2165,7 @@ export default {
                     }
 
 
-                    if(this.$store.getters.xt_user.org.id == 10510){
+                    if(this.org_id == 10510  || this.org_id == 0){
                       preTime = nowTime
                     }
 
@@ -2317,7 +2318,7 @@ export default {
                 var preTime = nowTime
                 if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
@@ -2338,7 +2339,7 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
 
-                  if(this.$store.getters.xt_user.org.id == 10510){
+                  if(this.org_id == 10510  || this.org_id == 0){
                     preTime = nowTime
                   }
                 }
@@ -2709,7 +2710,7 @@ export default {
                     if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2730,18 +2731,18 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510 || this.org_id == 0 ){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
                     } else {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -2759,6 +2760,9 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                         // preTime = nowTime
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -2907,7 +2911,7 @@ export default {
                       // var preTime = ''
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2917,7 +2921,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -2929,7 +2933,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }
@@ -3395,6 +3399,9 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(this.org_id == 10510  || this.org_id == 0){
+                        preTime = nowTime
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
@@ -3981,6 +3988,9 @@ export default {
                         preTime = this.record_date + ' ' + '17:00'
                       }
                     }
+                    if(this.org_id == 10510  || this.org_id == 0){
+                      preTime = nowTime
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }
@@ -4646,7 +4656,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206  ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -4658,20 +4668,21 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -4689,6 +4700,10 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
+
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -4835,7 +4850,7 @@ export default {
                       var preTime = nowTime
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date+ ' ' + '6:00'
@@ -4856,7 +4871,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }
@@ -5293,7 +5308,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -5305,13 +5320,14 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
@@ -5335,6 +5351,9 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
 
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -5491,7 +5510,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206 ||  this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -5504,7 +5523,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -358,7 +358,9 @@
 
           <el-table-column label="药品追溯码" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
+               <div  @click="changeDrugCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码"></el-input>
+              </div>
             </template>
           </el-table-column>
 
@@ -410,6 +412,25 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
+
+    <el-dialog
+      title="药品追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -545,9 +566,29 @@ export default {
       warehousing_id:0,
       showCheck:false,
       showReturnCheck:false,
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:""
     };
   },
   methods: {
+    changeDrugCode(row,index){
+      this.textarea=""
+      this.textarea = row.drug_code
+      this.currentRow = row
+      this.currentIndex =index
+      this.dialogVisible = true
+    },
+    saveTextArea(){
+
+      for(let i=0;i<this.recordInfo.recordData.length;i++){
+         if(this.currentIndex == i){
+           this.recordInfo.recordData[i].drug_code = this.textarea 
+         }
+      }
+      this.dialogVisible = false
+    },
     handleSave: function () {
       if (this.recordInfo.recordData.length <= 0) {
         this.$message.error("请添加入库信息");

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -341,7 +341,10 @@
 
           <el-table-column label="药品追溯码" width="150" align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input>
+              <!-- <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input> -->
+              <div  @click="changeDrugCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.drug_code"  placeholder="请输入药品追溯码" :disabled="disabled"></el-input>
+              </div>
             </template>
           </el-table-column>
 
@@ -395,6 +398,25 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
+
+    <el-dialog
+      title="药品追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -503,9 +525,29 @@ export default {
       list:[],
       is_check:0,
       drug_waresing_id:0,
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:""
     };
   },
   methods: {
+    changeDrugCode(row,index){
+      this.textarea=""
+      this.textarea = row.drug_code
+      this.currentRow = row
+      this.currentIndex =index
+      this.dialogVisible = true
+    },
+    saveTextArea(){
+
+      for(let i=0;i<this.recordInfo.recordData.length;i++){
+         if(this.currentIndex == i){
+           this.recordInfo.recordData[i].drug_code = this.textarea 
+         }
+      }
+      this.dialogVisible = false
+    },
     comfirm: function(val) {
       this.$refs.dialog.hide();
 

src/xt_pages/user/components/PatientDetail.vue

@@ -212,7 +212,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="家属电话: " prop="homeTelephone">
+              <el-form-item label="家属电话: ">
                 <el-input
                   v-model="form.homeTelephone"
                   maxlength="20"

src/xt_pages/user/components/PatientForm.vue

@@ -261,7 +261,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家属电话 : " prop="homeTelephone">
+                <el-form-item label="家属电话 : ">
                   <el-input
                     v-model="form.homeTelephone"
                     maxlength="20"

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))