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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -0,0 +1,194 @@
+<template>
+  <el-dialog width="854px" title="收费单" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="form"  ref="formValue" label-width="100px">
+
+      <el-form-item label="日期：">
+        <div>{{record_date}}</div>
+      </el-form-item>
+
+
+      <el-form-item label="医保：" prop="name" :validate-event="is_Name">
+        <el-input type="number" v-model="form.medical_insurance_price"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="自费：" prop="age" :validate-event="is_Name">
+        <el-input type="number" v-model="form.private_price"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="支付方式：">
+        <el-select v-model="form.pay_way" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in payWays"
+            :key="index"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
+        <el-input type="number" v-model="form.pay_price"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="付款卡号：" prop="id_card" :validate-event="is_Name">
+        <el-input v-model="form.pay_card_no"></el-input>
+      </el-form-item>
+
+      <el-form-item class="specialFormItem" label="折扣金额：">
+        <div style="display:flex;">
+          <el-input v-model="form.discount_price"></el-input>
+        </div>
+      </el-form-item>
+      <el-form-item class="specialFormItem" label="优惠金额：">
+        <div style="display:flex;">
+          <el-input v-model="form.preferential_price"></el-input>
+        </div>
+      </el-form-item>
+      <el-form-item label="实收金额：">
+        <div style="display:flex;">
+          <el-input v-model="form.reality_price"></el-input>
+        </div>
+      </el-form-item>
+      <el-form-item label="找回金额：">
+        <div style="display:flex;">
+          <el-input v-model.number="form.found_price"></el-input>
+        </div>
+      </el-form-item>
+
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    name: 'chargeDialog',
+
+    data() {
+
+      return {
+        record_date:'',
+        form: {
+          medical_insurance_price:'',
+          private_price:'',
+          pay_way:'',
+          pay_price:'',
+          pay_card_no:'',
+          discount_price:'',
+          preferential_price:'',
+          reality_price:'',
+          found_price:'',
+
+        },
+        payWays: [
+          {value: 1, label: '现金'},
+          {value: 2, label: '银行卡'},
+          {value: 3, label: '微信'},
+          {value: 4, label: '支付宝'},
+        ],
+        total:"",
+
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+
+        resetForm: {
+          medical_insurance_price:'',
+          private_price:'',
+          pay_way:'',
+          pay_price:'',
+          pay_card_no:'',
+          discount_price:'',
+          preferential_price:'',
+          reality_price:'',
+          found_price:'',
+        },
+
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function (total) {
+        this.total = total
+        this.form.private_price = total
+        this.form.pay_price = total
+
+        this.visibility = true
+
+      }, hide: function () {
+        this.visibility = false
+      }, cancel: function (formName) {
+        this.$emit('cancel', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      confirm: function (formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('confirm', value)
+            this.form = Object.assign({}, this.resetForm)
+          }
+        })
+      },
+      getValue: function () {
+        let form = {}
+        form = this.form
+        return form
+      }
+    },mounted() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+
+      var nowHours = nowDate.getHours()
+      var nowMin = nowDate.getMinutes()
+      var nowSecond = nowDate.getSeconds()
+
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)+" "+(nowHours < 10 ? '0' + nowHours : nowHours)+":"+(nowMin < 10 ? '0' + nowMin : nowMin)
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -61,15 +61,10 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">
-          {{getGroup(scope.row.statistical_classification)}}
-        </template>
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
-          {{scope.row.single_dose}}
-        </template>
+        <template slot-scope="scope">{{scope.row.single_dose}}</template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
@@ -121,7 +116,7 @@
 
     <div class="additionalBox">
       <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span>{{item.item_name}}</span>
+        <span :title="item.item_name">{{item.item_name}}</span>
         <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
         共
         <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -2,13 +2,13 @@
   <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
-    <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
+    <el-form :model="form"  :rules="rules"  ref="formValue"  label-width="100px">
       <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
          <el-input  v-model="form.name"></el-input>
       </el-form-item>
 
-      <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
-        <el-select v-model="form.sex" placeholder="请选择">
+      <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+        <el-select v-model="form.gender" placeholder="请选择">
           <el-option
             v-for="item in sex"
             :key="item.value"
@@ -33,13 +33,7 @@
 
 
       <el-form-item label="医疗类别：">
-        <el-select v-model="form.medicalCare" placeholder="请选择">
-          <!-- <el-option
-          v-for="item in medicalCare"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          </el-option> -->
+        <el-select v-model="form.medical_care" placeholder="请选择">
           <el-option
             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
             :key="index"
@@ -61,13 +55,13 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
-        <el-input v-model="form.idCard"></el-input>
+      <el-form-item label="证件号码：" prop="id_card"  :validate-event="is_Name">
+        <el-input v-model="form.id_card"></el-input>
       </el-form-item>
 
 
       <el-form-item label="结算类型：">
-        <el-select v-model="form.settlementValue" placeholder="请选择">
+        <el-select v-model="form.settlement_value" placeholder="请选择">
           <el-option
             v-for="item in settlement"
             :key="item.value"
@@ -80,12 +74,6 @@
 
       <el-form-item label="社保类型：">
         <el-select v-model="form.social_type" placeholder="请选择">
-          <!-- <el-option
-          v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
-          :key="index"
-          :label="item.name"
-          :value="item.id">
-          </el-option> -->
           <el-option
             v-for="item in medicalCare"
             :key="item.value"
@@ -96,110 +84,172 @@
       </el-form-item>
       <el-form-item class="specialFormItem" label="医保卡号：">
         <div style="display:flex;">
-          <el-input v-model="form.medicalInsuranceCard"></el-input>
-          <!-- <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button> -->
+          <el-input v-model="form.medical_insurance_card"></el-input>
         </div>
       </el-form-item>
 
+      <el-form-item label="挂号类型："  prop="register_type"  :validate-event="is_Name">
+        <el-select v-model="form.register_type"  placeholder="请选择">
+          <el-option
+            v-for="item in register"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="挂号费：">
+        <el-input v-model.number="form.registration_fee"></el-input>
+      </el-form-item>
+      <el-form-item label="诊疗费：">
+        <el-input v-model.number="form.medical_expenses"></el-input>
+      </el-form-item>
     </el-form>
 
-    <!--<el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"-->
-             <!--:label-position="labelPosition"-->
-             <!--label-width="100px">-->
-
-      <!--<el-row>-->
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="诊断名称" prop="class_name">-->
-            <!--<el-input v-model="formValue.class_name"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="拼音" prop="pinyin">-->
-            <!--<el-input v-model="formValue.pinyin"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="五笔" prop="wubi">-->
-            <!--<el-input v-model="formValue.wubi"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="目录代码" prop="content_code">-->
-            <!--<el-input v-model="formValue.content_code"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="国家编码" prop="country_code">-->
-            <!--<el-input v-model="formValue.country_code"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-
-        <!--<el-col :span="8">-->
-          <!--<el-form-item label="国家目录名称" prop="country_content_name">-->
-            <!--<el-input v-model="formValue.country_content_name"></el-input>-->
-          <!--</el-form-item>-->
-        <!--</el-col>-->
-      <!--</el-row>-->
-
-      <!--<el-col>-->
-        <!--<el-form-item label="备注">-->
-          <!--<el-input type="textarea" :row="5" v-model="formValue.remark"-->
-                    <!--placeholder="请输入内容">-->
-          <!--</el-input>-->
-        <!--</el-form-item>-->
-      <!--</el-col>-->
-    <!--</el-form>-->
-
     <span slot="footer" class="dialog-footer">
-    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
-    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
-    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
+    <el-button  @click="cancel('formValue')">取 消</el-button>
+    <el-button  type="primary" @click="confirm('formValue')">保 存</el-button>
   </span>
   </el-dialog>
 
 </template>
 
 <script>
+  import { getDictionaryDataConfig } from '@/utils/data'
   export default {
-    name: 'diagnoseOtherDialog',
+    name: 'registerDialog',
 
     data() {
 
       return {
+        form:{
+          settlement_value: '',
+          medical_insurance_card:'',
+          name:'',
+          gender:'',
+          certificates:'',
+          medical_care:'',
+          birthday:'',
+          age:'',
+          id_card:'',
+          register:'',
+          doctor:'',
+          department:'',
+          registration_fee:'',
+          medical_expenses:'',
+          cost:'',
+          phone:'',
+          social_type:'',
+        },
+        settlement: [
+            {value: 1,label: '医保'},
+            {value: 2,label: '自费'},
+            {value: 3,label:'公费'},
+            {value: 4,label:'农保'},
+            {value: 5,label:'会员'},
+            {value: 6,label:'职工'},
+            {value: 7,label:'合同'}
+          ],
+        sex: [{
+          value: 1,
+          label: '男'
+        }, {
+          value: 2,
+          label: '女'
+        }],
+        certificates: [{
+          value: 1,
+          label: '内地身份证'
+        }, {
+          value: 2,
+          label: "社保卡"
+        },{
+          value: 3,
+          label: "护照"
+        },{
+          value: 4,
+          label: "军官证"
+        },{
+          value: 5,
+          label: "台胞证"
+        },{
+          value: 6,
+          label: "港澳地区身份证"
+        }],
+        medicalCare: [{
+          value: 1,
+          label: '职工基本医疗保险'
+        }, {
+          value: 2,
+          label: "公务员医疗补助"
+        },{
+          value: 3,
+          label: "大额医疗费用补助"
+        },{
+          value: 4,
+          label: "离休人员医疗"
+        },{
+          value: 5,
+          label: "城乡居民基本医疗保险"
+        },{
+          value: 6,
+          label: "城乡居民大病医疗保险"
+        },
+          {
+            value: 7,
+            label: "生育保险"
+          }],
+        register: [{
+          value: 1,
+          label: '普通'
+        }, {
+          value: 2,
+          label: "主治"
+        },{
+          value: 3,
+          label: "主任"
+        },{
+          value: 4,
+          label: "免收诊金"
+        },{
+          value: 5,
+          label: "专家"
+        }],
+        rules: {
+          name:[{ required:true,message:"患者姓名不能为空",trigger: 'blur'}],
+          gender:[{ required:true,message:"患者性别不能为空",trigger: 'blur'}],
+          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
+          register_type: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
+          doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
+          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
+          age:[{ required:true,message:"患者年龄不能为空",trigger: 'blur'}],
+          birthday:[{required:true,message:"患者出生日期不能为空",trigger:'blur'}]
+        },
+
         visibility: false,
         labelPosition: 'right',
         isClose: false,
-        form: {
-          class_name: '',
-          content_code: '',
-          country_code: '',
-          country_content_name: '',
-          remark: '',
-          pinyin: '',
-          wubi: ''
 
-        },
         resetForm: {
-          class_name: '',
-          content_code: '',
-          country_code: '',
-          country_content_name: '',
-          remark: '',
-          pinyin: '',
-          wubi: ''
+          settlement_value: '',
+          medical_insurance_card:'',
+          name:'',
+          gender:'',
+          certificates:'',
+          medical_care:'',
+          birthday:'',
+          age:'',
+          id_card:'',
+          register:'',
+          doctor:'',
+          department:'',
+          registration_fee:'',
+          medical_expenses:'',
+          cost:'',
+          phone:'',
+          social_type:'',
         },
-        rules: {
-          class_name: [
-            { required: true, message: '请输入大类名称', trigger: 'blur' }
-          ],
-          content_code: [
-            { required: true, message: '请输入目录代码', trigger: 'blur' }
-          ]
 
-        }
       }
     },
     props: {
@@ -223,33 +273,43 @@
       }
     },
     methods: {
-      show: function() {
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      show: function(patientInfo) {
+        this.form.name = patientInfo.name
+        this.form.gender = patientInfo.gender
+        this.form.age = patientInfo.age
+        this.form.birthday = patientInfo.birthday
+        this.form.phone = patientInfo.phone
+        this.form.birthday = patientInfo.birthday
+        this.form.id_card = patientInfo.id_card_no
+        this.form.social_type = patientInfo.health_care_type
+        if( this.form.social_type == 0){
+          this.form.social_type = ""
+
+        }
         this.visibility = true
 
       }, hide: function() {
         this.visibility = false
-      },
-      cancle: function(formName) {
-        this.$emit('dialog-cancle', this.getValue())
+      }, cancel: function(formName) {
+        this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      comfirm: function(formName) {
+      confirm: function(formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
             let value = {}
             value = this.getValue()
-            this.$emit('dialog-comfirm', value)
+            this.$emit('confirm', value)
             this.form = Object.assign({}, this.resetForm)
-
           }
         })
       },
       getValue: function() {
         let form = {}
-        form = this.formValue
-        form['title'] = this.titles
-        form['type'] = this.type
-        form['isCreated'] = this.isCreated
+        form = this.form
         return form
       }
     }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,21 +5,21 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-         <div class="mainCell" style="justify-content: space-between;">
+         <!-- <div class="mainCell" style="justify-content: space-between;font-size:14px;">
           <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
           <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
           <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
-        </div>
+        </div> -->
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
-            <el-radio :label=1>未收费</el-radio>
+            <!-- <el-radio :label=1>未收费</el-radio>
             <el-radio :label=2>已收费</el-radio>
             <el-radio :label=3>已退费</el-radio>
+            <el-radio :label=4>全部</el-radio> -->
+            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
+            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
+            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
             <el-radio :label=4>全部</el-radio>
-            <!--<el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>-->
-            <!--<el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>-->
-            <!--<el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>-->
-            <!--<el-radio :label=4>全部</el-radio>-->
 
           </el-radio-group>
         </div>
@@ -210,10 +210,11 @@
         </div>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
-
-   <register-dialog></register-dialog>
+    <additionalCharges ref='additionalCharges' @click="addCharges"
+                       :addtions_charge="addtions_charge"></additionalCharges>
 
+    <register-dialog ref='register' v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
+  <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -232,14 +233,16 @@
   import medicalInsuranceRefund from './components/medicalInsuranceRefund'
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
-  import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
+  import {getPatientInformation, getPatientList} from '@/api/project/project'
+  import {getPatientInfo, getSchedulePatientList, Refund, register, upload} from '@/api/his/his'
   import RegisterDialog from "./components/registerDialog";
   import treatPrint from './treatPrint'
+  import ChargeDialog from "./components/chargeDialog";
 
   const moment = require('moment')
   export default {
     components: {
+      ChargeDialog,
       RegisterDialog,
       BreadCrumb,
       noCharge,
@@ -253,13 +256,13 @@
     data() {
       return {
         crumbs: [
-          { path: false, name: '门诊收费' },
-          { path: false, name: '门诊收费管理' }
+          {path: false, name: '门诊收费'},
+          {path: false, name: '门诊收费管理'}
         ],
-        current_index:0,
-        cal_one:'',
-        cal_two:'',
-        cal_three:'',
+        current_index: 0,
+        cal_one: '',
+        cal_two: '',
+        cal_three: '',
         tableHeight: '',
         fullHeight: document.documentElement.clientHeight,
         activeName: 'first',
@@ -281,7 +284,7 @@
           name: '杨美英',
           mdtrt_id: '1709946'
         }],
-        patientInfo: { id: 0 },
+        patientInfo: {id: 0},
         doctor: {},
         total: 0,
         state: '未收费',
@@ -291,11 +294,11 @@
         start_time: moment().locale('zh-cn').format('YYYY-MM-DD'),
         patient_id: 0,
         prescription_id: 0,
-        all_table_data:[],
-        order:{},
-        addtions_charge:[],
-        treatVisible:false,
-        paramsObj:{}
+        all_table_data: [],
+        order: {},
+        addtions_charge: [],
+        treatVisible: false,
+        paramsObj: {}
       }
     },
     created() {
@@ -316,6 +319,53 @@
       this.getPatientList()
     },
     methods: {
+      chargeConfirm(form){
+        form['id'] = this.patientInfo.id
+        form['record_time'] =  this.record_date
+        this.loadingtwo = true
+        upload(form).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            this.loadingtwo = false
+            return false
+          } else {
+            this.state = '已收费'
+            this.$message({message: '收费成功', type: 'success'})
+            this.loadingtwo = false
+            this.cal_one = this.cal_one - 1
+            this.cal_two = this.cal_two + 1
+            this.patientTableData.splice(this.current_index, 1)
+          }
+        })
+
+      },chargeCancel(){
+        this.$refs.charge.hide()
+      },
+      confirm(forms) {
+        forms['id'] = this.patientInfo.id,
+          forms['record_time'] = this.record_date,
+          this.loadingone = true
+        register(forms).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            this.loadingone = false
+            this.$refs.register.hide()
+            return false
+          } else {
+            this.$message({message: '挂号成功', type: 'success'})
+            this.$refs.register.hide()
+            this.loadingone = false
+            var his_info = response.data.data.his_info
+            this.hisPatientInfo = his_info
+          }
+        })
+
+
+      }, cancel() {
+        this.$refs.register.hide()
+
+
+      },
       addCharges() {
         this.$refs.additionalCharges.show()
       },
@@ -379,7 +429,7 @@
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
-                  unit:prescription.project[b].unit,
+                  unit: prescription.project[b].unit,
                 }
 
                 tempProject.push(obj)
@@ -440,14 +490,14 @@
         if (this.curPrescriptions.type == 1) {
           if (this.curPrescriptions.advices != null) {
             for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-              total = total +  Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number)* 100) / 100
+              total = total + Math.floor((this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number) * 100) / 100
 
             }
           }
         } else {
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-              total = total +  Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
+              total = total + Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
 
             }
           }
@@ -455,7 +505,7 @@
 
         if (this.curPrescriptions.addition != null) {
           for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
-            total = total +  Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
+            total = total + Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
           }
         }
         return Math.floor(total * 100) / 100
@@ -493,45 +543,30 @@
 
         if (index == 1) {
 
+
         } else if (index == 2) {
 
           this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
 
         } else if (index == 3) {
           let obj = {
-            record_date:this.record_date,
-            patient_id:this.patient_id,
-            prescription_id:this.prescription_id
+            record_date: this.record_date,
+            patient_id: this.patient_id,
+            prescription_id: this.prescription_id
           }
           this.paramsObj = obj
           this.treatVisible = true
           // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
-          if(this.hisPatientInfo.id == 0){
-            this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
+          if (this.hisPatientInfo.id == 0) {
+            this.$message({message: '该患者尚未挂号,请先挂号', type: 'error'})
             return
           }
 
-          let params = {
-            'id': this.patientInfo.id,
-            'record_time': this.record_date
-          }
-          this.loadingtwo = true
-          upload(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              this.loadingtwo = false
-              return false
-            } else {
-              this.state = '已收费'
-              this.$message({ message: '收费成功', type: 'success' })
-              this.loadingtwo = false
-              this.cal_one  =  this.cal_one-1
-              this.cal_two = this.cal_two + 1
-              this.patientTableData.splice(this.current_index,1)
-            }
-          })
+          this.$refs.charge.show(this.getTotal())
+
+
 
         } else if (index == 5) {
 
@@ -550,7 +585,7 @@
                 this.loadingtwo = false
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' })
+                this.$message({message: '退费成功', type: 'success'})
                 this.loadingtwo = false
 
               }
@@ -568,29 +603,9 @@
             return
           }
 
+          this.$refs.register.show(this.patientInfo)
 
 
-
-          let params = {
-            'id': this.patientInfo.id,
-            'record_time': this.record_date
-          }
-          this.loadingone = true
-          register(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              this.loadingone = false
-
-              return false
-
-            } else {
-              this.$message({ message: '挂号成功', type: 'success' })
-
-              this.loadingone = false
-              var his_info = response.data.data.his_info
-              this.hisPatientInfo = his_info
-            }
-          })
         }
       },
 
@@ -621,21 +636,21 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               console.log('99999999', response.data.data.list)
 
-              if(response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 ||response.data.data.list[i].info.prescription_status == 2 ){
+              if (response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 || response.data.data.list[i].info.prescription_status == 2) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
                   one_count = one_count + 1
                   this.patientTableData.push(response.data.data.list[i])
                 }
               }
 
-              if(response.data.data.list[i].info.prescription_status == 3){
+              if (response.data.data.list[i].info.prescription_status == 3) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
 
                   two_count = two_count + 1
                 }
               }
 
-              if(response.data.data.list[i].info.prescription_status == 4){
+              if (response.data.data.list[i].info.prescription_status == 4) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
                   three_count = three_count + 1
                 }
@@ -655,8 +670,8 @@
               case 1:
                 this.patientTableData = []
 
-                for (let i = 0; i < this.all_table_data.length; i++){
-                  if(this.all_table_data[i].info.prescription_status == 0 || this.all_table_data[i].info.prescription_status == 1 || this.all_table_data[i].info.prescription_status == 2 ){
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  if (this.all_table_data[i].info.prescription_status == 0 || this.all_table_data[i].info.prescription_status == 1 || this.all_table_data[i].info.prescription_status == 2) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
@@ -664,8 +679,8 @@
                 break
               case 2:
                 this.patientTableData = []
-                for (let i = 0; i < this.all_table_data.length; i++){
-                  if(this.all_table_data[i].info.prescription_status == 3){
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  if (this.all_table_data[i].info.prescription_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
@@ -675,9 +690,9 @@
               case 3:
                 this.patientTableData = []
 
-                for (let i = 0; i < this.all_table_data.length; i++){
+                for (let i = 0; i < this.all_table_data.length; i++) {
 
-                  if(this.all_table_data[i].info.prescription_status == 4){
+                  if (this.all_table_data[i].info.prescription_status == 4) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
@@ -692,17 +707,13 @@
 
             this.current_index = 0
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+            this.getPatientInformation(this.patientTableData[0].patients.id, "")
 
 
           }
         })
 
 
-
-
-
-
       },
 
       //患者列表
@@ -723,21 +734,21 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               // console.log('99999999', response.data.data.list)
 
-              if(response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 ||response.data.data.list[i].info.prescription_status == 2 ){
+              if (response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 || response.data.data.list[i].info.prescription_status == 2) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
                   one_count = one_count + 1
                   this.patientTableData.push(response.data.data.list[i])
                 }
               }
 
-              if(response.data.data.list[i].info.prescription_status == 3){
+              if (response.data.data.list[i].info.prescription_status == 3) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
 
                   two_count = two_count + 1
                 }
               }
 
-              if(response.data.data.list[i].info.prescription_status == 4){
+              if (response.data.data.list[i].info.prescription_status == 4) {
                 if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
                   three_count = three_count + 1
                 }
@@ -754,7 +765,7 @@
 
             this.current_index = 0
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+            this.getPatientInformation(this.patientTableData[0].patients.id, "")
 
           }
         })
@@ -769,8 +780,8 @@
         this.getPatientInformation(val.patients.id, val.info.batch_number)
         this.patient_id = val.patients.id
 
-        for (let i =0; i < this.patientTableData.length; i++){
-          if(this.patientTableData[i].patients.id == val.patients.id){
+        for (let i = 0; i < this.patientTableData.length; i++) {
+          if (this.patientTableData[i].patients.id == val.patients.id) {
             this.current_index = i
           }
 
@@ -779,11 +790,11 @@
       },
 
       //获取患者的基本信息
-      getPatientInformation(id,batch_number) {
+      getPatientInformation(id, batch_number) {
         let params = {
           'record_date': this.record_date,
           'patient_id': id,
-          'number':batch_number,
+          'number': batch_number,
         }
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -797,9 +808,9 @@
             this.addtions_charge = response.data.data.addtions_charge
 
             this.prescriptions = []
-            console.log("9991323242r5253535",response.data.data.prescription)
+            console.log("9991323242r5253535", response.data.data.prescription)
             this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
-            console.log("222222",this.prescription_id)
+            console.log("222222", this.prescription_id)
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
 
@@ -857,14 +868,13 @@
               }
 
 
-
               let index = i + 1
               let obj = {
                 id: prescription.id,
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
-                addition:tempAddition,
+                addition: tempAddition,
                 order_status: response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }
@@ -896,7 +906,7 @@
           this.tableHeight = tableHeight
           this.timer = true
           let that = this
-          setTimeout(function() {
+          setTimeout(function () {
             that.timer = false
           }, 400)
         }
@@ -920,7 +930,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
+    padding-top: 20px;
 
   .el-radio {
     margin-right: 5px;
@@ -932,7 +942,8 @@
     display: flex;
     align-items: center;
   }
-  .fixedCell{
+
+  .fixedCell {
     position: fixed;
     z-index: 99;
     right: 42px;
@@ -997,13 +1008,16 @@
     flex-direction: column;
     position: relative;
   }
-  .preTabs{
-    height:100%;
+
+  .preTabs {
+    height: 100%;
     display: flex;
     flex-direction: column;
-    .el-tab-pane{
-      height:auto !important;
-    }
+
+  .el-tab-pane {
+    height: auto !important;
+  }
+
   }
 
   .settlementTabs {
@@ -1071,12 +1085,14 @@
   }
 
   }
-  .preTabs{
-    .el-tabs__content{
-      flex: 1;
-      overflow-y: auto;
-      padding: 5px 0 5px 5px;
-    }
+  .preTabs {
+
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 5px 0 5px 5px;
+  }
+
   }
 </style>
 

src/xt_pages/outpatientCharges/summary.vue

@@ -64,7 +64,7 @@
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+          <template slot-scope="scope">{{scope.row.reality_price}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="科室">
           <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -66,7 +66,7 @@
 
                       <div class="additionalBox">
                         <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span>{{item.item_name}}</span>
+                          <span :title="item.item_name">{{item.item_name}}</span>
                           <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
                           共
                           <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
@@ -95,12 +95,12 @@
                         <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
                     </ul>
-                    <p class="centerRightTitle">收费信息</p>
+                    <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
                         <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
-                        <li style="width:50%;">实收金额：{{order.medfee_sumamt}}元</li>
-                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.medfee_sumamt}}元</li>
-                        <li style="width:50%;">优惠金额：0.00元</li>
+                        <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.reality_price}}元</li>
+                        <li style="width:50%;">优惠金额：{{order.preferential_price}}元</li>
                         <li style="width:50%;">总金额</li>
                         <li style="width:50%;">{{order.medfee_sumamt}}元</li>
                     </ul>
@@ -360,7 +360,7 @@ export default {
     }
     .centerRightTitle{
         color:#409EFF;
-        padding: 10px 0;
+        padding:0 0 10px 0;
     }
     .basicUl{
         border-top: 1px solid #e5e5e5;
@@ -377,6 +377,29 @@ export default {
             font-size: 14px;
         }
     }
+    .additionalBox{
+      margin-top: 20px;
+      display: flex;
+      flex-wrap: wrap;
+      .additionalOne{
+        margin-right:20px;
+        margin-bottom:10px;
+        display: flex;
+        align-items: center;
+        >span{
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          width:80px;
+          display: inline-block;
+          font-size: 14px;
+        }
+      }
+      .deleteIcon{
+        color:red;
+        margin-left:5px;
+      }
+    }
 }
 </style>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -68,9 +68,6 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="过敏病史: " prop="name" style="visibility: hidden;">
-            <el-input placeholder="" readonly></el-input>
-          </el-form-item>
         </el-form>
         <div class="tabsBox">
 
@@ -197,10 +194,14 @@
                         <el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'" :data="advices_template" border
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                                  highlight-current-row>
+                                  highlight-current-row
+                                  @select='selectTemplate'
+                                  @select-all="changeTemplateData"
+
+                        >
                           <el-table-column type="selection" width="40" align="center"></el-table-column>
                           <el-table-column prop="name" label="名称">
-                            <template slot-scope="scope">{{}}</template>
+                            <template slot-scope="scope">{{scope.row.name}}</template>
                           </el-table-column>
                           <!--<el-table-column label="规格" width="60">-->
                             <!--<template slot-scope="scope">33</template>-->
@@ -330,13 +331,13 @@
     data() {
       return {
         register: [
-          {value: 0,label:"普通"},
-          {value: 1,label: '急诊'},
-          {value: 2,label: "儿科"},
-          {value: 3,label: "麻醉"},
-          {value: 4,label: "精一"},
-          {value: 5,label: "精二"},
-          {value: 6,label: "其他"},
+          {value: 1,label:"普通"},
+          {value: 2,label: '急诊'},
+          {value: 3,label: "儿科"},
+          {value: 4,label: "麻醉"},
+          {value: 5,label: "精一"},
+          {value: 6,label: "精二"},
+          {value: 7,label: "其他"},
 
         ],
         multipleTableHeight:'',
@@ -392,10 +393,18 @@
         diagnoses: [],
         diagnose:'',
         curTotal: 0,
-        prescription_id: 0
+        prescription_id: 0,
+        tempDrugs:[]
+
       }
     },
     methods: {
+      selectTemplate(selection, row){
+        this.tempDrugs = selection
+
+      },changeTemplateData(selection){
+        this.tempDrugs = selection
+      },
       stockInCount: function(row) {
         let total = 0;
         if(row.stock_in != null) {
@@ -654,6 +663,11 @@
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
+        this.diagnose = info.diagnosis
+
+        if(this.diagnose == 0){
+          this.diagnose = ""
+        }
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
@@ -1037,7 +1051,9 @@
           this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
           this.teamList = []
           this.curDrugs = []
+          this.tempDrugs = []
           this.$refs.tables.clearSelection()
+          this.$refs.multipleTableTwo.clearSelection()
           this.$refs.multipleTable.clearSelection()
           return
         }
@@ -1046,13 +1062,17 @@
           this.$message.error('改处方是药品，无法添加项目')
           this.teamList = []
           this.$refs.tables.clearSelection()
+
           return
         }
 
         if (this.curStatus == 2 && this.rightTab == 1) {
           this.$message.error('改处方是项目，无法添加药品')
           this.curDrugs = []
+          this.tempDrugs = []
           this.$refs.multipleTable.clearSelection()
+          this.$refs.multipleTableTwo.clearSelection()
+
           return
         }
 
@@ -1061,7 +1081,6 @@
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
               this.$message.error('改处方存在相同的项目，无法添加相同的项目')
               return
-
             }
           }
         }

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -99,7 +99,7 @@
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
      
 
-      <el-form-item label="发病日期: " prop="name">
+      <el-form-item label="发病日期: " prop="name" style="width:49%;">
         <el-date-picker
           style="width:100%;"
           v-model="start_time"
@@ -107,12 +107,9 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="name">
+      <el-form-item label="" prop="name" style="width:49%;">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-form-item label="" prop="name" style="visibility: hidden;">
-        <div></div>
-      </el-form-item>
       <el-form-item label="主诉:" style="width:49%;">
         <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
             <el-option

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -54,8 +54,8 @@
               <el-button size="small" ref="button_six"   @click="open(6)">治疗单</el-button>
               <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
             </el-popover>
-            <el-button size="small" ref="button_three" @click="open(4)" 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>
+            <!--<el-button size="small" ref="button_three" @click="open(4)" 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>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -561,8 +561,8 @@ export default {
         let arr = this.medicalCare
         let str = ''
         arr.map(item => {
-          if(item.value == type)
-          str = item.label
+          if(item.id == type)
+          str = item.name
         })
         return str
       },

src/xt_pages/workforce/components/tableData.vue

@@ -1950,9 +1950,9 @@ export default {
     ScheduleItem
   },
   mounted() {
-    console.log(this.tableContainHeight);
+    console.log('this.tableContainHeight,',this.$refs.table.$el.offsetTop);
     this.tableContainHeight =
-      window.innerHeight - this.$refs.table.$el.offsetTop - 160;
+      window.innerHeight - this.$refs.table.$el.offsetTop - 120;
     console.log(this.tableContainHeight);
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
@@ -1963,7 +1963,7 @@ export default {
         if (window.fullHeight < 200) {
           that.tableHeight = 200;
         } else {
-          that.tableHeight = window.fullHeight - 200;
+          that.tableHeight = window.fullHeight - 160;
         }
       })();
     };