Merge branch 'master' of http://47.103.65.67:3000/yeguodong/web_dist

src/components/inpatient/nurse-module/BottleCard.vue

@@ -38,26 +38,26 @@
       </thead>
       <tbody>
         <tr>
-          <td colspan="4">药品名称</td>
-          <td style="width: 36px;text-align: center;">规格</td>
+          <td colspan="5">药品名称 / 规格</td>
+          <!-- <td style="width: 36px;text-align: center;">规格</td> -->
           <td style="width: 36px;text-align: center;">频率</td>
           <td style="width: 36px;text-align: center;">用法</td>
           <td style="width: 36px;text-align: center;">数量</td>
         </tr>
         <tr v-for="item in drugs">
-          <td colspan="4" style="width: 100%;height: 100%;position: relative">
-            <div style="position: absolute;left: 2px;top: 2px;width:90%">
+          <td colspan="5" style="width: 100%;height: 100%;position: relative">
+            <div style="margin-bottom: 10px;">
               {{ item.drugName }}
+              <!-- <br/>
+              <br/> -->
             </div>
-            <!-- <div style="position: absolute;right: 2px;top: 50%; font-weight: bolder">
-              {{ item.specification }}
-            </div> -->
+            <div style="width: 100%;text-align: center;font-weight: bold;">{{ item.specification }}</div>
           </td>
-          <td>
-            <div style="font-weight: bolder">
+          <!-- <td>
+            <div style="width: 20px;font-weight: bolder;padding: 0 1px;word-wrap: break-word;">
               {{ item.specification }}
             </div>
-          </td>
+          </td> -->
           <td style="text-align: right">
             <div>{{ item.frequCode }}</div>
             <div>{{ item.startHour }}</div>

src/components/medical-advice/nursing-manage/FirstHuLiDan.vue

@@ -753,7 +753,9 @@ const closeHld =()=>{
 //保存护理单
 const saveHuLiDan=(val)=>{
     setFormData(formData.value)
-    saveYzTemperature(formData.value).then((res)=>{
+    let datas = formData.value
+    delete datas.detailNo
+    saveYzTemperature(datas).then((res)=>{
         if(val != 1){
             //保存
             emit('refreshHuLidan')

src/components/medical-insurance/settle-detail-list/InpatientSetlList.vue

@@ -56,7 +56,7 @@
         <td colspan="2">{{ setlinfo.balc }}</td>
       </tr>
     </table>
-    <div style="height: 8px"></div>
+    <!-- <div style="height: 8px"></div>
     <table>
       <tr>
         <td rowspan="3">既往费用</td>
@@ -204,7 +204,7 @@
         <td colspan="2">{{ setlinfo.polItemInfo.allFundAmt }}</td>
         <td colspan="3">{{ setlinfo.polItemInfo.allSum }}</td>
       </tr>
-    </table>
+    </table> -->
     <div style="height: 8px"></div>
     <table>
       <tr>

src/views/hospitalization/zy-gl/AdvancePaymentDeal.vue

@@ -83,6 +83,11 @@
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
+                <!-- <el-col :span="12">
+                  <el-form-item label="" prop="inpatientNoType">
+                    <button @click="printSjNew">打印</button>
+                  </el-form-item>
+                </el-col> -->
               </el-row>
             </el-collapse-item>
           </el-collapse>
@@ -470,20 +475,28 @@ const printCode = ref(null)
 function printSjNew(){
   let LODOP = getLodop();
   //设置默认打印机
-  if(stringIsBlank(printCode.value)){
-    ElMessage.error('请选择打印机')
-    return
-  }
-  LODOP.SET_PRINTER_INDEX(printCode.value);
+  // if(stringIsBlank(printCode.value)){
+  //   ElMessage.error('请选择打印机')
+  //   return
+  // }
+  // LODOP.SET_PRINTER_INDEX(printCode.value);
+  // LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
+  // LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "192mm");
+  // LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "97mm");
+  // LODOP.SET_PRINT_PAGESIZE(2, "192mm", "97mm", "CreateCustomPage");
+  // LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "住院预交金");//对新建的纸张重命名
+  // let strStyle = "<style>table{width: 170mm;} table,td,th {border-width: 1px;border-style: solid;border-collapse: collapse;padding: 8px;}</style>"
+  // LODOP.ADD_PRINT_HTM("0mm", "8mm", "120mm", "280mm", strStyle + document.getElementById("report_table_1").innerHTML);
+  // LODOP.PRINT();
   LODOP.SET_PRINT_STYLE("FontSize", 9); //字体大小
-  LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "192mm");
-  LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "97mm");
-  LODOP.SET_PRINT_PAGESIZE(1, "192mm", "97mm", "CreateCustomPage");
+  LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "210mm");
+  LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "290mm");
+  LODOP.SET_PRINT_PAGESIZE(1, "210mm", "290mm", "CreateCustomPage");
   LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "住院预交金");//对新建的纸张重命名
-  let strStyle = "<style>table{width: 170mm;} table,td,th {border-width: 1px;border-style: solid;border-collapse: collapse;padding: 8px;}</style>"
-  LODOP.ADD_PRINT_HTM("0mm", "8mm", "120mm", "280mm", strStyle + document.getElementById("report_table_1").innerHTML);
-  LODOP.PRINT();
-  // LODOP.PREVIEW();
+  let strStyle = "<style>table{width: 180mm;} table,td,th {border-width: 1px;border-style: solid;border-collapse: collapse;padding: 8px;}</style>"
+  LODOP.ADD_PRINT_HTM("0mm", "8mm", "130mm", "280mm", strStyle + document.getElementById("report_table_1").innerHTML);
+  // LODOP.PRINT();
+  LODOP.PREVIEW();
   clearPrintData()
 }
 

src/views/medical-advice/nursing-manage/ThreeTestList.vue

@@ -169,10 +169,14 @@
                                     </el-table-column>
                                     <el-table-column prop="shitOther" label="大便(次)">
                                         <template #default="scope">
+                                            <!-- 原有选择框代码（已屏蔽，保留以备后用）
                                             <el-select v-model="scope.row.shitOther" >
                                                 <el-option v-for="item in shitOtherList" :key="item.code" :label="item.name" :value="item.code">
                                                 </el-option>
                                             </el-select>
+                                            -->
+                                            <!-- 新的输入框实现 -->
+                                            <el-input v-model="scope.row.shitOther" placeholder="请输入大便次数" clearable></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column prop="urineQuanInfo" label="尿量(ml)" >
@@ -331,6 +335,7 @@ const urineInfoList = ref([
     }
 ])
 
+// 大便(次)选项列表（已屏蔽，保留以备后用）
 const shitOtherList = ref([
     {
         code:'☆',

src/views/medical-insurance/allpatient/SiSettleDetailList.vue

@@ -5,7 +5,7 @@
         style="
           width: 100%;
           text-align: center;
-          font-size: 22px;
+          font-size: 15px;
           font-weight: bold;
           margin-bottom: 8px;
         "
@@ -15,14 +15,15 @@
       <div
         style="width: 100%; display: flex; margin-bottom: 4px; font-size: 12px"
       >
-        <div style="width: 25%; text-align: left">
+        <div style="width: 50%; text-align: left">
           医疗机构名称：{{ env.VITE_HOSPITAL_NAME }}
         </div>
-        <div style="width: 25%">医疗机构编码：{{ env.VITE_HOSPITAL_CODE }}</div>
+        <div style="width: 50%; text-align: right">打印日期：{{ nowdate }}</div>
+        <!-- <div style="width: 25%">医疗机构编码：{{ env.VITE_HOSPITAL_CODE }}</div>
         <div style="width: 25%">医院等级：三级综合</div>
-        <div style="width: 25%; text-align: right">金额单位：元</div>
+        <div style="width: 25%; text-align: right">金额单位：元</div> -->
       </div>
-      <div
+      <!-- <div
         style="width: 100%; display: flex; margin-bottom: 8px; font-size: 12px"
       >
         <div style="width: 25%; text-align: left">
@@ -31,7 +32,7 @@
         <div style="width: 25%">{{ patNoType }}：{{ setlinfo.patNo }}</div>
         <div style="width: 25%">就诊号：{{ setlinfo.mdtrtId }}</div>
         <div style="width: 25%; text-align: right">打印日期：{{ nowdate }}</div>
-      </div>
+      </div> -->
       <InpatientSetlList v-if="outParam.type === 21" :setlinfo="setlinfo" />
       <OtherOutpatientSetlList
         v-if="outParam.type === 11 && !isEmployeeOutpatient"
@@ -51,7 +52,8 @@
         "
       >
         <div style="width: 30%">患者/家属签字：</div>
-        <div style="width: 30%">联系电话：</div>
+        <!-- <div style="width: 30%">联系电话：</div> -->
+        <div style="width: 30%">医院盖章：</div>
         <div style="width: 20%">经办人：{{ setlinfo.staffName }}</div>
         <div style="width: 20%">审核人：</div>
       </div>