Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2197,10 +2197,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 = [];
@@ -2401,8 +2403,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/allListTemplate/summaryPrint.vue

@@ -1,60 +1,78 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}汇总清单</div>
-    <div class="allListInfo">
+    <div class="allListTitle">
+      {{ $store.getters.xt_user.org.org_name }}汇总清单
+    </div>
+    <div class="allListInfo" style="border-top: 1px solid;">
       <div>科别：门诊</div>
       <div>床号：</div>
       <div>门诊号：{{ order.mdtrt_id }}</div>
-      <div>患者姓名：{{ patient.name }}</div>
+      <div>姓名：{{ patient.name }}</div>
     </div>
 
-    <div class="allListInfo">
+    <div class="allListInfo" style="border-bottom: 1px solid;">
       <div>预交款：</div>
-      <div>门诊日期：</div>
       <div>总费用：{{ order.medfee_sumamt }}</div>
+      <div>门诊日期：</div>
     </div>
 
     <div class="allListInfo">
-      <div>西药:&nbsp;&nbsp;&nbsp;{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
-      <div>中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
+      <div>
+        西药:&nbsp;&nbsp;&nbsp;{{
+          order.westernMedicineCostTotal ? order.westernMedicineCostTotal : ""
+        }}
+      </div>
+      <div>
+        中成药:{{
+          order.chineseTraditionalMedicineCostTotal
+            ? order.chineseTraditionalMedicineCostTotal
+            : ""
+        }}
+      </div>
       <div>中草药:</div>
-      <div>检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
     </div>
 
-
     <div class="allListInfo">
+      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal : "" }}</div>
       <div>输氧费:</div>
-      <div>手术费:{{order.operationCostTotal?order.operationCostTotal:''}}</div>
-      <div>化验费:{{order.laboratoryCostTotal?order.laboratoryCostTotal:''}}</div>
-      <div>输血费:</div>
+      <div>
+        手术费:{{ order.operationCostTotal ? order.operationCostTotal : "" }}
+      </div>
     </div>
 
-
     <div class="allListInfo">
-      <div >诊察费:{{order.zhenChaCostTotal?order.zhenChaCostTotal:''}}</div>
-      <div >治疗费:{{order.treatCostTotal?order.treatCostTotal:''}}</div>
-      <div >护理费:</div>
-      <div >床位费:{{order.bedCostTotal?order.bedCostTotal:''}}</div>
+      <div>
+        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal : "" }}
+      </div>
+      <div>输血费:</div>
+      <div>
+        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal : "" }}
+      </div>
     </div>
 
-
     <div class="allListInfo">
-      <div >麻醉费:</div>
-      <div >材料费:{{order.materialCostTotal?order.materialCostTotal:''}}</div>
-      <div >其他费:{{order.otherCostTotal?order.otherCostTotal:''}}</div>
-      <div style="visibility: hidden;">其他费:</div>
+      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal : "" }}</div>
+      <div>护理费:</div>
+      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal : "" }}</div>
+    </div>
+    <div class="allListInfo">
+      <div>麻醉费:</div>
+      <div>
+        材料费:{{ order.materialCostTotal ? order.materialCostTotal : "" }}
+      </div>
+      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal : "" }}</div>
     </div>
     <!--    <div style="display:flex;justify-content: space-between;">-->
-<!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
-<!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
-<!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
-<!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
-<!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
-<!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
-<!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
-<!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-<!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
-<!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+    <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
+    <!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
+    <!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
+    <!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
+    <!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
+    <!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
+    <!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
+    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
+    <!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
+    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
     <!--    </div>-->
     <!--    <div style="display:flex;justify-content: space-between;">-->
     <!--      <div style="position: absolute;top:190px;left:40px">中成药</div>-->
@@ -82,129 +100,150 @@
     <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
     <!--    </div>-->
 
-
     <table class="allListTable" border="1">
       <tr>
-        <td style="width:10%">费用类别</td>
-        <td style="width:35%">项目名称</td>
-        <td style="width:5%">单位</td>
-        <td style="width:10%">数量</td>
-        <td style="width:10%">单价</td>
-        <td style="width:10%">金额</td>
-        <td style="width:10%">医保类型</td>
-
+        <td style="width: 10%">费用类别</td>
+        <td style="width: 35%">项目名称</td>
+        <td style="width: 5%">单位</td>
+        <td style="width: 10%">数量</td>
+        <td style="width: 10%">单价</td>
+        <td style="width: 10%">金额</td>
+        <td style="width: 10%">医保类型</td>
       </tr>
-      <template v-for='(item,index) in list'>
+      <template v-for="(item, index) in list">
         <tr v-if="item.is_total == 2">
-          <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.name }}{{ item.spec }}</td>
-          <td style="width:5%">{{ item.unit }}</td>
-          <td style="width:10%;text-align:right;">{{ item.count }}</td>
-          <td style="width:10%;text-align:right;">{{ item.price.toFixed(4) }}</td>
-          <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
-          <td style="width:10%">{{ item.medicine_insurance_kind }}</td>
-
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td
+            style="
+              width: 35%;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            "
+          >
+            {{ item.name }}{{ item.spec }}
+          </td>
+          <td style="width: 5%">{{ item.unit }}</td>
+          <td style="width: 10%; text-align: right">{{ item.count }}</td>
+          <td style="width: 10%; text-align: right">
+            {{ item.price.toFixed(4) }}
+          </td>
+          <td style="width: 10%; text-align: right">
+            {{ (item.price * item.count).toFixed(2) }}
+          </td>
+          <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
         </tr>
         <tr v-if="item.is_total == 1">
-          <td style="width:10%"></td>
-          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">合计</td>
-          <td style="width:5%"></td>
-          <td style="width:10%;text-align:right;"></td>
-          <td style="width:10%;text-align:right;"></td>
-          <td style="width:10%;text-align:right;">{{ item.total }}</td>
-          <td style="width:10%"></td>
-
+          <td style="width: 10%"></td>
+          <td
+            style="
+              width: 35%;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            "
+          >
+            合计
+          </td>
+          <td style="width: 5%"></td>
+          <td style="width: 10%; text-align: right"></td>
+          <td style="width: 10%; text-align: right"></td>
+          <td style="width: 10%; text-align: right">{{ item.total }}</td>
+          <td style="width: 10%"></td>
         </tr>
       </template>
     </table>
-
   </div>
 </template>
 
 <script>
-import { uParseTime } from '@/utils/tools'
+import { uParseTime } from "@/utils/tools";
 
 export default {
   props: {
     list: {
       type: Array,
-      default: function() {
-        return []
-      }
-    }, patient: {
+      default: function () {
+        return [];
+      },
+    },
+    patient: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, order: {
+      default: function () {
+        return {};
+      },
+    },
+    order: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, admin: {
+      default: function () {
+        return {};
+      },
+    },
+    admin: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, hospital: {
+      default: function () {
+        return {};
+      },
+    },
+    hospital: {
       type: Object,
-      default: function() {
-        return {}
-      }
-
-    }
+      default: function () {
+        return {};
+      },
+    },
   },
   data() {
     return {
       page: 1,
-      pageArr: []
-    }
+      pageArr: [],
+    };
   },
   methods: {
-    getNowTime: function() {
-      let dateTime
-      let yy = new Date().getFullYear()
-      let mm = new Date().getMonth() + 1
-      let dd = new Date().getDate()
-      let hh = new Date().getHours()
-      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
-          :
-          new Date().getMinutes()
-      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
-          :
-          new Date().getSeconds()
-      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
-      return dateTime
+    getNowTime: function () {
+      let dateTime;
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let hh = new Date().getHours();
+      let mf =
+        new Date().getMinutes() < 10
+          ? "0" + new Date().getMinutes()
+          : new Date().getMinutes();
+      let ss =
+        new Date().getSeconds() < 10
+          ? "0" + new Date().getSeconds()
+          : new Date().getSeconds();
+      dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
+      return dateTime;
     },
     getTimes(time) {
-      return uParseTime(time, '{y}-{m}-{d}')
-    }, getTotal: function(items) {
-      let total = 0
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getTotal: function (items) {
+      let total = 0;
       for (let i = 0; i < items.length; i++) {
-        total = total + (items[i].count * items[i].price).toFixed(2)
+        total = total + (items[i].count * items[i].price).toFixed(2);
       }
-      return total
-
-    }
-
+      return total;
+    },
   },
   watch: {
     list: {
       handler(newVal) {
-        this.getPage()
+        this.getPage();
       },
-      deep: true
-    }
-  }
-}
-
-
+      deep: true,
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .allList-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;
@@ -224,6 +263,10 @@ export default {
   margin: 10px 0;
 }
 
+.allListInfo div{
+  min-width: 200px;
+}
+
 .allListTable {
   width: 100%;
   text-align: center;

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/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -1,149 +1,169 @@
 <template>
   <div id="allList-print" class="allList-print">
-      <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用清单</div>
-      <div class="allListInfo">
-        <div style="text-align:left;">患者姓名：{{ patient.name }}</div>
-        <div style="text-align:left;padding-left: -20px">性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
-        <div style="text-align:left;">结算类型：{{order.is_medicine_insurance == 1 ?'医保':'自费'}}</div>
-<!--        <div>发票号码：</div>-->
+    <div class="allListTitle">
+      {{ $store.getters.xt_user.org.org_name }}费用清单
+    </div>
+    <div class="allListInfo">
+      <div style="text-align: left">患者姓名：{{ patient.name }}</div>
+      <div style="text-align: left; padding-left: -20px">
+        性别：{{ patient.gender == 1 ? "男" : "女" }}
+      </div>
+      <div style="text-align: left">
+        结算类型：{{ order.is_medicine_insurance == 1 ? "医保" : "自费" }}
       </div>
+      <!--        <div>发票号码：</div>-->
+    </div>
 
     <div class="allListInfo">
-        <div style="text-align:left;">住院/门诊号：{{order.mdtrt_id}}</div>
-        <div style="text-align:left;">科室：血透</div>
-        <div style="text-align:left;">就诊流水号：{{order.mdtrt_id}}</div>
+      <div style="text-align: left">住院/门诊号：{{ order.mdtrt_id }}</div>
+      <div style="text-align: left">科室：血透</div>
+      <div style="text-align: left">就诊流水号：{{ order.mdtrt_id }}</div>
     </div>
 
-      <div class="allListInfo">
-        <div style="text-align:left;">总费用：{{order.medfee_sumamt}}</div>
-        <div style="text-align:left;">个人支付：{{order.psn_part_amt}}</div>
-        <div style="text-align:left;">基金支付记账：{{order.fund_pay_sumamt}}</div>
-        <div style="text-align:left;">补充医疗支付记账：0.00</div>
-        <div style="text-align:left;">救助支付金额：{{order.maf_pay}}</div>
+    <div class="allListInfo">
+      <div style="text-align: left">总费用：{{ order.medfee_sumamt }}</div>
+      <div style="text-align: left">个人支付：{{ order.psn_part_amt }}</div>
+      <div style="text-align: left">
+        基金支付记账：{{ order.fund_pay_sumamt }}
       </div>
-      <table class="allListTable" border="1">
-        <tr>
-          <td style="width:5%">序号</td>
-          <td style="width:15%">处方日期</td>
-          <td style="width:10%">费用编号</td>
-          <td style="width:40%">费用名称</td>
-          <td style="width:5%">单位</td>
-          <td style="width:5%">数量</td>
-          <td style="width:10%">单价</td>
-          <td style="width:10%">金额</td>
-        </tr>
-        <template v-for='(item,index) in list'>
-          <tr v-if="item.is_total == 0">
-            <td style="width:5%">{{index + 1}}</td>
-            <td style="width:15%">{{item.p_time}}</td>
-            <td style="width:10%">{{item.feedetl_sn.split("-")[2]}}</td>
-            <td style="width:30%;white-space: nowrap;overflow: hidden;">{{item.name}}{{item.spec}}</td>
-            <td style="width:5%">{{item.unit}}</td>
-            <td style="width:5%;text-align:right;">{{ item.count }}</td>
-            <td style="width:10%;text-align:right;">{{ item.price }}</td>
-            <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
-          </tr>
-          <tr v-if="item.is_total == 1">
-            <td style="width:5%"></td>
-            <td style="width:15%"></td>
-            <td style="width:10%"></td>
-            <td style="width:30%;white-space: nowrap;overflow: hidden;">{{item.name}}</td>
-            <td style="width:5%"></td>
-            <td style="width:5%"></td>
-            <td style="width:10%;text-align:right;"></td>
-            <td style="width:10%;text-align:right;">{{ item.price}}</td>
-          </tr>
-        </template>
-      </table>
+    </div>
 
+    <div class="allListInfo">
+      <div style="text-align: left">补充医疗支付记账：0.00</div>
+      <div style="text-align: left">救助支付金额：{{ order.maf_pay }}</div>
+      <div></div>
     </div>
+    <table class="allListTable" border="1">
+      <tr>
+        <td style="width: 5%">序号</td>
+        <td style="width: 15%">处方日期</td>
+        <td style="width: 10%">费用编号</td>
+        <td style="width: 40%">费用名称</td>
+        <td style="width: 5%">单位</td>
+        <td style="width: 5%">数量</td>
+        <td style="width: 10%">单价</td>
+        <td style="width: 10%">金额</td>
+      </tr>
+      <template v-for="(item, index) in list">
+        <tr v-if="item.is_total == 0">
+          <td style="width: 5%">{{ index + 1 }}</td>
+          <td style="width: 15%">{{ item.p_time }}</td>
+          <td style="width: 10%">{{ item.feedetl_sn.split("-")[2] }}</td>
+          <td style="width: 30%; white-space: nowrap; overflow: hidden">
+            {{ item.name }}{{ item.spec }}
+          </td>
+          <td style="width: 5%">{{ item.unit }}</td>
+          <td style="width: 5%; text-align: right">{{ item.count }}</td>
+          <td style="width: 10%; text-align: right">{{ item.price }}</td>
+          <td style="width: 10%; text-align: right">
+            {{ (item.price * item.count).toFixed(2) }}
+          </td>
+        </tr>
+        <tr v-if="item.is_total == 1">
+          <td style="width: 5%"></td>
+          <td style="width: 15%"></td>
+          <td style="width: 10%"></td>
+          <td style="width: 30%; white-space: nowrap; overflow: hidden">
+            {{ item.name }}
+          </td>
+          <td style="width: 5%"></td>
+          <td style="width: 5%"></td>
+          <td style="width: 10%; text-align: right"></td>
+          <td style="width: 10%; text-align: right">{{ item.price }}</td>
+        </tr>
+      </template>
+    </table>
+  </div>
 </template>
 
 <script>
-import { uParseTime } from '@/utils/tools'
+import { uParseTime } from "@/utils/tools";
 
 export default {
   props: {
     list: {
       type: Array,
-      default: function() {
-        return []
-      }
-    }, patient: {
+      default: function () {
+        return [];
+      },
+    },
+    patient: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, order: {
+      default: function () {
+        return {};
+      },
+    },
+    order: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, admin: {
+      default: function () {
+        return {};
+      },
+    },
+    admin: {
       type: Object,
-      default: function() {
-        return {}
-      }
-    }, hospital: {
+      default: function () {
+        return {};
+      },
+    },
+    hospital: {
       type: Object,
-      default: function() {
-        return {}
-      }
-
-    }
+      default: function () {
+        return {};
+      },
+    },
   },
   data() {
     return {
       page: 1,
-      pageArr: []
-    }
+      pageArr: [],
+    };
   },
   methods: {
-    getNowTime: function() {
-      let dateTime
-      let yy = new Date().getFullYear()
-      let mm = new Date().getMonth() + 1
-      let dd = new Date().getDate()
-      let hh = new Date().getHours()
-      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
-          :
-          new Date().getMinutes()
-      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
-          :
-          new Date().getSeconds()
-      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
-      return dateTime
+    getNowTime: function () {
+      let dateTime;
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let hh = new Date().getHours();
+      let mf =
+        new Date().getMinutes() < 10
+          ? "0" + new Date().getMinutes()
+          : new Date().getMinutes();
+      let ss =
+        new Date().getSeconds() < 10
+          ? "0" + new Date().getSeconds()
+          : new Date().getSeconds();
+      dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
+      return dateTime;
     },
     getTimes(time) {
-      return uParseTime(time, '{y}-{m}-{d}')
-    }, getTotal: function(items) {
-      let total = 0
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getTotal: function (items) {
+      let total = 0;
       for (let i = 0; i < items.length; i++) {
-        total = total + (items[i].count * items[i].price).toFixed(2)
+        total = total + (items[i].count * items[i].price).toFixed(2);
       }
-      return total
-
+      return total;
     },
-
-
   },
   watch: {
     list: {
       handler(newVal) {
         // this.getPage()
       },
-      deep: true
-    }
-  }
-}
-
-
+      deep: true,
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 .allList-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;
@@ -163,6 +183,10 @@ export default {
   margin: 10px 0;
 }
 
+.allListInfo div {
+  min-width: 200px;
+}
+
 .allListTable {
   width: 100%;
   text-align: center;

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -108,43 +108,41 @@
             开单日期：
             {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
           </div>
-          <div>医生签字：
-            <span
-            style="width: 100px; display: inline-block"
-            v-if="item.creator == ''"
-          >
-            {{ item.doctor ? item.doctor : "" }}
-          </span>
+          <div>
+            医生签字：
+
+            <img
+              v-if="setAdminUserES(advicePrint[0].creator)"
+              style="height: 30px"
+              :src="setAdminUserES(advicePrint[0].creator)"
+              alt=""
+              srcset=""
+            />
             <span
-            style="width: 100px; display: inline-block"
-            v-else-if="doc_name != ''"
-          >
-            {{ doc_name }}
-          </span>
-          <img
-            style="height: 30px"
-            :src="setAdminUserES(item.creator,item.doctor)"
-            alt=""
-            srcset=""
-            v-else
-          />
-        </div>
-            </div>
+              style="width: 100px; display: inline-block"
+              v-else-if="advicePrint[0].doctor != ''"
+            >
+              {{ advicePrint[0].doctor ? advicePrint[0].doctor : "" }}
+            </span>
+            <span v-else>
+
+            </span>
+          </div>
         </div>
       </div>
-      <img
-        style="width: 100%"
-        v-if="org_id == 10138"
-        src="https://kuyi.shengws.com/bailin/blend.jpg"
-        alt=""
-      />
-      <img
-        style="width: 100%"
-        v-if="org_id == 10278"
-        src="https://kuyi.shengws.com/bailinbeier.png"
-        alt=""
-      />
     </div>
+    <img
+      style="width: 100%"
+      v-if="org_id == 10138"
+      src="https://kuyi.shengws.com/bailin/blend.jpg"
+      alt=""
+    />
+    <img
+      style="width: 100%"
+      v-if="org_id == 10278"
+      src="https://kuyi.shengws.com/bailinbeier.png"
+      alt=""
+    />
   </div>
 </template>
 <script>
@@ -165,7 +163,7 @@ export default {
   },
   data() {
     return {
-      doctorList_1:[],
+      doctorList_1: [],
       doctorList: [],
       advicePrint: {},
       patient: {},
@@ -175,7 +173,7 @@ export default {
       department: [],
       prescriptions: [],
       projectList: [],
-      doc_name:"",
+      doc_name: "",
       orgname: "",
       diagnoses: [],
       pageArr: [],
@@ -197,7 +195,7 @@ export default {
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {
           var history = response.data.data.history;
-          console.log("中国history222222", history);
+          // console.log("中国history222222", history);
           this.history = history;
         }
       });
@@ -227,7 +225,7 @@ export default {
       }
       return "";
     },
-    
+
     getPrescriptionPrint() {
       var params = {
         // patient_id:this.patient_id,
@@ -239,21 +237,21 @@ export default {
         ids: this.ids,
         p_type: 2,
       };
-      console.log("params", params);
+      // console.log("params", params);
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
-          console.log("adviceprint9999", advicePrint);
+          // console.log("adviceprint9999", advicePrint);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
-          console.log("处方222222", this.prescriptions);
+          // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          console.log("hisPatient", hisPatient);
+          // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           let projectPrint = [];
           let total = 0;
           this.advicePrint.map((item) => {
-            console.log("imte233232323232323223", item.project);
+            // console.log("imte233232323232323223", item.project);
             if (item.project.length > 0) {
               item.project.map((it) => {
                 if (it.type == 2) {
@@ -266,7 +264,7 @@ export default {
             }
           });
           this.doctorList_1 = response.data.data.eles;
-          console.log(this.doctorList_1, "医生列表");
+          // console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
             for (var index = 0; index < operatorsLen; index++) {
@@ -290,17 +288,18 @@ export default {
               data2.push(item);
             }
           });
-
+          this.projectPrint = data;
+          console.log("列表", this.projectPrint);
           this.total = total.toFixed(2);
           this.pre_time = this.advicePrint[0].pre_time;
           this.doctor = this.advicePrint[0].doctor;
-          this.projectPrint = data;
+
           this.singleProjectPrint = data2;
-          console.log("99999999999999999", projectPrint);
+
           var projectlist = response.data.data.projectlist;
 
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", projectlist);
+          // console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
           this.getPage();
           let outputlist1Name = response.data.data.his.patient_info
@@ -310,15 +309,17 @@ export default {
         }
       });
     },
-     // 电子签名
-    setAdminUserES(id,name) {
+    // 电子签名
+    setAdminUserES(id) {
+      // console.log(id, "id");
       if (id == 0) {
         return "";
       }
       if (id in this.operatorMaps) {
+        // console.log(this.operatorMaps, "this.operatorMaps");
         return this.operatorMaps[id].url;
       } else {
-        this.doc_name = name
+        // console.log("po");
         return "";
       }
     },
@@ -329,7 +330,7 @@ export default {
       getHisPatientDetail(params).then((response) => {
         if (response.data.state == 1) {
           var hisPatient = response.data.data.hisPatient;
-          console.log("挂号病人", hisPatient);
+          // console.log("挂号病人", hisPatient);
           this.hisPatient = hisPatient;
         }
       });
@@ -339,7 +340,7 @@ export default {
         if (response.data.state == 1) {
           this.department = response.data.data.department;
           this.diagnoses = response.data.data.diagnose.sort(this.compare("id"));
-          console.log("争端", this.diagnoses);
+          // console.log("争端", this.diagnoses);
         }
       });
     },

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

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -254,7 +254,7 @@
             label="处方编号"
             width="120">
           <template slot-scope="scope">
-            <span>检验单1</span>
+            <span>检验单</span>
           </template>
         </el-table-column>
         <el-table-column label="检验单号">