新分支

src/xt_pages/dialysis/details/index.vue

           })
 
           // console.log("newArrwowowowowoowwowo",newArr)
+          if(this.tableData!=null){
+            for(let i=0;i<this.tableData.length;i++){
+              this.$refs.tab.setCurrentRow(this.tableData[i])
+            }
+          } 
+         
           this.tableData = newArr
           this.getData()
 
         }
 
         this.tableData1 = newArr
+        if(this.tableData1!=null){
+           for(let i=0;i<this.tableData1.length;i++){
+            this.$refs.tab1.setCurrentRow(this.tableData1[i])
+           }
+        }
         const name = this.$route.query.patient_name
         this.tableData1.map((item, index) => {
           if (name == item.patient.name) {
         // this.end_time = moment().month(months).endOf('month').format('YYYY-MM-DD')
         // console.log('rrrrr',this.start_time,this.end_time);
         // this.end_time =   moment(oldValue).format('YYYY-MM-DD')
-      }
-    }
+     
+      },
+      
+    },
+   
+
   }
 }
 </script>

src/xt_pages/dialysis/newDoctorAdvice.vue

        </el-autocomplete>
        <el-button type="primary" @click="toSeach">搜索</el-button>
 
-       
+
       </div>
       <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
-       
+
       </div>
       <div class="cell clearfix">
         <label class="title">
 
         <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
 
-        
+
       </div>
 
 
             <span v-else>
 
             </span>
-           
+
           </template>
         </el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           for(let i=0;i<this.partitionArr.length;i++){
            this.zoneIdList.push(this.partitionArr[i].id)
           }
-         
+
           // this.partitionArr.unshift({ id: 0, name: "全部" });
           var dics  =  response.data.data.dics
           var obj = {id:0,name:"全部"}
         if(name == '全部'){
           name = ""
         }
-       
+
         var nameOne = ""
          for(let i=0;i<this.excutList.length;i++){
             if(this.execution_frequency == this.excutList[i].id){
 
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
-       
+
         getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
            if(this.is_sort == 0){
               newList = schedules
            }
-          
+
            if(this.is_sort == 0 ||  this.is_sort == 1){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
 
         if (row.prescribing_number) {
           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
-         
+
         }
 
         if (row.single_dose) {
           if (this.template_id != 6) {
             tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
-           
+
           } else {
             tempSingleDoseDesc = row.single_dose  + row.single_dose_unit
-            
+
           }
         }
 
         if (row.advice_desc) {
-           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
-         
-          
+           tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+
+
         }
 
         if (isChild == 1) {
         } else {
           // 是子药
           return (row.advice_name +tempDrugSpecDesc +' ' + tempPrescribingNumberDesc + tempSingleDoseDesc)
-         
+
         }
     },
     handleSelectionChange(val){
-     
+
       this.selecting_schs = val;
       this.is_status = 1
     },
         return searchArray
       },
      handleSelect(val) {
-      
+
        this.patient_id = val.id
        this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
 
              if(config.is_open!=1){
                if(doctorList!=null && doctorList.length > 0){
-                let dataInfo = {}
+                  let dataInfo = {}
                   doctorList.forEach((item, index) => {
                   let { advice_name } = item
                   if (!dataInfo[advice_name]) {
                 this.tableList = hisarr
               }
 
-             
+
              }
           }
         })
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
             str = this.partion_type.join(",")
          }
          this.partion_str = ""
-         this.partion_str = str  
+         this.partion_str = str
          this.tableList = []
           var params = {
             schedule_type:this.schedule_type,
                  }
                }
              }
-             
+
              let dataInfo = {}
               newArr.forEach((item, index) => {
               let { project_id } = item
               }
             })
             let arr = Object.values(dataInfo)
-            
+
             if(arr!=null && arr.length >0){
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<newArr.length;j++){
                    if(arr[i].project_id == newArr[j].project_id){
                       arr[i].child.push(newArr[i])
                    }
-                } 
+                }
               }
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<arr[i].child.length;j++){
         const { columns, data } = param;
         const sums = [];
         columns.forEach((column, index) => {
-        
+
           if (index === 0) {
             sums[index] = '总数';
             return;
           }
           if(index > 2){
             const values = data.map(item => item[column.property]);
-           
+
 
           }
 
         }
       })
     },
-   
+
 
   },
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

            }
         }
 
-        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id == 0 || this.org_id == 10644){
+        //HIS客户显示临时医嘱的地方
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/stock/drugs/drugStockInOrder.vue

         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 13">调拨入库</span>
-            <span v-else>手动入库</span>
+            <span v-else>
+              <span v-if="org_id !=10633"> 手动入库</span>
+              <span v-if="org_id ==10633"> 验货入库</span>
+            </span>
           </template>
         </el-table-column>
 

src/xt_pages/stock/stockInOrder.vue

         <el-table-column label="入库方式" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 12">调拨入库</span>
-            <span v-if="scope.row.is_sys == 0">手动入库</span>
+            <span v-if="scope.row.is_sys == 0">
+              <span v-if="org_id !=10633"> 手动入库</span>
+              <span v-if="org_id ==10633"> 验货入库</span>
+            </span>
           </template>
         </el-table-column>