Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/common/common.js

@@ -48,7 +48,7 @@ export function getConfigurationList(limit, page) {
 }
 
 export function getConfigurationDetail(id, params) {
- 
+
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
@@ -531,10 +531,12 @@ export function getCountModeId(params){
 }
 
 export function getRolloutCount(params){
-  
+
   return request({
     url:"/com/api/getrolloutcount",
     method:"Get",
     params:params
   })
-}
+}
+
+

src/api/his/his.js

@@ -106,10 +106,11 @@ export function delHisProject(params) {
 }
 
 
-export function getHisOrderList() {
+export function getHisOrderList(params) {
   return request({
     url: "/api/hisorder/list",
     method: "get",
+    params:params,
   });
 }
 
@@ -152,5 +153,36 @@ export function Refund(params) {
 }
 
 
+export function delHisAddition(params) {
+  return request({
+    url: "/api/addition_charge/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function getDoctorList() {
+  return request({
+    url: "/api/doctor/list",
+    method: "get",
+  });
+}
+
+
+export function getExportConsumeDetailList(params) {
+  return request({
+    url: "/api/consumedetail/export",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+
+
+
 
 

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -10,39 +10,55 @@
       <el-table-column align="center" prop="name" width="90" label="单次用量">
         <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>
+            <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+            <div> {{scope.row.single_dose}}</div>
+
             <div> {{scope.row.single_dose_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
 
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          {{scope.row.day}}
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <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>
+            <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+            <div> {{scope.row.prescribing_number}}</div>
+
             <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+          <div> {{scope.row.retail_price}}</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
         </template>
       </el-table-column>
     </el-table>
@@ -60,42 +76,68 @@
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+          {{scope.row.single_dose}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{scope.row.delivery_way}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          {{scope.row.number_days}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.total" placeholder="" readonly></el-input>
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}}
+
+            <div>{{scope.row.unit}}</div>
+
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}
+
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" readonly></el-input>
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
         </template>
       </el-table-column>
     </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span>{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
   </div>
 </template>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -334,6 +334,7 @@
                   execution_frequency: prescription.advices[b].execution_frequency,
                   retail_price: prescription.advices[b].price.toString(),
                   remark: prescription.advices[b].remark,
+                  day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   single_dose_unit: prescription.advices[b].single_dose_unit,
                   prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
@@ -357,8 +358,10 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code
+                  medical_code: prescription.project[b].project.medical_code,
+                  unit:prescription.project[b].unit,
                 }
+
                 tempProject.push(obj)
               }
               let index = i + 1
@@ -421,19 +424,21 @@
 
             }
           }
-          return Math.floor(total * 100) / 100
-
         } else {
-          var total = 0
           if (this.curPrescriptions.project != null) {
             for (let b = 0; b < this.curPrescriptions.project.length; b++) {
               total = total +  Math.floor((this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total) * 100) / 100
 
             }
           }
-          return Math.floor(total * 100) / 100
+        }
 
+        if (this.curPrescriptions.addition != null) {
+          for (let b = 0; b < this.curPrescriptions.addition.length; b++) {
+            total = total +  Math.floor((this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count) * 100) / 100
+          }
         }
+        return Math.floor(total * 100) / 100
 
       },
       getTotal() {
@@ -450,12 +455,14 @@
               total = total + Math.floor((this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total) * 100) / 100
             }
           }
-
-          for (let i = 0; i < this.addtions_charge.length; i++) {
-            total = total + Math.floor(this.addtions_charge[i].price * 100) / 100
+          if (this.prescriptions[i].addition != null) {
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              total = total + Math.floor((this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count) * 100) / 100
+            }
           }
-          return Math.floor(total * 100) / 100
         }
+        return Math.floor(total * 100) / 100
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -500,28 +507,43 @@
           })
 
         } else if (index == 5) {
-          let params = {
-            '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.$confirm('是否退费', '退费', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              '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
+
+              }
+            })
+
+          }).catch(() => {
+
           })
 
+
         } else if (index == 6) {
 
           if (this.patientInfo.id == 0) {
             this.$message.error('请先选择要挂号的病人')
             return
           }
+
+
+
+
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
@@ -554,45 +576,102 @@
         // console.log(id)
         // this.radioStatus = id
         // this.getPatientList()
+        let temp_id = id
 
-        switch (id) {
-          case 1:
-                this.patientTableData = []
+        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 = []
+            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)
 
-            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])
+              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])
+                }
               }
 
-            }
-            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])
+              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.all_table_data.push(response.data.data.list[i])
+              }
             }
-            break
-          case 3:
-            this.patientTableData = []
 
-            for (let i = 0; i < this.all_table_data.length; i++){
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = three_count
 
-              if(this.all_table_data[i].info.prescription_status == 4){
-                this.patientTableData.push(this.all_table_data[i])
-              }
+            switch (temp_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
 
             }
-            break
-          case 4:
-            this.patientTableData = []
-            this.patientTableData = this.all_table_data
-            break
 
-        }
+            this.current_index = 0
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+
+
+          }
+        })
+
+
 
 
 
@@ -699,6 +778,7 @@
 
               let tempAdvice = []
               let tempProject = []
+              let tempAddition = []
 
               for (let b = 0; b < prescription.advices.length; b++) {
                 let obj = {
@@ -709,6 +789,7 @@
                   execution_frequency: prescription.advices[b].execution_frequency,
                   retail_price: prescription.advices[b].price.toString(),
                   remark: prescription.advices[b].remark,
+                  day: prescription.advices[b].day,
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   single_dose_unit: prescription.advices[b].single_dose_unit,
                   prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
@@ -736,12 +817,27 @@
                 }
                 tempProject.push(obj)
               }
+
+              for (let b = 0; b < prescription.addition.length; b++) {
+                let obj = {
+                  id: prescription.addition[b].id,
+                  item_name: prescription.addition[b].item_name,
+                  price: prescription.addition[b].price,
+                  count: prescription.addition[b].count,
+                  item_id: prescription.addition[b].item_id,
+                }
+                tempAddition.push(obj)
+              }
+
+
+
               let index = i + 1
               let obj = {
                 id: prescription.id,
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
+                addition:tempAddition,
                 order_status: response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }

src/xt_pages/outpatientCharges/summary.vue

@@ -6,27 +6,40 @@
     <div class="app-container">
       <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
         <div>
-          <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+          <el-input size="small" style="width:150px;"  v-model="keywords"
                     class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select size="small" v-model="value" placeholder="请选择" style="width:150px;margin-left:10px;">
+          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              label="全部"
+              value="0">
+            </el-option>
+            <el-option
+              v-for="item,index in doctors"
+              :key="index"
+              :label="item.user_name"
+              :value="item.admin_user_id">
             </el-option>
           </el-select>
-          <el-date-picker size="small" v-model="selected_date" prefix-icon="el-icon-date"
-                          @change="handleScheduleDateChange" :editable="false" :clearable="false"
-                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间"
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                          @change="handleStartTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+
+          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                          @change="handleEndTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
                           align="right"></el-date-picker>
           <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
-        <!--<el-button size="small" type="primary">报表下载</el-button>-->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
       <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -38,8 +51,8 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="门诊/销售编号">
-          <template slot-scope="scope">{{ scope.row.number }}</template>
+        <el-table-column align="center" prop="name" label="门诊号">
+          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
@@ -53,8 +66,8 @@
         <el-table-column align="center" prop="name" label="实收金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="舍入金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt - scope.row.medfee_sumamt}}</template>
+        <el-table-column align="center" prop="name" label="科室">
+          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
           <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
@@ -75,14 +88,28 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+
+      >
+      </el-pagination>
     </div>
+
+
   </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList } from '@/api/his/his'
+  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
@@ -95,10 +122,153 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
         ],
-        tableData: []
+        tableData: [],
+        limit:10,
+        page:1,
+        keywords:"",
+        start_time:"",
+        end_time:"",
+        total:"",
+        doctors:[],
+        admin_user_id:"",
+
       }
     },
     methods: {
+      export_detail(){
+        let params= {
+          start_time:this.start_time,
+          end_time: this.end_time,
+        }
+        getExportConsumeDetailList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            let list = []
+            for (let i =0; i < response.data.data.order.length; i++){
+            let order =   response.data.data.order[i]
+              let number = ""
+              let name = ""
+              let department = ""
+              let doctor_name = ""
+              let balance_accounts = ""
+
+              let order_status = ""
+
+
+
+              if(order.his_patient != null && order.his_patient.number.length > 0){
+                number = order.his_patient.number
+
+              }
+
+              if(order.his_patient != null ){
+                if(order.his_patient.balance_accounts_type == 1){
+                  balance_accounts = "自费"
+                }
+
+                if(order.his_patient.balance_accounts_type == 2){
+                  balance_accounts = "医保"
+                }
+              }
+
+              if(order.patient != null && order.patient.name.length > 0){
+                name = order.patient.name
+
+              }
+
+              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+                department = order.p_info.department.name
+
+              }
+
+              if(order.p_info != null && order.p_info.doctor.length > 0){
+                doctor_name = order.p_info.doctor
+              }
+
+              if(order.order_status == 1){
+                order_status = "待结算"
+              }
+
+              if(order.order_status == 2){
+                order_status = "已结算"
+              }
+
+              if(order.order_status == 3){
+                order_status = "已退费"
+              }
+
+
+              let obj = {
+                "就诊号":number,
+                "患者姓名":name,
+                "应收金额":order.medfee_sumamt,
+                "实收金额":order.medfee_sumamt,
+                "科室":department,
+                "医生姓名":doctor_name,
+                "收费类别":balance_accounts,
+                "收费者姓名":doctor_name,
+                "总金额":order.medfee_sumamt,
+                "现金支付":"",
+                "账户支付":"",
+                "支付宝支付":"",
+                "微信支付":"",
+                "其他支付":"",
+                "收费日期":"",
+                "收费状态":order_status,
+                "退费日期":"",
+              }
+              list.push(obj)
+            }
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: "消费明细"
+              })
+            })
+
+          }
+        })
+
+      },  formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+      changeDoctor(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      handleSizeChange(limit){
+        this.limit = limit;
+        this.getHisOrderList()
+
+      },handleCurrentChange(page){
+        this.page = page;
+        this.getHisOrderList()
+
+
+      },
+      handleStartTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },handleEndTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      searchAction(){
+        this.page = 1
+        this.getHisOrderList()
+
+
+      },
       getTimes(time) {
         return uParseTime(time, "{y}-{m}-{d}");
       },
@@ -109,17 +279,41 @@
           return uParseTime(value, temp)
         }
         return ''
+      },getHisOrderList(){
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          type: this.admin_user_id
+        }
+        getHisOrderList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.order
+            this.total = response.data.data.total
+          }
+        })
+
+      },getDoctorList(){
+        getDoctorList().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctors = response.data.data.doctors
+          }
+        })
+
+
       }
     }, created() {
-      getHisOrderList().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.tableData = response.data.data.order
+     this.getDoctorList()
+     this.getHisOrderList()
 
-        }
-      })
 
     }
   }

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -7,22 +7,87 @@
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                      <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-table  :data="tableData" border style="width: 99%;"
+                                :row-style="{ color: '#303133' }"
+                                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+
+                        <el-table-column align="center" prop="project_name" label="名称">
+                          <template slot-scope="scope">{{ scope.row.name }}</template>
+                        </el-table-column>
+
+                        <el-table-column align="center" prop="project_name" label="分类">
+                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
+                        </el-table-column>
+
+
+                        <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+                          <template slot-scope="scope">
+                            {{getGroup(scope.row.statistical_classification)}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
+                            {{scope.row.single_dose}}{{scope.row.single_dose_unit}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+                            {{scope.row.delivery_way}}
+
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+                            {{scope.row.execution_frequency}}
 
-                      </el-tabs>
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="number_days" width="50" label="天数">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+                            {{scope.row.day}}
+
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="total" width="50" label="总量">
+                          <template slot-scope="scope">
+                            <div style="display:flex;">
+                              <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+                              {{scope.row.count}}
+                              <div>{{scope.row.prescribing_number_unit}}</div>
+
+                            </div>
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" width="50" label="单价">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                            {{scope.row.price}}
+
+                          </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" width="50" label="备注">
+                          <template slot-scope="scope">
+                            <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+                            {{scope.row.remark}}
+
+                          </template>
+                        </el-table-column>
+                      </el-table>
+
+                      <div class="additionalBox">
+                        <div class="additionalOne" v-for="(item,index) in additions" :key="index">
+                          <span>{{item.item_name}}</span>
+                          <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+                          共
+                          <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+                          次
+                          <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+                        </div>
+                      </div>
 
                     </div>
                     <div class="costBox">
@@ -68,6 +133,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
 import prescriptionTable from './components/prescriptionTable'
+import { getDictionaryDataConfig} from "@/utils/data";
 
 export default {
     components:{
@@ -86,6 +152,7 @@ export default {
           prescriptions: [],
           record_date: '',
           tableData: [],
+          additions:[],
           editableTabsValue: '1',
           loadingone: false,
           editableTabs: [{
@@ -111,7 +178,9 @@ export default {
     },created(){
       this.GetOrderDetail()
   },methods:{
-
+    getDictionaryDataConfig(module, filed_name) {
+      return getDictionaryDataConfig(module, filed_name)
+    },
     tabclickEvent(val) {
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
@@ -134,6 +203,16 @@ export default {
         }
       })
       return targetObj
+    },  getGroup(id){
+      var name = ""
+      var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+      console.log("2235",statistics_category)
+      for(let i=0;i<statistics_category.length;i++){
+        if(id == statistics_category[i].id){
+          name = statistics_category[i].name
+        }
+      }
+      return name
     },
     getTotal() {
       var total = 0
@@ -172,59 +251,65 @@ export default {
           this.order = response.data.data.order
 
           this.prescriptions = []
+          this.tableData = []
+
           for (let i = 0; i < response.data.data.prescription.length; i++) {
             var prescription = response.data.data.prescription[i]
 
-            let tempAdvice = []
-            let tempProject = []
 
             for (let b = 0; b < prescription.advices.length; b++) {
               let obj = {
-                advice_id: prescription.advices[b].id,
-                drug_name: prescription.advices[b].advice_name,
+                name: prescription.advices[b].advice_name,
+                statistical_classification:"",
+                type:1,
                 single_dose: prescription.advices[b].single_dose,
                 delivery_way: prescription.advices[b].delivery_way,
                 execution_frequency: prescription.advices[b].execution_frequency,
-                retail_price: prescription.advices[b].price.toString(),
+                price: prescription.advices[b].price.toString(),
+                day: prescription.advices[b].day,
+                count:prescription.advices[b].prescribing_number.toString(),
                 remark: prescription.advices[b].remark,
-                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
 
               }
-              tempAdvice.push(obj)
+              this.tableData.push(obj)
             }
 
             for (let b = 0; b < prescription.project.length; b++) {
-              console.log(prescription.project[b].project.project_name)
               let obj = {
-                id: prescription.project[b].id,
-                project_id: prescription.project[b].project.id,
-                project_name: prescription.project[b].project.project_name,
+                name: prescription.project[b].project.project_name,
                 statistical_classification: prescription.project[b].project.statistical_classification,
                 single_dose: prescription.project[b].single_dose,
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
-                number_days: prescription.project[b].day,
-                total: prescription.project[b].count.toString(),
                 price: prescription.project[b].price,
+                day: prescription.project[b].day,
+                count: prescription.project[b].count.toString(),
                 remark: prescription.project[b].remark,
-                medical_code: prescription.project[b].project.medical_code
+                single_dose_unit:"",
+                prescribing_number_unit:"",
+                type:2,
               }
-              tempProject.push(obj)
+              this.tableData.push(obj)
             }
-            let index = i + 1
-            let obj = {
-              id: prescription.id,
-              name: '处方' + index,
-              advices: tempAdvice,
-              project: tempProject,
-              type: response.data.data.prescription[i].type
+
+            for (let b = 0; b < prescription.addition.length; b++) {
+                this.additions.push( prescription.addition[b])
             }
-            this.prescriptions.push(obj)
-            this.curPrescriptions = this.prescriptions[0]
+
+
+
+            // let index = i + 1
+            // let obj = {
+            //   id: prescription.id,
+            //   name: '处方' + index,
+            //   advices: tempAdvice,
+            //   project: tempProject,
+            //   type: response.data.data.prescription[i].type
+            // }
+            // this.prescriptions.push(obj)
+            // this.curPrescriptions = this.prescriptions[0]
 
           }
           // this.tableData = response.data.data.order

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -11,7 +11,7 @@
               @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>
+        <template slot-scope="scope">{{ scope.row.item_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额(元)">
         <template slot-scope="scope">
@@ -33,8 +33,7 @@
     props: {
       hisPatientInfo: Object,
       patientInfo: Object,
-      additions: Array,
-      addtions_charge: Array
+      additions: Array
 
     },
     data() {
@@ -60,28 +59,17 @@
       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)
+        for (let i = 0; i < this.additions.length; i++) {
+          let obj = {
+            id: '0',
+            item_id: this.additions[i].id,
+            item_name: this.additions[i].name,
+            price: this.additions[i].price,
+            count: this.additions[i].count,
           }
+          this.chargeTable.push(obj)
         }
+
       },
       hide() {
         this.visible = false
@@ -90,20 +78,7 @@
         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
-
-          }
-        })
+        this.$emit('setData', this.charges)
       }
     },
     watch: {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -145,6 +145,14 @@
                           <el-table-column label="规格" width="60">
                             <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                           </el-table-column>
+                          <el-table-column label="库存" width="60">
+                            <template slot-scope="scope">{{
+                              stockInCount(scope.row) -
+                              salesReturnCount(scope.row) -
+                              stockOutCount(scope.row) +
+                              cancelStockCount(scope.row)
+                              }}</template>
+                          </el-table-column>
                           <el-table-column label="单价" width="40">
                             <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                           </el-table-column>
@@ -253,7 +261,7 @@
       </div>
     </div>
     <additionalCharges   v-on:setData="setCharge" ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
-                       :patientInfo="patientInfo" :additions="additions" :addtions_charge="addtions_charge"></additionalCharges>
+                       :patientInfo="patientInfo" :additions="additions" ></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -282,7 +290,10 @@
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
-      addtions_charge:Array,
+      addtions_charge: {
+        type: Array,
+        default: []
+      },
 
       other_sick: {
         type: Array,
@@ -302,7 +313,7 @@
     data() {
       return {
         register_type: '',
-        value: '',
+        value: '0',
         form: {
           name: ''
         },
@@ -315,7 +326,7 @@
           title: '处方1',
           name: '1'
         }],
-        tabIndex: 1,
+        tabIndex: this.prescriptions.length,
         currenet_inedx: 0,
         rightTab: 1,
         activeName: '1',
@@ -355,11 +366,51 @@
       }
     },
     methods: {
-      setCharge(additional_charges){
-        console.log("111122222")
-        this.addtions_charge = additional_charges
-        console.log(this.addtions_charge )
+      stockInCount: function(row) {
+        let total = 0;
+        if(row.stock_in != null) {
+          for (let i = 0; i < row.stock_in.length; i++) {
+            total = total + row.stock_in[i].warehousing_count;
+          }
+        }
+        return total;
+      },
+      salesReturnCount: function(row) {
+        let total = 0;
+        if(row.sales_return != null) {
 
+          for (let i = 0; i < row.sales_return.length; i++) {
+            total = total + row.sales_return[i].count;
+          }
+        }
+        return total;
+      },
+      stockOutCount: function(row) {
+        let total = 0;
+        if(row.stock_out != null) {
+
+          for (let i = 0; i < row.stock_out.length; i++) {
+            total = total + row.stock_out[i].count;
+          }
+        }
+        return total;
+      },
+      cancelStockCount: function(row) {
+        let total = 0;
+        if(row.cancel_stock != null) {
+          for (let i = 0; i < row.cancel_stock.length; i++) {
+            total = total + row.cancel_stock[i].count;
+          }
+        }
+        return total;
+      },
+
+      setCharge(additional_charges){
+        for (let i = 0; i < additional_charges.length; i++){
+          additional_charges[i].count = 1
+          this.curPrescriptions.addition.push(additional_charges[i])
+        }
+        this.$refs.additionalCharges.hide()
 
       },
       searchAction() {
@@ -393,6 +444,15 @@
                 total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
               }
             }
+
+            if (this.prescriptions[i].addition != null) {
+              for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+                total = total + this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count
+              }
+            }
+
+
+
             total =  Math.floor(total * 100) / 100
           }
         }
@@ -400,7 +460,6 @@
 
       }, getCurTotal() {
         var total = 0
-        console.log(this.editableTabsValue)
 
         if(this.curPrescriptions.type == 1) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
@@ -428,12 +487,14 @@
               total = total + this.prescriptions[i].project[b].price * this.prescriptions[i].project[b].total
             }
           }
-        }
-        if(this.addtions_charge != null) {
-          for (let i = 0; i < this.addtions_charge.length; i++) {
-            total = total + this.addtions_charge[i].price
+
+          if (this.prescriptions[i].addition != null) {
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              total = total + this.prescriptions[i].addition[b].price * this.prescriptions[i].addition[b].count
+            }
           }
         }
+
         return Math.floor(total * 100) / 100
       },
       createFilter(queryString) {
@@ -492,39 +553,22 @@
             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
-
             }
-
           }
         })
 
@@ -578,15 +622,14 @@
         this.teamList = []
 
       },
-      setData(data, info,addition_charge) {
-        this.addition_charge = addition_charge
+      setData(data, info) {
         this.prescription_id = data[0].id
-
-        console.log('99999999', data[0].id)
+        this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
+        console.log( this.curPrescriptions)
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
@@ -608,7 +651,12 @@
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
         this.doctorValue = info.doctor_id
-        this.departmentValue = info.departments
+        this.departmentValue = info.departmentValue
+
+        if(this.doctorValue == 0){
+
+        }
+
         this.register_type = info.register_type
 
         if (info.prescription_status == 1 || info.prescription_status == 2) {
@@ -635,8 +683,8 @@
         }
       },
       open(index) {
-        if (this.curPrescriptions.order_status >= 2) {
-          this.$message.error('当前处方处于结算或者退费状态,无法保存')
+        if (this.curPrescriptions.order_status == 2) {
+          this.$message.error('当前处方已经结算,无法保存')
           return
         }
         if (this.doctorValue.length <= 0) {
@@ -668,16 +716,26 @@
             if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length > 0) {
               this.prescriptions[i]['type'] = 2
             }
+
+
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               this.prescriptions[i].advices[b].single_dose = this.prescriptions[i].advices[b].single_dose.toString()
               this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
               this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
+              this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
 
             }
 
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
               this.prescriptions[i].project[b].price = parseFloat(this.prescriptions[i].project[b].price)
+              this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
+            }
 
+            for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+              this.prescriptions[i].addition[b].id = parseInt(this.prescriptions[i].addition[b].id)
+              this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
+              this.prescriptions[i].addition[b].price = parseFloat(this.prescriptions[i].addition[b].price)
+              this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
             }
           }
           let data = {
@@ -707,6 +765,8 @@
           return
         }
 
+        this.tabIndex = this.prescriptions.length
+
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
@@ -714,7 +774,8 @@
           name: newTabName,
           order_status: 0,
           advices: [],
-          project: []
+          project: [],
+          addition:[]
 
         })
         this.editableTabsValue = newTabName
@@ -818,9 +879,9 @@
             })
           }
 
+        }).catch(() => {
+
         })
-          .catch(() => {
-          })
 
       },
       clickTab(tab) {
@@ -922,8 +983,6 @@
           }
         }
 
-        console.log(this.curDrugs)
-        console.log(this.curPrescriptions.advices)
 
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
@@ -939,8 +998,6 @@
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
-
-            console.log(temp2)
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
@@ -952,12 +1009,17 @@
                   execution_frequency: temp[b].execution_frequency,
                   retail_price: temp[b].retail_price.toString(),
                   remark: '',
+                  day:'',
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
                   medical_insurance_number: temp[b].medical_insurance_number
 
                 }
+
+                if(obj.prescribing_number == 0 || obj.prescribing_number.length  == 0){
+                  obj.prescribing_number = 1
+                }
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -977,9 +1039,12 @@
                   total: temp2[b].total,
                   price: temp2[b].price,
                   remark: '',
-                  medical_code: temp2[b].medical_code
+                  medical_code: temp2[b].medical_code,
+                  unit:temp2[b].unit
+                }
+                if(obj.total == 0 ){
+                  obj.total = 1
                 }
-                console.log(obj)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
@@ -1077,16 +1142,15 @@
           }
         }
       }
-    },
-    created() {
+    },mounted(){
       this.getInitData()
       //获取所有项目
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
 
-    }
 
+    },
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -53,15 +53,6 @@
             <span style="width:200px;">血压：{{case_history.sbp}}~{{case_history.dbp}} mmHg</span>
           </div>
         </div>
-        <div class="commonCell">
-          <p></p>
-          <div class="detailMain">
-            <span style="width:140px;">血糖：{{case_history.blood_sugar}} mmol/L</span>
-            <span style="width:140px;">血脂：{{case_history.blood_fat}} mmol/L</span>
-            <span style="width:140px;">身高：{{case_history.height}} cm</span>
-            <span style="width:200px;">体重： kg</span>
-          </div>
-        </div>
         <div class="commonCell">
           <p>主诉</p>
           <div>{{case_history.chief_conplaint}}</div>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,6 +2,7 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
@@ -39,6 +40,13 @@
         </template>
       </el-table-column>
 
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.day" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
@@ -49,7 +57,7 @@
       </el-table-column>
       <el-table-column align="center" prop="retail_price" width="60" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -66,7 +74,7 @@
 
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <!-- <el-table-column align="center" type="index" width="40" label="序号"></el-table-column> -->
+       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
@@ -97,12 +105,14 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.total" style="width:50" placeholder=""></el-input>
+            <div>{{scope.row.unit}}</div>
+
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder=""></el-input>
+          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -117,16 +127,16 @@
       </el-table-column>
     </el-table>
 
-    <!--<div class="additionalBox">-->
-      <!--<div class="additionalOne" v-for="(item,index) in 8" :key="index">-->
-        <!--<span>治疗费</span>-->
-        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
-        <!--共-->
-        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
-        <!--次-->
-        <!--<i class="el-icon-delete deleteIcon"></i>-->
-      <!--</div>-->
-    <!--</div>-->
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span>{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+        次
+        <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+      </div>
+    </div>
 
 
 
@@ -135,12 +145,13 @@
 
 <script>
   import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData,delHisAdvice,delHisProject } from '@/api/his/his'
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
 
   export default {
     props: {
       preDrugs: Array,
       activeType: Number,
+      addtions_charge:Array,
       prescription:{
         type:Object,
         default: function () {
@@ -179,6 +190,41 @@
       }
     },
    methods:{
+     delAddition(index, addition){
+       if(this.prescription.order_status == 2){
+         this.$message.error('该处方已经结算或者退费，无法删除')
+         return
+       }
+       this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
+         confirmButtonText: "确 定",
+         cancelButtonText: "取 消",
+         type: "warning"
+       }).then(() => {
+         this.$nextTick(function(){
+           if(addition.id == 0){
+             this.prescription.addition.splice(index, 1)
+           }else{
+             let params = {
+               'id': addition.id,
+             }
+             delHisAddition(params).then(response => {
+               if (response.data.state == 0) {
+                 this.$message.error(response.data.msg)
+                 return false
+               } else {
+                 var temp2 = this.deepClone(this.prescription.addition)
+                 temp2.splice(index, 1)
+                 this.prescription.addition = temp2
+                 this.$message.success(response.data.data.msg)
+               }
+             })
+           }
+         });
+
+       })
+         .catch(() => {});
+
+     },
       getInitData(){
         getInitData().then(response => {
           if (response.data.state == 0) {
@@ -191,7 +237,7 @@
         })
 
       },deleteDrug:function(index, row){
-       if(this.prescription.order_status >= 2){
+       if(this.prescription.order_status == 2){
          this.$message.error('该处方已经结算或者退费，无法删除')
          return
        }
@@ -267,7 +313,7 @@
          return name
       },
       deleteProject(row,i){
-        if(this.prescription.order_status = 2){
+        if(this.prescription.order_status == 2){
           this.$message.error('该处方已经结算或者退费，无法删除')
           return
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -147,7 +147,8 @@
           {
             name: '处方1',
             advice: [],
-            project: []
+            project: [],
+            addition:[],
           }
         ],
         search_input: '',
@@ -172,7 +173,6 @@
         templatedetail:{},
         detalid:0,
         prescription_id:0,
-        addtions_charge:[],
 
         patientid:0,
         prescriptionList:[],
@@ -231,7 +231,7 @@
 
             if(this.patientTableData.length > 0) {
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.choosePatient(this.patientTableData[0])
+              this.getPatientInfo(this.patientTableData[0])
             }
 
             this.prescriptionList = response.data.data.list.prescription
@@ -239,8 +239,7 @@
 
           }
         })
-      },
-      choosePatient(val) {
+      },getPatientInfo(val){
         this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,
@@ -253,14 +252,12 @@
           } else {
 
             this.prescriptions = []
-            this.addtions_charge = []
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
 
             this.info = response.data.data.info
 
-            this.addtions_charge = response.data.data.addtions_charge
 
 
             this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
@@ -300,6 +297,8 @@
                 var prescription = response.data.data.prescription[i]
                 let tempAdvice = []
                 let tempProject = []
+                let tempAddition = []
+
 
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
@@ -310,6 +309,7 @@
                     execution_frequency: prescription.advices[b].execution_frequency,
                     retail_price: prescription.advices[b].price.toString(),
                     remark: prescription.advices[b].remark,
+                    day:prescription.advices[b].day,
                     prescribing_number:prescription.advices[b].prescribing_number.toString(),
                     single_dose_unit:prescription.advices[b].single_dose_unit,
                     prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
@@ -341,6 +341,18 @@
                 }
 
 
+                for (let b = 0; b < prescription.addition.length; b++) {
+                  let obj = {
+                    id: prescription.addition[b].id,
+                    item_name: prescription.addition[b].item_name,
+                    price: prescription.addition[b].price,
+                    count: prescription.addition[b].count,
+                    item_id: prescription.addition[b].item_id,
+                  }
+                  tempAddition.push(obj)
+                }
+
+
 
                 let index = i + 1
                 let obj = {
@@ -348,6 +360,7 @@
                   name: '处方' + index,
                   advices: tempAdvice,
                   project: tempProject,
+                  addition:tempAddition,
                   order_status:prescription.order_status
                 }
                 this.prescriptions.push(obj)
@@ -358,6 +371,7 @@
                 name: '处方' + 1,
                 advices: [],
                 project: [],
+                addition:[],
                 orderStatus:0,
               }
               this.prescriptions.push(obj)
@@ -365,7 +379,138 @@
 
 
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.addition_charge)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+          }
+        })
+
+
+
+      },
+      choosePatient(val) {
+        this.patientid = val.patients.id
+        let params = {
+          'record_date': this.record_date,
+          'patient_id': val.patients.id
+        }
+        getPatientInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.prescriptions = []
+            this.patientInfo = response.data.data.xt_info
+            this.hisPatientInfo = response.data.data.his_info
+            this.case_history = response.data.data.case_history
+            this.info = response.data.data.info
+            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+            if (this.case_history.temperature <= 0) {
+              this.case_history.temperature = ''
+            }
+            if (this.case_history.blood_sugar <= 0) {
+              this.case_history.blood_sugar = ''
+            }
+            if (this.case_history.pulse <= 0) {
+              this.case_history.pulse = ''
+            }
+            if (this.case_history.sbp <= 0) {
+              this.case_history.sbp = ''
+            }
+            if (this.case_history.dbp <= 0) {
+              this.case_history.dbp = ''
+            }
+            if (this.case_history.height <= 0) {
+              this.case_history.height = ''
+            }
+            if (this.case_history.blood_fat <= 0) {
+              this.case_history.blood_fat = ''
+            }
+            if (this.case_history.sick_type <= 0) {
+              this.case_history.sick_type = ''
+            }
+            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            if (this.case_history.is_infect == 1) {
+              this.case_history.is_infect = true
+            } else {
+              this.case_history.is_infect = false
+            }
+            this.prescriptionList =response.data.data.prescription
+            if (response.data.data.prescription.length > 0) {
+              for (let i = 0; i < response.data.data.prescription.length; i++) {
+                var prescription = response.data.data.prescription[i]
+                let tempAdvice = []
+                let tempProject = []
+                let tempAddition = []
+                for (let b = 0; b < prescription.advices.length; b++) {
+                  let obj = {
+                    advice_id: prescription.advices[b].id,
+                    drug_name: prescription.advices[b].advice_name,
+                    single_dose: prescription.advices[b].single_dose,
+                    delivery_way: prescription.advices[b].delivery_way,
+                    execution_frequency: prescription.advices[b].execution_frequency,
+                    retail_price: prescription.advices[b].price.toString(),
+                    remark: prescription.advices[b].remark,
+                    day:prescription.advices[b].day,
+                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
+                    single_dose_unit:prescription.advices[b].single_dose_unit,
+                    prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
+                    medical_insurance_number:prescription.advices[b].med_list_codg,
+                    id:prescription.advices[b].drug_id
+                  }
+                  tempAdvice.push(obj)
+                }
+                for (let b = 0; b < prescription.project.length; b++) {
+                  console.log(prescription.project[b])
+                  console.log(prescription.project[b].project)
+                  let obj = {
+                    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].project.statistical_classification,
+                    single_dose: prescription.project[b].single_dose,
+                    delivery_way: prescription.project[b].delivery_way,
+                    execution_frequency: prescription.project[b].execution_frequency,
+                    number_days: prescription.project[b].day,
+                    total:prescription.project[b].count.toString(),
+                    price:prescription.project[b].price,
+                    remark:prescription.project[b].remark,
+                    medical_code:prescription.project[b].project.medical_code,
+                    unit:prescription.project[b].unit
+                  }
+                  tempProject.push(obj)
+                }
+                for (let b = 0; b < prescription.addition.length; b++) {
+                  let obj = {
+                    id: prescription.addition[b].id,
+                    item_name: prescription.addition[b].item_name,
+                    price: prescription.addition[b].price,
+                    count: prescription.addition[b].count,
+                    item_id: prescription.addition[b].item_id,
+                  }
+                  tempAddition.push(obj)
+                }
+                let index = i + 1
+                let obj = {
+                  id: prescription.id,
+                  name: '处方' + index,
+                  advices: tempAdvice,
+                  project: tempProject,
+                  addition:tempAddition,
+                  order_status:prescription.order_status
+                }
+                this.prescriptions.push(obj)
+              }
+            } else {
+              let obj = {
+                id:0,
+                name: '处方' + 1,
+                advices: [],
+                project: [],
+                addition:[],
+                orderStatus:0,
+              }
+              this.prescriptions.push(obj)
+            }
+            this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
       },

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -5,43 +5,42 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input size="small" style="width:150px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
+        <el-input size="small" style="width:150px;" v-model="keywords"
                   class="filter-item"/>
         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索
         </el-button>
-        <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+        <el-date-picker v-model="record_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange"
                         :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
       </div>
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
         <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+          <template slot-scope="scope">{{ scope.row.patients.name }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="110">
-          <template slot-scope="scope"> {{getTimes(scope.row.record_date)}}</template>
+          <template slot-scope="scope"> {{getTimes(scope.row.info.ctime)}}</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">{{scope.row.prescription_number}}</template>
+          <template slot-scope="scope">{{scope.row.info.prescription_number}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.doctor}}</template>
+          <template slot-scope="scope">{{scope.row.info.doctor}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.diagnosis }}</template>
+          <template slot-scope="scope">{{ scope.row.info.diagnosis }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态">
           <template slot-scope="scope">
-            <div v-if=" scope.row.prescription_status == 1">新建</div>
-            <div v-if=" scope.row.prescription_status == 2">待结算</div>
-            <div v-if=" scope.row.prescription_status == 3">已结算</div>
-            <div v-if=" scope.row.prescription_status == 4">已退费</div>
-
+            <div v-if=" scope.row.info.id == 0">未就诊</div>
+            <div v-if=" scope.row.info.id > 0">已就诊</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">
@@ -80,6 +79,11 @@
     },
     data() {
       return {
+        keywords:"",
+        total:0,
+        record_date:"",
+        page:1,
+        limit:10,
         crumbs: [
           { path: false, name: '门诊医生站' },
           { path: false, name: '既往查询' }
@@ -104,28 +108,72 @@
       }
     },
     methods: {
+      searchAction(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleScheduleDateChange(){
+        this.page = 1;
+        this.limit = 10;
+        this.getHisPrescriptionList()
+
+      },
+      handleCurrentChange(page) {
+        this.page = page;
+        this.getHisPrescriptionList()
+
+      },
+
+      handleSizeChange(limit) {
+        this.limit = limit;
+        this.getHisPrescriptionList()
+
+
+      },
       getTimes(time) {
-        return uParseTime(time, "{y}-{m}-{d}");
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       },
       handerShowDetail(row) {
-        console.log(row)
-        this.$refs.inquiriesDetail.show(row.id)
+        if(row.info.id == 0){
+          this.$message.error("未就诊")
+          return
+        }
+        this.$refs.inquiriesDetail.show(row.info.id)
       }, getHisPrescriptionList() {
-        getHisPrescriptionList().then(response => {
+        let params = {
+          record_date:this.record_date,
+          page: this.page,
+          limit: this.limit,
+          keywords: this.keywords,
+        }
+        getHisPrescriptionList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
             this.tableData = response.data.data.order
+            this.total = response.data.data.total
             this.$nextTick(() => {
               this.$refs.table.doLayout(); //解决表格错位
             });
-
           }
         })
 
       }
     }, 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.getHisPrescriptionList()
 

src/xt_pages/stock/drugs/query.vue

@@ -3,13 +3,14 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="setting"
-        >设置</el-button
-        >
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="setting"
+      >设置
+      </el-button
+      >
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
@@ -26,7 +27,8 @@
           type="primary"
           icon="el-icon-search"
           @click="search"
-        >搜索</el-button
+        >搜索
+        </el-button
         >
       </div>
 
@@ -136,9 +138,9 @@
   import SettingDialog from './settingDialog/index'
 
   export default {
-    name: "stockIn",
+    name: 'stockIn',
     created() {
-      this.GetAllDrugStockQueryList();
+      this.GetAllDrugStockQueryList()
     },
     components: {
       SettingDialog,
@@ -147,29 +149,29 @@
     data() {
       return {
         crumbs: [
-          { path: false, name: "库存管理" },
-          { path: "/stock/drugs/stock/query", name: "药品库存查询" }
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
-        keywords: "",
+        keywords: '',
         total: 0,
         multipleSelection: [],
-        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-        start_time: "",
-        end_time: "",
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
         page: 1,
         limit: 10,
         goodType: [],
         goodInfo: [],
-        tempArr:[],
+        tempArr: [],
         sameRowArr: [],
         WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
         }
-      };
+      }
     },
     methods: {
-      handleSpanTempArr(){
+      handleSpanTempArr() {
         this.tempArr = []
 
         for (let i = 0; i < this.WarehouseInfo.warehouseInfoDate.length; i++) {
@@ -204,8 +206,6 @@
         })
         this.sameRowArr = sameRowArr
 
-
-
       },
       merge({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
@@ -218,113 +218,116 @@
         }
       },
       GetAllDrugStockQueryList: function() {
-        console.log(this.keywords);
+        console.log(this.keywords)
         const Params = {
           page: this.page,
           limit: this.limit,
           keyword: this.keywords
-        };
-        this.WarehouseInfo.loading = true;
-        this.WarehouseInfo.warehouseInfoDate = [];
+        }
+        this.WarehouseInfo.loading = true
+        this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
           if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false;
-            this.$message.error(response.data.msg);
-            return false;
+            this.WarehouseInfo.loading = false
+            this.$message.error(response.data.msg)
+            return false
           } else {
-            this.WarehouseInfo.loading = false;
-            this.total = response.data.data.total;
+            this.WarehouseInfo.loading = false
+            this.total = response.data.data.total
             for (let i = 0; i < response.data.data.list.length; i++) {
 
               this.WarehouseInfo.warehouseInfoDate.push(
                 response.data.data.list[i]
-              );
+              )
             }
             this.handleSpanTempArr()
           }
-        });
+        })
       },
       getSpecificationName: function(id) {
-        let name = "";
+        let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == id) {
-            name = this.goodInfo[i].specification_name;
+            name = this.goodInfo[i].specification_name
           }
         }
-        return name;
+        return name
       },
       getTypeName: function(id) {
-        let name = "";
+        let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == id) {
-            name = this.goodType[i].type_name;
+            name = this.goodType[i].type_name
           }
         }
-        return name;
+        return name
       },
 
-
       handleBack: function() {
-        this.$router.go(-1);
+        this.$router.go(-1)
       },
       handleSizeChange(val) {
-        this.limit = val;
-        this.GetAllDrugStockQueryList();
+        this.limit = val
+        this.GetAllDrugStockQueryList()
       },
       handleCurrentChange(val) {
-        this.page = val;
-        this.GetAllDrugStockQueryList();
+        this.page = val
+        this.GetAllDrugStockQueryList()
       },
       calculate: function(val) {
-        return Math.round(parseFloat(val) * 100) / 100;
+        return Math.round(parseFloat(val) * 100) / 100
       },
       startTimeChange: function() {
-        this.GetAllDrugStockQueryList();
+        this.GetAllDrugStockQueryList()
       },
       endTimeChange: function() {
-        this.GetAllDrugStockQueryList();
+        this.GetAllDrugStockQueryList()
       },
       stockInCount: function(row) {
-        let total = 0;
-          for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
-            total = total + row.query_drug_warehousing_info[i].warehousing_count;
+        let total = 0
+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+          total = total + row.query_drug_warehousing_info[i].warehousing_count
         }
-        return total;
+        return total
       },
       salesReturnCount: function(row) {
-        let total = 0;
+        let total = 0
 
-          for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
-            total = total + row.query_drug_sales_return_info[i].count;
+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+          total = total + row.query_drug_sales_return_info[i].count
         }
-        return total;
+        return total
       },
       stockOutCount: function(row) {
-        let total = 0;
+        let total = 0
 
-          for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
-            total = total + row.query_drug_warehouseout_info[i].count;
+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+          total = total + row.query_drug_warehouseout_info[i].count
         }
-        return total;
+        return total
       },
       cancelStockCount: function(row) {
-        let total = 0;
-          for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
-            total = total + row.query_drug_cancel_stock_info[i].count;
-          }
-        return total;
+        let total = 0
+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+          total = total + row.query_drug_cancel_stock_info[i].count
+        }
+        return total
+      },
+      showStockInDetailDialog: function(val) {
+      },
+      showSaleReturnDetailDialog: function() {
+      },
+      showStockOutDetailDialog: function() {
+      },
+      showCancelStockDetailDialog: function() {
       },
-      showStockInDetailDialog: function(val) {},
-      showSaleReturnDetailDialog: function() {},
-      showStockOutDetailDialog: function() {},
-      showCancelStockDetailDialog: function() {},
       search: function() {
-        this.GetAllDrugStockQueryList();
-      },setting:function() {
+        this.GetAllDrugStockQueryList()
+      }, setting: function() {
         this.$refs.dialog.show()
       }
     }
-  };
+  }
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
@@ -336,6 +339,7 @@
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+
   }
 
   .title {
@@ -366,12 +370,14 @@
   .count {
     color: #bd2c00;
   }
+
   .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 {