518合并代码

src/api/patient.js

@@ -239,7 +239,6 @@ export function deleteRescueRecords(patient_id, ids_str) {
 }
 
 export function EditLapseto(patient_id, data) {
-  console.log('data', data)
   return request({
     url: '/api/patients/lapseto/edit?id=' + patient_id,
     method: 'post',

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -53,6 +53,39 @@
       <el-form-item label="过敏史: " prop="name">
         <el-input v-model="allergic_history" placeholder=""></el-input>
       </el-form-item>
+<!-- 
+      <el-form-item label="工作单位: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+      <el-form-item label="原发病: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+      <el-form-item label="确诊肾衰日期: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+     <el-form-item label="药物过敏史: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+       <el-form-item label="初始透析日期: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+       <el-form-item label="体格检查: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+       <el-form-item label="专科检查: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item>
+
+        <el-form-item label="实验室及器械检查: " prop="name">
+        <el-input v-model="allergic_history" placeholder=""></el-input>
+      </el-form-item> -->
+
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -55,12 +55,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="name" label="单位">
-                <template slot-scope="scope">
-                  {{scope.row.prescribing_number_unit}}
-                </template>
-            </el-table-column>
-
+           
             <el-table-column align="center" prop="total" label="操作">
                 <template slot-scope="scope">
                   <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id)">使用明细</div>

src/xt_pages/stock/stockQuery.vue

@@ -148,24 +148,34 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          
+          <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
               </td>
             </tr>
-         
-
+         </span>
          </template>
        </el-table-column>
       
         <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
+           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583"> 
+             {{
+              getWareInfo(scope.row.xt_warehouse_info) -
+              getAutoCount(scope.row.id) -
+              getOutCount(scope.row.id) +
+              getCancelCount(scope.row.id)
+              }}
+          </span>
+          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;
               </td>
             </tr>
+          </span>
          </template>
        </el-table-column>
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -19,7 +19,7 @@
         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint" v-if="org_id != 10188">
+              <div class="signPrint" v-if="org_id != 10188 && org_id!=10217">
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>