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

package-lock.json

@@ -14394,6 +14394,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
+    "vue-calendar-component": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
+      "integrity": "sha512-BJh7xOBzM7QVcapcN4EbPQ1eZ8Pii1/oy+dzqjZTilRSIDD7SRPdFpnUJwZvs8lCrhtBAyJbYFsdm2SogXWHVQ=="
+    },
     "vue-clipboard": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/vue-clipboard/-/vue-clipboard-0.0.1.tgz",

package.json

@@ -73,6 +73,7 @@
     "sortablejs": "1.7.0",
     "v-fit-columns": "^0.2.0",
     "vue": "2.5.16",
+    "vue-calendar-component": "^2.8.2",
     "vue-clipboard": "0.0.1",
     "vue-clipboard2": "^0.3.1",
     "vue-count-to": "1.0.13",

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -409,6 +409,7 @@ export default {
     },
     //选中行数
     handleCurrentChange(val) {
+      console.log("state--",this.state)
       this.currentRow = val;
       console.log("this.currentRow", this.currentRow);
       if (this.state == 1) {
@@ -704,8 +705,7 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           drugwithdrawal(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -954,7 +954,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624 || org_i==10624)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -98,7 +98,9 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-             {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            <!-- {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}} -->
           </template>
 
         </el-table-column>

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -41,7 +41,9 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
-                  {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
+                  <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
+                  <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
                 </td>
                </tr>
               </tbody>

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -267,13 +267,13 @@
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="封管液" v-if="dialysisSett.blood_access==1">
+        <el-table-column align="center" label="封管液" v-if="dialysisSett.blood_access==1 && org_id!=10629">
            <template slot-scope="scope">
              <span v-if="getBloodAccessOption(scope.row.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="促红" v-if="org_id!=10599">
+        <el-table-column align="center" label="促红" v-if="org_id!=10599 && org_id!=10629">
            <template slot-scope="scope">
               {{ scope.row.advice_spc }}
            </template>

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -49,11 +49,11 @@
                 <td width="100" v-if="dialysisSett.calcium==1">钙</td>
                 <td width="100" v-if="dialysisSett.bicarbonate == 1">碳酸氢盐</td>
                 <td width="100" v-if="dialysisSett.blood_access==1">血管通路</td>
-                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
+                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1 && org_id!=10629">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">封管液</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">促红</td>
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">封管液</td>
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">促红</td>
               </tr>
               </thead>
               <tbody>
@@ -175,13 +175,13 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
                 
                 
-                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599">
+                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599 && org_id!=10629">
                   {{ item.advice_spc }}
                 </td>
                </tr>

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

@@ -372,7 +372,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460)">
+        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460 || org_id ==10551)">
           <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>

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

@@ -2847,10 +2847,15 @@ mu
               this.dialysisPrescription.dialysate_temperature = 36.5
               this.dialysisPrescription.prescribing_number = 1
             }
-            if(this.$store.getters.xt_user.org.id == 10447 || this.$store.getters.xt_user.org.id == 10600){
+            if(this.$store.getters.xt_user.org.id == 10447 || this.$store.getters.xt_user.org.id == 10600 ){
               this.dialysisPrescription.dialysate_flow = 500
             }
 
+            if(this.$store.getters.xt_user.org.id == 10375){
+              this.dialysisPrescription.dialysate_flow = 500
+              this.dialysisPrescription.bicarbonate = 32
+            }
+
             if(this.$store.getters.xt_user.org.id == 10598 || this.$store.getters.xt_user.org.id == 10612){
                if(this.dialysisPrescription.dialysis_duration_minute == ""){
                  this.dialysisPrescription.dialysis_duration_minute =0

src/xt_pages/dialysis/details/index.vue

@@ -17,14 +17,14 @@
           type="primary"
           @click="next"
           >下一位</el-button
-        >   
+        >
 
-        <!-- <el-button
+        <el-button
           size="small"
           type="primary"
           @click="history_click"
-          
-          >透析历史</el-button> -->
+
+          >透析历史</el-button>
 
         <el-button
           size="small"
@@ -43,7 +43,6 @@
 
       </div>
     </div>
-
     <div
       class="loadingBox"
       v-loading="loading"
@@ -1191,7 +1190,6 @@
 
     </div>
     </div>
-
     <!-- 透析历史 -->
     <el-dialog class="history"
       :title="'患者信息（姓名：'+patient.name+'、透析号：'+patient.dialysis_no +'）' "
@@ -1199,7 +1197,7 @@
       width="50%"
       >
       <div>
-        <div >
+         <div >
           透析频率：
           <div class="touxipl"></div>
         </div>
@@ -1207,20 +1205,22 @@
           <div style="border-left: 2px solid #409eff;color: #409eff;padding: 0 10px;">
             <span>已排详情</span>
           </div>
-          <div>
-            <el-calendar v-model="time_value" >  
-              <template
-                slot="dateCell"
-                slot-scope="{date, data}" @click="viewDayWork(data)">
-                <P v-if="data.day.split('-').slice(1).join('-')=='03-06'"
-                  style="background: red;color: white;text-align: center;">
-                  HD
-                </P>
-                <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;">
-                  {{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : ''}}<br/>
-                  <span v-if="data.day.split('-').slice(1).join('-')=='03-06'">上午 门诊</span>
-                </p>
-
+          <div @click="viewDayWork">
+            <el-calendar v-model="time_value">
+                <template
+                  slot="dateCell"
+                  slot-scope="{date, data}" >
+                    <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;" >
+                      {{ data.day.split('-').slice(2).join('-') }}<br/>
+                      <span v-for="(item,index) in orderList" :key="index" style="background: red;color: white;text-align: center;">
+                        <span v-if="data.day == item.order_date">
+                          {{ getModeId(item.mode_id) }}
+                          <span v-if="item.schedual_type_name ==1">上午</span>
+                          <span v-if="item.schedual_type_name ==2">下午</span>
+                          <span v-if="item.schedual_type_name ==3">晚上</span>
+                        </span>
+                      </span>
+                    </p>
               </template>
             </el-calendar>
           </div>
@@ -1261,6 +1261,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
 import Calendar from 'vue-calendar-component'
+import data from '../../../store/modules/data'
 export default {
   name: 'index',
   components: {
@@ -1408,14 +1409,14 @@ export default {
       norefresh:true,
       historyclick:false,
       time_value:new Date(),
-      
-      startTime:'',
-      endTime:'',
-      
+
+      start_time:moment().startOf('months').format('YYYY-MM-DD'),
+      end_time:moment().endOf('months').format('YYYY-MM-DD'),
+      orderList:[]
     }
   },
   created() {
-    
+
    this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
    this.org_id = this.$store.getters.xt_user.org.id,
    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
@@ -1620,7 +1621,7 @@ export default {
     // this.getmonth(this.time_value)
     // this.handlePick(this.time_value)
   },
- 
+
   beforeDestroy(){
 
     let unObj = {
@@ -2098,7 +2099,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
-      console.log("时间人民站起来了呃")
+
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
@@ -2922,29 +2923,103 @@ export default {
     },
     // 透析历史
     history_click(){
-      this.historyclick =true
+      this.getPatientDialysisRecordList()
       // this.getmonth(this.time_value2)
       // console.log('time_value',moment(this.time_value2).format('YYYY-MM-DD'));
     },
+    getPatientDialysisRecordList(){
+      var params= {
+        patient_id:this.$route.query.patient_id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+      getPatientDialysisRecordList(params).then(response=>{
+         if(response.data.state == 1){
+           var list  = response.data.data.list
+           this.historyclick =true
+           if(list!=null && list.length>0){
+             for(let i=0;i<list.length;i++){
+
+               list[i].order_date =""
+               if(this.org_id ==9538 || this.org_id ==10101||this.org_id ==10353){
+                  list[i].order_date = this.getOrderTime(list[i].dialysis_date)
+                  list[i].schedual_type_name= list[i].schedual_type
+               }else{
+                 list[i].order_date = this.getOrderTime(list[i].schedule_date)
+                 list[i].schedual_type_name= list[i].schedule_type
+               }
+
+             }
+           }
+           console.log("list------",list)
+           this.orderList = []
+           this.orderList = list
+         }
+      })
+    },
     // 获取每个月的第一天和最后一天
     getmonth(val){
-      const months= new Date(val).getMonth()
-      let startTime =  moment().month(months).startOf('month').format('YYYY-MM-DD')
-      
-      //   //某月最后一天
-      let endTime = moment().month(months).endOf('month').format('YYYY-MM-DD')
-      this.startTime = startTime
-      this.endTime = endTime
-      console.log('time_value333333',this.startTime,this.endTime);
+      // const months= new Date(val).getMonth()
+      // let startTime =  moment().month(months).startOf('month').format('YYYY-MM-DD')
+      // //   //某月最后一天
+      // let endTime = moment().month(months).endOf('month').format('YYYY-MM-DD')
+      // this.startTime = startTime
+      // this.endTime = endTime
+      // console.log('time_value333333',this.startTime,this.endTime);
+    },
+    getOrderTime(val){
+      // console.log('77778888',val,this.dialysis_date=uParseTime(val, "{y}-{m}-{d}"));
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    viewDayWork(val){
+      const len = (val.target.innerText).split(' ')
+      console.log("val33333333333333444",len)
+      if(val.target.innerText == '下个月'){
+        this.time_value()
+      }else if(val.target.innerText == '上个月'){
+        this.time_value()
+      }else if(val.target.innerText =='今天'){
+        this.time_value()
+      }else{
+        // console.log('4444',this.orderList);
+        if(len.length>1){
+          var patient_id = this.$route.query.patient_id
+          var start_time = this.timestamp(this.start_time)
+          this.$router.push({
+            path: "/dialysis/details",
+            query: { patient_id:patient_id , date: start_time}
+          });
+          this.history_click = false
+        }else{
+          this.time_value()
+        }
+        
+      }
+    },
+    timestamp(start_time) {
+      // 使用 Date 对象和它的 getTime 方法将日期字符串转换为时间戳
+      return new Date(start_time).getTime()/1000 - 28800;
     }
+
   },
   watch:{
     time_value:{
       handler(newValue,oldValue){
+        console.log("newValue----------",newValue)
         // this.initData()
         this.time_value = newValue
-        this.getmonth(this.time_value)
+        // this.getmonth(this.time_value)
         console.log('yyyyyyyyyyy',moment(this.time_value).format('YYYY-MM-DD'),moment(oldValue).format('YYYY-MM-DD'))
+
+        this.start_time = moment(this.time_value).format('YYYY-MM-DD')
+        this.end_time =   moment(oldValue).format('YYYY-MM-DD')
       }
     }
   }
@@ -3124,10 +3199,10 @@ export default {
       }
     }
     .el-dialog__body{
-      padding: 15px 10px 
+      padding: 15px 10px
     }
   }
-  
+
 }
 .Calendar{
     color: #000 !important;

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -201,9 +201,9 @@
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/longSignPrint.vue

@@ -32,11 +32,11 @@
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              
@@ -53,7 +53,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617|| org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -42,7 +42,7 @@
 
        
       </div>
-      <div class="filter-container" v-if="org_id == 0 || org_id ==10101">
+      <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
@@ -183,9 +183,9 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 && org_id!=0 ">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340 || org_id == 0">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
       </div>
 
 
@@ -1477,26 +1477,30 @@ export default {
         return name
     },
     getAdviceContent(row, isChild) {
+         console.log("rwoo22222222222222333",row)
         let tempSingleDoseDesc = ''
         let tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
 
         if (row.prescribing_number) {
-          tempPrescribingNumberDesc =
-            row.prescribing_number + '' + row.prescribing_number_unit
+          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
+            tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+           
           } else {
-            tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
+            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) {
@@ -1507,30 +1511,15 @@ export default {
           // console.log(11,row.delivery_way)
           // console.log(22,row.execution_frequency)
 
-          return (
-            row.advice_name +
-            tempDrugSpecDesc +
-            ' ' +
-            tempPrescribingNumberDesc +
-            tempSingleDoseDesc +
-            ' ' +
-            row.delivery_way +
-            ' ' +
-            row.execution_frequency
-          )
+          return (row.advice_name + tempDrugSpecDesc + ' ' + tempPrescribingNumberDesc + tempSingleDoseDesc +' ' + row.delivery_way +' ' +row.execution_frequency)
         } else {
           // 是子药
-          return (
-            row.advice_name +
-            tempDrugSpecDesc +
-            ' ' +
-            tempPrescribingNumberDesc +
-            tempSingleDoseDesc
-          )
+          return (row.advice_name +tempDrugSpecDesc +' ' + tempPrescribingNumberDesc + tempSingleDoseDesc)
+         
         }
     },
     handleSelectionChange(val){
-      console.log("val88888888",val)
+     
       this.selecting_schs = val;
       this.is_status = 1
     },
@@ -1862,9 +1851,9 @@ export default {
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/signPrint.vue

@@ -31,11 +31,11 @@
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              
@@ -52,11 +52,11 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1052,10 +1052,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598 || org_id ==10624">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598&&org_id!=10624">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -2824,7 +2824,12 @@
                       style="flex: 1"
                       v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                     >
-
+                      <span v-if="org_id!=10460">
+                          透析中入量(L)：
+                       </span>
+                      <span v-if="org_id==10460">
+                        透析中入量(ml)：
+                      </span>
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"
@@ -2835,12 +2840,7 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=10460">
-                          透析中入量(L)：
-                        </span>
-                        <span v-if="org_id==10460">
-                          透析中入量(ml)：
-                        </span>
+                      
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                     </div>
 

src/xt_pages/outpatientDoctorStation/batch_replacement.vue

@@ -519,6 +519,7 @@ export default {
     this.getdrugconfigs();
     let tableHeight = document.body.clientHeight - 263;
     this.tableHeight = tableHeight;
+    this.getusernames();
   },
   mounted() {
     const that = this;
@@ -544,6 +545,16 @@ export default {
     },
   },
   methods: {
+    getusernames(){
+      var params = {}
+      gethisusertoalive(params).then((res) =>{
+        console.log("this.res",res)
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          console.log("this.tableData", this.tableData);
+        }
+      });
+    },
     save() {
       var tmp = this.modeOptions[this.modeOptions_value].name;
       var tmp2 = "";
@@ -740,6 +751,7 @@ export default {
       console.log(">>>>>>>", this.new_type);
       this.id = "";
       this.tableData = [];
+      this.getusernames()
     },
     changeid(item, index) {
       console.log("");
@@ -831,6 +843,7 @@ export default {
       replacepeoplename(params).then((res) => {
         if (res.data.state == 1) {
           this.tableData = res.data.data.list;
+          
         }
       });
     },

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -21,6 +21,11 @@
         >
           {{ orgname }}处方笺
         </div>
+        <div class="printTitle" v-else>
+          <span>{{ orgname }}处方笺</span>
+          <span style="font-size: 14px;font-weight: normal;color: red;" 
+            v-if="prescriptions[index].med_type == '1112'">(精)</span>
+        </div>
         <div >
           <div  style="display: flex;border-top: 2px solid #000;margin-top: 10px;line-height: 24px;padding: 0 10px;">
             <p style="width: 200px;">姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
@@ -802,7 +807,7 @@ export default{
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.org_id = xtuser.org.id;
-
+    console.log('jjjjjj',this.orgname);
     // for(let j=0;j<this.advicess.length;j++){
     //   console.log('44444444');
     //   for(let x=j+1;x<this.advicess.length;x++){

src/xt_pages/role/admin.vue

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