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

src/api/new_stock/stock.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+import { sort } from 'semver'
+
+export function GetDrugStock(params) {
+  return request({
+    url: '/api/drug/stock',
+    method: 'get',
+    params:params
+  })
+}
+export function GetDrugChangeStock(params) {
+  return request({
+    url: '/api/drug/change',
+    method: 'get',
+    params:params
+
+  })
+}

src/router/modules/hisTool.js

@@ -162,6 +162,34 @@ export default {
       component: () => import('@/xt_pages/outpatientTool/org_export_data'),
       name: 'orgExportData',
       meta: { title: 'orgExportData', noCache: true }
-    }
+    },
+
+        { //药品盘存
+          path: '/outpatientTool/drugStock',
+          component: () => import('@/xt_pages/outpatientTool/drugStock'),
+          name: 'drugStock',
+          meta: {
+            title: '药品盘存',
+            noCache: true
+          }
+        },
+        {//药品变更
+          path: '/outpatientTool/drugChange',
+          component: () => import('@/xt_pages/outpatientTool/drugChange'),
+          name: 'drugChange',
+          meta: {
+            title: '药品变更',
+            noCache: true
+          }
+        },
+        {//药品查询
+          path: '/outpatientTool/drugQuery',
+          component: () => import('@/xt_pages/outpatientTool/drugQuery'),
+          name: 'drugQuery',
+          meta: {
+            title: '药品查询',
+            noCache: true
+          },
+        },
   ]
 }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -940,6 +940,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 76">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1445,6 +1457,10 @@
             v-if="org_template_info.template_id == 75">
 
           </DialysisPrintOrderseventyfive>
+          <DialysisPrintOrderSeventysix v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 76">
+
+          </DialysisPrintOrderSeventysix>
         </div>
       </el-container>
     </div>
@@ -1538,6 +1554,7 @@ import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTw
 import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
 import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderseventyfive from './template/DialysisPrintOrderseventyfive'
+import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysix'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1617,6 +1634,7 @@ export default {
     DialysisPrintOrderSeventythree,
     DialysisPrintOrderSop,
     DialysisPrintOrderseventyfive,
+    DialysisPrintOrderSeventysix,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2299,6 +2317,13 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 76) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -724,39 +724,42 @@
 
         <table class="print-table" border="1" style="line-height:30px;">
           <tr style="line-height:20px;">
-            <td style="min-width:60px">时间</td>
-            <td style="min-width:60px">
+            <td style="width:60px">时间</td>
+            <td style="width:60px">
               血压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               心率
               <br />次/分
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               血流量
               <br />ml/min
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               静脉压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               跨膜压
               <br />(mmHg)
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               超滤率
               <br />L/h
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               超滤量
               <br />L
             </td>
-            <td style="min-width:60px">
+            <td style="width:60px">
               NA⁺
               <br />
             </td>
+            <td style="width:60px">透析液温度<br/>℃</td>
+            <td style="width:60px">血容量<br/>L</td>
+            <td style="width:60px">kt/v</td>
             <td style="min-width:60px">病情变化及处理</td>
             <td style="min-width:110px">护士签名核对者</td>
           </tr>
@@ -780,6 +783,10 @@
             <td>{{ monitor.ultrafiltration_rate }}</td>
             <td>{{ monitor.ultrafiltration_volume }}</td>
             <td>{{ monitor.sodium_concentration }}</td>
+            <td>{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ""}}</td>
+            <td>{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
+            <td>{{ monitor.ktv ? monitor.ktv : "" }}</td>
+            <!-- 病情变化及处理 -->
             <td>
               <span style="line-height:18px;display:block;">
                 {{ monitor.symptom }}&nbsp;{{ monitor.dispose }}&nbsp;{{

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -188,18 +188,21 @@
                 <span v-if="prescription.anticoagulant_name == '那屈肝素钙'"> 
                   {{  prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }} IU
                 </span>
-                <span v-if="prescription.anticoagulant_name == '肝素钠'">
+                <span >
                     
                 </span>
             </div>
           </div>
           <div class="inline_block" style="flex: 1;">
-            首剂:
+            肝素钠首剂:
             <div class="under_line"
               style=" width: 60%;
                 text-align: left; white-space: normal;
               ">
+              <span v-if="prescription.anticoagulant_name == '肝素钠'">
                 {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "0" }} &nbsp;
+              </span>
+              <span v-else>/</span>
             </div>
            
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
@@ -217,7 +220,10 @@
               style=" width: 60%;
                 text-align: left; white-space: normal;
               ">
+              <span v-if="prescription.anticoagulant_name == '肝素钠'">
                 {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "0" }} &nbsp;
+              </span>
+              <span>/</span>
             </div>
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
             <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -18,21 +18,22 @@
             org_id != 10215 &&
             org_id != 10265 &&
             org_id != 4 &&
-            org_id != 0 &&
             org_id != 9675 &&
-            org_id != 10489
+            org_id != 10489 &&
+            org_id != 0
+
           "
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215"
+          v-if="org_id == 10215 || org_id == 0"
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree
           v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
-        <Printfour v-if="org_id == 10489 || org_id == 0" :paramsObj="invoiceParams">
+        <Printfour v-if="org_id == 10489 " :paramsObj="invoiceParams">
         </Printfour>
 <!--        <print-night v-if="org_id == 10210 || org_id == 0"-->
 <!--                  :paramsObj="invoiceParams"></print-night>-->

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -125,8 +125,8 @@
       <div style="display: flex; justify-content: space-between">
         <div style="position: absolute; top: 190px; left: 50px"></div>
         <div style="position: absolute; top: 190px; left: 130px"></div>
-        <div style="position: absolute; top: 190px; left: 180px"></div>
-        <div style="position: absolute; top: 190px; left: 260px"></div>
+        <div style="position: absolute; top: 190px; left: 180px">护理费</div>
+        <div style="position: absolute; top: 190px; left: 260px">        {{ list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : "" }}</div>
         <div style="position: absolute; top: 190px; left: 340px">材料费</div>
         <div style="position: absolute; top: 190px; left: 420px">
           {{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : "" }}

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,7 +10,7 @@
         type="primary"
       >打印</el-button>
       <el-button
-      v-if="org_id==10088 || org_id == 0"
+      v-if="org_id==10088"
       style="position:fixed;right:115px;z-index:999"
       size="small" type="success"
       @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
@@ -23,7 +23,7 @@
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
-          <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
+          <printFour v-if="org_id == 10215 || org_id == 0 " :paramsObj="invoiceParams"></printFour>
           <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
           <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -67,8 +67,8 @@
             <div style="position: absolute;top:190px;left:260px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:340px">材料费</div>
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:190px;left:480px"></div>
-            <div style="position: absolute;top:190px;left:540px"></div>
+            <div style="position: absolute;top:190px;left:480px">护理费</div>
+            <div style="position: absolute;top:190px;left:540px">{{list.hiliCostTotal?list.hiliCostTotal.toFixed(2):''}}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:210px;left:50px"></div>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -6,8 +6,9 @@
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510 || this.$store.getters.xt_user.org_id == 0">湖北省基本医疗保险门诊费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10694">江西省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510  &&this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510  && this.$store.getters.xt_user.org_id != 10633 && this.$store.getters.xt_user.org_id != 10694">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -166,7 +166,7 @@
 
           <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
           <div style="display:flex;">
-              <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span>
+              <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.order ? balanceAccounts.order.mdtrt_id : ''}}</span>
               </div>
               <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span>
               </div>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -6,8 +6,10 @@
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10515">湖南省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10694">江西省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10633">广东省社会医疗保险医疗费用结算单</div>
+
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10633  && this.$store.getters.xt_user.org_id != 10694">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -744,16 +744,16 @@
       },
 
       searchProjectAction() {
-
+        const tabProject1 = this.allProject
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
 
         } else {
           let arr = []
-          for (let i = 0; i < this.tabProject.length; i++) {
-            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
-              arr = arr.concat(this.tabProject[i])
+          for (let i = 0; i < tabProject1.length; i++) {
+            if (tabProject1[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            tabProject1[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(tabProject1[i])
             }
           }
           this.tabProject = arr
@@ -761,20 +761,20 @@
         }
       },
       searchAction() {
+        const drugs1 = this.allDrugs
         if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
         } else {
           let arr = []
-          for (let i = 0; i < this.drugs.length; i++) {
-            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
-            this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
-            this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-            this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
-              arr = arr.concat(this.drugs[i])
+          for (let i = 0; i < drugs1.length; i++) {
+            if (drugs1[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].wubi.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            drugs1[i].first_letter.indexOf(this.search_keyword) != -1) {
+              arr = arr.concat(drugs1[i])
             }
           }
           this.drugs = arr
-
         }
 
       },
@@ -810,6 +810,7 @@
         return getDictionaryDataConfig(module, filed_name)
 
       },
+      // 药品数据源
       getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
@@ -829,6 +830,7 @@
             }
 
             this.allDrugs = response.data.data.drugs
+            console.log('111111',response.data.data.drugs);
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
             for (let i = 0; i < this.doctors.length; i++) {
@@ -2583,6 +2585,7 @@
       this.getZuobiaoDrugStock()
       this.getZuobiaoGoodStock()
       this.getPrescriptionTemplateInfo()
+      // 获取所有药品
       this.getInitData()
       //获取所有项目
       this.getlist()

src/xt_pages/outpatientTool/drugChange.vue

@@ -0,0 +1,455 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div class="cell clearfix">
+        <span>入库时间:</span>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>-
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;margin-right:10px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+
+      <div>
+        <div>销售状态:</div>
+        <el-select size="small" v-model="is_sale" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="changeStock">
+          <el-option
+            label="不限"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div>
+        <div>变更状态:</div>
+        <el-select size="small" v-model="change_type" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="change">
+          <el-option
+            label="不限"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in changes"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+      <div>
+        <el-button type="primary" @click="query()">查询</el-button>
+        <el-button type="primary" @click="change_stock()">变更</el-button>
+        <el-button type="primary" @click="exportdata()">导出</el-button>
+
+        <!--        <el-button type="primary" @click="change()">变更</el-button>-->
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              max-height="600"
+              @select="selectCostInfo"
+              @selection-change="changeCostInfoTableData"
+              @select-all="changeAllCostInfoTableData"
+              highlight-current-row>
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column align="center" prop="name" label="药品名称">
+        <template slot-scope="scope">{{scope.row.drug_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="药品类型">
+        <template slot-scope="scope">{{scope.row.drug_type}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格单位">
+        <template slot-scope="scope">{{scope.row.spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="国家编码">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="批号">
+        <template slot-scope="scope">{{scope.row.batch_number}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="数量">
+        <template slot-scope="scope">
+          <div>{{scope.row.count}}{{scope.row.unit}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="开方日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.p_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="结算日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.e_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="销售状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="变更状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="盘存日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.pc_date}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
+          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-size="5"
+      :page-sizes="[10, 20, 50, 100,500,1000,2000]"
+      background
+      style="margin-top:20px;float: right"
+      :total="value"
+    ></el-pagination>
+
+    <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              max-height="600"
+              @select="selectCostInfo"
+              @selection-change="changeCostInfoTableData"
+              @select-all="changeAllCostInfoTableData"
+              highlight-current-row>
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column align="center" prop="name" label="药品名称">
+        <template slot-scope="scope">{{scope.row.drug_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="药品类型">
+        <template slot-scope="scope">{{scope.row.drug_type}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格单位">
+        <template slot-scope="scope">{{scope.row.spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="国家编码">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="批号">
+        <template slot-scope="scope">{{scope.row.batch_number}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="数量">
+        <template slot-scope="scope">
+          <div>{{scope.row.count}}{{scope.row.unit}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="开方日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.p_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="结算日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.e_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="盘存状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="变更状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="盘存日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.pc_date}}</div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetDrugChangeStock } from '../../api/new_stock/stock'
+import { getDictionaryDataConfig } from "@/utils/data";
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      drugTypeList: [{ id: 0, name: "全部" }],
+      start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
+      end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
+      tableData: [],
+      change_type:"0",
+      selection:[],
+      page:1,
+      limit:10,
+      value:0,
+      is_sale:"0",
+      items: [
+        { id: 1, name: '已盘存' },
+        { id: 2, name: '未盘存' },
+      ],
+      changes: [
+        { id: 1, name: '已变更' },
+        { id: 2, name: '未变更' },
+      ]
+    }
+  },
+  methods: {
+    deleteStock(row){
+
+
+
+    },
+    sigle_stock(row){
+      var that = this;
+      let params = {
+        ids:row.id,
+        admin_user_id:this.$store.getters.xt_user.user.id
+      };
+      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '医保错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+            }).catch(() => {
+            })
+          }else{
+
+          }
+        }
+      }).catch(function(error) {
+      })
+    },
+    handleSizeChange(val) {
+      this.limit = val
+      this.GetDrugStock()
+    },
+    handleCurrentChange(val) {
+      this.page = val
+      this.GetDrugStock()
+    },
+    selectCostInfo(selection, row) {
+      this.selection = selection
+    }, changeCostInfoTableData(val) {
+      this.selection = val
+    }, changeAllCostInfoTableData(selection) {
+      this.selection = selection
+    },
+    delete(){
+
+
+    },
+    exportdata(){
+      let list = []
+      // for (let i = 0; i < this.tableData.length; i++) {
+      //   let order = this.tableData[i]
+      //   let name = order.name
+      //   let item_name = order.item_name
+      //   let count = order.count
+      //   let price = order.price.toFixed(2)
+      //   let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
+      //   let total = order.total.toFixed(2)
+      //
+      //   let obj = {
+      //     '患者姓名': name,
+      //     '项目名称': item_name,
+      //     '数量': count,
+      //     '单价': price,
+      //     '费用': pay_sumamt,
+      //     '费用总额': total
+      //   }
+      //   list.push(obj)
+      // }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '明细',
+          ref: this.$refs['table'].$el
+        })
+      })
+
+    },formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    change_stock(){
+      let ids  = ""
+      for (var i = 0; i < this.selection.length; i++){
+        if (ids.length == 0){
+          ids = this.selection[i].id
+        }else{
+          ids = ids + "," + this.selection[i].id
+        }
+      }
+      var that = this;
+      let params = {
+        ids:ids,
+        admin_user_id:this.$store.getters.xt_user.user.id
+      };
+      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '医保错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+            }).catch(() => {
+            })
+          }else{
+
+          }
+        }
+      }).catch(function(error) {
+      })
+
+    },
+    query(){
+      this.GetDrugStock()
+
+    },
+    change(){
+
+
+    },getDrugType(id) {
+      var name = "";
+      for (let i = 0; i < this.drugTypeList.length; i++) {
+        if (this.drugTypeList[i].id == id) {
+          name = this.drugTypeList[i].name;
+        }
+      }
+
+      return name;
+    },  getTime(val) {
+      if(val == "" || val == undefined){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },GetDrugStock(){
+      this.tableData = []
+      let params = {
+        start_time: this.start_time,
+        end_time: this.end_time,
+        page:this.page,
+        limit:this.limit,
+        is_sale:this.is_sale,
+        is_bg:this.change_type
+      }
+      GetDrugChangeStock(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.value = response.data.data.total
+          for(let i =0; i < response.data.data.info.length; i++){
+            let obj = {
+              id:response.data.data.info[i].id,
+              drug_name:response.data.data.info[i].BaseDrugLib.drug_name,
+              drug_type:this.getDrugType(response.data.data.info[i].BaseDrugLib.drug_type),
+              spec: response.data.data.info[i].BaseDrugLib.dose + response.data.data.info[i].BaseDrugLib.dose_unit + "*" + response.data.data.info[i].BaseDrugLib.min_number + response.data.data.info[i].BaseDrugLib.min_unit+"/" +response.data.data.info[i].BaseDrugLib.max_unit,
+              code:response.data.data.info[i].BaseDrugLib.medical_insurance_number,
+              batch_number:response.data.data.info[i].batch_number,
+              count: response.data.data.info[i].PCount,
+              p_date:this.getTime(response.data.data.info[i].PDate),
+              e_date:(response.data.data.info[i].SDate),
+              is_sale:response.data.data.info[i].is_sale,
+              pc_date:response.data.data.info[i].pc_date,
+              is_bg:response.data.data.info[i].is_change,
+              unit:response.data.data.info[i].Unit
+            }
+            this.tableData.push(obj)
+          }
+        }
+      })
+    },
+    changeStock(){
+
+
+    },
+  },
+  created() {
+    var drugTypeList = getDictionaryDataConfig("system", "drug_type");
+    this.drugTypeList.push(...drugTypeList);
+  this.GetDrugStock()
+  }
+}
+</script>
+

src/xt_pages/outpatientTool/drugQuery.vue

@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div class="cell clearfix">
+        <span>入库时间:</span>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>-
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;margin-right:10px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+
+      <div>
+        <div>查询类型:</div>
+        <el-select size="small" v-model="sale_type" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="changeStock">
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div>
+        <div>药品:</div>
+        <el-select size="small" v-model="change_type" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="change">
+          <el-option
+            v-for="item,index in changes"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+      <div>
+        <el-button type="primary" @click="query()">查询</el-button>
+        <el-button type="primary" @click="stock()">变更</el-button>
+        <el-button type="primary" @click="exportdata()">导出</el-button>
+
+        <!--        <el-button type="primary" @click="change()">变更</el-button>-->
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              max-height="600"
+              highlight-current-row>
+      <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>
+      </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">
+          <div></div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="生产日期">
+        <template slot-scope="scope">
+          <div></div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="有效日期">
+        <template slot-scope="scope">
+          <div></div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="盘存状态">
+        <template slot-scope="scope">
+          <div></div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="盘存日期">
+        <template slot-scope="scope">
+          <div></div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button type="text" @click="stock(scope.row)">盘存</el-button>
+          <el-button type="text" @click="delete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      start_time: '',
+      end_time: '',
+      tableData: [],
+      stock_type:"0",
+      change_type:"0",
+      items: [
+        { id: 1, name: '药品库存信息查询' },
+        { id: 2, name: '药品库存变更信息查询' },
+        { id: 3, name: '药品销售信息查询' },
+        { id: 4, name: '入库药品追溯信息查询' },
+        { id: 5, name: '药品销售追溯信息查询' },
+        { id: 6, name: '实时药品库存查询' },
+        { id: 7, name: '药品库存明细查询' },
+      ],
+      drugs: [
+        { id: 1, name: '已变更' },
+        { id: 2, name: '未变更' },
+      ]
+    }
+  },
+  methods: {
+    delete(){
+
+
+    },
+    exportdata(){
+
+
+    },
+    stock(){
+
+
+    },
+    query(){
+
+
+    },
+    change(){
+
+
+    },
+    changeStock(){
+
+
+    },
+    endTimeChange(){
+
+
+    },
+    startTimeChange(){
+
+
+    },
+  },
+  created() {
+
+  }
+}
+</script>
+

src/xt_pages/outpatientTool/drugStock.vue

@@ -0,0 +1,440 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div class="cell clearfix">
+        <span>入库时间:</span>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>-
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;margin-right:10px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
+
+
+      <div>
+        <div>盘存状态:</div>
+        <el-select size="small" v-model="stock_type" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="changeStock">
+          <el-option
+            label="不限"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div>
+        <div>变更状态:</div>
+        <el-select size="small" v-model="change_type" placeholder="请选择"
+                   style="width:100px;margin-left:10px;" @change="change">
+          <el-option
+            label="不限"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in changes"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+      <div>
+        <el-button type="primary" @click="query()">查询</el-button>
+        <el-button type="primary" @click="stock()">盘存</el-button>
+        <el-button type="primary" @click="exportdata()">导出</el-button>
+
+        <!--        <el-button type="primary" @click="change()">变更</el-button>-->
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              max-height="600"
+              @select="selectCostInfo"
+              @selection-change="changeCostInfoTableData"
+              @select-all="changeAllCostInfoTableData"
+              highlight-current-row>
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column align="center" prop="name" label="药品名称">
+        <template slot-scope="scope">{{scope.row.drug_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="药品类型">
+        <template slot-scope="scope">{{scope.row.drug_type}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格单位">
+        <template slot-scope="scope">{{scope.row.spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="国家编码">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="批号">
+        <template slot-scope="scope">{{scope.row.batch_number}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="入库数量">
+        <template slot-scope="scope">
+          <div>{{scope.row.count}}{{scope.row.unit}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="开方日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.p_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="结算日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.e_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="盘存状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="变更状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="盘存日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.pc_date}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
+          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+
+    <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              max-height="600"
+              @select="selectCostInfo"
+              @selection-change="changeCostInfoTableData"
+              @select-all="changeAllCostInfoTableData"
+              highlight-current-row>
+      <el-table-column
+        align="center"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column align="center" prop="name" label="药品名称">
+        <template slot-scope="scope">{{scope.row.drug_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="药品类型">
+        <template slot-scope="scope">{{scope.row.drug_type}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="规格单位">
+        <template slot-scope="scope">{{scope.row.spec}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="国家编码">
+        <template slot-scope="scope">{{scope.row.code}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="批号">
+        <template slot-scope="scope">{{scope.row.batch_number}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="入库数量">
+        <template slot-scope="scope">
+          <div>{{scope.row.count}}{{scope.row.unit}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="生产日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.p_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="有效日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.e_date}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="total" label="盘存状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="变更状态">
+        <template slot-scope="scope">
+          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" label="盘存日期">
+        <template slot-scope="scope">
+          <div>{{scope.row.pc_date}}</div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetDrugStock } from '../../api/new_stock/stock'
+const moment = require('moment')
+import { getDictionaryDataConfig } from "@/utils/data";
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+
+export default {
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      drugTypeList: [{ id: 0, name: "全部" }],
+      start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
+      end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
+      tableData: [],
+      stock_type:"0",
+      change_type:"0",
+      selection:[],
+      items: [
+        { id: 1, name: '已盘存' },
+        { id: 2, name: '未盘存' },
+      ],
+      changes: [
+        { id: 1, name: '已变更' },
+        { id: 2, name: '未变更' },
+      ]
+    }
+  },
+  methods: {
+    sigle_stock(row){
+      let ids  = row.id
+      var that = this;
+      let params = {
+        ids:ids,
+        admin_user_id:this.$store.getters.xt_user.user.id
+      };
+      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '医保错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+            }).catch(() => {
+            })
+          }else{
+
+          }
+        }
+      }).catch(function(error) {
+      })
+
+    },
+    selectCostInfo(selection, row) {
+      this.selection = selection
+    }, changeCostInfoTableData(val) {
+      this.selection = val
+    }, changeAllCostInfoTableData(selection) {
+      this.selection = selection
+    },
+    deleteStock(){
+
+
+    },
+    exportdata(){
+      let list = []
+      // for (let i = 0; i < this.tableData.length; i++) {
+      //   let order = this.tableData[i]
+      //   let name = order.name
+      //   let item_name = order.item_name
+      //   let count = order.count
+      //   let price = order.price.toFixed(2)
+      //   let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
+      //   let total = order.total.toFixed(2)
+      //
+      //   let obj = {
+      //     '患者姓名': name,
+      //     '项目名称': item_name,
+      //     '数量': count,
+      //     '单价': price,
+      //     '费用': pay_sumamt,
+      //     '费用总额': total
+      //   }
+      //   list.push(obj)
+      // }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '明细',
+          ref: this.$refs['table'].$el
+        })
+      })
+
+    },formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    stock(){
+      console.log(this.selection)
+      let ids  = ""
+      for (var i = 0; i < this.selection.length; i++){
+        if (ids.length == 0){
+          ids = this.selection[i].id
+        }else{
+          ids = ids + "," + this.selection[i].id
+        }
+      }
+      var that = this;
+      let params = {
+        ids:ids,
+        admin_user_id:this.$store.getters.xt_user.user.id
+      };
+      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '医保错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+            }).catch(() => {
+            })
+          }else{
+
+          }
+        }
+      }).catch(function(error) {
+      })
+    },
+    query(){
+      this.GetDrugStock()
+
+
+    },
+    change(){
+
+
+    },
+    changeStock(){
+
+
+    },
+    endTimeChange(){
+
+
+    }, getDrugType(id) {
+      var name = "";
+      for (let i = 0; i < this.drugTypeList.length; i++) {
+        if (this.drugTypeList[i].id == id) {
+          name = this.drugTypeList[i].name;
+        }
+      }
+
+      return name;
+    },  getTime(val) {
+      if(val == "" || val == undefined){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    startTimeChange(){
+
+
+    },GetDrugStock(){
+      this.tableData = []
+      let params = {
+        start_time: this.start_time,
+        end_time: this.end_time,
+        is_pc:this.stock_type,
+        is_bg:this.change_type
+      }
+      GetDrugStock(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          for(let i =0; i < response.data.data.info.length; i++){
+            let obj = {
+              id:response.data.data.info[i].id,
+              drug_name:response.data.data.info[i].drug.drug_name,
+              drug_type:this.getDrugType(response.data.data.info[i].drug.drug_type),
+              spec: response.data.data.info[i].drug.dose + response.data.data.info[i].drug.dose_unit + "*" + response.data.data.info[i].drug.min_number + response.data.data.info[i].drug.min_unit+"/" +response.data.data.info[i].drug.max_unit,
+              code:response.data.data.info[i].drug.medical_insurance_number,
+              batch_number:response.data.data.info[i].batch_number,
+              count: response.data.data.info[i].warehousing_count,
+              p_date:this.getTime(response.data.data.info[i].product_date),
+              e_date:this.getTime(response.data.data.info[i].expiry_date),
+              is_pc:response.data.data.info[i].is_pc,
+              pc_date:response.data.data.info[i].pc_date,
+              is_bg:response.data.data.info[i].is_bg,
+              unit: response.data.data.info[i].max_unit,
+            }
+            this.tableData.push(obj)
+          }
+        }
+      })
+    }
+  },
+  created() {
+    var drugTypeList = getDictionaryDataConfig("system", "drug_type");
+    this.drugTypeList.push(...drugTypeList);
+    this.GetDrugStock()
+  }
+}
+</script>
+

src/xt_pages/outpatientTool/org_export_data.vue

@@ -671,7 +671,7 @@ export default {
                   maf = maf + order.orders[b].maf_pay
                   acct = 0.00
                   gongwuyuan = gongwuyuan + order.orders[b].cvlserv_pay
-                  danweibuchong = danweibuchong + order.orders[b].hifes_pay
+                  // danweibuchong = danweibuchong + order.orders[b].
                   daeyiliao = daeyiliao + order.orders[b].hifob_pay
 
                 }
@@ -683,7 +683,7 @@ export default {
                 obj["小计I+II"] = qifuxian_1 + bili_2
                 obj["基本统筹基金"] = hifp
                 obj["公务员补助"] = gongwuyuan
-                obj["单位补充保险"] = danweibuchong
+                obj["单位补充保险"] = hifm
                 obj["煤矿补充保险"] = ""
                 obj["超封顶线费用"] = chaofengding
                 obj["大额医疗保险应付"] = daeyiliao

src/xt_pages/user/ktv.vue

@@ -694,7 +694,12 @@ export default {
         this.$message.error("透后体重不能为空")
         return
       }
-      value = ((-Math.log((valueTwo /valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
+      console.log((-Math.log((valueTwo / valueOne - (0.008 * valueThree)))) )
+      console.log((4-3.5*(valueTwo/valueOne)))
+
+      console.log((4-3.5*(valueTwo/valueOne)) * valueFour/valueSix)
+
+      value = ((-Math.log((valueTwo / valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "KT/V"){