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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1023,7 +1023,7 @@
                       </div>
                     </div>
 
-                    <div class="row" style="padding: 2px 0; line-height: 23px">
+                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id!=10449">
                       <div class="inline_block">
                         透析液成分钾：
                         <div
@@ -1273,7 +1273,7 @@
                       </div>
                     </div>
 
-                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id == 3877 || org_id == 10449">
+                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id == 3877">
                       <div class="inline_block">
                         置换速度：
                         <div

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1036,7 +1036,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0; line-height: 23px">
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id !=10449">
                     <div class="inline_block">
                       透析液成分钾：
                       <div
@@ -1284,7 +1284,7 @@
                   </div>
 
 
-                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 || org_id == 3877 || org_id ==10449 || org_id == 9671">
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 || org_id == 3877  || org_id == 9671">
                     <div
                       class="inline_block"
                       style="margin-left: 20px"

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2827,6 +2827,7 @@ export default {
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
+
       let obj = {
         id: 0,
         name: newTabName,
@@ -2834,7 +2835,7 @@ export default {
         advices: [],
         project: [],
         addition: [],
-        pre_time: this.prescriptions[0].pre_time
+        pre_time: nowTime
 
       }
 

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -64,8 +64,8 @@
           <td width="6.1%">数量</td>
           <td width="8.1%">单价</td>
           <td width="8.1%">金额</td>
-          <!-- <td width="10.1%">医保标识</td> -->
-          <td width="10.1%">个人自付</td>
+           <td width="10.1%">医保标识</td>
+<!--          <td width="10.1%">个人自付</td>-->
 
         </tr>
         <!-- width="72.6%"  16.82%  16.1-->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2944,7 +2944,7 @@ export default {
         advices: [],
         project: [],
         addition: [],
-        pre_time: this.prescriptions[0].pre_time
+        pre_time: nowTime
 
       }
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -38,7 +38,10 @@
             <div style="margin-bottom: 10px">
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}
             </div>
-            <div style="margin-bottom: 10px">
+            <div style="margin-bottom: 10px" v-if="org_id == 10537">
+              医保卡号：{{item.patient.id_card_no}}
+            </div>
+            <div style="margin-bottom: 10px" v-else>
               医保卡号：
             </div>
             <div style="margin-bottom: 10px" v-if="org_id != 10188">

src/xt_pages/role/admin.vue

@@ -179,12 +179,12 @@
            
 
         
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSendInformaton">发送短信验证码</el-button>  -->
+          @click="toSendInformaton">发送短信验证码</el-button> 
        
           
      </div>
@@ -271,7 +271,7 @@
               </el-button>
             </span> -->
 
-            <!-- <span>
+            <span>
               <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
                     <span>创建签署人用户</span>
               </el-button>
@@ -287,7 +287,7 @@
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
               </el-button>
-            </span> -->
+            </span>
             <el-tooltip
               class="item"
               effect="dark"
@@ -485,7 +485,7 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
-  ,CreateQianshuUserName,toSendInformaton,CreateSKDSendInformation} from "@/api/role/admin";
+  ,CreateQianshuUserName,CreateSKDSendInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";