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

                 <span>{{ scope.row.Total ? scope.row.Total : "" }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="生产厂商" width="140" align="center">
+              <template slot-scope="scope">
+                <span>{{ getManutuer(scope.row.DrugId) }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Doctor ? scope.row.Doctor : "" }}</span>
       fen: [],
       partition: 0, //分区
       drugList:[],
+      baseList:[],
     };
   },
   watch: {},
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
           this.waitmount_data = res.data.data.list;
+          this.baseList =[]
+          this.baseList = res.data.data.baseList
           if (this.shift != 0 || this.partition != 0) {
             if (this.waitmount_data == null) {
               this.waitmount = 0;
         if (res.data.state == 1) {
            var list = res.data.data.list;
            console.log("hhhhawoowowow",list)
+           this.baseList =[]
+          this.baseList = res.data.data.baseList
           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.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []
             if(list!=null && list.length >0){
        }
       }
       return medical_insurance_number
+    },
+    getManutuer(drug_id){
+       var manufacturer_name = ""
+       for(let i=0;i<this.baseList.length;i++){
+         if(drug_id == this.baseList[i].id){
+            manufacturer_name = this.baseList[i].manufacturer_name
+         }
+       }
+       return manufacturer_name
     }
   },
 };

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume

src/xt_pages/role/admin.vue

         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-        -->
+       
 
          <!-- <el-button
           type="primary"

src/xt_pages/workforce/appointment.vue

       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
-        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
+        <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess'></schedule-upload-excel>
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
           导出排班
         </el-button>
-        <!-- <el-button
+      
+        <el-button
             @click="generateLog()"
             class="filter-item"
             type="primary"
-            v-if="is_edit"
+           
             size="small"
         >下载日志
-        </el-button> -->
+        </el-button>
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
         </el-button>
         <!-- <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
 
           })
 
+          console.log("tablelist020200220",this.tableList)
+          
+
           const filename = '排班模版'
 
 
                   //  周一上午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
                     console.log(week[j].name)
-                    list[i].shangwu = week[j].name
+                    list[i].shangwu = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   // 周一下午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
-                    list[i].xiawu = week[j].name
+                    list[i].xiawu = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   // 周一晚上
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
-                    list[i].wanshang = week[j].name
+                    list[i].wanshang = week[j].name+" "+week[i].dialysis_machine_name
                   }
 
                   //周二上午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
-                    list[i].shangwu1 = week[j].name
+                    list[i].shangwu1 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周二下午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
-                    list[i].xiawu1 = week[j].name
+                    list[i].xiawu1 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周二晚上
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
-                    list[i].wanshang1 = week[j].name
+                    list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
                   }
 
                   //周三上午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
-                    list[i].shangwu2 = week[j].name
+                    list[i].shangwu2 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周三下午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
-                    list[i].xiawu2 = week[j].name
+                    list[i].xiawu2 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周三晚上
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
-                    list[i].wanshang2 = week[j].name
+                    list[i].wanshang2 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周四上午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
-                    list[i].shangwu3 = week[j].name
+                    list[i].shangwu3 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周四下午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
-                    list[i].xiawu3 = week[j].name
+                    list[i].xiawu3 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周四晚上
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
-                    list[i].wanshang3 = week[j].name
+                    list[i].wanshang3 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周五上午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
-                    list[i].shangwu4 = week[j].name
+                    list[i].shangwu4 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周五下午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
-                    list[i].xiawu4 = week[j].name
+                    list[i].xiawu4 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周五晚上
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
-                    list[i].wanshang4 = week[j].name
+                    list[i].wanshang4 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周六上午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
-                    list[i].shangwu5 = week[j].name
+                    list[i].shangwu5 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周六下午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
-                    list[i].xiawu5 = week[j].name
+                    list[i].xiawu5 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周六晚上
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
-                    list[i].wanshang5 = week[j].name
+                    list[i].wanshang5 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周日上午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
-                    list[i].shangwu6 = week[j].name
+                    list[i].shangwu6 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周日下午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
-                    list[i].xiawu6 = week[j].name
+                    list[i].xiawu6 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                   //周日晚上
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
-                    list[i].wanshang6 = week[j].name
+                    list[i].wanshang6 = week[j].name+" "+week[i].dialysis_machine_name
                   }
                 }
 
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
                   //周一
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu7 = nextWeek[j].name
+                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周一下午
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu7 = nextWeek[j].name
+                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周一晚上
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang7 = nextWeek[j].name
+                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周二上午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu8 = nextWeek[j].name
+                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周二下午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu8 = nextWeek[j].name
+                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周二晚上
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang8 = nextWeek[j].name
+                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周三上午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu9 = nextWeek[j].name
+                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周三下午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu9 = nextWeek[j].name
+                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周三晚上
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang9 = nextWeek[j].name
+                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周四上午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu10 = nextWeek[j].name
+                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周四下午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu10 = nextWeek[j].name
+                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周四晚上
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang10 = nextWeek[j].name
+                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周五上午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu11 = nextWeek[j].name
+                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周五下午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu11 = nextWeek[j].name
+                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周五晚上
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang11 = nextWeek[j].name
+                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周六上午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu12 = nextWeek[j].name
+                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周六下午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu12 = nextWeek[j].name
+                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周六晚上
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang12 = nextWeek[j].name
+                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
 
                   //周日上午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu13 = nextWeek[j].name
+                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周日下午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu13 = nextWeek[j].name
+                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                   //周日晚上
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang13 = nextWeek[j].name
+                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
                   }
                 }
 
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
                   //周一
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu14 = lastWeek[j].name
+                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周一下午
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu14 = lastWeek[j].name
+                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周一晚上
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang14 = lastWeek[j].name
+                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周二
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu15 = lastWeek[j].name
+                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周二下午
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu15 = lastWeek[j].name
+                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周二晚上
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang15 = lastWeek[j].name
+                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周三
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu16 = lastWeek[j].name
+                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周三下午
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu16 = lastWeek[j].name
+                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周三晚上
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang16 = lastWeek[j].name
+                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周四
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu17 = lastWeek[j].name
+                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周四下午
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu17 = lastWeek[j].name
+                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周四晚上
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang17 = lastWeek[j].name
+                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周五
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu18 = lastWeek[j].name
+                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周五下午
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu18 = lastWeek[j].name
+                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周五晚上
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang18 = lastWeek[j].name
+                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周六
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu19 = lastWeek[j].name
+                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周六下午
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu19 = lastWeek[j].name
+                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周六晚上
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang19 = lastWeek[j].name
+                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
 
                   //周日
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu20 = lastWeek[j].name
+                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周日下午
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu20 = lastWeek[j].name
+                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                   //周日晚上
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang20 = lastWeek[j].name
+                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
                   }
                 }