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

src/main.js

 
 import * as filters from './filters' // global filters
 
-import * as voicePromptFun from './utils/voicePrompt' 
+import * as voicePromptFun from './utils/voicePrompt'
 
 import 'default-passive-events'
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
 // import Popup from "./components/Popup/index"  //全局删除弹框控件
 // Vue.prototype.$popup = Popup.install
 // Vue.component(Popup)
+import FileSaver from 'file-saver'
 
+import XLSX from 'xlsx'
+Vue.prototype.$FileSaver = FileSaver; //设置全局
+
+Vue.prototype.$XLSX = XLSX; //设置全局
 import Computed from "../src/xt_pages/components/Computed/index"  //自动计算金额控件
 Vue.component("Computed",Computed)
 

src/xt_pages/hospitalStation/index.vue

                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
-                that.form.medical_insurance_card = response.data.data.number
+                that.form.id_card_no = patient.id_card_no
+                that.form.medicalInsuranceCard = response.data.data.number
 
                 that.InsuplcAdmdvs = []
                 // console.log(parseNumber(response.data.data.info.output.insuinfo.psn_type))

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

                 console.log('res',this.list)
                 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.list.zhenChaCostTotal
-                this.smalltoBIG(this.totalPrice)
+                this.smalltoBIG(this.list.order.medfee_sumamt)
                 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();

src/xt_pages/hospitalStation/shouJuPrint.vue

+<template>
+  <div>
+    <template>
+      <el-button
+          style="position:fixed;right:25px;z-index:999"
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+      >打印</el-button
+      >
+    </template>
+    <div class="app-container" style="padding-top:40px;">
+      <div class='dialysisPage'>
+        <shou-ju-print-one :paramsObj="invoiceParams"></shou-ju-print-one>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import printOne from './invoiceTemplate/printOne'
+import printTwo from './invoiceTemplate/printTwo'
+import printThree from './invoiceTemplate/printThree'
+import ShouJuPrintOne from './shouJuTemplate/shouJuPrintOne'
+export default {
+  name: "shouJuPrint",
+  components: {
+    ShouJuPrintOne,
+    printOne,
+    printTwo,
+    printThree
+  },
+  props:{
+    invoiceParams:Object
+  },
+  data() {
+    return {
+      childResponse: {},
+      //   invoiceParams:{}
+      org_id:''
+
+    };
+  },
+  methods: {
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].id == id) {
+          return this.adminUser[i].name;
+        }
+      }
+    },
+    getTime(value, temp) {
+      if (value == 0) {
+        return "";
+      }
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    printThisPage() {
+
+      const style =
+          '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+      printJS({
+        printable: "invoice-print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
+  },
+  created() {
+    console.log('this.invoiceParams',this.invoiceParams)
+    this.org_id = this.$store.getters.xt_user.org_id
+    console.log(this.org_id,'this.org_id')
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.invoiceParams = val
+
+      },
+      deep:true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.printTitle{
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+}
+.infoMain{
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding:0 10px;
+}
+.infoMain .infoP{
+  width: 33%;
+  line-height: 24px;
+}
+.prescriptionBox{
+  padding:0 10px;
+  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;
+}
+.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;
+}
+</style>

src/xt_pages/hospitalStation/shouJuTemplate/shouJuPrintOne.vue

+<template>
+  <div id='invoice-print'>
+
+    <div style="display:flex;justify-content: space-between;">
+      <!-- 机构名称 -->
+      <div>{{ list.org_name }}</div>
+      <!-- 单据号 -->
+      <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
+      <div></div>
+      <div  style="position: absolute;left:560px;top:70px;">
+        <!-- 发票序号 -->
+      </div>
+    </div>
+
+    <div style="display:flex;justify-content: space-between;">
+      <!-- 姓名 -->
+      <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
+      <!-- 个人电脑编号 -->
+      <div style="position: absolute;top:90px;left:240px;"></div>
+      <!-- 科室 -->
+      <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
+      <!-- 床号 -->
+      <div style="position: absolute;top:90px;left:240px;"></div>
+    </div>
+
+    <div style="display:flex;justify-content: space-between;">
+      <!-- 住院号 -->
+      <div style="position: absolute;top:90px;left:120px;"> {{ list.his_hospital_record.number?list.order.mdtrt_id:'' }}</div>
+      <!-- 入院日期 -->
+      <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.in_hosptial_time?list.his_hospital_record.in_hosptial_time.spilt(' ')[0]:''}}</div>
+      <!-- 出院日期 -->
+      <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.out_hosptial_time?list.his_hospital_record.out_hosptial_time.spilt(' ')[0]:''}}</div>
+      <!-- 住院天数 -->
+      <div style="position: absolute;top:90px;left:240px;">{{getDay(list.his_hospital_record.in_hosptial_time.split(' ')[0] ,list.his_hospital_record.out_hosptial_time.split(' ')[0])}}</div>
+    </div>
+
+    <!-- <div style="display:flex;justify-content: space-between;">
+        <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+        <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money  }}</div>
+        <div style="position: absolute;top:110px;left:580px;">门特</div>
+    </div> -->
+
+
+    <div style="display:flex;justify-content: space-between;">
+      <div style="position: absolute;top:160px;left:40px">西药</div>
+      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+      <div style="position: absolute;top:160px;left:180px">检查费</div>
+      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+      <div style="position: absolute;top:160px;left:340px">护理费</div>
+      <div style="position: absolute;top:160px;left:420px"></div>
+      <div style="position: absolute;top:160px;left:500px">麻醉费</div>
+      <div style="position: absolute;top:160px;left:580px"></div>
+    </div>
+    <div style="display:flex;justify-content: space-between;">
+      <div style="position: absolute;top:190px;left:40px">中成药费</div>
+      <div style="position: absolute;top:190px;left:110px"></div>
+      <div style="position: absolute;top:190px;left:180px">治疗费</div>
+      <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
+      <div style="position: absolute;top:190px;left:340px">CT核磁</div>
+      <div style="position: absolute;top:190px;left:420px"></div>
+      <div style="position: absolute;top:190px;left:500px">床位费</div>
+      <div style="position: absolute;top:190px;left:580px"></div>
+    </div>
+    <div style="display:flex;justify-content: space-between;">
+      <div style="position: absolute;top:220px;left:40px">中草药费</div>
+      <div style="position: absolute;top:220px;left:110px"></div>
+      <div style="position: absolute;top:220px;left:180px">手术费</div>
+      <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
+      <div style="position: absolute;top:220px;left:340px">输血费</div>
+      <div style="position: absolute;top:220px;left:420px"></div>
+      <div style="position: absolute;top:220px;left:500px">取暖费</div>
+      <div style="position: absolute;top:220px;left:580px"></div>
+    </div>
+    <div style="display:flex;justify-content: space-between;">
+      <div style="position: absolute;top:250px;left:40px">高压氧费</div>
+      <div style="position: absolute;top:250px;left:110px"></div>
+      <div style="position: absolute;top:250px;left:180px">化验费</div>
+      <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
+      <div style="position: absolute;top:250px;left:340px">氧气费</div>
+      <div style="position: absolute;top:250px;left:420px"></div>
+      <div style="position: absolute;top:250px;left:500px">其他</div>
+      <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
+    </div>
+
+    <div>
+            <span>
+            <span  style="position: absolute;top:280px;left:180px">
+                <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
+                    {{ zhongwen.substring(0,1) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:280px;left:220px">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:280px;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:280px;left:300px">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:280px;left:340px">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:280px;left:380px">
+                <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:280px;left:420px">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:280px;left:460px">
+                <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:280px;left:540px">{{ totalPrice }}</span>
+    </div>
+
+
+    <div style="position: absolute;top:310px;left:320px">
+      <!-- 个人账户支付 -->
+      {{list.order.acct_pay?list.order.acct_pay:''}}
+    </div>
+    <div style="position: absolute;top:310px;left:380px">
+      <!-- 统筹支付 -->
+      {{list.order.hifp_pay?list.order.hifp_pay:''}}
+    </div>
+    <div style="position: absolute;top:310px;left:500px">
+      {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
+      <!-- 现金支付 -->
+    </div>
+    <div style="position: absolute;top:340px;left:320px">
+      {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
+      <!-- 公务员补助 -->
+    </div>
+    <div style="position: absolute;top:340px;left:380px">
+      {{list.order.maf_pay?list.order.maf_pay:''}}
+      <!-- 医疗救助 -->
+    </div>
+    <div style="position: absolute;top:340px;left:500px">
+      <!-- 大病 -->
+      {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
+
+
+    </div>
+    <div style="position: absolute;top:340px;left:560px">
+      <!-- 其他基金支付 -->
+      {{list.order.oth_pay?list.order.oth_pay:''}}
+
+    </div>
+    <div style="position: absolute;top:370px;left:320px">
+      <!-- 预交款合计 -->
+
+    </div>
+    <div style="position: absolute;top:370px;left:380px">
+      <!-- 补交款 -->
+    </div>
+    <div style="position: absolute;top:370px;left:500px">
+      <!-- 应退款 -->
+    </div>
+    <div>
+      <div style="position: absolute;top:400px;left:40px">
+        <!-- 开票日期 -->
+        {{printDate}}
+
+      </div>
+      <div style="position: absolute;top:400px;left:280px">
+        <!-- 结算日期： -->
+        {{list.order.setl_time?list.order.setl_time.split(' ')[0]:''}}
+      </div>
+      <div style="position: absolute;top:400px;left:580px">
+        <!-- 经手人： -->
+        {{list.admin_user_name}}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInvoice } from '@/api/project/project'
+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:{
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+
+    },
+    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.totalPrice)
+        // var data = new Date(res.data.data.date * 1000);
+        var data = new Date(this.paramsObj.setl_time);
+        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);  //遍历转化为大写的数字
+      }
+
+      this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+      console.log(this.zhongwen)
+    },
+
+  },
+  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/hospitalStation/summary.vue

                           上传结算清单
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
+<!--                      <el-button size="mini" type="primary" @click="shouJuPrint(scope.row)">打印收据</el-button>-->
 
 <!--                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">-->
 <!--                            撤销出院-->
                 :visible.sync="invoiceVisible">
             <invoicePrint ref="print" :invoiceParams='invoiceParams'></invoicePrint>
         </el-dialog>
+
+
+      <el-dialog
+          class="centerDialog"
+          width="1200px"
+          title="打印"
+          :visible.sync="shouJuVisible">
+<!--        <invoicePrint ref="print" :invoiceParams='invoiceParams'></invoicePrint>-->
+<!--        <shou-ju-print></shou-ju-print>-->
+        <shou-ju-print ref="shouJuPrint" :invoiceParams='invoiceParams'></shou-ju-print>
+      </el-dialog>
         <!-- <el-dialog
                 class="centerDialog"
                 width="1200px"
   import axios from 'axios'
   import invoicePrint from './invoicePrint'
   import statementPrint from './statementPrint'
+  import ShouJuPrint from './shouJuPrint'
 
   // import settlementPrint from './settlementPrint'
 
   export default {
     components: {
+      ShouJuPrint,
       NewStatementPrintTwo,
       NewStatementPrint,
       BreadCrumb,
           { value: 1, label: '住院' },
           { value: 2, label: '门诊' }
         ],
+        shouJuVisible:false,
 
       }
     },
         this.invoiceParams = paramsObj
         console.log(this.invoiceParams,'999')
         this.invoiceVisible = true
+      },shouJuPrint(obj){
+        let paramsObj = {
+          order_id: obj.id,
+          patient_id: obj.patient_id,
+          name: obj.patient.name,
+          age: obj.age,
+          gend: obj.gend,
+          setl_time: obj.setl_time
+        }
+        this.invoiceParams = paramsObj
+        this.shouJuVisible = true
+
       }
     }, created() {
 

src/xt_pages/outpatientCharges/allListPrint.vue

     <template>
       <el-button
         style="position:fixed;right:25px;z-index:999"
-        :loading="loading"
         size="small"
         icon="el-icon-printer"
         @click="printThisPage"
             this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
             this.order['treatCostTotal'] = response.data.data.treatCostTotal
 
-
+            console.log("~~~~~")
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
-
             if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
                     tempDetails.push(order_info[b])
                   }
                 }
+                console.log("～～～～～～～～")
+                console.log(tempDetails)
 
+                console.log("1111="+tempDetails)
                 obj.details = this.setNewData(tempDetails)
+                console.log("22222="+obj.details)
                 this.list =  this.list.concat(obj.details)
+                console.log("222233332="+ this.list)
               }
-
               let newobj = {}
               newobj['total'] = this.order.medfee_sumamt
               newobj['is_total'] = 1
               this.list.push(newobj)
-
             }else{
-
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
               for (let i = 0; i < order_info.length; i++) {
                 obj[next] ? '' : obj[next] = true && cur.push(next)
                 return cur
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
               let tempOrderInfo = []
-
               for (let i = 0; i < med_chrgitm_types.length; i++) {
                 let obj = {
                   total: 0,
                     tempDetails.push(order_info[b])
                   }
                 }
-
                 obj.details = this.setNewData(tempDetails)
                 obj.total = this.getTotal(obj.details)
-
                 obj.details.push({
                   total: obj.total,
                   is_total: 1,

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

     <div class="allListInfo" style="border-bottom: 1px solid;">
       <div>预交款：</div>
       <div>总费用：{{ order.medfee_sumamt }}</div>
-      <div>门诊日期：</div>
+      <div>门诊日期：{{ hospital.in_hosptial_time? hospital.in_hosptial_time.split(' ')[0]:''}}</div>
     </div>
 
     <div class="allListInfo">
       <div>
         西药:&nbsp;&nbsp;&nbsp;{{
-          order.westernMedicineCostTotal ? order.westernMedicineCostTotal : ""
+          order.westernMedicineCostTotal? order.westernMedicineCostTotal.toFixed(2)  : ""
         }}
       </div>
       <div>
         中成药:{{
           order.chineseTraditionalMedicineCostTotal
-            ? order.chineseTraditionalMedicineCostTotal
-            : ""
+            ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
+              : ""
         }}
       </div>
       <div>中草药:</div>
     </div>
 
     <div class="allListInfo">
-      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal : "" }}</div>
+      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal.toFixed(2)  : "" }}</div>
       <div>输氧费:</div>
       <div>
-        手术费:{{ order.operationCostTotal ? order.operationCostTotal : "" }}
+        手术费:{{ order.operationCostTotal ? order.operationCostTotal.toFixed(2)  : "" }}
       </div>
     </div>
 
     <div class="allListInfo">
       <div>
-        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal : "" }}
+        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal.toFixed(2)  : "" }}
       </div>
       <div>输血费:</div>
       <div>
-        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal : "" }}
+        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2)  : "" }}
       </div>
     </div>
 
     <div class="allListInfo">
-      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal : "" }}</div>
+      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal.toFixed(2)  : "" }}</div>
       <div>护理费:</div>
-      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal : "" }}</div>
+      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal.toFixed(2)  : "" }}</div>
     </div>
     <div class="allListInfo">
       <div>麻醉费:</div>
       <div>
-        材料费:{{ order.materialCostTotal ? order.materialCostTotal : "" }}
+        材料费:{{ order.materialCostTotal ? order.materialCostTotal.toFixed(2)  : "" }}
       </div>
-      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal : "" }}</div>
+      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal.toFixed(2)  : "" }}</div>
     </div>
     <!--    <div style="display:flex;justify-content: space-between;">-->
     <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
+          <div v-if="this.$store.getters.xt_user.org_id == 10340">
+                        <el-button size="small"
+                                   @click="openZb(1)"
+                                   type="primary">登记
+                        </el-button>
+
+                        <el-button  size="small"
+                                   @click="openZb(2)"
+                                   type="primary">记账
+                        </el-button>
+
+                        <el-button   size="small"
+                                   @click="openZb(3)"
+                                   type="primary">撤销记账
+                        </el-button>
 
-          <div>
+          </div>
+
+
+          <div  v-if="this.$store.getters.xt_user.org_id != 10340">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
+                                    v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && this.$store.getters.xt_user.org_id != 10340)"
                                     size="small"
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
                                 >预结算
                                 </el-button>
                                 <el-button
-                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"
+                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10340"
                                     size="small"
                                     @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
 
 
                                 <el-button v-loading="loadingtwo"
-                                           v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"
+                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3)&&this.$store.getters.xt_user.org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
                                            type="primary">收费

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                 @change="changeTime"
                                 :editable="false"
                                 style="width: 150px;"
-
                                 type="date"
                                 placeholder="选择开始时间"
                                 align="right"
 
       },
       setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
-        this.curMonthPrescriptions = {}
+        // this.start_time = moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD')
+        // this.end_time = moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD')
+        this.start_time = moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD')
+            this.end_time = moment(new Date()).add('year', 0).format('YYYY-MM-DD')
+            this.editableTabsValueTwo =  '处方1'
+
+            this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
 

src/xt_pages/user/components/PatientDetail.vue

 
                 <el-radio-group v-model="form.troble_shoot" disabled>
                   <el-radio :label="1">是</el-radio>
-                  <el-radio :label="2">否</el-radio>
+                  <el-radio :label="2">否</el-radio>m
                 </el-radio-group>
               </el-form-item>
+
+              <el-form-item label="人员编码: ">
+                <el-input
+                    v-model="form.zb_patient_id"
+                ></el-input>
+              </el-form-item>
             </el-col>
 
             <!--<el-col :span="16" >-->
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
                 <span v-if="org_id ==3907 || org_id == 9671">{{ getTime(patientPrint.created_time) }}</span>
-                <span v-else>{{printDate}}</span> 
+                <span v-else>{{printDate}}</span>
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>
   sch_remark:"",
   org_id:0,
   troble_shoot:"",
+  zb_patient_id:""
 };
 
 export default {
             this.form.gender = patietInfo.gender;
             this.form.is_infectious = patietInfo.is_infectious;
             this.form.troble_shoot = patietInfo.troble_shoot
+            this.form.zb_patient_id = patietInfo.zb_patient_id
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
             if(patietInfo.is_infectious == 1){
-               this.form.remind_cycle = 0 
+               this.form.remind_cycle = 0
 
             }
             console.log("222222",this.form.remind_cycle)

src/xt_pages/user/components/PatientForm.vue

                 </el-form-item>
 
               </el-col>
-              
+
               <el-col :span="8">
                 <el-form-item label="疑难内瘘 : " prop="contagions">
                  <el-radio-group v-model="form.troble_shoot">
                       <el-radio :label="2">否</el-radio>
                     </el-radio-group>
                 </el-form-item>
+
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="人员编码: ">
+                  <el-input
+                      v-model="form.zb_patient_id"
+                  ></el-input>
+                </el-form-item>
+
               </el-col>
 
+
+
               <el-col :span="16" v-if="!isEdit">
                 <el-form-item label="检查结果日期 : ">
                   <!--<el-date-picker v-model="form.record_date" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'"-->
   contact_name: "",
   user_sys_before_count: "",
   troble_shoot:2,
+  zb_patient_id:"",
   formItem: [
     {
       id: 0,
             this.form.age = parseInt(this.form.age);
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
+
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
             }else{
               this.form.avatar = this.form.avatar + "?imageView2/2/w/500/h/500/q/90"
             }
             console.log("form---",this.form)
-        
+
             editPatient(this.patientID, this.form)
 
               .then(response => {
           } else {
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
+
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {
             }
 
             this.form.troble_shoot = patietInfo.troble_shoot
+            this.form.zb_patient_id = patietInfo.zb_patient_id
+
 
             this.form.first_treatment_date = uParseTime(
               patietInfo.first_treatment_date,
       }
     },
     changeInfectious(val){
-      
+
       if(val == 1){
          this.showOne = false
       }