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/PatientDispensing.vue

@@ -526,7 +526,7 @@ export default {
         if (res.data.state == 1) {
            var list = res.data.data.list;
            console.log("hhhhawoowowow",list)
-          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 0 ){
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ){
             this.tableData = []
             if(list!=null && list.length >0){
               for(let i=0;i<list.length;i++){
@@ -537,7 +537,7 @@ export default {
             }
 
           }
-          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 0){
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387){
             this.tableData = []
             this.tableData = list
           }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -437,7 +437,7 @@
             </td>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
-                <span
+                <!-- <span
                   v-if="orderForm.url === ''"
                   >上机护士:{{ orderForm.start_nurse }}</span
                 >
@@ -447,6 +447,15 @@
                 >
                   上机护士: 
                   <img :src="orderForm.url" style="height: 30px" />
+                </span> -->
+                上机护士:
+                <span
+                  v-if="setAdminUserES(dialysisOrder.start_nurse) == ''"
+                  >{{getAdminUser(dialysisOrder.start_nurse)}}</span
+                >
+
+                <span v-else style="height: 36px">
+                  <img style="height:30px;" :src="setAdminUserES(dialysisOrder.start_nurse)" alt srcset />
                 </span>
               </span>
             </td>

src/xt_pages/workforce/appointment.vue

@@ -898,6 +898,7 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
+      console.log("whhwhwhwhwhwh",this.templateObj.template_id)
       if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }