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

src/api/his/his.js

@@ -499,6 +499,17 @@ export function refundNumber(params) {
 }
 
 
+export function changeMedType(params) {
+  return request({
+    url: "/api/changemedtype/post",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
 
 
 

src/router/modules/drugs.js

@@ -30,6 +30,32 @@ export default {
       name: 'drugsStockOut',
       meta: { title: 'drugsStockOut', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugModifyPrice',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
+      name: 'drugModifyPrice',
+      meta: { title: 'drugModifyPrice', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugModifyPricePrint',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPricePrint'),
+      name: 'drugModifyPricePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugModifyPricePrint', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugDamaged',
+      component: () => import('@/xt_pages/stock/drugs/drugDamaged'),
+      name: 'drugDamaged',
+      meta: { title: 'drugDamaged', noCache: true }
+    },
+    {
+      path: '/stock/drugs/drugWarning',
+      component: () => import('@/xt_pages/stock/drugs/drugWarning'),
+      name: 'drugWarning',
+      meta: { title: 'drugWarning', noCache: true }
+    },
     // {
     //   path: '/stock/drugs/stock/return',
     //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),

src/xt_pages/data/components/addDrugs.vue

@@ -112,7 +112,7 @@
                                       maxlength="30"></el-input>
                           <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
                                 <el-option
-                                        v-for="(item,index) in  getDataConfig('hemodialysis','units')"
+                                        v-for="(item,index) in unitList"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -139,7 +139,7 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="中心静脉置管"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="中心静脉置管"></label-box>
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-颈内') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-锁骨下') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -260,7 +260,10 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
+
         ],
         sex: [{
           value: 1,

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -241,7 +241,9 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -257,7 +257,9 @@
           { value: 4, label: '农保' },
           { value: 5, label: '会员' },
           { value: 6, label: '职工' },
-          { value: 7, label: '合同' }
+          { value: 7, label: '合同' },
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -242,7 +242,9 @@
           {value: 4, label: '农保'},
           {value: 5, label: '会员'},
           {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          {value: 7, label: '合同'},
+          {value: 8, label: '医保自费'},
+
         ],
         sex: [{
           value: 1,
@@ -523,6 +525,10 @@
         this.form.certificates = 1
         this.form.medical_care = 11
         this.form.settlement_value = 1
+        this.form.register = 4
+        this.form.registration_fee = 0
+        this.form.medical_expenses = 0
+
 
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,6 +15,7 @@
         <div class='dialysisPage'>
             <printOne v-if="org_id != 10106" :paramsObj="invoiceParams"></printOne>
             <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
+            <!-- <printThree :paramsObj="invoiceParams"></printThree> -->
         </div>
     </div>
   </div>
@@ -23,11 +24,13 @@
 <script>
 import printOne from './invoiceTemplate/printOne'
 import printTwo from './invoiceTemplate/printTwo'
+import printThree from './invoiceTemplate/printThree'
 export default {
   name: "invoicePrint",
   components: {
     printOne,
-    printTwo
+    printTwo,
+    printThree
   },
   props:{
     invoiceParams:Object

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -0,0 +1,237 @@
+<template>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <!-- <div style="position: absolute;top:30px;left:70px;">{{ list.order_number }}</div> -->
+            <!-- <div>{{ list.id_card_no }}</div> -->
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div  style="position: absolute;left:400px;top:85px;">{{ list.department_name }}</div>
+            <!-- <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div> -->
+            <div></div>
+            <div>
+                <span style="position: absolute;left:120px;top:60px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <!-- <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
+                <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>-->
+            </div> 
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:80px;left:120px;"> {{ paramsObj.name }}</div>
+            <!-- <div style="position: absolute;top:60px;left:210px;">√</div> -->
+            <!-- <div>{{ list.pay_way }}</div> -->
+            <!-- <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
+            <div style="position: absolute;top:60px;left:640px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div> -->
+        </div>
+        <!-- <div style="display:flex;justify-content: space-between;">
+            <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div>
+            <div style="position: absolute;top:90px;left:290px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:90px;left:460px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
+        </div> -->
+        <!-- <div style="display:flex;justify-content: space-between;"> -->
+            <div style="position: absolute;top:120px;left:120px">西药 {{ list.westernMedicineCostTotal }}</div>
+            <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
+            <div style="position: absolute;top:140px;left:120px">检查费 {{ list.checkCostTotal }}</div>
+            <!-- <div style="position: absolute;top:180px;left:80px"></div> -->
+            <div style="position: absolute;top:160px;left:120px">治疗费 {{ list.treatCostTotal }}</div>
+            <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
+            <div style="position: absolute;top:180px;left:120px">床位费 {{ list.bedCostTotal }}</div>
+            <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
+        <!-- </div> -->
+        <!-- <div style="display:flex;justify-content: space-between;"> -->
+            <div style="position: absolute;top:200px;left:120px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
+            <div style="position: absolute;top:220px;left:120px">化验费 {{ list.laboratoryCostTotal }}</div>
+            <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
+            <div style="position: absolute;top:240px;left:120px">手术费 {{ list.operationCostTotal }}</div>
+            <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
+            <div style="position: absolute;top:260px;left:120px">其他费 {{ list.otherCostTotal }}</div>
+            <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
+        <!-- </div> -->
+        <!-- <div style="display:flex;justify-content: space-between;"> -->
+            <!-- <div style="position: absolute;top:200px;left:40px"></div>
+            <div style="position: absolute;top:200px;left:110px"></div>
+            <div style="position: absolute;top:200px;left:200px"></div>
+            <div style="position: absolute;top:200px;left:280px"></div> -->
+            <div style="position: absolute;top:280px;left:120px">材料费 {{ list.materialCostTotal }}</div>
+            <!-- <div style="position: absolute;top:200px;left:460px"></div> -->
+            <!-- <div style="position: absolute;top:200px;left:560px"></div>
+            <div style="position: absolute;top:200px;left:640px"></div> -->
+        <!-- </div> -->
+        <!-- <div>
+            <span>
+            <span style="position: absolute;top:250px;left:200px">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:260px">
+                <span v-if="zhongwen.indexOf('仟') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:320px">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:380px">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:440px">
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:500px">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:250px;left:560px">
+                <span v-if="zhongwen.indexOf('分') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            </span>
+            <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
+        </div> -->
+        <div style="position: absolute;top:300px;left:120px">合计大写 {{ zhongwen }}</div>
+        <div style="position: absolute;top:300px;left:400px">合计小写 {{ list.psn_cash_money }}</div>
+        <div>
+            <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
+            <div style="position: absolute;top:320px;left:120px">{{ list.name }}</div>
+        </div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:''
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                console.log('res',res)
+                this.list = res.data.data
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                this.smalltoBIG(this.list.psn_cash_money)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";  
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+            console.log("str",str)
+            if(str == '零元零角零分'){
+                this.zhongwen = '零'
+            }else{
+                this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            }
+
+            console.log(this.zhongwen)
+        },
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
+
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                }
+                this.getInvoice(params)
+
+            },
+            deep:true
+        }
+    }
+}
+</script>

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -64,7 +64,8 @@
         ids:'',
         info:null,
         org_id:'',
-        balanceAccounts:{}
+        balanceAccounts:{},
+        num:0
       };
     },
     methods:{
@@ -82,14 +83,119 @@
         // });
 
         if(this.org_id == 10138){
-          const style =
-          '@media print {#prescription-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 50%;}}}';
-          printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style,
-              scanStyles: false
-          });
+          setTimeout(() => {
+            const style =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 49%;}}}';
+            const style2 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 52%;}}}';
+            const style3 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 55%;}}}';
+            const style4 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 58%;}}}';
+            const style5 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 61%;}}}';
+            const style6 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 66%;}}}';
+            const style7 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 71%;}}}';
+            const style8 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 75%;}}}';
+            const style9 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 80%;}}}';
+            const style10 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 90%;}}}';
+            const style11 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 91%;}}}';
+            const style12 =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 91%;}}}';
+            if(this.num >= 13){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style,
+                scanStyles: false
+              });
+            }else if(this.num == 12){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style2,
+                scanStyles: false
+              });
+            }else if(this.num == 11){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style3,
+                scanStyles: false
+              });
+            }else if(this.num == 10){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style4,
+                scanStyles: false
+              });
+            }else if(this.num == 9){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style5,
+                scanStyles: false
+              });
+            }else if(this.num == 8){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style6,
+                scanStyles: false
+              });
+            }else if(this.num == 7){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style7,
+                scanStyles: false
+              });
+            }else if(this.num == 6){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style8,
+                scanStyles: false
+              });
+            }else if(this.num == 5){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style9,
+                scanStyles: false
+              });
+            }else if(this.num == 4){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style10,
+                scanStyles: false
+              });
+            }else if(this.num == 3){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style11,
+                scanStyles: false
+              });
+            }else if(this.num <= 2){
+              printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style12,
+                scanStyles: false
+              });
+            }
+            
+            
+          },500)
         }else{
           const style =
           '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
@@ -144,18 +250,22 @@
                 details: [],
                 total: 0
               }
+              let num = 0
               this.balanceAccounts.order_info.map(item => {
                 
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
+                  num++
                 }else{
                   if(item.project.type == 2){
                     obj2.details.push(item)
                     obj2.total += (item.pric * item.project.count)
+                    num++
                   }else{
                     obj3.details.push(item)
                     obj3.total += (item.pric * item.project.count)
+                    num++
                   }
                 }
               })
@@ -164,6 +274,8 @@
               this.balanceAccounts.new_detail_list.push(obj2)
               this.balanceAccounts.new_detail_list.push(obj3)
               console.log(111,this.balanceAccounts)
+              this.num = num
+              console.log('this.num',this.num)
             }
           })
 

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -15,7 +15,7 @@
                   <div>费别：<span style="display:inline-block;width:80px;">{{info.patient_info.transBody.outputlist1 ? getName(info.patient_info.transBody.outputlist1) : ''}}</span>
                   </div>
                   <div>电脑号：<span style="display:inline-block;width:80px;">{{info.patient_info.transBody.aac999 ? info.patient_info.transBody.aac999 : ''}}</span></div>
-                  <div>收费日期：<span style="display:inline-block;width:80px;">{{info.record_date ? info.record_date : ''}}</span></div>
+                  <div>收费日期：<span style="display:inline-block;width:100px;">{{info.record_date ? info.record_date : ''}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
@@ -24,12 +24,12 @@
                   <tr>
                       <td width="70">类别</td>
                       <td>项目</td>
-                      <td width="80">规格</td>
+                      <td width="180">规格</td>
                       <td width="50">单位</td>
                       <td width="50">数量</td>
                       <td width="60">单价</td>
                       <td width="70">总额</td>
-                      <td width="100">小计</td>
+                      <td width="130">小计</td>
                   </tr>
                   <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
                       <tr v-for="(subItem,index) in item.details" :key="index">
@@ -46,26 +46,26 @@
                   </div>
                   <tr>
                     <td colspan="7">
-                      <div style="display:flex;flez-wrap:wrap;">
+                      <div style="display:flex;flez-wrap:wrap;font-size:16px;">
                         <div style="width:33%;" v-for="(item,index) in info.transBody.outputlist2" :key="index">{{getValue(item)}}</div>
                       </div>
                     </td>
-                    <td>合计: {{info.transBody.akc264?info.transBody.akc264:0}}元</td>
+                    <td style="font-size:16px;">合计: {{info.transBody.akc264?info.transBody.akc264:0}}元</td>
                   </tr>
                   <tr>
                       <td colspan="7">
-                          <div style="display:flex;flez-wrap:wrap;">
+                          <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
                               <div style="width:33%;">医疗费总额：{{info.transBody.akc264?info.transBody.akc264:0}}元</div>
                               <div style="width:33%;">基金支付金额：{{info.transBody.akb068?info.transBody.akb068:0}}元</div>
                               <div style="width:33%;">个人账户支付金额：{{info.transBody.akb066?info.transBody.akb066:0}}元</div>
 
                           </div>
-                          <div style="display:flex;flez-wrap:wrap;">
+                          <div style="display:flex;flez-wrap:wrap;font-size:16px;">
                               <div style="width:33%;">个人支付金额：{{info.transBody.akb067?info.transBody.akb067:0}}元</div>
                               <div style="width:33%;">个人账户金额：{{info.after_money}}元</div>
                           </div>
                       </td>
-                      <td>合计：{{info.transBody.akc264?info.transBody.akc264:0}}元</td>
+                      <td style="font-size:16px;">合计：{{info.transBody.akc264?info.transBody.akc264:0}}元</td>
                   </tr>
 
               </table>
@@ -86,12 +86,12 @@
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
                   <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</span></div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient == '1' ? '男' : '女'}}</span></div>
+                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span></div>
                   <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
                   </div>
                   <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
-                  <div>收费日期：<span style="display:inline-block;width:80px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                  <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
@@ -100,12 +100,12 @@
                   <tr>
                       <td width="70">类别</td>
                       <td>项目</td>
-                      <td width="80">规格</td>
+                      <td width="180">规格</td>
                       <td width="50">单位</td>
                       <td width="50">数量</td>
                       <td width="60">单价</td>
                       <td width="70">总额</td>
-                      <td width="100">小计</td>
+                      <td width="130">小计</td>
                   </tr>
                   <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
                       <tr v-for="(subItem,index) in item.details" :key="index">

src/xt_pages/outpatientCharges/summary.vue

@@ -84,6 +84,9 @@
                 <el-table-column align="center" width="90" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>
                 </el-table-column>
+                <el-table-column align="center" width="90" prop="name" label="医疗类型">
+                    <template slot-scope="scope"><div>{{getMedType(scope.row.med_type)}}</div></template>
+                </el-table-column>
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
                         {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
@@ -241,6 +244,95 @@
       }
     },
     methods: {
+      getMedType(med_type) {
+        var med_type = parseInt(med_type)
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+          switch (med_type) {
+            case 11:
+              return '普通门诊'
+
+              break
+            case 12:
+              return '家庭通道'
+
+              break
+            case 13:
+              return '门诊大病'
+
+              break
+
+            case 14:
+              return '重疾特药'
+              break
+
+            case 15:
+              return '门诊慢病'
+
+              break
+            case 16:
+              return '门诊特检'
+
+              break
+            case 17:
+              return '健康体检'
+
+              break
+            case 18:
+              return '预防接种'
+
+              break
+            case 19:
+              return '门诊输血'
+
+              break
+            case 91:
+              return '新冠肺炎门诊'
+              break
+            case 1111:
+              return '精一' + '处方'
+              break
+            case 1112:
+              return '精二' + '处方'
+              break
+          }
+
+        } else {
+
+          switch (med_type) {
+            case 11:
+              return '普通门诊'
+
+              break
+            case 12:
+              return '门诊挂号'
+
+              break
+            case 13:
+              return '急诊'
+
+              break
+
+            case 14:
+              return '门诊特殊病'
+              break
+
+            case 15:
+              return '门诊统筹'
+
+              break
+            case 16:
+              return '门诊慢性病'
+
+              break
+            case 21:
+              return '普通住院'
+              break
+
+          }
+
+        }
+
+      },
       uploadInfo(row) {
         var that = this
         axios.get('http://127.0.0.1:9532/api/settlelist/get', {
@@ -291,6 +383,10 @@
 
       }, toRefund(row) {
 
+        console.log("~~~~~")
+        console.log(row)
+        console.log(this.$store.getters.xt_user.org_id )
+
 
 
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
@@ -335,8 +431,8 @@
           }).catch(() => {
           })
 
-        } else if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-
+        } else if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+            var that = this
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -345,8 +441,8 @@
             let params = {
               'order_id': row.id,
               'patient_id': row.patient_id,
-              'record_time': that.getTimes(row.settle_accounts_date),
-              'admin_user_id': that.$store.getters.xt_user.user.id
+              'record_time': this.getTimes(row.settle_accounts_date),
+              'admin_user_id': this.$store.getters.xt_user.user.id
             }
             axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
               params: params
@@ -404,14 +500,29 @@
       },
       toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+         if(row.mdtrt_id.indexOf("H") > -1){
           this.statementVisible9504 = true
-          let obj = {
-            order_id: row.id,
-            patient_id: row.patient_id,
-            record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id
-          }
-          this.orderObj9504 = obj
+            let obj = {
+              order_id: row.id,
+              patient_id: row.patient_id,
+              record_time: this.getTimes(row.settle_accounts_date),
+              admin_user_id: this.$store.getters.xt_user.user.id
+            }
+            this.orderObj9504 = obj
+         }else{
+           
+           this.statementVisible9504 = true
+            let obj = {
+              order_id: row.id,
+              patient_id: row.patient_id,
+              record_time: this.getTimes(row.settle_accounts_date),
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              balance_accounts_type:2
+            }
+            this.orderObj9504 = obj
+         }
+
+         
         } else {
           this.statementVisible = true
           let obj = {

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -0,0 +1,348 @@
+<template>
+  <div>
+       <template>
+        <el-button
+          style="float:right;"
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+            
+      <div class='dialysisPage' style="padding-top:40px;">
+        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+      </div>
+  </div>
+</template>
+
+<script>
+import { jsGetAge, uParseTime } from "@/utils/tools";
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import print from "print-js";
+import printOne from "./checkTemplate/printOne"
+import { getAllDoctorList,getAllHisPatientList } from "@/api/project/project"
+export default {
+  name: "dialysisPrintOrder",
+  components: {
+    BreadCrumb,
+    printOne,
+  },
+  props:{
+    paramsObj:Object
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
+      record_date:"",
+      patientTableData:[],
+      advicePrint:[],
+      hisPatient:{},
+      patient:{},
+      search_input:"",
+      loading:false,
+      patient_id:0,
+      prescription_id:0,
+      ids:''
+    };
+  },
+  methods:{
+    printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+        setTimeout(() => {
+            const style =
+            '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
+            printJS({
+                printable: "prescription-print3",
+                type: "html",
+                style: style,
+                scanStyles: false
+            });
+        },500)
+        
+    },
+    getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+               
+               this.doctorList = doctor
+             }
+         })   
+     },
+    getAllHisPatientList(){
+         const params = {
+           record_date:this.record_date
+         }
+      getAllHisPatientList(params).then(response=>{
+         if(response.data.state == 1){
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+
+            console.log('222', this.patientTableData)
+            let cal_one = 0
+            let cal_two = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
+                cal_one = cal_one + 1
+              }
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                cal_two = cal_two + 1
+              }
+            }
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
+            this.cal_one = cal_one
+            this.cal_two = cal_two   
+         }
+      })
+    },
+
+    changePatient(row){
+      console.log("row",row)
+      this.patient_id = row.patient_id
+      this.record_date = this.record_date
+      this.prescription_id = this.prescription_id
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //     prescription_id:this.prescription_id,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
+    },
+    searchAction(){
+
+    }
+    
+  },
+
+  created() {
+    this.org_id = this.$store.getters.xt_user.org_id
+    this.getAllDoctorList()
+    var record_date = this.paramsObj.record
+    this.record_date = record_date
+    console.log("record_date",record_date)
+    this.prescription_id = this.paramsObj.prescription_id
+    this.patient_id = this.paramsObj.patient_id
+    this.ids = this.paramsObj.ids
+    this.getAllHisPatientList(record_date)
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        this.patient_id = this.paramsObj.patient_id
+        var record_date = this.paramsObj.record
+        this.record_date = record_date
+        var prescription_id = this.paramsObj.prescription_id
+        this.prescription_id = prescription_id
+        this.ids = this.paramsObj.ids
+        
+      },
+      deep:true
+    }
+  }
+
+};
+</script>
+
+<style>
+.dialysis-print-order {
+  width: 960px;
+  margin: 0 auto;
+}
+
+.dialysis-print-order .order-yy-name {
+  margin: auto;
+  text-align: center;
+  font-size: 20px;
+  letter-spacing: 5px;
+}
+
+.dialysis-print-order .order-title {
+  margin: auto;
+  font-weight: 600;
+  text-align: center;
+  font-size: 22px;
+  padding: 10px;
+}
+
+.dialysis-print-order .table-box {
+  width: 100%;
+  line-height: 23px;
+  font-size: 14px;
+}
+
+.dialysis-print-order .print-table {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+}
+
+.dialysis-print-order .print-table-no {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  font-size: 14px;
+}
+
+.dialysis-print-order .under-line {
+  border-bottom: 1px solid #999;
+  width: 95%;
+  text-align: center;
+  margin-left: 2px;
+}
+
+.dialysis-print-order .title-box {
+  text-align: center;
+  font-size: 16px;
+}
+
+.dialysis-print-order .radio-lebel-box {
+  font-weight: 400;
+  cursor: pointer;
+}
+
+.dialysis-print-order .radio-no {
+  opacity: 0;
+  outline: none;
+  position: absolute;
+  margin: 0;
+  width: 0;
+  height: 0;
+  z-index: -1;
+}
+
+.dialysis-print-order .radio-inner {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: none;
+  display: inline-block;
+  line-height: 1;
+  position: relative;
+  vertical-align: middle;
+}
+
+.dialysis-print-order .radio-fang {
+  display: inline-block;
+  position: relative;
+  border: 1px solid #000;
+  box-sizing: border-box;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  z-index: 1;
+  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+
+.dialysis-print-order .is-checked-radio::after {
+  content: "√";
+  font-size: 15px;
+}
+
+.dialysis-print-order .print-table-no tr td {
+  padding: 8px 5px;
+  line-height: 25px;
+}
+
+.dialysis-print-order .print-table tr td {
+  padding: 1px 1px;
+  /*line-height: 25px;*/
+}
+
+.es-img {
+  height: 30px;
+}
+
+.advice-name {
+  text-align: left;
+}
+
+.advice-children {
+  display: flex;
+}
+
+.title-box-pro {
+  border: 0 #fff;
+  line-height: 25px;
+  height: 25px;
+  text-align: left;
+  padding-left: 10px !important;
+}
+.title-box-pro-tr {
+  border: 0 #fff;
+}
+.text-align-left {
+  text-align: left !important;
+  padding-left: 10px !important;
+  font-size: 14px !important;
+  line-height: 25px;
+}
+.print-table-tr-new td {
+  line-height: 20px !important;
+}
+.border-top-solid {
+  border: solid 1px #000;
+}
+.print-template-two tr {
+  line-height: 30px;
+}
+
+.table-box1 {
+  border: 1px solid #000;
+  width: 100%;
+  line-height: 30px;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+.table-box1 tr {
+  border-bottom: 1px solid #000;
+}
+</style>
+
+<style lang="scss">
+
+.newContainer{
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+  
+  .el-date-editor{
+    .el-input__inner{
+      padding-right:0px;
+    }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+}
+.newContainer::-webkit-scrollbar{
+  height: 15px !important;
+}
+</style>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -0,0 +1,460 @@
+<template>
+    <div>
+        <div id='prescription-print3' class="prescription-print">
+            <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
+            <div class="printTitle">检验申请单</div>
+
+            <div style="border:1px solid #000;">
+                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;line-height:40px;padding:0 10px;">
+                    <div>是否急诊：否</div>
+                    <div>结算方式：{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</div>
+                    <div>金额：{{ total }}</div>
+                </div>
+                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;line-height:40px;padding:0 10px;">
+                    <div>姓名：{{advicePrint[0].patient.name?advicePrint[0].patient.name:""}}</div>
+                    <div>性别：
+                        <span v-if="advicePrint[0].patient.gender == 1">男</span>
+                        <span v-if="advicePrint[0].patient.gender == 2">女</span>
+                    </div>
+                    <div>年龄：{{advicePrint[0].patient.age?advicePrint[0].patient.age:""}}岁</div>
+                </div>
+                <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
+                <div style="margin-bottom:20px;padding:0 10px;">体格检查：
+                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                </div>
+                <div style="margin-bottom:20px;padding:0 10px;">临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
+                <div style="display:flex;margin-bottom:20px;padding:0 10px;">
+                    <div>检验项目：</div>
+                    <div>
+                        <div v-for="item in projectPrint" style="margin-bottom:10px;">{{ item.project.project_name }}</div>
+                    </div>
+                </div>
+                <div style="display:flex;justify-content: space-between;border-top:1px solid #000;line-height:40px;padding:0 10px;">
+                    <div>开单医生：{{ doctor ? doctor : '' }}</div>
+                    <div>开单日期：
+                        {{getTime(pre_time) ? getTime(pre_time).split(' ')[0] : ''}}
+                    </div>
+                    <div>医生签字：{{ doctor ? doctor : '' }}</div>
+                </div>
+            </div>   
+            <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
+        </div>
+    </div>
+
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail,getPatientCaseHistory} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
+export default {
+    props:{
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number,
+      ids:String
+    }, 
+    data(){
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[],
+        prescriptions:[],
+        projectList:[],
+        orgname:"",
+        diagnoses:[],
+        pageArr:[],
+        faber:{},
+        total:0,
+        projectPrint:[],
+        time:'',
+        doctor:''
+      }
+    },
+   methods:{
+    getPatientCaseHistory(){
+        const params = {
+          patient_id:this.patient_id
+        }
+        getPatientCaseHistory(params).then(response=>{
+            if(response.data.state == 1){
+                var history = response.data.data.history
+                console.log("中国history222222",history)
+                this.history = history
+            }
+        })
+    },
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+               
+               this.doctorList = doctor
+             }
+         })   
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+       getPrescriptionPrint(){
+         var params = {
+          // patient_id:this.patient_id,
+          // record_date:this.record_date,
+          // prescription_id:this.prescription_id,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids
+        }
+        console.log("params",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint9999",advicePrint)
+            this.advicePrint = advicePrint
+            this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
+            var hisPatient = response.data.data.hisPatient
+            console.log("hisPatient",hisPatient)
+            this.hisPatient = hisPatient
+            let projectPrint = []
+            let total = 0
+            this.advicePrint.map(item => {
+              if(item.project.length > 0){
+                  item.project.map(it => {
+                        if(it.type == 2){
+                            if(it.project.cost_classify == 3){
+                                projectPrint.push(it)
+                                total += it.project.price
+                            }
+                        }
+                  })
+                
+              }
+            })
+            this.total = total
+            this.pre_time = this.advicePrint[0].pre_time
+            this.doctor = this.advicePrint[0].doctor
+            this.projectPrint = projectPrint
+            console.log('this.projectPrint',projectPrint)
+            var projectlist =  response.data.data.projectlist
+
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
+            this.getPage()
+            let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
+            this.faber = outputlist1Name
+
+            
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     },
+    getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+          
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       }
+
+        return total + addtotal
+      },
+      
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+
+     getDiagnosis(ids){
+        let id = ids.split(',')
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          // if(id == this.diagnoses[i].id){
+          //    name = this.diagnoses[i].class_name
+          // }
+          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
+            name += this.diagnoses[i].class_name + ' '
+          }
+        }
+        return name
+     },
+     getPage(){
+        this.page = 1
+        this.pageArr = []
+
+        this.advicePrint.map(item => {
+          let arr = []
+          item.pageArr = []
+          if(item.advices.length <= 5){
+            this.page = 1
+            arr.push(item.advices.length)
+            item.pageArr.push(arr)
+            
+          }else if(item.advices.length > 5){
+            this.page = parseInt(item.advices.length / 5)
+            let num = item.advices.length % 5
+            for (var i=0;i<this.page;i++){
+              item.pageArr.push([5])
+            }
+            if(num != 0){
+              item.pageArr.push([num])
+            }
+          }
+        })
+        // console.log('this.pageArr',this.pageArr)
+      },
+      getName(list) {
+        console.log('list',list)
+        let new_list = []
+        for (let i = 0; i < list.length; i++) {
+          if (list[i].aac031 == '1') {
+            new_list.push(list[i])
+          }
+        }
+
+        switch (new_list[0].bcc334) {
+          case "A31001":
+            return "深圳医保1档"
+            break
+          case "A31002":
+            return "深圳医保2档"
+
+            break
+          case "A31003":
+            return "深圳医保3档"
+
+            break
+          case "A31004":
+            return "二档（少儿）"
+
+            break
+          case "A31005":
+            return "学生二档"
+
+            break
+          case "A31006":
+            return "大学生二档"
+
+            break
+          case "A32001":
+            return "在职公务员"
+            break
+          case "A32002":
+            return "在职驻深公务员"
+
+            break
+          case "A39301":
+            return "家属统筹医疗"
+
+            break
+          case "A41001":
+            return "工伤在职"
+
+            break
+          case "A51001":
+            return "生育在职"
+
+            break
+          case "A52001":
+            return "生育医疗一档"
+
+            break
+          case "A52002":
+            return "生育医疗一档"
+
+            break
+          case "C31001":
+            return "一档医疗退休"
+
+            break
+          case "C31002":
+            return "二档医疗退休"
+            break
+
+        }
+
+
+
+      },
+
+   },
+   created(){
+      this.getAllDoctorList()
+      this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
+      this.getPatientCaseHistory()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
+     
+   },
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-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; 
+    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;
+}
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+.infoTitle{
+    display: flex;
+    margin-top:10px;
+    line-height: 24px;
+}
+.infoTitle div{
+    width: 200px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    margin-top:10px;
+}
+.infoMain div{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    min-height:400px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox div{
+    line-height: 20px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between; 
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+.under_line{
+  display: inline-block;
+  border-bottom: 1px solid #000;
+  flex: 1;
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -46,9 +46,9 @@
 
                     </el-form-item>
 
-                    <el-form-item label="诊断:" prop="name" label-position="right">
+                    <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;">
 
-                        <el-select style="width:100%;" v-model="diagnose" placeholder="">
+                        <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple>
                             <el-option
                                     v-for="(item,index) in diagnoses"
                                     :key="index"
@@ -540,6 +540,9 @@
           {value: 18, label: "预防接种"},
           {value: 19, label: "门诊输血"},
           {value: 91, label: "新冠肺炎门诊"},
+          {value: 1111, label: "精一"},
+          {value: 1112, label: "精二"},
+
         ],
 
         isLastOrNextVisible: false,
@@ -613,7 +616,7 @@
         department: [],
         sick: [],
         diagnoses: [],
-        diagnose: "",
+        diagnose: [],
         state1: '',
         curTotal: 0,
         prescription_id: 0,
@@ -744,7 +747,8 @@
               obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
               obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
-              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
+              // obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
+              obj['single_dose_unit'] = drug_month_prescriptions.advices[a].drug.dose_unit
 
 
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
@@ -1748,22 +1752,7 @@
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
-            // var info = response.data.data.info
-            // if (info.user_type == 2 || info.user_type == 1) {
-            //   this.doctorValue = info.admin_user_id
-            //   if (info.department_id == 0) {
-            //     if (this.department.length > 0) {
-            //       this.departmentValue = this.department[0].id
-            //     } else {
-            //       this.departmentValue = ''
-            //
-            //     }
-            //   } else {
-            //     this.departmentValue = info.department_id
-            //   }
-            // }else{
-            //   this.doctorValue = this.doctors[0].admin_user_id
-            // }
+
           }
         })
 
@@ -1868,14 +1857,12 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data,last_info) {
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
 
 
-
-        console.log(doctors)
         for (let i = 0; i < doctors.length; i++) {
           if (doctors[i].user_type == 1) {
             doctors.splice(i, 1)
@@ -1903,14 +1890,7 @@
           this.curPrescriptions = {}
         }
 
-        this.diagnose = info.diagnosis
-        if (this.diagnose == 0) {
-          this.diagnose = ""
-          for (let i = 0; i < this.diagnoses.length; i++) {
-            this.diagnose = this.diagnoses[0].id
-          }
 
-        }
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -1927,14 +1907,6 @@
           this.showTwo = true
         }
 
-        this.state1 = info.sick_type
-        if (this.state1 == 0) {
-          this.state1 = ''
-          for (let i = 0; i < this.sick.length; i++) {
-            this.state1 = this.sick[0].id
-          }
-
-        }
         this.state2 = info.sick_history
         if (this.state2 == 0) {
           this.state2 = ''
@@ -1955,52 +1927,100 @@
           this.order_status = '已退费'
         }
 
-        if (info.id > 0) {
-          this.doctorValue = info.doctor_id
-          this.departmentValue = info.departments
-        } else {
-          if (hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
-            this.doctorValue = hisPatientInfo.doctor
-            this.departmentValue = hisPatientInfo.department
+
+
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            if (admin_info.user_type == 2) {
-              this.doctorValue = admin_info.admin_user_id
-              if (admin_info.department_id == 0) {
-                if (this.department.length > 0) {
-                  if (department && department.length > 0) {
-                    this.departmentValue = department[0].id
+            this.drugs = response.data.data.drugs
+            this.allDrugs = response.data.data.drugs
+            this.advices_template = response.data.data.advices_template
+            this.doctors = response.data.data.doctors
+            for (let i = 0; i < this.doctors.length; i++) {
+              if (this.doctors[i].user_type == 1) {
+                this.doctors.splice(i, 1)
+              }
+            }
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+            this.diagnoses = response.data.data.diagnose
+            this.additions = response.data.data.additions
 
-                  } else {
 
-                    this.departmentValue = ''
 
-                  }
-                } else {
-                  this.departmentValue = ''
-                }
-              } else {
-                this.departmentValue = admin_info.department_id
+
+
+            if (info.id > 0) {
+              this.doctorValue = info.doctor_id
+              this.departmentValue = info.departments
+            } else {
+              if(admin_info.id > 0 && admin_info.user_type == 2){
+                this.doctorValue = admin_info.admin_user_id
+                this.departmentValue = this.department[0].id
+
+              }else{
+
+                this.doctorValue = this.doctors[0].admin_user_id
+                this.departmentValue = this.department[0].id
+
+              }
+
+
+            }
+
+            if (info.register_type == 0) {
+              for (let i = 0; i < this.register.length; i++) {
+                this.register_type = this.register[0].value
               }
             } else {
-              this.doctorValue = doctors[0].admin_user_id
+              this.register_type = info.register_type
             }
-            if (this.doctorValue == 0) {
-              this.doctorValue = ''
+            this.diagnose = []
+
+            if(info.id == 0){
+              if(last_info.diagnosis.length == 0){
+                this.diagnose = []
+              }else{
+                for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
+                  this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
+
+                }
+              }
+            }else{
+              if(info.diagnosis.length == 0){
+                this.diagnose = []
+              }else{
+                for(let i = 0; i < info.diagnosis.split(",").length;i++){
+                  this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
+
+                }
+
+              }
+
             }
+
+
+
+            this.state1 = info.sick_type
+            if (this.state1 == 0 || this.state1 == "") {
+              this.state1 = ''
+              for (let i = 0; i < this.sick.length; i++) {
+                this.state1 = this.sick[0].id
+              }
+            }
+
+            if(this.departmentValue == "" || this.departmentValue == 0){
+              if(this.department.length > 0){
+                this.departmentValue = this.department[0].id
+
+              }
+            }
+
           }
-        }
-        console.log(info.register_type)
-        if (info.register_type == 0) {
-          for (let i = 0; i < this.register.length; i++) {
-            this.register_type = this.register[0].value
-          }
-        } else {
-          this.register_type = info.register_type
-        }
+        })
 
-        if (this.diagnose == 0) {
-          this.diagnose = ""
-        }
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -2077,7 +2097,6 @@
             this.$message.error('疾病类型不能为空')
             return
           }
-          console.log(this.prescriptions)
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
@@ -2104,7 +2123,7 @@
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
-              diagnose: this.diagnose,
+              diagnose: this.diagnose.join(","),
               sick_type: this.state1,
               sick_history: this.state2,
               doctor: this.doctorValue,
@@ -2183,7 +2202,7 @@
             if (index == 1) {
               let params = {
                 patient_id: this.patientInfo.id,
-                diagnose: this.diagnose,
+                diagnose: this.diagnose.join(","),
                 sick_type: this.state1,
                 sick_history: this.state2,
                 doctor: this.doctorValue,
@@ -2613,8 +2632,8 @@
                   remark: '',
                   day: "1",
                   prescribing_number: temp3[b].prescribing_number,
-                  single_dose_unit: temp3[b].drug.min_unit,
-                  prescribing_number_unit: temp3[b].drug.max_unit,
+                  single_dose_unit: temp3[b].drug.dose_unit,
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
                   medical_insurance_number: temp3[b].drug.medical_insurance_number
                 }
 
@@ -2640,8 +2659,8 @@
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,
-                  single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].max_unit,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b]
                 }
@@ -2795,12 +2814,16 @@
         })
       },
       selectTeam(row) {
+        console.log(row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].item_id)
         }
+        console.log(arr)
         var ids = arr.join(',')
+        console.log(ids)
         var strArr = ids.split(',')
+        console.log(strArr)
         var res = []//接收不重复的数据
 
         for (var i = 0; i < strArr.length; i++) {
@@ -2816,6 +2839,7 @@
             res.push(strArr[i])
           }
         }
+        console.log(res)
         var idstr = res.join(',')
         const params = {
           project_id: idstr

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -117,13 +117,13 @@
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
+          <el-input v-model="scope.row.execution_frequency" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <el-input v-model="scope.row.number_days" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
             <div>{{'天'}}</div>
           </div>
         </template>
@@ -399,18 +399,18 @@
         if(scope.row.drug.min_unit == scope.row.single_dose_unit){
           if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
             console.log(1)
-            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           }else{
             console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number) 
           }
         }else{
           if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
             console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose) 
           }else{
             console.log(1234)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
           }
         }
         if(scope.row.prescribing_number == 0){
@@ -430,24 +430,26 @@
         
       },
       getPrescribingNumberUnit(scope){
-        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
-          }else{
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
-          }
-        }else{
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
-          }else{
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
-          }
-        }
-        if(scope.row.prescribing_number == 0){
-          scope.row.prescribing_number = 1
-        }
+
+        // console.log('scope',scope)
+        // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+        //   }
+        // }else{
+        //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+        //   }else{
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+        //   }
+        // }
+        // if(scope.row.prescribing_number == 0){
+        //   scope.row.prescribing_number = 1
+        // }
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          scope.row.retail_price = scope.row.drug.min_price
           if(scope.row.prescribing_number > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
@@ -455,7 +457,7 @@
           if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
-          scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+          scope.row.retail_price = scope.row.drug.retail_price
         }
       },
       changePrescribingNumber(scope){
@@ -470,7 +472,7 @@
         }
       },
       getProjectSingleDose(scope){
-        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        this.prescription.project[scope.$index].total = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.number_days ? scope.row.number_days : 1)
         if(this.prescription.project[scope.$index].total == 0){
           this.prescription.project[scope.$index].total = 1
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -101,17 +101,20 @@
                         <el-button size="small" ref="button_three" @click="open_two()" type="primary">处方调用</el-button>
                         <el-button size="small" @click="open_three()" type="primary">存模板</el-button>
 
-                        <el-popover
+                        <!-- <el-popover
                                 placement="bottom"
-                                width="200"
+                                width="300"
                                 trigger="click">
                             <el-button size="small" ref="button_two" @click="open(2)">处方单</el-button>
                             <el-button size="small" ref="button_six" @click="open(6)">治疗单</el-button>
+                            <el-button size="small" ref="button_six" @click="open(20)">检验单</el-button>
                             <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印
                             </el-button>
 
-                        </el-popover>
-                        <!--<el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
+                        </el-popover> -->
+                        <el-button size="small" @click="openPrint" type="primary">打印</el-button>
+
+                        <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
                     </div>
                     <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
                         <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
@@ -145,17 +148,18 @@
         </div>
 
         <el-dialog
-                title="处方打印"
+                title="打印"
                 :visible.sync="centerDialogVisible"
                 width="600px"
                 center>
-            <el-table
+                <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">处方笺打印</div>
+                <el-table
                     ref="multipleTable"
-                    :data="tableData"
+                    :data="tableData1"
                     tooltip-effect="dark"
                     style="width: 600px"
 
-                    @selection-change="handleSelectionChange">
+                    @selection-change="handleSelectionChange1">
                 <el-table-column
                         align='center'
                         type="selection"
@@ -171,9 +175,67 @@
                 </el-table-column>
                 <el-table-column label="处方号">
                     <template slot-scope="scope">
-          <span>
-           <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
-          </span>
+                      <span>
+                        <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
+                      </span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">治疗单打印</div>
+                <el-table
+                    ref="multipleTable"
+                    :data="tableData2"
+                    tooltip-effect="dark"
+                    style="width: 600px"
+
+                    @selection-change="handleSelectionChange2">
+                <el-table-column
+                        align='center'
+                        type="selection"
+                        width="50">
+                </el-table-column>
+                <el-table-column
+                        align='center'
+                        label="治疗单编号"
+                        width="120">
+                    <template slot-scope="scope">
+                        <span>治疗 {{scope.$index + 1}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="治疗单号">
+                    <template slot-scope="scope">
+                      <span>
+                        <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
+                      </span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">检验单打印</div>
+                <el-table
+                    ref="multipleTable"
+                    :data="tableData3"
+                    tooltip-effect="dark"
+                    style="width: 600px"
+
+                    @selection-change="handleSelectionChange3">
+                <el-table-column
+                        align='center'
+                        type="selection"
+                        width="50">
+                </el-table-column>
+                <el-table-column
+                        align='center'
+                        label="处方编号"
+                        width="120">
+                    <template slot-scope="scope">
+                        <span>检验单1</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="检验单号">
+                    <template slot-scope="scope">
+                      <span>
+                        <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
+                      </span>
                     </template>
                 </el-table-column>
             </el-table>
@@ -183,15 +245,22 @@
                     title="打印"
                     :visible.sync="innerVisible"
                     append-to-body>
-
-                <print v-if="index == 2" :paramsObj='paramsObj'></print>
-                <treatPrint v-if="index == 6" :paramsObj='paramsObj'></treatPrint>
+                <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
+                <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
+                <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
             </el-dialog>
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
       </span>
         </el-dialog>
+        <!-- <el-dialog
+                class="centerDialog"
+                width="600px"
+                title="打印"
+                :visible.sync="checkVisible">
+            <checkPrint v-if="index == 20" :paramsObj='paramsObj'></checkPrint>
+        </el-dialog> -->
         <el-dialog
                 class="centerDialog"
                 width="600px"
@@ -216,6 +285,7 @@
   import print from './print'
   import treatPrint from './treatPrint'
   import recordPrint from './recordPrint'
+  import checkPrint from './checkPrint'
   import dialysisIndex from './components/dialysisIndex'
 
   const moment = require('moment')
@@ -230,6 +300,7 @@
       print,
       treatPrint,
       recordPrint,
+      checkPrint,
       dialysisIndex
     },
     data() {
@@ -267,6 +338,7 @@
         diagnoses: [],
         other_sick: [],
         info: {},
+        last_info:{},
         templatedetail: {},
         detalid: 0,
         prescription_id: 0,
@@ -275,13 +347,20 @@
         patientid: 0,
         prescriptionList: [],
         centerDialogVisible: false,
-        tableData: [],
-        selecting_schs: [],
+        tableData1: [],
+        tableData2: [],
+        tableData3: [],
+        tableData4: [],
+        selecting_schs1: [],
+        selecting_schs2: [],
+        selecting_schs3: [],
         index: 0,
         admin_info: {},
         saveLoading: false,
         innerVisible: false,
         paramsObj: {},
+        paramsObj2: {},
+        paramsObj3: {},
         recordVisible: false,
         recordObj: {},
         additions: [],
@@ -295,9 +374,21 @@
         cure_data_two:[],
 
         all_his_patients:[],
+        checkVisible:false
       }
     },
     methods: {
+      openPrint(){
+        // this.centerDialogVisible = true
+        this.getPrescriptionList(this.patientInfo.id)
+      },
+      printThisPage(){
+        this.$nextTick(() => {
+          this.$refs.print.printThisPage()
+          this.$refs.treatPrint.printThisPage()
+          this.$refs.checkPrint.printThisPage()
+        })
+      },
       changeOther(patient_id){
         this.radio = 2;
         let params = {
@@ -1042,6 +1133,31 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            //排班
+            for (let i = 0; i < response.data.data.list_two.length; i++) {
+              //未就诊
+              if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.un_cure_data.push(obj)
+              }
+
+              //已就诊
+              if (response.data.data.list_two[i].prescription.length > 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.cure_data.push(obj)
+              }
+            }
+
             //挂号
             for (let i = 0; i < response.data.data.list.length; i++) {
               for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
@@ -1069,30 +1185,7 @@
             }
 
 
-            //排班
-            for (let i = 0; i < response.data.data.list_two.length; i++) {
-              //未就诊
-              if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
-                let obj = {
-                  name: response.data.data.list_two[i].name,
-                  number: response.data.data.list_two[i].his_patient.number,
-                  id: response.data.data.list_two[i].id,
-                  his_patient_id: response.data.data.list_two[i].his_patient.id
-                }
-                this.un_cure_data.push(obj)
-              }
 
-              //已就诊
-              if (response.data.data.list_two[i].prescription.length > 0 && response.data.data.list_two[i].his_patient.id == 0) {
-                let obj = {
-                  name: response.data.data.list_two[i].name,
-                  number: response.data.data.list_two[i].his_patient.number,
-                  id: response.data.data.list_two[i].id,
-                  his_patient_id: response.data.data.list_two[i].his_patient.id
-                }
-                this.cure_data.push(obj)
-              }
-            }
 
             this.all_data = this.all_data.concat(this.cure_data)
             this.all_data = this.all_data.concat(this.un_cure_data)
@@ -1126,7 +1219,6 @@
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        this.patientid = val.id
         let params = {
           'record_date': this.record_date,
           'patient_id': val.id,
@@ -1144,6 +1236,7 @@
 
             return false
           } else {
+            this.patientid = val.id
             this.isloading = false
 
             this.prescriptions = []
@@ -1153,6 +1246,8 @@
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
             this.info = response.data.data.info
+            this.last_info = response.data.data.last_info
+
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
 
@@ -1428,126 +1523,9 @@
                 this.prescriptions.push(obj)
 
               }
-              // else{
-              //
-              //   if(response.data.data.count <= 1 ){
-              //     if(response.data.data.last_prescriptions.length == 0){
-              //       let obj = {
-              //         id: 0,
-              //         name: '处方' + 1,
-              //         advices: [],
-              //         project: [],
-              //         addition: [],
-              //         order_status: 0,
-              //         pre_time: nowTime,
-              //
-              //       };
-              //       this.prescriptions.push(obj)
-              //
-              //
-              //     }else {
-              //       for (let i = 0; i < response.data.data.last_prescriptions.length; i++) {
-              //         var prescription = response.data.data.last_prescriptions[i];
-              //         let tempAdvice = [];
-              //         let tempProject = [];
-              //         let tempAddition = [];
-              //
-              //         //药品
-              //         for (let b = 0; b < prescription.advices.length; b++) {
-              //           let obj = {
-              //             advice_id:0,
-              //             drug_name: prescription.advices[b].advice_name,
-              //             single_dose: prescription.advices[b].single_dose,
-              //             delivery_way: prescription.advices[b].delivery_way,
-              //             execution_frequency: prescription.advices[b].execution_frequency,
-              //             retail_price: prescription.advices[b].price.toString(),
-              //             remark: prescription.advices[b].remark,
-              //             day: prescription.advices[b].day,
-              //             prescribing_number: prescription.advices[b].prescribing_number.toString(),
-              //             single_dose_unit: prescription.advices[b].single_dose_unit,
-              //             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-              //             medical_insurance_number: prescription.advices[b].med_list_codg,
-              //             id: prescription.advices[b].drug_id,
-              //             drug:prescription.advices[b].drug
-              //
-              //           };
-              //           tempAdvice.push(obj)
-              //         }
-              //
-              //         //项目
-              //         for (let b = 0; b < prescription.project.length; b++) {
-              //           let obj = {
-              //             id:0,
-              //             project_id: prescription.project[b].project_id,
-              //             project_name: prescription.project[b].project.project_name,
-              //             statistical_classification: prescription.project[b].project.statistical_classification,
-              //             single_dose: prescription.project[b].single_dose,
-              //             delivery_way: prescription.project[b].delivery_way,
-              //             execution_frequency: prescription.project[b].execution_frequency,
-              //             number_days: prescription.project[b].day,
-              //             total: prescription.project[b].count.toString(),
-              //             price: prescription.project[b].price,
-              //             remark: prescription.project[b].remark,
-              //             medical_code: prescription.project[b].project.medical_code,
-              //             unit: prescription.project[b].project.unit,
-              //             type: prescription.project[b].type
-              //           };
-              //
-              //           if (prescription.project[b].type == 2) {
-              //             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-              //             obj['medical_code'] = prescription.project[b].project.medical_code
-              //             obj['project_name'] = prescription.project[b].project.project_name
-              //
-              //           } else if (prescription.project[b].type == 3) {
-              //             obj['statistical_classification'] = ""
-              //             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-              //             obj['project_name'] = prescription.project[b].good_info.good_name
-              //           }
-              //           tempProject.push(obj)
-              //         }
-              //
-              //         //附加收费
-              //         for (let b = 0; b < prescription.addition.length; b++) {
-              //           let obj = {
-              //             item_name: prescription.addition[b].item_name,
-              //             price: prescription.addition[b].price,
-              //             count: prescription.addition[b].count,
-              //             item_id: prescription.addition[b].item_id,
-              //           };
-              //           tempAddition.push(obj)
-              //         }
-              //
-              //         var preTime = nowTime
-              //
-              //         let index = i + 1;
-              //         let obj = {
-              //           id: 0,
-              //           name: '处方' + index,
-              //           advices: tempAdvice,
-              //           project: tempProject,
-              //           addition: tempAddition,
-              //           order_status: 1,
-              //           pre_time: preTime
-              //         };
-              //         this.prescriptions.push(obj)
-              //       }
-              //     }
-              //   }else{
-              //     let obj = {
-              //       id: 0,
-              //       name: '处方' + 1,
-              //       advices: [],
-              //       project: [],
-              //       addition: [],
-              //       order_status: 0,
-              //       pre_time: nowTime,
-              //
-              //     };
-              //     this.prescriptions.push(obj)
-              //   }
-              // }
             }
-            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+            console.log("~~~~~00000222222")
+            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
           }
         })
 
@@ -1590,6 +1568,8 @@
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
@@ -1983,7 +1963,7 @@
                     //   }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               });
@@ -2016,6 +1996,8 @@
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
@@ -2402,7 +2384,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               })
@@ -2436,6 +2418,8 @@
                   this.hisPatientInfo = response.data.data.his_info;
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
+                  this.last_info = response.data.data.last_info
+
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
 
@@ -2821,7 +2805,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions);
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department,this.hisPatientInfo, this.month_prescriptions,this.last_info);
                   this.$refs.child.watchSign = 0
                 }
               });
@@ -2869,13 +2853,13 @@
               return
             }
           })
-          this.$confirm('是否保存当前处方', '保存', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            this.open(1)
-          }).catch(() => {
+          // this.$confirm('是否保存当前处方', '保存', {
+          //   confirmButtonText: '确 定',
+          //   cancelButtonText: '取 消',
+          //   type: 'warning'
+          // }).then(() => {
+          //   this.open(1)
+          // }).catch(() => {
 
             for(let i = 0; i < this.all_data.length; i++){
               if(this.all_data[i].id == val.id){
@@ -2920,6 +2904,8 @@
 
                 this.case_history = response.data.data.case_history
                 this.info = response.data.data.info
+                this.last_info = response.data.data.last_info
+
                 this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
                 if (this.case_history.breathing <= 0) {
                   this.case_history.breathing = ''
@@ -3297,11 +3283,11 @@
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
               }
             })
 
-          })
+          // })
 
           // this.$message.error('需要保存保存处方才能切换')
         } else {
@@ -3330,6 +3316,8 @@
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
               this.info = response.data.data.info
+              this.last_info = response.data.data.last_info
+
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
 
@@ -3716,7 +3704,7 @@
                   // }
                 }
               }
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions)
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions,this.last_info)
             }
           })
 
@@ -3761,6 +3749,8 @@
           this.getPrescriptionList(this.patientInfo.id,2)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
+        }else if(index == 20){
+          this.getPrescriptionList(this.patientInfo.id,2,3)
         }
 
       },
@@ -3799,31 +3789,90 @@
         this.prescription_id = data
       },
 
-      getPrescriptionList(id,type) {
+      getPrescriptionList(id,type,checkType) {
         getPrescriptionList(id,2).then(response => {
           if (response.data.state == 1) {
-            this.centerDialogVisible = true
-            var list = response.data.data.list
-            let arr = []
-            for (let i = 0; i < list.length; i++) {
-              if(list[i].type == type){
-                list[i].prescription_number = list[i].prescription_number + i
-                arr.push(list[i])
+            if(checkType != 3){
+              this.centerDialogVisible = true
+              var list = response.data.data.list
+              let arr1 = []
+              let arr2 = []
+              let arr3 = []
+              let arr4 = []
+              for(var i=list.length-1;i>=0;i--){
+                if(list[i].type == 1){
+                  list[i].prescription_number = list[i].prescription_number + i
+                  arr1.push(list[i])
+                }
+                if(list[i].type == 2){
+                  list[i].prescription_number = list[i].prescription_number + i
+                  arr2.push(list[i])
+                  arr3.push(list[i])
+                  arr4.push(list[i])
+                }
+                if(list[i].type == 2){
+                  let count = 0
+                  list[i].project.map(item => {
+                    if(item.type == 2){
+                      if(item.project.cost_classify == 3){
+                        count++
+                      }
+                    }
+                  })
+                  if(count == list[i].project.length){
+                    arr2.map((items,index) => {
+                      if(items.id == list[i].id){
+                        arr2.splice(index,1);
+                      }
+                    })
+                  }
+                }
               }
+              this.tableData1 = arr1
+              this.tableData2 = arr2
+              this.tableData4 = arr4
+              this.tableData3 = [arr3[0]]
+              
+            }else{
+              var list = response.data.data.list
+              let arr = []
+              for (let i = 0; i < list.length; i++) {
+                if(list[i].type == type){
+                  list[i].prescription_number = list[i].prescription_number + i
+                  arr.push(list[i])
+                }
 
+              }
+              console.log('arrrrrrrrrr',arr)
+              this.selecting_schs = arr
+              
+              this.savePrint()
             }
-            this.tableData = arr
+            
           }
         })
       },
-      handleSelectionChange(val) {
-        this.selecting_schs = val
+      handleSelectionChange1(val) {
+        this.selecting_schs1 = val
+      },
+      handleSelectionChange2(val) {
+        this.selecting_schs2 = val
+      },
+      handleSelectionChange3(val) {
+        if(val.length == 0){
+          this.selecting_schs3 = []
+        }else{
+          this.selecting_schs3 = this.tableData4
+        }
       },
       handleClick() {
         if(this.titleType == "电子处方"){
           if(this.radio == 1){
             this.un_cure_data.map(item => {
+              console.log("~~~~~~~~")
               if(item.id == this.patientid){
+                console.log("~~~~~~~~22222222")
+
                 this.getPatientInfo(item)
               }
             })
@@ -3844,34 +3893,68 @@
 
       },
       savePrint() {
-        var arr = [];
-        for (let i = 0; i < this.selecting_schs.length; i++) {
-          arr.push(this.selecting_schs[i].id)
+        //处方
+        var arr1 = [];
+        if(this.selecting_schs1.length > 0){
+          for (let i = 0; i < this.selecting_schs1.length; i++) {
+            arr1.push(this.selecting_schs1[i].id)
+          }
+          var ids1 = arr1.join(',')
+            let obj1 = {
+            record: this.record_date,
+            prescription_id: this.prescription_id,
+            ids: ids1,
+            patient_id: this.patientid
+          };
+          this.paramsObj = obj1;
         }
-        var ids = arr.join(',')
-        if (this.index == 2) {
-          let obj = {
+        
+        //治疗
+        var arr2 = [];
+        if(this.selecting_schs2.length > 0){
+          for (let i = 0; i < this.selecting_schs2.length; i++) {
+            arr2.push(this.selecting_schs2[i].id)
+          }
+          var ids2 = arr2.join(',')
+          let obj2 = {
             record: this.record_date,
             prescription_id: this.prescription_id,
-            ids: ids,
+            ids: ids2,
             patient_id: this.patientid
           };
-          this.paramsObj = obj;
-          this.innerVisible = true
-
-          //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+          this.paramsObj2 = obj2;
         }
-        if (this.index == 6) {
-          let obj = {
+        var arr3 = []
+        if(this.selecting_schs3.length > 0){
+          for (let i = 0; i < this.selecting_schs3.length; i++) {
+            arr3.push(this.selecting_schs3[i].id)
+          }
+          var ids2 = arr3.join(',')
+          let obj3 = {
             record: this.record_date,
             prescription_id: this.prescription_id,
-            ids: ids,
+            ids: ids2,
             patient_id: this.patientid
           };
-          this.paramsObj = obj;
-          this.innerVisible = true
-          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+          this.paramsObj3 = obj3;
         }
+          
+        
+        
+        
+        this.innerVisible = true
+
+        // if(this.index == 20){
+        //   console.log('ids',ids)
+        //   let obj = {
+        //     record: this.record_date,
+        //     prescription_id: this.prescription_id,
+        //     ids: ids,
+        //     patient_id: this.patientid
+        //   };
+        //   this.paramsObj = obj;
+        //   this.checkVisible = true
+        // }
       }, getTime(val, temp) {
         if (val != 0) {
           return uParseTime(val, temp)

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -159,12 +159,26 @@
         })
       },
       getDiagnosis(id){
+        let ids = id.split(",")
         var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-           if(id == this.diagnoses[i].id){
-              name = this.diagnoses[i].class_name
-           }
+        for(let i = 0; i < ids.length; i++){
+
+          for(let b=0;b<this.diagnoses.length;b++){
+            if(parseInt(ids[i]) == this.diagnoses[b].id){
+              if(name.length == 0){
+                name = this.diagnoses[b].class_name
+              }else{
+                name = name +"," + this.diagnoses[b].class_name
+
+              }
+            }
+          }
+
         }
+
+
+
+
         return name
       }
     }, created() {

src/xt_pages/outpatientDoctorStation/print.vue

@@ -2,7 +2,7 @@
   <div>
       <template>
         <el-button
-          style="position:fixed;right:25px;z-index:999"
+          style="float:right;"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -76,14 +76,16 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       if(this.org_id == 10138){
-        const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}}';
-        printJS({
-          printable: "prescriptionPrint",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
+        setTimeout(() => {
+          const style =
+          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          printJS({
+            printable: "prescriptionPrint1",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        },500)
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -78,7 +78,12 @@
         </div>
         <div class="otherInfo">
             <div class="otherName">体格检查：</div>
-            <div style="flex:1;">无</div>
+            <div style="flex:1;">
+                <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+            </div>
         </div>
         <div class="otherInfo">
             <div class="otherName">门诊诊断：</div>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -1,13 +1,17 @@
 <template>
 <div>
-  <div id='prescriptionPrint'>
+  <div id='prescriptionPrint1'>
     <div v-for="(item,index) in advicePrint" :key="index">
-      <div id='prescription-print' v-if="item.project.length == 0"  v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
+      <div id='prescription-print' v-if="item.project.length == 0" v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
           <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
-          <div class="printTitle">处方笺</div>
+          <div class="printTitle">
+            处方笺
+            <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
+            <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
+          </div>
           <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber ? getName(faber.transBody.outputlist1) : '' }}</span></div>
-            <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber ? faber.transBody.aac999 : ''  }}</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></div>
+            <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
           </div>
 
@@ -40,16 +44,16 @@
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-               
+              </div>
+              
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div> -->
-               <div style="text-align:center;" >(以下空白)</div>
+              </div> -->
+              <div style="text-align:center;" >(以下空白)</div>
 
           </div>
           <div style="display:flex;">
@@ -73,11 +77,11 @@
           </div>
           <div class="actionBar">
 
-                 <p>审核：</p>
-                 <p>配对：</p>
-                 <p>核对：</p>
-                 <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+                <p>审核：</p>
+                <p>配对：</p>
+                <p>核对：</p>
+                <p>发药：</p>
+                <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
           </div> -->
           <div style="page-break-after:always"></div>
       </div>
@@ -166,10 +170,11 @@ export default {
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            let outputlist1Name = JSON.parse(response.data.data.his.patient_info);
+            this.getPage()
+            let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
-            this.getPage()
+            
           }
        })
      },
@@ -255,11 +260,15 @@ export default {
         return project_name
      },
 
-     getDiagnosis(id){
+     getDiagnosis(ids){
+        let id = ids.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          // if(id == this.diagnoses[i].id){
+          //    name = this.diagnoses[i].class_name
+          // }
+          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -2,7 +2,7 @@
   <div>
        <template>
         <el-button
-          style="position:fixed;right:25px;z-index:999"
+          style="float:right;"
           :loading="loading"
           size="small"
           icon="el-icon-printer"
@@ -66,15 +66,17 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       if(this.org_id == 10138){
+        setTimeout(() => {
+          const style =
+          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          printJS({
+            printable: "prescriptionPrint2",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        },500)
         
-        const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}}';
-        printJS({
-          printable: "prescriptionPrint",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,343 +1,347 @@
 <template>
-   <div id='prescriptionPrint'>
-    <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
-
-        <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
-            <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
-                <span>费别</span>
-                <span>自费</span>
-                <span>公费</span>
-                <span>保险</span>
-                <span>其他</span>
+    <div id='prescriptionPrint'>
+        <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
+
+            <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+                <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                    <span>费别</span>
+                    <span>自费</span>
+                    <span>公费</span>
+                    <span>保险</span>
+                    <span>其他</span>
+                </div>
+                <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
             </div>
-            <div>就诊日期：{{getTime(item.ctime,"{y}-{m}-{d}")}}</div>
-        </div>
 
-        <div class="printTitle">{{orgname}}</div>
-        <div class="printTitle">处方、治疗单</div>
+            <div class="printTitle">{{orgname}}</div>
+            <div class="printTitle">处方、治疗单</div>
 
-        <div class="infoTitle">
-            <div>门诊编号：</div>
-            <div>电脑号：</div>
-        </div>
+            <div class="infoTitle">
+                <div>门诊编号：</div>
+                <div>电脑号：</div>
+            </div>
 
-        <div class="infoMain">
-            <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
-            <div style="margin-bottom: 10px;width:25%">性别：
-                <span v-if="item.patient.gender == 1">男</span>
-                <span v-if="item.patient.gender == 2">女</span>
+            <div class="infoMain">
+                <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                <div style="margin-bottom: 10px;width:25%">性别：
+                    <span v-if="item.patient.gender == 1">男</span>
+                    <span v-if="item.patient.gender == 2">女</span>
+                </div>
+                <div style="margin-bottom: 10px;width:25%">年龄：
+                    <span>{{item.patient.age}}</span>
+                </div>
+                <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
+                </div>
+                <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
             </div>
-            <div style="margin-bottom: 10px;width:25%">年龄：
-                <span>{{item.patient.age}}</span>
+
+            <div class="prescriptionBox">
+                <table style="width:100%;text-align:center;line-height:25px;">
+                    <tr>
+                        <td>序号</td>
+                        <td>项目名称</td>
+                        <td>数量</td>
+                        <td>单位</td>
+                        <td>单价</td>
+                        <td>部位</td>
+                        <td>备注</td>
+                        <td>天数</td>
+                    </tr>
+                    <tr v-for="(it,index) in item.project" :key="index">
+                        <td>{{index+1}}</td>
+                        <td>{{it.type == 2 ?getProjectName(it.project_id):it.good_info.good_name}}</td>
+                        <td>{{it.single_dose}}</td>
+                        <td>{{getUnit(it.unit)}}</td>
+                        <td>{{it.price}}</td>
+                        <td></td>
+                        <td>{{it.remark}}</td>
+                        <td>{{it.day}}</td>
+
+                    </tr>
+
+                    <tr v-for="(it,index) in item.advices" :key="index">
+                        <td>{{index+1}}</td>
+                        <td>{{it.advice_name?it.advice_name:''}}</td>
+                        <td>{{it.single_dose?it.single_dose:''}}</td>
+                        <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
+                        <td>{{it.price}}</td>
+                        <td></td>
+                        <td>{{it.remark}}</td>
+                        <td>{{it.day}}</td>
+
+                    </tr>
+                </table>
+            </div>
+
+            <div class="infoTitle">
+                <div>开单医生：{{item.doctor?item.doctor:''}}</div>
+                <div>签章：</div>
             </div>
-            <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}</div>
-            <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
-            <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
-            <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
-        </div>
 
-        <div class="prescriptionBox">
-            <table style="width:100%;text-align:center;line-height:25px;">
+            <div class="actionBar">
+                <div>执行医生：{{item.doctor?item.doctor:''}}</div>
+                <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+            </div>
+
+            <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
                 <tr>
-                    <td>序号</td>
-                    <td>项目名称</td>
-                    <td>数量</td>
-                    <td>单位</td>
-                    <td>单价</td>
-                    <td>部位</td>
-                    <td>备注</td>
-                    <td>天数</td>
+                    <td style="width:16%;">治疗时间</td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
                 </tr>
-                <tr v-for="(it,index) in item.project" :key="index">
-                    <td>{{index+1}}</td>
-                    <td>{{it.type == 2 ?getProjectName(it.project_id):it.good_info.good_name}}</td>
-                    <td>{{it.single_dose}}</td>
-                    <td>{{getUnit(it.unit)}}</td>
-                    <td>{{it.price}}</td>
-                    <td></td>
-                    <td>{{it.remark}}</td>
-                    <td>{{it.day}}</td>
-
+                <tr>
+                    <td style="width:16%;">医生签字</td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
+                    <td style="width:16%;"></td>
                 </tr>
-
-                <tr v-for="(it,index) in item.advices" :key="index">
-                    <td>{{index+1}}</td>
-                    <td>{{it.advice_name?it.advice_name:''}}</td>
-                    <td>{{it.single_dose?it.single_dose:''}}</td>
-                    <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
-                    <td>{{it.price}}</td>
-                    <td></td>
-                    <td>{{it.remark}}</td>
-                    <td>{{it.day}}</td>
-
+                <tr>
+                    <td style="width:16px;">患者签字</td>
+                    <td style="width:16px;"></td>
+                    <td style="width:16px;"></td>
+                    <td style="width:16px;"></td>
+                    <td style="width:16px;"></td>
+                    <td style="width:16px;"></td>
                 </tr>
             </table>
         </div>
 
-        <div class="infoTitle">
-            <div>开单医生：{{item.doctor?item.doctor:""}}</div>
-            <div>签章：</div>
-        </div>
 
-        <div class="actionBar">
-            <div>执行医生：{{item.doctor?item.doctor:""}}</div>
-            <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
-        </div>
+        <!-- <div id='prescriptionPrint'>
 
-        <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-            <tr>
-                <td style="width:16%;">治疗时间</td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-            </tr>
-            <tr>
-                <td style="width:16%;">医生签字</td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-                <td style="width:16%;"></td>
-            </tr>
-            <tr>
-                <td style="width:16px;">患者签字</td>
-                <td style="width:16px;"></td>
-                <td style="width:16px;"></td>
-                <td style="width:16px;"></td>
-                <td style="width:16px;"></td>
-                <td style="width:16px;"></td>
-            </tr>
-        </table>
-     </div>
-
-
-    <!-- <div id='prescriptionPrint'>
-
-        <div v-for="(item,index) in advicePrint" :key="index">
-            <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-                <div style="display:flex;justify-content: space-between;font-weight:bold;">
-                    <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
-                        <span>费别</span>
-                        <span>自费</span>
-                        <span>公费</span>
-                        <span>保险</span>
-                        <span>其他</span>
+            <div v-for="(item,index) in advicePrint" :key="index">
+                <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+                    <div style="display:flex;justify-content: space-between;font-weight:bold;">
+                        <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                            <span>费别</span>
+                            <span>自费</span>
+                            <span>公费</span>
+                            <span>保险</span>
+                            <span>其他</span>
+                        </div>
+                        <div>就诊日期：{{getTime(item.ctime)}}</div>
                     </div>
-                    <div>就诊日期：{{getTime(item.ctime)}}</div>
-                </div>
 
-                <div class="printTitle">血液透析中心</div>
+                    <div class="printTitle">血液透析中心</div>
 
-                <div class="printTitle">处方、治疗单</div>
+                    <div class="printTitle">处方、治疗单</div>
 
-                <div class="infoTitle">
-                    <div>门诊编号：</div>
-                    <div>电脑号：</div>
-                </div>
-
-                <div class="infoMain">
-                    <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
-                    <div style="margin-bottom: 10px;width:25%">性别：
-                        <span v-if="item.patient.gender == 1">男</span>
-                        <span v-if="item.patient.gender == 2">女</span>
+                    <div class="infoTitle">
+                        <div>门诊编号：</div>
+                        <div>电脑号：</div>
                     </div>
-                    <div style="margin-bottom: 10px;width:25%">年龄：
-                        <span>{{item.patient.age}}</span>
+
+                    <div class="infoMain">
+                        <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                        <div style="margin-bottom: 10px;width:25%">性别：
+                            <span v-if="item.patient.gender == 1">男</span>
+                            <span v-if="item.patient.gender == 2">女</span>
+                        </div>
+                        <div style="margin-bottom: 10px;width:25%">年龄：
+                            <span>{{item.patient.age}}</span>
+                        </div>
+                        <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+                        <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                        <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                        <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
                     </div>
-                    <div style="margin-bottom: 10px;width:25%">参保类型：</div>
-                    <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
-                    <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
-                    <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
-                </div>
 
-                <div class="prescriptionBox">
-                    <table style="width:100%;text-align:center;line-height:25px;">
+                    <div class="prescriptionBox">
+                        <table style="width:100%;text-align:center;line-height:25px;">
+                            <tr>
+                                <td>序号</td>
+                                <td>项目名称</td>
+                                <td>数量</td>
+                                <td>单位</td>
+                                <td>单价</td>
+                                <td>部位</td>
+                                <td>备注</td>
+                                <td>天数</td>
+                            </tr>
+                            <tr v-for="(it,index) in item.project" :key="index">
+                                <td>{{index+1}}</td>
+                                <td>{{getProjectName(it.project_id)}}</td>
+                                <td>{{it.single_dose}}</td>
+                                <td>{{getUnit(it.unit)}}</td>
+                                <td>{{it.price}}</td>
+                                <td></td>
+                                <td>{{it.remark}}</td>
+                                <td>{{it.day}}</td>
+
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="infoTitle">
+                        <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                        <div>签章：</div>
+                    </div>
+                    <div class="actionBar">
+                        <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                        <div>费用：</div>
+                    </div>
+                    <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
                         <tr>
-                            <td>序号</td>
-                            <td>项目名称</td>
-                            <td>数量</td>
-                            <td>单位</td>
-                            <td>单价</td>
-                            <td>部位</td>
-                            <td>备注</td>
-                            <td>天数</td>
+                            <td style="width:16%;">治疗时间</td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
                         </tr>
-                        <tr v-for="(it,index) in item.project" :key="index">
-                            <td>{{index+1}}</td>
-                            <td>{{getProjectName(it.project_id)}}</td>
-                            <td>{{it.single_dose}}</td>
-                            <td>{{getUnit(it.unit)}}</td>
-                            <td>{{it.price}}</td>
-                            <td></td>
-                            <td>{{it.remark}}</td>
-                            <td>{{it.day}}</td>
-
+                        <tr>
+                            <td style="width:16%;">医生签字</td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                            <td style="width:16%;"></td>
+                        </tr>
+                        <tr>
+                            <td style="width:16px;">患者签字</td>
+                            <td style="width:16px;"></td>
+                            <td style="width:16px;"></td>
+                            <td style="width:16px;"></td>
+                            <td style="width:16px;"></td>
+                            <td style="width:16px;"></td>
                         </tr>
                     </table>
                 </div>
-                <div class="infoTitle">
-                    <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
-                    <div>签章：</div>
-                </div>
-                <div class="actionBar">
-                    <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
-                    <div>费用：</div>
-                </div>
-                <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-                    <tr>
-                        <td style="width:16%;">治疗时间</td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:16%;">医生签字</td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                        <td style="width:16%;"></td>
-                    </tr>
-                    <tr>
-                        <td style="width:16px;">患者签字</td>
-                        <td style="width:16px;"></td>
-                        <td style="width:16px;"></td>
-                        <td style="width:16px;"></td>
-                        <td style="width:16px;"></td>
-                        <td style="width:16px;"></td>
-                    </tr>
-                </table>
-            </div>
 
-        </div>
+            </div>
 
-    </div> -->
-  </div>
+        </div> -->
+    </div>
 </template>
 <script>
-import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
-export default {
-    props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import { getAllDoctorList, getPrescriptionPrint } from '@/api/project/project'
+  import { getInitData } from '@/api/his/his'
+
+  export default {
+    props: {
+      patient_id: Number,
+      record_date: String,
+      prescription_id: Number,
+      ids: String
     },
-    data(){
+    data() {
       return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        projectList:[],
-        prescriptions:[],
+        doctorList: [],
+        advicePrint: {},
+        patient: {},
+        tableData: [],
+        prescriptionInfo: [],
+        projectList: [],
+        prescriptions: [],
         settlement:
-         [
-          {value: 1,label: '医保'},
-          {value: 2,label: '自费'},
-          {value: 3,label:'公费'},
-          {value: 4,label:'农保'},
-          {value: 5,label:'会员'},
-          {value: 6,label:'职工'},
-          {value: 7,label:'合同'}
-         ],
-         hisPatient:{},
-         diagnoses:[]
+          [
+            { value: 1, label: '医保' },
+            { value: 2, label: '自费' },
+            { value: 3, label: '公费' },
+            { value: 4, label: '农保' },
+            { value: 5, label: '会员' },
+            { value: 6, label: '职工' },
+            { value: 7, label: '合同' },
+            { value: 8, label: '医保自费' }
+
+          ],
+        hisPatient: {},
+        diagnoses: []
       }
     },
-   methods:{
-     printThisPage() {
-      var ptime = Math.round(new Date().getTime() / 1000);
-      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
-
-      const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}';
-      printJS({
-        printable: "prescription-print",
-        type: "html",
-        style: style,
-        scanStyles: false
-      });
-    },
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
-
-               this.doctorList = doctor
-             }
-         })
-     },
-
-      getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
+    methods: {
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+
+        const style =
+          '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}'
+        printJS({
+          printable: 'prescription-print',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+      getAllDoctorList() {
+        getAllDoctorList().then(response => {
+          if (response.data.state == 1) {
+            var doctor = response.data.data.doctor
+
+            this.doctorList = doctor
+          }
+        })
+      },
+
+      getDoctor(id) {
+        var name = ''
+        for (let i = 0; i < this.doctorList.length; i++) {
+          if (id == this.doctorList[i].admin_user_id) {
+            name = this.doctorList[i].user_name
           }
         }
         return name
       },
       getTime(value, temp) {
         if (value != undefined) {
-            return uParseTime(value, temp)
+          return uParseTime(value, temp)
         }
         return ''
-     },
-     getPrescriptionPrint(){
-         var params = {
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids,
+      },
+      getPrescriptionPrint() {
+        var params = {
+          patient_id: this.patient_id,
+          record_date: this.record_date,
+          prescription_id: this.prescription_id,
+          ids: this.ids
         }
-        console.log("999999",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
+        console.log('999999', params)
+        getPrescriptionPrint(params).then(response => {
+          if (response.data.state == 1) {
+            var advicePrint = response.data.data.advicePrint
+            console.log('adviceprint', advicePrint)
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
+            var projectlist = response.data.data.projectlist
+            console.log('所有项目列表', projectlist)
             this.projectList = projectlist
             this.hisPatient = response.data.data.hisPatient
 
           }
-       })
-     },
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+        })
+      },
+      getProjectName(id) {
+        var project_name = ''
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (id == this.projectList[i].id) {
+            project_name = this.projectList[i].project_name
+          }
         }
         return project_name
-     },
-     getUnit(id){
-        var unit=""
-       for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               unit = this.projectList[i].unit
-           }
+      },
+      getUnit(id) {
+        var unit = ''
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (id == this.projectList[i].id) {
+            unit = this.projectList[i].unit
+          }
         }
         return unit
-     },
+      },
 
-       getTotalOne(id) {
+      getTotalOne(id) {
 
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
+          if (id == this.prescriptions[i].id) {
             if (this.prescriptions[i].project != null) {
               for (let a = 0; a < this.prescriptions[i].project.length; a++) {
                 total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
@@ -349,13 +353,13 @@ export default {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
-        }
+            addtotal = Math.floor(addtotal * 100) / 100
+          }
 
-       }
+        }
 
-      for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (id == this.prescriptions[i].id) {
             if (this.prescriptions[i].advices != null) {
               for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
@@ -367,118 +371,132 @@ export default {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
               }
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+            addtotal = Math.floor(addtotal * 100) / 100
+          }
         }
-       }
 
         return total + addtotal
       },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 1) {
             this.diagnoses = response.data.data.diagnose
-            console.log("争端",this.diagnoses)
+            console.log('争端', this.diagnoses)
           }
-       })
-     },
-     getDiagnosis(id){
-        var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+        })
+      },
+      getDiagnosis(id) {
+        var name = ''
+        for (let i = 0; i < this.diagnoses.length; i++) {
+          if (id == this.diagnoses[i].id) {
+            name = this.diagnoses[i].class_name
           }
         }
         return name
-     }
-   },
-   created(){
+      }
+    },
+    created() {
       this.getInitData()
       this.getAllDoctorList()
       this.getPrescriptionPrint()
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
 
-   },
-   watch:{
-     patient_id:function(val){
-       console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
-    //    this.getPrescriptionPrint()
-     },
-     ids:function(val){
-         this.ids = val
-         console.log('this.idsids',this.ids)
-         this.getPrescriptionPrint()
-     }
-   }
-}
+    },
+    watch: {
+      patient_id: function(val) {
+        console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
+        //    this.getPrescriptionPrint()
+      },
+      ids: function(val) {
+        this.ids = val
+        console.log('this.idsids', this.ids)
+        this.getPrescriptionPrint()
+      }
+    }
+  }
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-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;
-    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;
-}
-.prescription-print{
-    font-size: 14px;
-}
-.printTitle{
-    font-size: 18px;
-    text-align: center;
-    font-weight: bold;
-    margin-top: 10px;
-}
-.infoTitle{
-    display: flex;
-    border-bottom: 2px solid #000;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
-}
-.infoTitle div{
-    width: 300px;
-}
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
-}
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
-}
-.prescriptionBox{
-    padding:0 10px;
-    min-height:600px;
-}
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
-}
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
-}
-.drugsBox p{
-    line-height: 30px;
-}
-.drugsOne{
-    line-height: 24px;
-}
-.drugsOne span{
-    margin-right: 20px;
-}
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
-}
-.actionBar div{
-    width:150px;
-}
+    .prescription-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;
+        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;
+    }
+
+    .prescription-print {
+        font-size: 14px;
+    }
+
+    .printTitle {
+        font-size: 18px;
+        text-align: center;
+        font-weight: bold;
+        margin-top: 10px;
+    }
+
+    .infoTitle {
+        display: flex;
+        border-bottom: 2px solid #000;
+        margin-top: 10px;
+        line-height: 24px;
+        padding: 0 10px;
+    }
+
+    .infoTitle div {
+        width: 300px;
+    }
+
+    .infoMain {
+        display: flex;
+        flex-wrap: wrap;
+        border-bottom: 2px solid #000;
+        padding: 0 10px;
+    }
+
+    .infoMain div {
+        width: 50%;
+        line-height: 24px;
+    }
+
+    .prescriptionBox {
+        padding: 0 10px;
+        min-height: 600px;
+    }
+
+    .Rp {
+        font-size: 22px;
+        font-weight: bold;
+    }
+
+    .drugsBox {
+        padding-left: 40px;
+        margin-bottom: 10px;
+    }
+
+    .drugsBox p {
+        line-height: 30px;
+    }
+
+    .drugsOne {
+        line-height: 24px;
+    }
+
+    .drugsOne span {
+        margin-right: 20px;
+    }
+
+    .actionBar {
+        display: flex;
+        justify-content: space-between;
+        line-height: 24px;
+        padding: 0 10px;
+    }
+
+    .actionBar div {
+        width: 150px;
+    }
 </style>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -1,12 +1,15 @@
 <template>
-   <div id='prescriptionPrint'>
+   <div id='prescriptionPrint2'>
     <div id='prescription-print' v-if="item.advices.length == 0" class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
         <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
-        <div class="printTitle">治疗单</div>
+        <div class="printTitle">治疗单
+          <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
+          <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
+        </div>
         <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber ? getName(faber.transBody.outputlist1) : '' }}</span></div>
-            <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber ? faber.transBody.aac999 : ''  }}</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></div>
+            <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
         </div>
 
@@ -231,7 +234,7 @@ export default {
          hisPatient:{},
          diagnoses:[],
          department:[],
-         faber:{}
+         faber:{},
       }
     },
    methods:{
@@ -301,6 +304,21 @@ export default {
             this.projectList = projectlist
             this.hisPatient = response.data.data.hisPatient
 
+            let projectPrint = []
+            let total = 0
+            this.advicePrint.map(item => {
+              console.log(item.project.length)
+              if(item.project.length > 0){
+                for(var i=item.project.length-1;i>=0;i--){
+                  if(item.project[i].type==2){
+                    if(item.project[i].project.cost_classify == 3){
+                      item.project.splice(i,1);
+                    }
+                  }
+                }
+              }
+            })
+
             let outputlist1Name = JSON.parse(response.data.data.his.patient_info);
             this.faber = outputlist1Name
 
@@ -376,11 +394,15 @@ export default {
           }
        })
      },
-     getDiagnosis(id){
+     getDiagnosis(ids){
+        let id = ids.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          // if(id == this.diagnoses[i].id){
+          //    name = this.diagnoses[i].class_name
+          // }
+          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -545,7 +545,9 @@
             { value: 4, label: '农保' },
             { value: 5, label: '会员' },
             { value: 6, label: '职工' },
-            { value: 7, label: '合同' }
+            { value: 7, label: '合同' },
+            {value: 8, label: '医保自费'},
+
           ],
         // medicalCare: [{
         //   value: 1,
@@ -720,7 +722,7 @@
         return ''
       }, toReturnSZPatient(val) {
         if(val.balance_accounts_type == 2){
-          this.$confirm('是否退费', '退费', {
+          this.$confirm('是否退号', '退号 ', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
@@ -753,7 +755,7 @@
           }).then(() => {
             axios.get('http://127.0.0.1:9532/sz/api/refundnumber/get', {
               params: {
-                order_id: 0,
+                his_patient_id: val.id,
                 record_time: this.getTime(val.record_date, '{y}-{m}-{d}'),
                 admin_user_id: this.$store.getters.xt_user.user.id,
                 patient_id: val.patient_id

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -0,0 +1,305 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-input
+                size="small"
+                style="width: 200px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+                <el-date-picker
+                size="small"
+                v-model="value1"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+                <el-date-picker
+                size="small"
+                v-model="value2"
+                type="date"
+                style="margin-left:5px;width:140px;"
+                placeholder="选择日期">
+                </el-date-picker>
+            </div>
+            <div>
+                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
+                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="报损编码">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="报损日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="操作人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="审核日期">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="核对人">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="状态">
+            </el-table-column>
+            <el-table-column
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
+    <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+        <el-form :model="form" class="modifyDialog" label-width="120px">
+            <el-form-item label="耗材ID">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="药品名称">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="单位">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="进货价">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="零售价">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="报损数量">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="库存">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="产地">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="批准文号">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂商">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+                <div style="display:flex;">
+                    <el-input v-model="form.name"></el-input>
+                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="耗材ID"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="耗材名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="调价数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原进货价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="新零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="产地"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="批准文号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="备注"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            fixed="right"
+            width="100"
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "药品报损" }
+            ],
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+            total: 0,
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/stockModifyPricePrint'})
+            
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -0,0 +1,293 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;align-items: center;justify-content: space-between;">
+        <div>
+            <el-input
+            size="small"
+            style="width: 200px;"
+            class="filter-item"
+            v-model.trim="searchKey"
+            placeholder=""
+            />
+            <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+            >
+            <el-date-picker
+            size="small"
+            v-model="value1"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+            <el-date-picker
+            size="small"
+            v-model="value2"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+        </div>
+        <div>
+            <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
+            <el-button size="small" type="primary">核对</el-button>
+            <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary">导出</el-button>
+        </div>
+      </div>
+      <div style="margin-top:10px">
+            <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="单据编码">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="调价日期">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="操作人">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="状态">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="核对人">
+                </el-table-column>
+                <el-table-column
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+    </div>
+    <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+        <el-form :model="form" class="modifyDialog" label-width="120px">
+            <el-form-item label="药品名称">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="原价格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="现价格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="调价数量">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="备注" style="width:66%;">
+                <div style="display:flex;">
+                    <el-input v-model="form.name"></el-input>
+                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="单据编号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="药品名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="调价数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原进货价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="新零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="批准文号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="供应商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="备注"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            fixed="right"
+            width="100"
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "耗材调价" }
+            ],
+            tableHeight: '',
+            fullHeight: document.documentElement.clientHeight,
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/drugs/drugModifyPricePrint'})
+            
+        }
+    },
+    created(){
+        let tableHeight = document.body.clientHeight - 200;
+        this.tableHeight = tableHeight
+    },
+    mounted() {
+      const that = this;
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight;
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight(val) {
+        if (!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 200
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function() {
+            that.timer = false
+          }, 400)
+        }
+      }
+
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/stock/drugs/drugModifyPricePrint.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="printTitle">药品调价登记单</div>
+                <div class="flex">
+                    <div>药库类别：</div>
+                    <div>调价日期：</div>
+                </div>
+                <div class="flex">
+                    <div>单据编号：</div>
+                    <div>打印日期：</div>
+                </div>
+                <div class="tableTitle">
+                    <div style="width:8%">货号</div>
+                    <div style="width:8%">药品名称</div>
+                    <div style="width:8%">规格</div>
+                    <div style="width:8%">单位</div>
+                    <div style="width:8%">批次</div>
+                    <div style="width:8%">调价数量</div>
+                    <div style="width:8%">原进货价</div>
+                    <div style="width:8%">新进货价</div>
+                    <div style="width:8%">进货差价</div>
+                    <div style="width:8%">原零售价</div>
+                    <div style="width:8%">新零售价</div>
+                    <div style="width:8%">零售差价</div>
+                </div>
+                <div class="tableTr" v-for="item in 3">
+                    <div style="width:8%">上三</div>
+                    <div style="width:8%">上三名称</div>
+                    <div style="width:8%">上三</div>
+                    <div style="width:8%">上三</div>
+                    <div style="width:8%">上三</div>
+                    <div style="width:8%">上三数量</div>
+                    <div style="width:8%">上三货价</div>
+                    <div style="width:8%">上三货价</div>
+                    <div style="width:8%">上三差价</div>
+                    <div style="width:8%">上三售价</div>
+                    <div style="width:8%">上三售价</div>
+                    <div style="width:8%">上三差价</div>
+                </div>
+                <div class="tableBottom">
+                    <div style="width:8%">合计：</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">上三差价</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">上三差价</div>
+                </div>
+                <div style="display:flex;margin-top:1px;float:right;margin-top:10px;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
+                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '药品调价打印' },
+          ],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+
+
+    },
+    created(){
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+</style>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -54,7 +54,7 @@
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
               </td>
-              <td style="line-height:18px">{{ item.number }}</td>
+              <td style="line-height:18px">{{ item.batch_number }}</td>
               <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>

src/xt_pages/stock/drugs/drugWarning.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
+            <div>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input
+                size="small"
+                style="width: 200px;"
+                class="filter-item"
+                v-model.trim="searchKey"
+                placeholder=""
+                />
+                <el-button
+                size="small"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-search"
+                @click="search"
+                >搜索</el-button
+                >
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <div>
+                <el-button size="small" type="primary">导出</el-button>
+            </div>
+        </div>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            type="selection"
+            width="55">
+            </el-table-column>
+            <el-table-column
+            type="index"
+            width="50">
+            </el-table-column>
+            <el-table-column
+            fixed="left"
+            prop="date"
+            label="耗材ID"
+            width="80">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="耗材名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格型号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="进货价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="库存数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="库存预警"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="产地"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="批准文号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="供应商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="状态"
+            width="80">
+            </el-table-column>
+            <el-table-column
+            label="备注">
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "药品预警" }
+            ],
+            searchKey:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            total: 0,
+            options: [{
+                value: '选项1',
+                label: '黄金糕'
+                }, {
+                value: '选项2',
+                label: '双皮奶'
+                }, {
+                value: '选项3',
+                label: '蚵仔煎'
+                }, {
+                value: '选项4',
+                label: '龙须面'
+                }, {
+                value: '选项5',
+                label: '北京烤鸭'
+            }],
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        handleSizeChange(){},
+        handleCurrentChange(){}
+
+    },
+    created(){
+    },
+    mounted() {
+    },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/stock/stockWarning.vue

@@ -6,6 +6,14 @@
     <div class="app-container">
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
                 <el-input
                 size="small"
                 style="width: 200px;"
@@ -21,124 +29,33 @@
                 @click="search"
                 >搜索</el-button
                 >
-                <el-date-picker
-                size="small"
-                v-model="value1"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                v-model="value2"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
             </div>
             <div>
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
             </div>
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
             <el-table-column
-            prop="date"
-            label="报损编码">
-            </el-table-column>
-            <el-table-column
-            prop="date"
-            label="报损日期">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="操作人">
+            type="selection"
+            width="55">
             </el-table-column>
             <el-table-column
-            prop="name"
-            label="审核日期">
+            type="index"
+            width="50">
             </el-table-column>
             <el-table-column
-            prop="name"
-            label="核对人">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="状态">
-            </el-table-column>
-            <el-table-column
-            label="操作">
-                <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
-        </el-pagination>
-    </div>
-    <el-dialog
-        title="库房调价"
-        :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
-        <el-form :model="form" class="modifyDialog" label-width="120px">
-            <el-form-item label="耗材ID">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="药品名称">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="规格">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="单位">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="进货价">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="零售价">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="报损数量">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="库存">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="产地">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="批准文号">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="生产厂商">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="备注">
-                <div style="display:flex;">
-                    <el-input v-model="form.name"></el-input>
-                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
-                </div>
-            </el-form-item>
-        </el-form>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
+            fixed="left"
             prop="date"
             label="耗材ID"
-            width="100">
+            width="80">
             </el-table-column>
             <el-table-column
             prop="date"
@@ -147,7 +64,7 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="规格"
+            label="规格型号"
             width="100">
             </el-table-column>
             <el-table-column
@@ -157,22 +74,22 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="调价数量"
+            label="零售价"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="原进货价"
+            label="进货价"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="原零售价"
+            label="库存数量"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="新零售价"
+            label="库存预警"
             width="100">
             </el-table-column>
             <el-table-column
@@ -192,24 +109,30 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="备注"
+            label="供应商"
             width="100">
             </el-table-column>
             <el-table-column
-            fixed="right"
-            width="100"
-            label="操作">
-                <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
-                </template>
+            prop="name"
+            label="状态"
+            width="80">
+            </el-table-column>
+            <el-table-column
+            label="备注">
             </el-table-column>
         </el-table>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-    </el-dialog>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
   
   </div>
 </template>
@@ -227,11 +150,9 @@ export default {
             crumbs: [
                 { path: false, name: "库存管理" },
                 { path: false, name: "耗材管理" },
-                { path: false, name: "耗材报损" }
+                { path: false, name: "耗材预警" }
             ],
             searchKey:'',
-            value1:'',
-            value2:'',
             tableData: [{
                 date: '2016-05-02',
                 name: '王小虎',
@@ -249,20 +170,28 @@ export default {
                 name: '王小虎',
                 address: '上海市普陀区金沙江路 1516 弄'
             }],
-            dialogVisible:false,
-            form: {
-                name: '',
-            },
             total: 0,
+            options: [{
+                value: '选项1',
+                label: '黄金糕'
+                }, {
+                value: '选项2',
+                label: '双皮奶'
+                }, {
+                value: '选项3',
+                label: '蚵仔煎'
+                }, {
+                value: '选项4',
+                label: '龙须面'
+                }, {
+                value: '选项5',
+                label: '北京烤鸭'
+            }],
         }
     },
     methods:{
         search(){
 
-        },
-        print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
-            
         },
         handleSizeChange(){},
         handleCurrentChange(){}