更改

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2174,10 +2174,12 @@ export default {
               var item = this.records[recordIndex].advices[index];
               if (item.id in childMap) {
                 item.children = childMap[item.id];
+                // advices.push(childMap[item.id]);
               } else {
                 item.children = [];
               }
               advices.push(item);
+              
             }
 
             var leftAdvice = [];
@@ -2378,8 +2380,6 @@ export default {
       }
     },
     getAdminUser(key, id) {
-      console.log("key", key);
-      console.log("id", id);
       if (
         typeof key === "undefined" ||
         key == null ||

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -13,9 +13,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215  || org_id == 0 " :paramsObj="invoiceParams"></printTwo>
-            <printThree v-if="org_id == 10265" :paramsObj="invoiceParams"></printThree>
+            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=4&& org_id !=0" :paramsObj="invoiceParams"></printOne>
+            <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
+            <printThree v-if="org_id == 10265 || org_id == 0|| org_id == 4" :paramsObj="invoiceParams"></printThree>
         </div>
     </div>
   </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -10,6 +10,10 @@
             <div  style="position: absolute;left:560px;top:70px;">
             <!-- 发票序号 -->
             </div>
+             <div  style="position: absolute;left:660px;top:70px;">
+            <!-- 类别 -->
+            类别：
+            </div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
@@ -78,7 +82,7 @@
             <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
             <div style="position: absolute;top:250px;left:340px">氧气费</div>
             <div style="position: absolute;top:250px;left:420px"></div>
-            <div style="position: absolute;top:250px;left:500px">其他</div>
+            <div style="position: absolute;top:250px;left:500px">其他费</div>
             <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
 
@@ -157,17 +161,16 @@
           {{list.order.maf_pay?list.order.maf_pay:''}}
           <!-- 医疗救助 -->
         </div>
-        <div style="position: absolute;top:340px;left:500px">
-            <!-- 大病 -->
+        <!-- 大病 -->
+        <!-- <div style="position: absolute;top:340px;left:500px">
           {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
-
-
-        </div>
-        <div style="position: absolute;top:340px;left:560px">
-            <!-- 其他基金支付 -->
+        </div> -->
+        <!-- 其他基金支付 -->
+        <!-- <div style="position: absolute;top:340px;left:560px">
+            
           {{list.order.oth_pay?list.order.oth_pay:''}}
 
-        </div>
+        </div> -->
         <div style="position: absolute;top:370px;left:320px">
             <!-- 预交款合计 -->
 

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择">
             <el-option
               v-for="item,index in efs"
               :key="index"

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2288,6 +2288,24 @@
 
                 }
 
+                for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
+                  if(this.prescriptions[i].advices[b].execution_frequency == "" ){
+                    this.$message.error("请输入处方"+ (b+1) +"频率")
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                  if(this.prescriptions[i].advices[b].day == NaN ){
+                    this.$message.error("请输入处方"+(b+1)+"天数")
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                     if(this.prescriptions[i].advices[b].prescribing_number == "" ){
+                    this.$message.error("请输入处方"+(b+1)+"总量")
+                    this.$emit('editKeepLoad', false)
+                    return
+                  }
+                }
+
                 for (let b = 0; b < this.prescriptions[i].project.length; b++) {
                   this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()