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

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     //  host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
@@ -104,5 +104,5 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   },
-  
+
 }

src/api/data.js

@@ -219,6 +219,50 @@ export function GetMZSick(params) {
 
 
 
+export function createAddition(params) {
+  return request({
+    url: '/api/addition/create',
+    method: 'post',
+    params: params
+  })
+}
+
+export function modifyAddition(params) {
+  return request({
+    url: '/api/addition/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getAdditionList(params) {
+  return request({
+    url: '/api/addition/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteAddition(params) {
+  return request({
+    url: '/api/addition/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetAddition(params) {
+  return request({
+    url: '/api/addition/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+
 
 
 

src/api/his/his.js

@@ -143,10 +143,13 @@ export function getHisPrescriptionInfo(params){
 
 
 
-
-
-
-
+export function Refund(params) {
+  return request({
+    url: "/api/refund/post",
+    method: "post",
+    params:params,
+  });
+}
 
 
 

src/xt_pages/data/components/additionDialog.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <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="name">
+            <el-input v-model="formValue.name"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="国家编码" prop="code">
+            <el-input v-model="formValue.code"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="费用" >
+            <el-input type="number" v-model="formValue.price"></el-input>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </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>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  export default {
+    name: 'diagnosisDialog',
+
+    data() {
+
+      return {
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+        form: {
+          name: '',
+          code: '',
+          price: '',
+
+        },
+        resetForm: {
+          name: '',
+          code: '',
+          price: '',
+          wubi: ''
+        },
+        rules: {
+          name: [
+            { required: true, message: '请输入费用名称', trigger: 'blur' }
+          ],
+          code: [
+            { required: true, message: '请输入国家编码', trigger: 'blur' }
+          ]
+
+        }
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function() {
+        this.visibility = true
+
+      }, hide: function() {
+        this.visibility = false
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      comfirm: function(formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('dialog-comfirm', 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
+        return form
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/data/components/addtion.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+      <!--<manufacturer-or-dealer-dialog-->
+      <!--ref="dialog"-->
+      <!--:titles="manufacturerDialog.titles"-->
+      <!--:formValue="manufacturerDialog.formValue"-->
+      <!--:visibility="manufacturerDialog.isVisibility"-->
+      <!--:type="manufacturerDialog.type"-->
+      <!--:isCreated="manufacturerDialog.isCreated"-->
+      <!--v-on:dialog-comfirm="manufacturerDialogComfirm"-->
+      <!--v-on:dialog-cancle="manufacturerDialogCancle"-->
+      <!--&gt;</manufacturer-or-dealer-dialog>-->
+      <addition-dialog
+        ref="dialog"
+        :titles="Dialog.titles"
+        :formValue="Dialog.formValue"
+        :visibility="Dialog.isVisibility"
+        :type="Dialog.type"
+        :isCreated="Dialog.isCreated"
+        v-on:dialog-comfirm="dialogComfirm"
+        v-on:dialog-cancle="dialogCancle"
+
+      ></addition-dialog>
+
+
+      <el-row :gutter="15">
+        <el-col>
+          <div>
+            <el-button
+              size="small"
+              icon="el-icon-circle-plus-outline"
+              style="float: right;margin-bottom: 15px"
+              type="primary"
+              @click="showDialog"
+            >新增
+            </el-button>
+          </div>
+
+          <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="manufacturerData"
+            style="width: 100%"
+            border
+            v-loading="loading"
+          >
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.code }}
+              </template>
+            </el-table-column>
+
+
+
+            <el-table-column label="费用名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="金额" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.price }}元
+              </template>
+            </el-table-column>
+
+
+
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="编辑"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    createAddition,
+    modifyAddition,
+    getAdditionList,
+    deleteAddition,
+    GetAddition
+  } from '@/api/data'
+  import AdditionDialog from './additionDialog'
+
+  export default {
+    components: {
+      AdditionDialog,
+    },
+    name: 'addtion',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        manufacturerData: [],
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+
+        page: 1,
+        limit: 10,
+        loading: false,
+
+        manufacturer_code: '',
+        editId: '',
+        editIndex: '',
+        Dialog: {
+          titles: '新增',
+          isVisibility: false,
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            name: '',
+            code: '',
+            price: '',
+
+          },
+          resetForm: {
+            name: '',
+            code: '',
+            price: '',
+          }
+        }
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        this.editId = row.id
+        this.editIndex = index
+        let params = {
+          id: row.id
+        }
+        GetAddition(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.addition.name
+            this.Dialog.formValue.content_code =
+              response.data.data.addition.code
+            this.Dialog.formValue.price =
+              response.data.data.addition.price
+
+            this.Dialog.isCreated = 2
+            this.$refs.dialog.show()
+
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+            deleteAddition(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.manufacturerData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetAddition(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.name =
+              response.data.data.addition.name
+            this.Dialog.formValue.code =
+              response.data.data.addition.code
+            this.Dialog.formValue.price =
+              response.data.data.addition.price
+
+
+            this.Dialog.isCreated = 3
+            this.Dialog.isVisibility = true
+          }
+        })
+      },
+      dialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+        if (val.isCreated == 2) {
+          //修改
+          let params = {
+            name: val.name,
+            code: val.code,
+            price: val.price,
+            id: this.editId,
+
+          }
+          modifyAddition(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData[this.editIndex].name =
+                response.data.data.addition.name
+              this.manufacturerData[this.editIndex].code =
+                response.data.data.addition.code
+              this.manufacturerData[this.editIndex].price =
+                response.data.data.addition.price
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createAddition(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData.unshift(response.data.data.addition)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      dialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.Dialog.formValue = Object.assign(
+          {},
+          this.Dialog.resetForm
+        )
+        this.$refs.dialog.show()
+        this.Dialog.isCreated = 1
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit
+        }
+        this.loading = true
+        getAdditionList(params).then(response => {
+          if (response.data.state == 0) {
+            this.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.loading = false
+            this.total = response.data.data.total
+            this.manufacturerData = []
+            for (let i = 0; i < response.data.data.addition.length; i++) {
+              this.manufacturerData.push(response.data.data.addition[i])
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .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;
+  }
+</style>

src/xt_pages/data/specialDictionary.vue

@@ -26,11 +26,20 @@
           <dealer></dealer>
         </el-tab-pane>
 
-        <el-tab-pane label="门诊大病" name="7">
+        <el-tab-pane label="疾病类型" name="7">
           <!--<manufacturer></manufacturer>-->
           <diagnosis></diagnosis>
         </el-tab-pane>
-        <el-tab-pane label="配置项字典" name="8">
+
+        <!--<el-tab-pane label="医疗类别" name="8">-->
+          <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
+          <!--<diagnosis></diagnosis>-->
+        <!--</el-tab-pane>-->
+        <el-tab-pane label="附加收费配置" name="8">
+          <addtion></addtion>
+        </el-tab-pane>
+
+        <el-tab-pane label="配置项字典" name="9">
           <configure></configure>
         </el-tab-pane>
       </el-tabs>
@@ -49,10 +58,12 @@
   import configure from './components/configure'
   import Dealer from '../stock/config/dealer'
   import Diagnosis from './components/diagnosis'
+  import Addtion from './components/addtion'
 
   export default {
     name: 'specialDictionary',
     components: {
+      Addtion,
       Diagnosis,
       Dealer,
       BreadCrumb,

src/xt_pages/outpatientCharges/11.vue

@@ -0,0 +1,515 @@
+<template>
+  <div class="main-contain outpatientChargesManagement">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+      <div class="mainLeft">
+        <!--<div class="mainCell" style="justify-content: space-between;">-->
+        <!--<p>未就诊：<span>1</span>人</p>-->
+        <!--<p>已就诊：<span>0</span>人</p>-->
+        <!--</div>-->
+        <!--<div class="mainCell">-->
+        <!--<el-radio-group v-model="radio" @change="changeRadio">-->
+        <!--<el-radio :label=1>未就诊</el-radio>-->
+        <!--<el-radio :label=2>已就诊</el-radio>-->
+        <!--<el-radio :label=3>全部</el-radio>-->
+        <!--</el-radio-group>-->
+        <!--</div>-->
+        <div class="mainCell" style="margin-bottom:10px;">
+          <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+            搜索
+          </el-button>
+        </div>
+        <div style="flex:1;overflow-y:auto;">
+          <el-table :data="patientTableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                    highlight-current-row ref="tab"
+                    @current-change="handleCurrentChange">
+            <el-table-column align="center" prop="name" label="患者姓名">
+              <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="就诊号" width="90">
+              <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="mainRight">
+        <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
+          <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
+          <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
+          <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+          <el-button v-loading="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small" @click="open(6)"
+                     type="primary">挂号
+          </el-button>
+          <el-button v-loading="loadingtwo" v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small" @click="open(4)"
+                     type="primary">收费
+          </el-button>
+          <el-button size="small" @click="open(5)" type="primary">退费</el-button>
+        </div>
+        <div class="mainCenter">
+          <div class="centerLeft">
+            <div class="tabsBox">
+              <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+              <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
+                <el-tab-pane
+                  v-for="(item, index) in prescriptions"
+                  :key="index"
+                  :label="item.name"
+                  :name="item.name"
+                >
+                </el-tab-pane>
+                <div class="RP">Rp</div>
+                <prescription-table ref="prescription_tables" :prescription="curPrescriptions"></prescription-table>
+              </el-tabs>
+
+            </div>
+            <div class="costBox">
+              <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
+              <span>{{ state }}</span>
+            </div>
+          </div>
+          <div class="centerRight">
+            <p class="centerRightTitle">人员信息</p>
+            <div style="display:flex;justify-content: space-between;line-height:30px;">
+              <span style="font-size:14px;">人员编码:</span>
+              <span style="font-size:14px;">日期:{{record_date}}</span>
+            </div>
+            <ul class="basicUl">
+              <li style="width:50%;">姓名：{{patientInfo.name}}</li>
+              <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
+              <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+              <li style="width:50%;">身高：{{patientInfo.height}}</li>
+              <li style="width:50%;">体重：{{patientInfo.weight}}</li>
+              <li style="width:50%;">电话：{{patientInfo.phone}}</li>
+              <li style="width:100%;">地址：{{patientInfo.home_address}}</li>
+            </ul>
+            <p class="centerRightTitle">诊断信息</p>
+            <div style="display:flex;justify-content: space-between;line-height:30px;">
+              <span style="font-size:14px;">门诊编号:676273816287361</span>
+            </div>
+            <ul class="basicUl">
+              <li style="width:50%;">医生：{{ }}</li>
+              <li style="width:50%;">科室：{{ }}</li>
+              <li style="width:100%;">费用：{{ }}元</li>
+              <li style="width:100%;">判断结果：</li>
+              <li style="width:100%;">是否有传染病：</li>
+              <li style="width:100%;">血压：</li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--<additionalCharges ref='additionalCharges'></additionalCharges>-->
+  </div>
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import noCharge from './components/noCharge'
+  import charged from './components/charged'
+  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 } from '@/api/his/his'
+
+  const moment = require('moment')
+  export default {
+    components: {
+      BreadCrumb,
+      noCharge,
+      charged,
+      medicalInsuranceRefund,
+      prescriptionTable,
+      additionalCharges
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '门诊收费管理' }
+        ],
+        curPrescriptions: {},
+        prescriptions: [],
+        record_date: '',
+        tableData: [],
+        editableTabsValue: '1',
+        loadingone:false,
+        editableTabs: [{
+          title: '处方1',
+          name: '1'
+        }],
+        tabIndex: 1,
+        hisPatientInfo: {},
+        loadingtwo:false,
+        patientTableData: [{
+          name: '杨美英',
+          mdtrt_id: '1709946'
+        }],
+        patientInfo: { id: 0 },
+        doctor: {},
+        total: 0,
+        state: '未收费',
+        radio: 1,
+        radioStatus: 1,
+        search_input: '',
+        start_time: moment().locale('zh-cn').format('YYYY-MM-DD')
+      }
+    },
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+
+      //获取患者信息
+      this.getPatientList()
+    },
+    methods: {
+      tabclickEvent(val) {
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].name == val.name) {
+            this.curPrescriptions = {}
+            var temp = this.deepClone(this.prescriptions[i])
+            this.curPrescriptions = temp
+            console.log(this.curPrescriptions)
+          }
+        }
+      }, deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+      getTotal() {
+        var total = 0
+        console.log(this.prescriptions)
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          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].project != null) {
+            for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+              total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].count
+            }
+          }
+        }
+        return total
+      },
+      moreState(tab, event) {
+        if (tab == 'more') {
+          return false
+        }
+      },
+      open(index) {
+        if (index == 1) {
+        } else if (index == 2) {
+
+        } else if (index == 4) {
+
+          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.loadingtwo = false
+
+            }
+          })
+
+          this.state = '已收费'
+          this.$message({ message: '收费成功', type: 'success' })
+        } else if (index == 5) {
+          this.$message({ message: '退费成功', type: 'success' })
+        } else if (index == 6) {
+
+          if (this.patientInfo.id == 0) {
+            this.$message.error('请先选择要挂号的病人')
+            return
+          }
+          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.loadingone = false
+              var his_info = response.data.data.his_info
+              this.hisPatientInfo = his_info
+            }
+          })
+        }
+      },
+      addTab(targetName) {
+        let newTabName = ++this.tabIndex + ''
+        this.editableTabs.push({
+          title: '处方' + this.tabIndex,
+          name: newTabName
+        })
+        this.editableTabsValue = newTabName
+      },
+      removeTab(targetName) {
+        let tabs = this.editableTabs
+        let activeName = this.editableTabsValue
+        if (activeName === targetName) {
+          tabs.forEach((tab, index) => {
+            if (tab.name === targetName) {
+              let nextTab = tabs[index + 1] || tabs[index - 1]
+              if (nextTab) {
+                activeName = nextTab.name
+              }
+            }
+          })
+        }
+
+        this.editableTabsValue = activeName
+        this.editableTabs = tabs.filter(tab => tab.name !== targetName)
+      },
+      addCharges() {
+        this.$refs.additionalCharges.show()
+      },
+      choosePatient() {
+
+      },
+      changeRadio(id) {
+        console.log(id)
+        this.radioStatus = id
+        this.getPatientList()
+      },
+
+      //患者列表
+      getPatientList() {
+        let params = {
+          'record_date': this.record_date
+        }
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            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.patientTableData.push(response.data.data.list[i])
+              }
+            }
+
+            // this.cal_one = cal_one
+            // this.cal_two = cal_two
+          }
+        })
+      },
+
+      unique(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
+      },
+      handleCurrentChange(val) {
+        this.getPatientInformation(val.patients.id)
+      }, //获取患者的基本信息
+      getPatientInformation(id) {
+        let params = {
+          'record_date': this.record_date,
+          'patient_id': id
+        }
+        getPatientInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientInfo = response.data.data.xt_info
+            this.hisPatientInfo = response.data.data.his_info
+            this.prescriptions = []
+            for (let i = 0; i < response.data.data.prescription.length; i++) {
+              var prescription = response.data.data.prescription[i]
+              let index = i + 1
+              let obj = {
+                name: '处方' + index,
+                advices: prescription.advices,
+                project: prescription.project,
+                type: response.data.data.prescription[i].type
+              }
+              this.prescriptions.push(obj)
+              this.curPrescriptions = this.prescriptions[0]
+
+            }
+            // this.$refs.prescriptions.setData(this.prescriptions)
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .app-container {
+    height: 100%;
+  }
+
+  .outpatientChargesManagement {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+  .mainLeft {
+    width: 200px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+  .el-radio {
+    margin-right: 5px;
+  }
+
+  }
+  .mainCell {
+    height: 36px;
+    display: flex;
+    align-items: center;
+  }
+
+  .mainRight {
+    margin-left: 20px;
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+
+  .cellSpan {
+    min-width: 80px;
+    display: inline-block;
+    margin-right: 10px;
+  }
+
+  }
+  .tabsBox {
+    position: relative;
+    height: 90%;
+    overflow-y: auto;
+    margin-bottom: 60px;
+
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  }
+  .addTab {
+    position: absolute;
+    right: 0;
+    top: 6px;
+    z-index: 20;
+  }
+
+  .mainCenter {
+    display: flex;
+    flex: 1;
+  }
+
+  .costBox {
+    width: 100%;
+    height: 60px;
+    background: #fff;
+    position: absolute;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .centerLeft {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+  }
+
+  .centerRight {
+    width: 300px;
+    margin-left: 5px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .RP {
+    color: #409EFF;
+    font-size: 20px;
+    margin-bottom: 5px;
+  }
+
+  .centerRightTitle {
+    color: #409EFF;
+    padding-top: 10px;;
+  }
+
+  .basicUl {
+    border-top: 1px solid #e5e5e5;
+    border-left: 1px solid #e5e5e5;
+    display: flex;
+    flex-wrap: wrap;
+
+  li {
+    border-bottom: 1px solid #e5e5e5;
+    border-right: 1px solid #e5e5e5;
+    width: 100%;
+    height: 38px;
+    line-height: 38px;
+    text-indent: 5px;
+    font-size: 14px;
+  }
+
+  }
+  }
+</style>
+
+<style lang="scss">
+  #tab-more {
+
+  .el-icon-close {
+    display: none;
+  }
+
+  }
+</style>
+

src/xt_pages/outpatientCharges/components/additionalCharges.vue

@@ -5,33 +5,33 @@
         :visible.sync="visible"
         :before-close="_close"
     >
-        <el-table :data="tableData" border style="width: 100%;" height="300" 
-         :row-style="{ color: '#303133' }" 
-         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        <el-table :data="addtions_charge" border style="width: 100%;" height="300"
+         :row-style="{ color: '#303133' }"
+         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
           highlight-current-row
-          @selection-change="handleSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="40"></el-table-column>
             <el-table-column align="center" prop="name" label="名称" width="100">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
+                <template slot-scope="scope">{{ scope.row.item_name }}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="金额(元)">
                 <template slot-scope="scope">
-                    <el-input v-model="scope.row.money"></el-input>
+            {{ scope.row.price }}
                 </template>
             </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
 import { saveCharges } from "@/api/project/project"
 export default {
- 
+  props: {
+    addtions_charge: Array
+
+  },
     data(){
         return{
             visible:false,
@@ -39,9 +39,7 @@ export default {
                 name:''
             },
             tableData:[
-              {id:1,name:"工本费",money:""},
-              {id:2,name:"挂号费",money:""},
-              {id:3,name:"诊疗费",money:""}  
+
             ],
             patient_id:0,
             chargeTable:[]
@@ -56,34 +54,16 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-           this.patient_id = id
+        show() {
            this.visible = true
         },
         hide() {
            this.visible = false
         },
-        handleSelectionChange(val){
-          console.log("val",val)
-          this.chargeTable = val
-        },
-        submitAction(){
-           var params = {
-             patient_id:this.patient_id,
-             medicineData:this.chargeTable
-           }
-           console.log("params",params)
-          saveCharges(params).then(response=>{
-             if(response.data.state == 1){
-               var additionalCharge =  response.data.data.additionalCharge
-               console.log("additionalchar",additionalCharge)
-               this.visible = false
-               this.$message.success("保存成功")
-             }
-          })  
-        }
+
+
     },
-   
+
 }
 </script>
 

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -11,7 +11,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>
-            <div> {{scope.row.min_unit}}</div>
+            <div> {{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>
@@ -31,7 +31,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -6,15 +6,19 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
       <div class="mainLeft">
         <div class="mainCell" style="justify-content: space-between;">
-        <p style="font-size:14px;">未就诊：<span>1</span>人</p>
-        <p style="font-size:14px;">已就诊：<span>0</span>人</p>
+          <p style="color: red">未收费：<span>{{cal_one}}</span>人</p>
+          <p style="color: red">已收费：<span>{{cal_two}}</span>人</p>
+          <p style="color: red">已退费：<span>{{cal_three}}</span>人</p>
+
         </div>
         <div class="mainCell">
-        <el-radio-group v-model="radio" @change="changeRadio">
-        <el-radio :label=1>未就诊</el-radio>
-        <el-radio :label=2>已就诊</el-radio>
-        <el-radio :label=3>全部</el-radio>
-        </el-radio-group>
+          <el-radio-group v-model="radio" @change="changeRadio">
+            <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-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
@@ -23,7 +27,8 @@
           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;" :row-style="{ color: '#303133' }"
+          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+                    :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
@@ -42,15 +47,18 @@
           <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
-          <el-button v-loading="loadingone"  size="small"
+          <el-button v-loading="loadingone" size="small"
                      @click="open(6)"
+                     v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
                      type="primary">挂号
           </el-button>
           <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
-          <el-button size="small" @click="open(5)" type="primary" v-if="this.info && this.info.prescription_status == 3">退费</el-button>
+          <el-button size="small" @click="open(5)" type="primary"
+                     v-if="this.info && this.info.prescription_status == 3">退费
+          </el-button>
         </div>
 
         <div class="mainCenter">
@@ -59,7 +67,7 @@
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
-                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
                     <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"
@@ -117,7 +125,7 @@
                   <ul class="basicUl">
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
-                    <li style="width:100%;">总费用：{{ getTotal() }}</li>
+                    <li style="width:50%;">总费用：{{ getTotal() }}</li>
 
                     <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
                     <li style="width:100%;">是否有传染病：</li>
@@ -198,7 +206,7 @@
         </div>
       </div>
     </div>
-    <!--<additionalCharges ref='additionalCharges'></additionalCharges>-->
+    <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
   </div>
 </template>
 
@@ -211,7 +219,7 @@
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList, register, upload } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
 
   const moment = require('moment')
   export default {
@@ -229,7 +237,11 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '门诊收费管理' }
         ],
-        tableHeight:'',
+        current_index:0,
+        cal_one:'',
+        cal_two:'',
+        cal_three:'',
+        tableHeight: '',
         fullHeight: document.documentElement.clientHeight,
         activeName: 'first',
         info: {},
@@ -258,8 +270,11 @@
         radioStatus: 1,
         search_input: '',
         start_time: moment().locale('zh-cn').format('YYYY-MM-DD'),
-        patient_id:0,
-        prescription_id:0
+        patient_id: 0,
+        prescription_id: 0,
+        all_table_data:[],
+        order:{},
+        addtions_charge:[],
       }
     },
     created() {
@@ -280,6 +295,9 @@
       this.getPatientList()
     },
     methods: {
+      addCharges() {
+        this.$refs.additionalCharges.show()
+      },
       changeDate(val) {
         if (this.patientInfo.id == 0) {
           this.$message.error('请先选择患者')
@@ -297,6 +315,8 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
+            this.addtions_charge = response.data.data.addtions_charge
+
             this.prescriptions = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
@@ -316,7 +336,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -329,7 +348,7 @@
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
                   project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].statistical_classification,
+                  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,
@@ -365,7 +384,7 @@
 
       },
       tabclickEvent(val) {
-        console.log("val",val.name)
+        console.log('val', val.name)
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
 
@@ -374,13 +393,10 @@
             this.curPrescriptions = temp
           }
         }
-        console.log("9999",this.curPrescriptions)
+        console.log('9999', this.curPrescriptions)
         this.prescription_id = this.curPrescriptions.id
         this.total = 0
         this.total = this.getTotalOne()
-       
-
-
 
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
@@ -395,33 +411,31 @@
           }
         })
         return targetObj
-      },getTotalOne(){
+      }, getTotalOne() {
         var total = 0
-          if(this.curPrescriptions.type == 1) {
-            if (this.curPrescriptions.advices != null) {
-              for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-                console.log(this.curPrescriptions.advices[a].retail_price)
-                console.log(this.curPrescriptions.advices[a].prescribing_number)
+        if (this.curPrescriptions.type == 1) {
+          if (this.curPrescriptions.advices != null) {
+            for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+              console.log(this.curPrescriptions.advices[a].retail_price)
+              console.log(this.curPrescriptions.advices[a].prescribing_number)
 
-                total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
-              }
+              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
             }
-            return total
-
-          }else{
-            var total = 0
-            if (this.curPrescriptions.project != null) {
-              for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-                console.log(this.curPrescriptions.project[b].price )
-                console.log(this.curPrescriptions.project[b].total )
-                total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
-              }
+          }
+          return total
+
+        } else {
+          var total = 0
+          if (this.curPrescriptions.project != null) {
+            for (let b = 0; b < this.curPrescriptions.project.length; b++) {
+              console.log(this.curPrescriptions.project[b].price)
+              console.log(this.curPrescriptions.project[b].total)
+              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
             }
-            return total
-
           }
+          return total
 
-
+        }
 
       },
       getTotal() {
@@ -437,8 +451,13 @@
               total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
             }
           }
+
+        }
+        for (let i = 0; i < this.addtions_charge.length; i++){
+          total = total +  this.addtions_charge[i].price
         }
-        return total
+        return Math.floor(total * 100) / 100
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -446,17 +465,22 @@
         }
       },
       open(index) {
-        console.log("index",index)
+        console.log('index', index)
         if (index == 1) {
 
         } else if (index == 2) {
-           
-           this.$router.push("/outpatientDoctorStation/printtwo?record="+this.record_date+"&patient_id="+this.patient_id+"&prescription_id="+this.prescription_id)
-        
-        } else if(index == 3){
-            this.$router.push("/outpatientCharges/treatPrint?record_date="+this.record_date+"&patient_id="+this.patient_id+"&prescription_id="+this.prescription_id)
+
+          this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
+
+        } else if (index == 3) {
+          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' })
+            return
+          }
+
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
@@ -466,39 +490,34 @@
             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.state = '已收费'
-          this.$message({ message: '收费成功', type: 'success' })
         } else if (index == 5) {
           let params = {
-            'id': this.patientInfo.id,
-            'record_time': this.record_date
+            'order_id': this.order.id,
+            'number': this.order.number,
           }
           Refund(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.loadingtwo = false
-
               return false
-
             } else {
+              this.$message({ message: '退费成功', type: 'success' })
               this.loadingtwo = false
 
             }
           })
 
-
-
-
-          this.$message({ message: '退费成功', type: 'success' })
         } else if (index == 6) {
 
           if (this.patientInfo.id == 0) {
@@ -518,6 +537,8 @@
               return false
 
             } else {
+              this.$message({ message: '挂号成功', type: 'success' })
+
               this.loadingone = false
               var his_info = response.data.data.his_info
               this.hisPatientInfo = his_info
@@ -532,9 +553,52 @@
         this.getPatientList()
       },
       changeRadio(id) {
-        console.log(id)
-        this.radioStatus = id
-        this.getPatientList()
+        // console.log(id)
+        // this.radioStatus = id
+        // this.getPatientList()
+
+        switch (id) {
+          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 ){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+            }
+            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){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+
+            }
+            break
+          case 3:
+            this.patientTableData = []
+
+            for (let i = 0; i < this.all_table_data.length; i++){
+
+              if(this.all_table_data[i].info.prescription_status == 4){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+            }
+            break
+          case 4:
+            this.patientTableData = []
+            this.patientTableData = this.all_table_data
+            break
+
+        }
+
+
+
+
       },
 
       //患者列表
@@ -548,11 +612,46 @@
             return false
           } else {
             this.patientTableData = []
+            this.all_table_data = []
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
             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].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].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].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  three_count = three_count + 1
+                }
+              }
+
               if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-                this.patientTableData.push(response.data.data.list[i])
+                this.all_table_data.push(response.data.data.list[i])
               }
             }
+
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = three_count
+
+            this.current_index = 0
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+
           }
         })
       },
@@ -563,15 +662,24 @@
       },
       handleCurrentChange(val) {
         console.log('val', val)
-        this.getPatientInformation(val.patients.id)
+        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){
+            this.current_index = i
+          }
+
+        }
+
       },
 
       //获取患者的基本信息
-      getPatientInformation(id) {
+      getPatientInformation(id,batch_number) {
         let params = {
           'record_date': this.record_date,
-          'patient_id': id
+          'patient_id': id,
+          'number':batch_number,
         }
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -581,6 +689,9 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
+            this.order = response.data.data.order
+            this.addtions_charge = response.data.data.addtions_charge
+
             this.prescriptions = []
             console.log("9991323242r5253535",response.data.data.prescription)
             this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
@@ -603,7 +714,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -616,7 +726,7 @@
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
                   project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].statistical_classification,
+                  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,
@@ -634,7 +744,7 @@
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
-                order_status:response.data.data.prescription[i].order_status,
+                order_status: response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }
               this.prescriptions.push(obj)
@@ -643,13 +753,12 @@
               this.total = this.getTotalOne()
               console.log(this.total)
 
-
             }
           }
         })
       }
     },
-    mounted(){
+    mounted() {
       const that = this
       window.onresize = () => {
         return (() => {
@@ -659,16 +768,16 @@
       }
     },
     watch: {
-      fullHeight (val) {
-        if(!this.timer) {
+      fullHeight(val) {
+        if (!this.timer) {
           this.fullHeight = val
           let tableHeight = val - 263
           this.tableHeight = tableHeight
           this.timer = true
           let that = this
-          setTimeout(function (){
+          setTimeout(function() {
             that.timer = false
-          },400)
+          }, 400)
         }
       }
     }

src/xt_pages/outpatientCharges/summary.vue

@@ -44,17 +44,17 @@
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="患者类型">
-          <template slot-scope="scope">{{'医保'}}</template>
-        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope"></template>-->
+        <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="应收金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="舍入金额">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.medfee_sumamt - scope.row.medfee_sumamt}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
           <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
@@ -66,9 +66,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.order_status == 1">待结算</div>
             <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">结算失败</div>
-            <div v-if="scope.row.order_status == 4">已退费</div>
-
+            <div v-if="scope.row.order_status == 3">已退费</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作">

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -26,8 +26,12 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
-                      <span>{{ state }}</span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt }}元</span></span>
+                      <span v-if="order.order_status == 1">待结算</span>
+                      <span v-if="order.order_status == 2">已结算</span>
+                      <span v-if="order.order_status == 3">已退费</span>
+
+
                     </div>
                 </div>
                 <div class="centerRight">
@@ -42,17 +46,17 @@
                     </ul>
                     <p class="centerRightTitle">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：0.00元</li>
-                        <li style="width:50%;">实收金额：0.00元</li>
-                        <li style="width:50%;">舍入金额：0.00元</li>
+                        <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%;">总金额</li>
-                        <li style="width:50%;">0.00元</li>
-                    </ul>
-                    <p class="centerRightTitle">发票费用</p>
-                    <ul class="basicUl">
-                        <li style="width:100%;">西药费：0.00元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
                     </ul>
+                    <!--<p class="centerRightTitle">发票费用</p>-->
+                    <!--<ul class="basicUl">-->
+                        <!--<li style="width:100%;">西药费：0.00元</li>-->
+                    <!--</ul>-->
                 </div>
             </div>
         </div>
@@ -102,6 +106,7 @@ export default {
           radio: 1,
           radioStatus: 1,
           search_input: '',
+          order:{},
         }
     },created(){
       this.GetOrderDetail()
@@ -164,6 +169,8 @@ export default {
           this.patientInfo = response.data.data.order.patient
           this.hisPatientInfo = response.data.data.order.his_patient
           this.info = response.data.data.p_info
+          this.order = response.data.data.order
+
           this.prescriptions = []
           for (let i = 0; i < response.data.data.prescription.length; i++) {
             var prescription = response.data.data.prescription[i]
@@ -196,7 +203,7 @@ export default {
                 id: prescription.project[b].id,
                 project_id: prescription.project[b].project.id,
                 project_name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].statistical_classification,
+                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,

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -1,95 +1,116 @@
 <template>
-    <el-dialog
-        title="附加收费"
-        width="300px"
-        :visible.sync="visible"
-        :before-close="_close"
-    >
-        <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }"
-        :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
-          @selection-change="handleSelectionChange">
-            <el-table-column align="center" type="selection" width="40"></el-table-column>
-            <el-table-column align="center" prop="name" label="名称" width="100">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="金额(元)">
-                <template slot-scope="scope">
-                    <el-input v-model="scope.row.money" placeholder=""></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-            <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction()">保 存</el-button>
-        </div>
-    </el-dialog>
+  <el-dialog
+    title="附加收费"
+    width="300px"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-table :data="chargeTable" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+              @select-all="handleSelectionChange"
+              @select='selectDrugs'>
+      <el-table-column align="center" type="selection" width="40"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称" width="100">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="金额(元)">
+        <template slot-scope="scope">
+          <el-input type="number" v-model="scope.row.price" placeholder="请输入金额"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction()">保 存</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
- import { saveCharges } from "@/api/project/project"
-export default {
-   props: {
+  import { saveCharges } from '@/api/project/project'
+
+  export default {
+    props: {
       hisPatientInfo: Object,
-      patientInfo:Object,
+      patientInfo: Object,
+      additions: Array,
+      addtions_charge: Array
+
     },
-    data(){
-        return{
-            visible:false,
-            form:{
-                name:''
-            },
-            tableData:[
-              {id:1,name:"工本费",money:""},
-              {id:2,name:"挂号费",money:""},
-              {id:3,name:"诊疗费",money:""}
-            ],
-            chargeTable:[]
-        }
+    data() {
+      return {
+        visible: false,
+        chargeTable: [],
+        charges: []
+      }
     },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show() {
-            // this.clear()
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
-        },
-        handleSelectionChange(val){
-          console.log("val",val)
-          this.chargeTable = val
-        },
-        submitAction(){
-          var params = {
-             his_patient_id:this.hisPatientInfo.id,
-             patient_id:this.patientInfo.id,
-             medicineData:this.chargeTable
-           }
-        //    console.log("params",params)
-          saveCharges(params).then(response=>{
-             if(response.data.state == 1){
-               var additionalCharge =  response.data.data.additionalCharge
-               console.log("additionalchar",additionalCharge)
-               this.visible = false
-               this.$message.success("保存成功")
-             }
-          })
+    methods: {
+      selectDrugs(selection, row) {
+        this.charges = selection
+      },
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show() {
+        this.chargeTable = []
+        this.visible = true
+        if (this.addtions_charge == null || this.addtions_charge.length == 0) {
+          for (let i = 0; i < this.additions.length; i++) {
+            let obj = {
+              id: '0',
+              item_id: this.additions[i].id.toString(),
+              name: this.additions[i].name,
+              price: this.additions[i].price.toString()
+            }
+            this.chargeTable.push(obj)
+          }
+        } else {
+
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            let obj = {
+              id: this.addtions_charge[i].id.toString(),
+              item_id: this.addtions_charge[i].item_id.toString(),
+              name: this.addtions_charge[i].item_name,
+              price: this.addtions_charge[i].price.toString()
+            }
+            this.chargeTable.push(obj)
+          }
+        }
+      },
+      hide() {
+        this.visible = false
+      },
+      handleSelectionChange(val) {
+        this.charges = val
+      },
+      submitAction() {
+        var params = {
+          his_patient_id: this.hisPatientInfo.id,
+          patient_id: this.patientInfo.id,
+          medicineData: this.charges
         }
+        saveCharges(params).then(response => {
+          if (response.data.state == 1) {
+            var data = response.data.data.additional_charges
+            this.$emit('setData', data)
+            this.$message.success('保存成功')
+            this.visible = false
+
+          }
+        })
+      }
     },
-    watch:{
-       hisPatientInfo:function(val){
-         console.log("患者ID",this)
-       }
+    watch: {
+      hisPatientInfo: function(val) {
+        console.log('患者ID', this)
+      }
     }
-}
+  }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -22,16 +22,6 @@
           <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
           <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
-            <el-select style="width:100%;" v-model="register_type" placeholder="">
-              <el-option
-                v-for="(item,index) in this.register_types"
-                :key="index"
-                :label="item.name"
-                :value="item.name">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="医疗类型: " prop="name">
             <el-select style="width:100%;" v-model="register_type" placeholder="">
               <el-option
                 v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
@@ -41,7 +31,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="诊断:" prop="name">
+          <el-form-item label="疾病类型:" prop="name">
 
             <el-select style="width:100%;" v-model="state1" placeholder="">
               <el-option
@@ -65,8 +55,8 @@
         </el-form>
         <div class="tabsBox">
 
-          <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
-          <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" closable @tab-remove="removeTab"
+          <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+          <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
                    :before-leave="moreState" @tab-click="tabclickEvent">
             <el-tab-pane
               v-for="(item, index) in prescriptions"
@@ -104,9 +94,9 @@
             </el-option>
           </el-select>
           <span>当前处方总价：</span>
-          <span style="color:red;"></span>元
+          <span style="color:red;">{{getTotalOne()?getTotalOne():''}}</span>元
           <span style="margin-left:10px;">总价：</span>
-          <span style="color:red;">{{ getTotal() }}</span>元
+          <span style="color:red;">{{ getTotal()?getTotal():''}}</span>元
           <span>{{order_status}}</span>
 
         </div>
@@ -118,10 +108,10 @@
         </div> -->
         <el-tabs class="borderCard" type="border-card" v-model="rightTab" @tab-click="clickTab">
               <el-tab-pane label="药品" :name="1">
-                
+
               </el-tab-pane>
               <el-tab-pane label="项目" :name="2">
-                
+
               </el-tab-pane>
               <div style="height:100%;" v-show="showOne">
                   <el-tabs class="rightTabs" v-model="activeName">
@@ -237,9 +227,9 @@
               </div>
         </el-tabs>
         <template>
-          
 
-          
+
+
 
           <div class="comfirmBox">
             <!-- <div>
@@ -262,8 +252,8 @@
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
-                       :patientInfo="patientInfo"></additionalCharges>
+    <additionalCharges   v-on:setData="setCharge" ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
+                       :patientInfo="patientInfo" :additions="additions" :addtions_charge="addtions_charge"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -292,6 +282,7 @@
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
+      addtions_charge:Array,
 
       other_sick: {
         type: Array,
@@ -318,7 +309,7 @@
         drugs: [],
         allDrugs: [],
         advices_template: [],
-
+        additions:[],
         editableTabsValue: '处方1',
         editableTabs: [{
           title: '处方1',
@@ -357,19 +348,27 @@
           { id: 2, name: '自费' }
 
         ],
-        department:[],
-        sick:[],
-        prescription_id:0,
+        department: [],
+        sick: [],
+        curTotal: 0,
+        prescription_id: 0
       }
     },
     methods: {
+      setCharge(additional_charges){
+        console.log("111122222")
+        this.addtions_charge = additional_charges
+        console.log(this.addtions_charge )
+
+
+      },
       searchAction() {
-        if(this.search_keyword.length == 0){
+        if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
-        }else{
+        } else {
           let arr = []
-          for (let i = 0; i < this.drugs.length; i++){
-            if(this.drugs[i].drug_name.indexOf(this.search_keyword) != -1){
+          for (let i = 0; i < this.drugs.length; i++) {
+            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1) {
               arr = arr.concat(this.drugs[i])
             }
           }
@@ -377,6 +376,43 @@
 
         }
 
+      }, getTotalOne() {
+        var total = 0
+        console.log(this.prescriptions)
+        for (let i = 0; i < this.prescriptions.length; i++) {
+
+          if(this.prescriptions[i].name == this.editableTabsValue) {
+
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].retail_price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+            if (this.prescriptions[i].project != null) {
+              for (let b = 0; b < this.prescriptions[i].project.length; b++) {
+                total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
+              }
+            }
+            total =  Math.floor(total * 100) / 100
+          }
+        }
+        return total
+
+      }, getCurTotal() {
+        var total = 0
+        console.log(this.editableTabsValue)
+
+        if(this.curPrescriptions.type == 1) {
+          for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+            total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
+          }
+          return Math.floor(total * 100) / 100
+        }else{
+          for (let a = 0; a < this.curPrescriptions.project.length; a++) {
+            total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
+          }
+          return Math.floor(total * 100) / 100
+        }
 
       },
       getTotal() {
@@ -393,6 +429,11 @@
             }
           }
         }
+        if(this.addtions_charge != null) {
+          for (let i = 0; i < this.addtions_charge.length; i++) {
+            total = total + this.addtions_charge[i].price
+          }
+        }
         return Math.floor(total * 100) / 100
       },
       createFilter(queryString) {
@@ -450,8 +491,39 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
             this.sick = response.data.data.sick
+            this.additions = response.data.data.additions
+
+            var info = response.data.data.info
+
+            if (this.$store.getters.xt_user.user.user_type == 2 || this.$store.getters.xt_user.user.user_type == 1) {
+              console.log('11111')
+              this.doctorValue = this.$store.getters.xt_user.user.id
+            } else {
+              console.log('222222')
+
+              this.doctorValue = this.doctors[0].admin_user_id
+            }
+
+            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
+
+            }
 
           }
         })
@@ -496,6 +568,7 @@
           }
 
         }
+
       },
       clearData() {
         this.curPrescriptions = []
@@ -505,14 +578,16 @@
         this.teamList = []
 
       },
-      setData(data, info) {
+      setData(data, info,addition_charge) {
+        this.addition_charge = addition_charge
         this.prescription_id = data[0].id
-        console.log("99999999",data[0].id)
+
+        console.log('99999999', data[0].id)
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
-       
+
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -879,8 +954,7 @@
                   remark: '',
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].min_unit,
-                  min_unit: temp[b].min_unit,
+                  prescribing_number_unit: temp[b].max_unit,
                   medical_insurance_number: temp[b].medical_insurance_number
 
                 }
@@ -994,11 +1068,11 @@
             this.teamList = project
           }
         })
-      },changeDoctor(val){
+      }, changeDoctor(val) {
         console.log(val)
         console.log(this.doctors)
-        for (let i = 0; i < this.doctors.length;i++){
-          if(this.doctors[i].admin_user_id == this.doctorValue){
+        for (let i = 0; i < this.doctors.length; i++) {
+          if (this.doctors[i].admin_user_id == this.doctorValue) {
             this.departmentValue = this.doctors[i].department_id
           }
         }
@@ -1010,11 +1084,9 @@
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
-      
-   
-      
 
     }
+
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -106,6 +106,7 @@
 
 
 <script>
+  import { getDictionaryDataConfig} from "@/utils/data";
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
   import { uParseTime } from '@/utils/tools'
@@ -218,7 +219,6 @@
                   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,
-                  min_unit: prescription.advices[b].single_dose_unit,
                   medical_insurance_number: prescription.advices[b].med_list_codg
 
                 }
@@ -230,7 +230,7 @@
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
                   project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].statistical_classification,
+                  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,
@@ -251,6 +251,8 @@
                 type: response.data.data.prescription[i].type
               }
               this.prescriptions.push(obj)
+              console.log(this.prescriptions)
+
               this.curPrescriptions = this.prescriptions[0]
             }
           }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -10,7 +10,7 @@
       <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" readonly></el-input>
-          <div> {{scope.row.min_unit}}</div>
+          <div> {{scope.row.single_dose_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
@@ -29,7 +29,7 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -10,7 +10,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>
@@ -43,7 +43,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
-            <div> {{scope.row.min_unit}}</div>
+            <div> {{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -66,7 +66,7 @@
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-        <desk-prescription  :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
+        <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
                            v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
@@ -78,7 +78,7 @@
       </div>
 
     </div>
-    
+
      <el-dialog
       title="处方打印"
       :visible.sync="centerDialogVisible"
@@ -89,7 +89,7 @@
       :data="tableData"
       tooltip-effect="dark"
       style="width: 600px"
-      
+
       @selection-change="handleSelectionChange">
       <el-table-column
         type="selection"
@@ -101,7 +101,7 @@
         <template  slot-scope="scope">
           <span>处方编号</span>
         </template>
-      </el-table-column> 
+      </el-table-column>
       <el-table-column
         label="处方号"
         width="200">
@@ -110,7 +110,7 @@
            <el-input v-model="scope.row.id"></el-input>
           </span>
         </template>
-      </el-table-column> 
+      </el-table-column>
     </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -172,6 +172,8 @@
         templatedetail:{},
         detalid:0,
         prescription_id:0,
+        addtions_charge:[],
+
         patientid:0,
         prescriptionList:[],
         centerDialogVisible:false,
@@ -208,12 +210,14 @@
       change(val) {
         this.getList()
 
+
       },
       getList() {
         let params = {
           'record_date': this.record_date,
           'type': this.radio
         }
+        this.patientTableData = []
         getSchedulePatientList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -221,27 +225,18 @@
           } else {
             this.patientTableData = response.data.data.list
             this.patientTableDataTwo = response.data.data.list
-
-            console.log('222', this.patientTableData)
+            this.cal_one = response.data.data.total_one
+            this.cal_two =  response.data.data.total_two
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            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
-              }
+
+            if(this.patientTableData.length > 0) {
+              this.$refs.tab.setCurrentRow(this.patientTableData[0])
+              this.choosePatient(this.patientTableData[0])
             }
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            console.log(this.patientTableData[0])
-            this.choosePatient(this.patientTableData[0])
-            console.log("9999099999",this.patientTableData[0])
+
             this.prescriptionList = response.data.data.list.prescription
             this.patientid = this.patientTableData[0].patient_id
-            this.cal_one = cal_one
-            this.cal_two = cal_two
+
           }
         })
       },
@@ -264,6 +259,9 @@
 
             this.info = response.data.data.info
 
+            this.addtions_charge = response.data.data.addtions_charge
+
+
 
 
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
@@ -316,7 +314,6 @@
                     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,
-                    min_unit:prescription.advices[b].single_dose_unit,
                     medical_insurance_number:prescription.advices[b].med_list_codg,
                     id:prescription.advices[b].drug_id
                   }
@@ -329,7 +326,7 @@
                   console.log(prescription.project[b].project)
                   let obj = {
                     id: prescription.project[b].id,
-                    project_id: prescription.project[b].project.id,
+                    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,
@@ -366,9 +363,10 @@
               }
               this.prescriptions.push(obj)
             }
-            console.log(this.prescriptions)
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+
+
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.addition_charge)
           }
         })
       },
@@ -381,7 +379,7 @@
         if (index == 1) {
           this.$refs.prescriptions.open(1)
         } else if (index == 2) {
-         
+
           this.getPrescriptionList(this.patientid)
           // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
@@ -389,11 +387,13 @@
         } else if (index == 4) {
           this.$refs.prescriptions.open(4)
         }else if(index == 6){
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
+
           this.getPrescriptionList(this.patientid)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-          
+
         }
-        
+
       },
 
       opentwo(index) {
@@ -420,7 +420,7 @@
       // }
 
       getMsgFormSon(id){
-       
+
         this.detalid = id
       },
       changetwo(data){
@@ -438,7 +438,7 @@
       //         }
       //     })
       //   },
-      getPrescriptionList(id){   
+      getPrescriptionList(id){
         getPrescriptionList(id).then(response=>{
            if(response.data.state == 1){
              this.centerDialogVisible = true

src/xt_pages/outpatientRegistration/index.vue

@@ -33,7 +33,7 @@
                     <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
                         <el-input v-model="form.age"></el-input>
                     </el-form-item>
-                    
+
 
                     <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
                         <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
@@ -54,7 +54,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    
+
 
                   <el-form-item label="证件类型：">
                         <el-select v-model="form.certificates" placeholder="请选择">
@@ -100,7 +100,7 @@
                             <!-- <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button> -->
                         </div>
                     </el-form-item>
-                
+
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
@@ -157,7 +157,7 @@
                 </el-form>
                 <el-button style="float:right" @click="saveHisPatient('form')" type="primary">挂号</el-button>
             </div>
-            
+
         </div>
     </div>
 </template>
@@ -196,7 +196,7 @@ export default {
                 medicalExpenses:'',
                 cost:'',
                 total: '',
-                phone:'', 
+                phone:'',
                 social_type:'',
             },
             settlement: [{
@@ -303,7 +303,7 @@ export default {
     computed:{
         total(){
             if(this.form.registrationFee || this.form.medicalExpenses || this.form.cost){
-                return parseFloat(this.form.registrationFee ? this.form.registrationFee : 0) + parseFloat(this.form.medicalExpenses ? this.form.medicalExpenses : 0) + parseFloat(this.form.cost ? this.form.cost : 0) 
+                return parseFloat(this.form.registrationFee ? this.form.registrationFee : 0) + parseFloat(this.form.medicalExpenses ? this.form.medicalExpenses : 0) + parseFloat(this.form.cost ? this.form.cost : 0)
             }
         }
     },
@@ -321,7 +321,7 @@ export default {
             console.log(date)
             let curTime = moment(new Date(date)).format('YYYY-MM-DD')
             console.log("curTime22222",curTime)
-           
+
             console.log(this.jsGetAge(curTime))
 
             this.form.age = this.jsGetAge(curTime)
@@ -389,7 +389,7 @@ export default {
                 this.$message({message: '添加成功',type: 'success'});
             }
         },
-        
+
         getAllDoctorList(){
            getAllDoctorList().then(response=>{
              if(response.data.state == 1){
@@ -399,15 +399,15 @@ export default {
                console.log("department",department)
                this.departmentList = department
              }
-           })   
+           })
         },
-        saveHisPatient(formName){   
+        saveHisPatient(formName){
            if(this.form.name == ""){
              this.$message.error("患者姓名不能为空")
              this.is_Name = true
              return
            }
-          
+
 
            if(this.form.sex == ""){
              this.$message.error("患者性别不能为空")
@@ -453,7 +453,7 @@ export default {
                 }
                 if(this.form.costChecked == false){
                 this.check = 2
-                } 
+                }
                 if(this.form.idCard == ""){
                    this.show = true
                 }
@@ -462,7 +462,7 @@ export default {
                     medicalInsuranceCard:this.form.medicalInsuranceCard,
                     name:this.form.name,
                     sex:this.form.sex,
-                    certificates:this.form.certificates, 
+                    certificates:this.form.certificates,
                     medicalCare:this.form.medicalCare,
                     birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
                     age:parseInt(this.form.age),
@@ -479,7 +479,7 @@ export default {
                     social_type:this.form.social_type
                 }
                 console.log("params",params)
-              
+
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -504,9 +504,9 @@ export default {
                      this.form.total= "" ,
                      this.form.phone = "",
                      this.form.social_type = ""
-                   } 
+                   }
                 })
-             } 
+             }
           })
         },
        getTodaySchedulePatient(){
@@ -516,7 +516,7 @@ export default {
                console.log("今日排班",patient)
                this.patient = patient
              }
-          }) 
+          })
        },
        getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
@@ -525,7 +525,7 @@ export default {
     },
     created(){
       //获取当前机构有人员信息
-      this.getAllDoctorList()   
+      this.getAllDoctorList()
       //获取今日排班的患者
       this.getTodaySchedulePatient()
     }
@@ -543,7 +543,7 @@ export default {
     margin: 0 auto;
 }
 .basicForm{
-    
+
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;