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

src/xt_pages/Pharmacy/drugCode.vue

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div style="display: flex;margin-bottom:10px;">
-     
+
       <div>上传状态:
         <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
           <el-option
@@ -146,7 +146,7 @@
 
       <el-table-column align="center" prop="name" label="结算状态" v-if="is_type == 1">
         <template slot-scope="scope">
-          
+
           <div v-if="scope.row.pre.order_status == 2">已结算</div>
           <div v-if="scope.row.pre.order_status != 2">未结算</div>
         </template>
@@ -287,7 +287,8 @@ export default {
       var that = this;
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type,
       };
 
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
@@ -346,7 +347,9 @@ export default {
       var that = this;
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type,
+
       };
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
         if (response.data.state == 0) {
@@ -451,7 +454,7 @@ export default {
             this.dialogVisibleOne = false
          })
       }
-     
+
     },
     getPatientName(id) {
       var name = ""
@@ -580,7 +583,9 @@ export default {
       }
       let params = {
         id: ids,
-        admin_user_id: this.$store.getters.xt_user.user.id
+        admin_user_id: this.$store.getters.xt_user.user.id,
+        is_type:this.is_type
+
       };
       axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
         if (response.data.state == 0) {

src/xt_pages/charging/charging_cz.vue

@@ -180,7 +180,6 @@
 
       },
       savePatentCount(){
-         
         var params = {
           patient_id:this.patient_id,
           hd_count:this.hd_count,
@@ -191,7 +190,10 @@
           
         }
        savePatentCount(params).then(response=>{
-
+          if(response.data.state == 1){
+             var patientInCount = response.data.data.patientInCount
+             this.newcz_show = false
+          }
        }) 
       }
      

src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue

@@ -177,13 +177,13 @@
                           <label-box :isChecked="record.prescription.calcium=='1.75'?true :false" showValue="1.75mmo1/L"></label-box>&nbsp;&nbsp;
                         </div>
                         <div style="flex: 1;">
-                          医师签名:杨能华/
-                          <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
+                          医师签名:徐华
+                          <!-- <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
                             {{ getAdminUser(record.prescription, 'creater')}}
                           </span>
                           <span style="display: inline-block;width: 50%;" v-else>
                             <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
-                          </span>
+                          </span> -->
                         </div>
                       </div>
                       
@@ -325,7 +325,8 @@
                       <td>{{ advice[0].delivery_way }}</td>
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                       <td style="height:30px;line-height:30px">
-                        <span v-if="advice[0].start_time>0">杨能华/</span>
+                        徐华
+                        <!-- <span v-if="advice[0].start_time>0">杨能华/</span>
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
                           {{ getAdminUser(advice[0],'advice_doctor')}}
                         </span>
@@ -334,7 +335,7 @@
                           style="display:flex;align-items:center;justify-content:space-around;height:25px;"
                         >
                           <img style="height:25px;" :src="setAdminUserES(advice[0],'advice_doctor')" alt srcset />
-                        </span>
+                        </span> -->
                       </td>
                       <td style="height:30px;line-height:30px">
                         <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">{{ getAdminUser(advice[0], 'execution_staff') }}</span>
@@ -366,14 +367,14 @@
                 <div style="display: flex;border: 1px solid black;padding: 5px;">
                   <div style="flex: 1;">
                     <div style="display: inline-block;margin-right: 120px;">
-                      <span style="display: inline-block;">医生签名:</span>杨能华/
-                      <span>
+                      <span style="display: inline-block;">医生签名:</span>徐华
+                      <!-- <span>
                         <span v-if="setAdminUserES(record.prescription,'creater') == ''">
                           {{ getAdminUser(record.prescription,'creater') }}
                         </span>
                         <img class="es-img" :src="setAdminUserES(record.prescription,'creater')" alt=""
                           srcset="" v-else style="height: 30px;" />
-                      </span>
+                      </span> -->
                     </div>
                   </div>
                   <div style="flex: 1;">  

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1278,7 +1278,9 @@
                             org_id == 10629 ||
                             org_id == 10510 ||
                             org_id == 10598 ||
-                            org_id == 10567
+                            org_id == 10567 ||
+                            org_id ==10234 ||
+                            org_id == 10121
 
                           ">
                             KT/V
@@ -1530,7 +1532,9 @@
                             org_id == 10629 ||
                             org_id == 10510 ||
                             org_id == 10598 ||
-                            org_id == 10567
+                            org_id == 10567 ||
+                            org_id == 10234 || 
+                            org_id == 10121
                           ">
                             {{ monitor_record.ktv }}
                           </td>

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

@@ -11,11 +11,11 @@
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
             <div style="position: absolute;left: 20%;top: 3%;width: 70%;">
-              <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
+              <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702&&this.$store.getters.xt_user.template_info.org_id!=10744">
                 透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
               </span>&nbsp;&nbsp;
 
-              <span style="" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702">
+              <span style="" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702||this.$store.getters.xt_user.template_info.org_id==10744">
                 透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
               </span>&nbsp;&nbsp;
               <!-- style="position: absolute;left: 20%;top: 3%"  position: absolute;left:38%;top: 3%-->

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1462,7 +1462,7 @@
                           </td>
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                           <td width="50"
-                            v-if="org_id == 9538 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567">
+                            v-if="org_id == 9538 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id ==10234 || org_id == 10121">
                             KT/V</td>
                           <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                           <td width="50" v-if="org_id == 9671">在线尿素监测</td>
@@ -1652,7 +1652,7 @@
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">{{
                             monitor.filter_pressure ? monitor.filter_pressure : "" }}</td>
                           <td width="50"
-                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567">
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id == 10600 || org_id == 10629 || org_id == 10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 10234 || org_id == 10121">
                             {{ monitor.ktv ? monitor.ktv : "" }}
                           </td>
                           <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

@@ -134,13 +134,13 @@
                     <label-box :isChecked="prescription.calcium=='1.75'?true :false" showValue="1.75mmo1/L"></label-box>&nbsp;&nbsp;
                   </div>
                   <div style="flex: 1;">
-                    医师签名:杨能华/
-                    <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(prescription.creater) == ''">
+                    医师签名:徐华
+                    <!-- <span style="display: inline-block;width: 50%;" v-if="setAdminUserES(prescription.creater) == ''">
                       {{ getAdminUser(prescription.creater)}}
                     </span>
                     <span style="display: inline-block;width: 50%;" v-else>
                       <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
-                    </span>
+                    </span> -->
                   </div>
                 </div>
                 
@@ -278,7 +278,8 @@
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                 <td style="height:30px;line-height:30px">
-                  <span v-if="advice.start_time>0">杨能华/</span>
+                  徐华
+                  <!-- <span v-if="advice.start_time>0">徐华/</span>
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}
                   </span>
@@ -287,7 +288,7 @@
                     style="display:flex;align-items:center;justify-content:space-around;height:25px;"
                   >
                     <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
-                  </span>
+                  </span> -->
                 </td>
                 <td style="height:30px;line-height:30px">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
@@ -322,15 +323,15 @@
           <div style="display: flex;border: 1px solid black;padding: 5px;">
             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
-                <span style="display: inline-block;">医生签名:</span>杨能华/
-                <span>
+                <span style="display: inline-block;">医生签名:</span>徐华
+                <!-- <span>
                   <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
                     {{ getAdminUser(prescription.creater)}}
                   </span>
                   <span style="display: inline-block;" v-else>
                     <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
                   </span>
-                </span>
+                </span> -->
               </div>
             </div>
             <div style="flex: 1;">

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -152,10 +152,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-table  v-if="stock_type == 5"  :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+      <el-table  v-if="stock_type == 5"  :data="tableData"  border :row-style="{ color: '#303133' }" ref="table"
                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                  max-height="600"
                  highlight-current-row>
+
+        <el-table-column align="center" prop="name" label="就诊ID">
+          <template slot-scope="scope">{{scope.row.mdtrt_id}}</template>
+        </el-table-column>
         <el-table-column align="center" prop="name" label="药品名称">
           <template slot-scope="scope">{{scope.row.MedinsListName}}</template>
         </el-table-column>

src/xt_pages/outpatientTool/components/settle.vue

@@ -344,11 +344,11 @@ import { uParseTime } from '@/utils/tools'
     methods: {
       handleSizeChangeOne(val) {
         this.limit = val
-        this.GetRemindPatientList();
+        this.getSummarySettleList();
       },
       handleCurrentChangeOne(val) {
         this.page = val;
-        this.GetRemindPatientList();
+        this.getSummarySettleList();
       },
       getMode(id){
 

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -433,7 +433,6 @@
                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
@@ -2515,8 +2514,23 @@ export default {
       handleSelect1(){
 
       },
-      handleSelect(){
-
+      handleSelect(val){
+         console.log("val233333333333",val)
+       this.drug_id = val.drug_id
+        this.nameForm.drug_id = val.drug_id
+        this.nameForm.way = 1
+        this.nameForm.drug_name_id = val.drug_id
+        var tmp = val.drug_specs[0]
+        console.log("tmp",tmp)
+        this.nameForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+        this.nameForm.drug_spec_unit = tmp.max_unit
+        this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
+        this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
+        this.nameForm.single_dose = tmp.single_dose//单次用量
+        this.nameForm.single_dose_unit = tmp.drug_dose_unit
+        this.nameForm.delivery_way = tmp.delivery_way//给药途径
+        this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
+        this.nameForm.drug_id = tmp.id
       },
 
        querySearch(queryString, cb) {

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))