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

src/lang/zh.js

@@ -185,6 +185,7 @@ export default {
     stockOutDetail: '出库单详情',
     cancelStockDetail: '退库单详情',
     stockDetail: '明细查询',
+    stockModifyPrice:'耗材调价',
 
     showconfig: '显示配置',
     user_detail: '使用明细',

src/router/modules/stock.js

@@ -42,7 +42,13 @@ export default {
       name: 'cancelStockOrder',
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-
+    {
+      path: '/stock/stockModifyPrice',
+      component: () => import('@/xt_pages/stock/stockModifyPrice'),
+      name: 'stockModifyPrice',
+      meta: { title: 'stockModifyPrice', noCache: true }
+    },
+    
     // {
     //   path: "/stock/",
     //   component: Layout,

src/xt_pages/data/components/addDrugs.vue

@@ -963,6 +963,8 @@
           // this.form.dose = 1
           this.form.min_number = 1
           this.dosageShow = true
+        }else{
+          this.dosageShow = false
         }
         // if(val != this.form.max_unit){
         //   this.dosageShow = false

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -16,7 +16,7 @@
             <!--<printOne :info="info"></printOne>-->
 
             <print-one v-if="org_id != 10138" :info="info"></print-one>
-            <print-two v-else  :info="info" :paramsObj="paramsObj"></print-two>
+            <print-two v-else :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></print-two>
         </div>
     </div>
 </template>
@@ -63,7 +63,8 @@
         prescription_id:0,
         ids:'',
         info:null,
-        org_id:''
+        org_id:'',
+        balanceAccounts:{}
       };
     },
     methods:{
@@ -125,8 +126,44 @@
 
               return false
             } else {
-              console.log(response.data.data)
-
+              
+              this.balanceAccounts = response.data.data
+              let arr = []
+              let obj = {
+                type:1,
+                details: [],
+                total: 0
+              }
+              let obj2 = {
+                type:2,
+                details: [],
+                total: 0
+              }
+              let obj3 = {
+                type:3,
+                details: [],
+                total: 0
+              }
+              this.balanceAccounts.order_info.map(item => {
+                
+                if(item.advice_id > 0){
+                  obj.details.push(item)
+                  obj.total += (item.pric * item.advice.prescribing_number)
+                }else{
+                  if(item.project.type == 2){
+                    obj2.details.push(item)
+                    obj2.total += (item.pric * item.project.count)
+                  }else{
+                    obj3.details.push(item)
+                    obj3.total += (item.pric * item.project.count)
+                  }
+                }
+              })
+              this.balanceAccounts.new_detail_list = []
+              this.balanceAccounts.new_detail_list.push(obj)
+              this.balanceAccounts.new_detail_list.push(obj2)
+              this.balanceAccounts.new_detail_list.push(obj3)
+              console.log(111,this.balanceAccounts)
             }
           })
 
@@ -261,6 +298,7 @@
 
     created() {
       this.org_id = this.$store.getters.xt_user.org_id
+      
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div id='prescription-print' class="prescription-print" style="position: relative;">
+        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
             <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
@@ -76,12 +76,120 @@
             </div>
             <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
         </div>
+        <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
+          <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
+            <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>
+                <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span></div>
+            </div>
+            <div style="display:flex;justify-content: space-between;">
+                <div style="display:flex;">
+                  <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</span></div>
+                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient == '1' ? '男' : '女'}}</span></div>
+                  <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
+                  <div>费别：<span style="display:inline-block;width:80px;">自费</span>
+                  </div>
+                  <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
+                  <div>收费日期：<span style="display:inline-block;width:80px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                </div>
+                <div style="float:right">金额单位：元</div>
+            </div>
+            <div style="min-height: 300px;">
+              <table border='1' style="width:100%;" cellspacing="0">
+                  <tr>
+                      <td width="70">类别</td>
+                      <td>项目</td>
+                      <td width="80">规格</td>
+                      <td width="50">单位</td>
+                      <td width="50">数量</td>
+                      <td width="60">单价</td>
+                      <td width="70">总额</td>
+                      <td width="100">小计</td>
+                  </tr>
+                  <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
+                      <tr v-for="(subItem,index) in item.details" :key="index">
+                        <td>
+                          <span v-if="item.type == 1">药品费</span>
+                          <span v-if="item.type == 2">治疗费</span>
+                          <span v-if="item.type == 3">耗材费</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                          <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                          <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1"><span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
+                          <span v-if="item.type == 2"></span>
+                          <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1">{{ subItem.advice.drug.max_unit }}</span>
+                          <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                          <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                          <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                          <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1">{{ subItem.pric }}</span>
+                          <span v-if="item.type == 2">{{ subItem.pric }}</span>
+                          <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                        </td>
+                        <td>
+                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number * subItem.pric }}</span>
+                          <span v-if="item.type == 2">{{ subItem.project.count * subItem.pric }}</span>
+                          <span v-if="item.type == 3">{{ subItem.project.count * subItem.pric }}</span>
+                        </td>
+                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
+                      </tr>
+                  </div>
+                  <tr>
+                    <td colspan="7">
+                      <div style="display:flex;flez-wrap:wrap;">
+                        <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list" :key="index">
+                          <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
+                          <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                          <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
+                        </div>
+                      </div>
+                    </td>
+                    <td>合计: {{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                  </tr>
+                  <tr>
+                      <td colspan="7">
+                          <div style="display:flex;flez-wrap:wrap;">
+                              <div style="width:33%;">医疗费总额：0元</div>
+                              <div style="width:33%;">基金支付金额：0元</div>
+                              <div style="width:33%;">个人账户支付金额：0元</div>
+
+                          </div>
+                          <div style="display:flex;flez-wrap:wrap;">
+                              <div style="width:33%;">个人支付金额：0元</div>
+                              <div style="width:33%;">个人账户金额：0元</div>
+                          </div>
+                      </td>
+                      <td>合计：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                  </tr>
+
+              </table>
+            </div>
+            <div style="float:right;margin:10px 0;display:flex;">
+                <div>操作人：<span style="width:100px;display:inline-block;">{{balanceAccounts.admin_info.user_name}}</span></div>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+            </div>
+            <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
+        </div>
     </div>
 
 </template>
 <script>
   import axios from 'axios'
   import { getChargePrint } from '@/api/project/project'
+  import { uParseTime } from '@/utils/tools'
 
   export default {
     data() {
@@ -107,7 +215,8 @@
     },
     props: {
       paramsObj: Object,
-      info: Object
+      info: Object,
+      balanceAccounts:Object
     },
     methods: {
       getName(list) {
@@ -315,7 +424,13 @@
             console.log('hispatient', histpatient)
           }
         })
-      }
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+      },
     },
     mounted() {
       this.org_id = this.$store.getters.xt_user.org_id

src/xt_pages/stock/stockModifyPrice.vue

@@ -0,0 +1,260 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;align-items: center;justify-content: space-between;">
+        <div>
+            <el-input
+            size="small"
+            style="width: 200px;"
+            class="filter-item"
+            v-model.trim="searchKey"
+            placeholder=""
+            />
+            <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+            >
+            <el-date-picker
+            size="small"
+            v-model="value1"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+            <el-date-picker
+            size="small"
+            v-model="value2"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+        </div>
+        <div>
+            <el-button size="small" type="primary">新增</el-button>
+            <el-button size="small" type="primary">核对</el-button>
+            <el-button size="small" type="primary">打印</el-button>
+            <el-button size="small" type="primary">导出</el-button>
+        </div>
+      </div>
+      <div style="display: flex;justify-content: space-between;margin-top:10px">
+            <div style="width:541px;margin-right:10px;">
+                <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                    <el-table-column
+                    prop="date"
+                    label="单据编码"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="调价日期"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="操作人"
+                    width="80">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="状态"
+                    width="80">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="核对人"
+                    width="80">
+                    </el-table-column>
+                    <el-table-column
+                    width="100"
+                    label="操作">
+                        <template slot-scope="scope">
+                            <el-button type="text" size="small">删除</el-button>
+                            <el-button type="text" size="small">编辑</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <!-- <div style="flex:1;"> -->
+                <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                    <el-table-column
+                    fixed="left"
+                    prop="date"
+                    label="药品ID"
+                    width="80">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="药品名称"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="规格"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="生产厂家"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="批准文书"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="供应商"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="数量"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="原零价"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="现零价"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="进货价"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="零售总价"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="批号"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="生产日期"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="name"
+                    label="有效日期"
+                    width="100">
+                    </el-table-column>
+                </el-table>
+            <!-- </div> -->
+        </div>
+    </div>
+
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../components/bread-crumb";
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "耗材调价" }
+            ],
+            tableHeight: '',
+            fullHeight: document.documentElement.clientHeight,
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }]
+        }
+    },
+    methods:{
+        search(){
+
+        },
+    },
+    created(){
+        let tableHeight = document.body.clientHeight - 200;
+        this.tableHeight = tableHeight
+    },
+    mounted() {
+      const that = this;
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight;
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight(val) {
+        if (!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 200
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function() {
+            that.timer = false
+          }, 400)
+        }
+      }
+
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>