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

src/api/warehouse.js

@@ -0,0 +1,133 @@
+import request from '@/utils/request'
+
+//分页（已渲染）
+export function storehouselist(params) {
+  return request({
+    url: '/api/secondary/storehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取当前机构的所有可用仓库名称接口(已渲染)
+export function getallstorehousename(params) {
+  return request({
+    url: '/api/secondary/getallstorehousename',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取一条仓库数据接口(好像用不到了)
+export function getonestorehouse(params) {
+  return request({
+    url: '/api/secondary/getonestorehouse',
+    method: 'get',
+    params: params
+  })
+}
+
+//修改仓库接口(已渲染)
+export function updatestorehouse(data) {
+  return request({
+    url: '/api/secondary/updatestorehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+//添加仓库接口(已渲染)
+export function addstorehouse(data) {
+  return request({
+    url: '/api/secondary/addstorehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+//仓库地址查重接口(合并到新增)
+export function isstorehouseaddress(params) {
+  return request({
+    url: '/api/secondary/isstorehouseaddress',
+    method: 'get',
+    params: params
+  })
+}
+
+//仓库名称查重接口(合并到新增)
+export function isstorehousename(params) {
+  return request({
+    url: '/api/secondary/isstorehousename',
+    method: 'get',
+    params: params
+  })
+}
+
+//删除仓库接口(已渲染)
+export function deletestorehouse(params) {
+  return request({
+    url: '/api/secondary/deletestorehouse',
+    method: 'get',
+    params: params
+  })
+}
+
+//修改仓库状态接口(已渲染)
+export function updatestatus(params) {
+  return request({
+    url: '/api/secondary/updatestatus',
+    method: 'get',
+    params: params
+  })
+}
+
+//获取仓库编号接口(已渲染)
+export function getcode(params) {
+  return request({
+    url: '/api/secondary/getcode',
+    method: 'get',
+    params: params
+  })
+}
+
+//查询该机构的仓库配置(已渲染)
+export function findstorehouseconfig(params) {
+  return request({
+    url: '/api/secondary/findstorehouseconfig',
+    method: 'get',
+    params: params
+  })
+}
+
+//更改耗材自动入库仓库(已渲染)
+export function updateinfo(params) {
+  return request({
+    url: '/api/secondary/updateinfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改耗材自动出库仓库(已渲染)
+export function updateoutinfo(params) {
+  return request({
+    url: '/api/secondary/updateoutinfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改药品自动入库仓库(已渲染)
+export function updatedruginfo(params) {
+  return request({
+    url: '/api/secondary/updatedruginfo',
+    method: 'get',
+    params: params
+  })
+}
+//更改药品自动出库仓库(已渲染)
+export function updatedrugout(params) {
+  return request({
+    url: '/api/secondary/updatedrugout',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -22,7 +22,7 @@
         <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
         <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
         <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
-        <td width="100" v-else></td>
+        <td width="100" v-if="!info.hosp_lv"></td>
 
       </tr>
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/test.vue

@@ -0,0 +1,400 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</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 != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+
+    <table class="statementTable" border="1">
+      <tr>
+        <td width="80">机构名称</td>
+        <td colspan="4">{{info.fixmedins_name}}</td>
+        <td width="80">机构编码</td>
+        <td colspan="4">{{info.fixmedins_code}}</td>
+        <td width="100">医保结算级别</td>
+        <td width="100" v-if="info.hosp_lv == '1'">三级特等</td>
+        <td width="100" v-if="info.hosp_lv == '2'">三级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '3'">三级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '4'">三级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '5'">二级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '6'">二级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '7'">二级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '8'">一级甲等</td>
+        <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
+        <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
+        <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
+        <td width="100" v-if="!info.hosp_lv"></td>
+
+      </tr>
+      <tr>
+        <td width="90">就医登记号</td>
+        <td colspan="11">{{info.psn_no}}</td>
+      </tr>
+      <tr>
+        <td width="80">姓名</td>
+        <td width="80">{{info.psn_name}}</td>
+        <td width="80">性别</td>
+        <td width="50" v-if="info.gend == '1'">男</td>
+        <td width="50" v-if="info.gend == '2'">女</td>
+
+        <td width="80">出生日期</td>
+        <td width="100">{{info.brdy}}</td>
+        <td width="90">个人电脑号</td>
+        <td width="110"></td>
+        <td width="80">人员类别</td>
+        <td colspan="3" v-if="info.psn_type == '11'">在职</td>
+        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
+        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
+
+        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
+
+        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+
+
+
+      </tr>
+      <tr>
+        <td>单位名称</td>
+        <td colspan="5">{{info.emp_name}}</td>
+        <td width="80">联系电话</td>
+        <!-- <td width="110">{{info.patient.phone}}</td> -->
+        <td>13535320234</td>
+        <td width="80">身份证号</td>
+        <td colspan="3">{{info.certno}}</td>
+      </tr>
+      <tr>
+        <td>住院号</td>
+        <td>{{info.number}}</td>
+        <td>科别</td>
+        <td width="100"></td>
+        <td>床号</td>
+        <td></td>
+        <td>入院日期</td>
+        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+        <td>出院日期</td>
+        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+        <td>住院天数</td>
+        <td>{{getDay(info.begndate,info.enddate)}}</td>
+
+      </tr>
+      <tr>
+        <td>险种</td>
+        <td colspan="2" v-if="info.insutype == '310'">职工基本医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '320'">公务员医疗补助</td>
+        <td colspan="2" v-if="info.insutype == '330'">大额医疗费用补助</td>
+        <td colspan="2" v-if="info.insutype == '340'">离休人员医疗保障</td>
+        <td colspan="2" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
+        <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
+
+
+        <td>入院第一诊断</td>
+        <td colspan="3">{{info.dise_name}}</td>
+        <td>出院第一诊断</td>
+        <td colspan="4">{{info.dise_name}}</td>
+      </tr>
+      <tr>
+        <td>业务类别</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
+
+        <td>结算时间</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;">
+          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+            
+        </td>
+      </tr>
+      <tr>
+        <td>费用名称</td>
+        <td colspan="2">总费用</td>
+        <td>自费</td>
+        <td colspan="2">部分项目自付</td>
+        <td>费用名称</td>
+        <td colspan="2">总费用</td>
+        <td>自费</td>
+        <td colspan="2">部分项目自付</td>
+      </tr>
+      <tr>
+        <td>床位费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
+        <td>西成药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>中药费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>中成药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
+        </td>
+        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">
+          {{info.chinese_traditional_medicine_cost_part_self_total}}
+        </td>
+      </tr>
+      <tr>
+        <td>中草药</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>检查费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>治疗费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
+        <td>放射费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>手术费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
+        <td>化验费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
+      </tr>
+      <tr>
+        <td>输血费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td>输氧费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>其他</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
+        <td>麻醉费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>材料费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
+        <td>特殊检查费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+      </tr>
+      <tr>
+        <td>特殊治疗费</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;">0</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+      </tr>
+      <tr>
+        <td>合计</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
+          parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
+          parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
+          parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+        </td>
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
+          parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
+          parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        </td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
+          parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
+          parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
+          parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
+          parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
+          parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+        </td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+        <td style="text-align:right;padding-right:10px;"></td>
+        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">基本医疗保险统筹基金支付</td>
+        <td colspan="3">{{info.hifp_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大额基金支付</td>
+        <td colspan="3">{{info.hifob_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">大病基金支付</td>
+        <td colspan="3">{{info.hifmi_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">补充保险基金支付</td>
+        <td colspan="3">{{info.hifes_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">医疗救助基金支付</td>
+        <td colspan="3">{{info.maf_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
+        <td colspan="3">{{info.cvlserv_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3">{{info.acct_pay}}</td>
+      </tr>
+      <tr>
+        <td>收款人:</td>
+        <!-- <td colspan="2">{{info.charge_admin.user_name}}</td> -->
+        <td colspan="2">高慧与</td> 
+        <td>审核人:</td>
+        <td colspan="2" v-if="this.$store.getters.xt_user.org_id == 10106">{{'梅晓辉'}}</td>
+        <!-- <td colspan="2" v-if="this.$store.getters.xt_user.org_id != 10106">{{info.p_admin.user_name}}</td> -->
+        <td colspan="2">梅晓辉</td>
+        <td>制单人:</td>
+        <!-- <td colspan="2">{{info.p_admin.user_name}}</td> -->
+        <td colspan="2">梅晓辉</td>
+        <td>打印日期</td>
+        <td colspan="2">{{getNowTime()}}</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="text-align:left;padding-left:10px;line-height:20px;">
+          注: 1、部分项目自付金额是指基本医疗保险范围内的项目需参保人先按规定比例自付的金额。<br/>
+          &ensp;&ensp;&ensp;2、此表由医院打印。<br/>
+          &ensp;&ensp;&ensp;3、此表一式两份，医院、参保人各一份。
+        </td>
+      </tr>
+      <tr rowspan="2">
+        <td  colspan="12" style="text-align:left;padding-left:10px;">
+          病人家属签字:
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      info: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, p_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, charge_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }
+    },methods:{
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
+      getNowTime: function () {
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        let hh = new Date().getHours();
+        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes();
+        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds();
+        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
+        return dateTime
+      },
+
+    }
+  }
+
+
+</script>
+
+
+<style lang="scss" scoped>
+  .statement-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
+
+  .statementTitle {
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  .statementTable {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+</style>

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

@@ -3,6 +3,7 @@
     title="新增仓库信息"
     :visible.sync="dialogVisible"
     width="30%"
+    :before-close="closePop"
   >
     <div class="main_contain">
       <el-form
@@ -13,54 +14,67 @@
         label-width="100px"
         class="demo-ruleForm"
       >
-        <el-form-item label="活动名称">
-          <span>SH-6732</span>
+        <el-form-item label="仓库编号">
+          <span>{{storehouse_code}}</span>
         </el-form-item>
-        <el-form-item label="仓库名称" prop="region">
-          <el-input v-model="ruleForm.name"></el-input>
+        <el-form-item label="仓库名称" prop="storehouse_name">
+          <el-input v-model="ruleForm.storehouse_name"></el-input>
         </el-form-item>
-        <el-form-item label="仓库地址" prop="desc">
-          <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+        <el-form-item label="仓库地址" prop="address">
+          <el-input type="textarea" v-model="ruleForm.address"></el-input>
         </el-form-item>
-        <el-form-item label="状态" prop="resource">
-          <el-radio-group v-model="ruleForm.resource">
-            <el-radio label="启用"></el-radio>
-            <el-radio label="禁用"></el-radio>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="ruleForm.status">
+            <el-radio :label="1" >启用</el-radio>
+            <el-radio :label="0" >禁用</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="仓库管理员" prop="region">
-          <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-            <el-option label="区域一" value="shanghai"></el-option>
-            <el-option label="区域二" value="beijing"></el-option>
-          </el-select>
+        <el-form-item label="仓库管理员" ><!--prop="region">-->
+          admin
+<!--          <el-select v-model="ruleForm.region" placeholder="请选择管理员">-->
+<!--            <el-option label="admin" value="0"></el-option>-->
+<!--          </el-select>-->
         </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">保存</el-button>
+      <el-button @click="closePop">取 消</el-button>
+      <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
+import { getcode,addstorehouse,updatestorehouse } from "@/api/warehouse";
+import login from '../../../../mock/login'
 export default {
   data() {
     return {
+      show_type: 1,
+      storehouse_id: "",
+      storehouse_code:"coco",
       dialogVisible: false,
       labelPosition:'left',
       ruleForm: {
-        name: "",
+        admin_name:"",
+        storehouse_name: "",
         region: "",
         date1: "",
         date2: "",
         delivery: false,
         type: [],
-        resource: "",
-        desc: "",
+        status: "",
+        address: "",
       },
+      //表单验证规则
       rules: {
-        region: [{ required: true, message: "请选择活动区域", trigger: "change" }],
+        storehouse_name:[{
+          required:true,message:"仓库名称不能为空",trigger: "change"
+        }],
+        address:[{
+          required:true,message:"仓库地址不能为空",trigger: "change"
+        }],
+        // region: [{ required: true, message: "请选择活动区域", trigger: "change" }],
         type: [{
             type: "array",
             required: true,
@@ -69,9 +83,124 @@ export default {
           },],
         desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
       },
+      type:"",
+      // storehouse:{
+      //   storehouse_code:"",
+      // },
     };
   },
   methods: {
+    show(data, type) {
+      if (type == 1) {
+        this.initstorehouseData();
+        this.show_type = 1;
+        this.title = "新增仓库";
+        this.dialogVisible = true;
+      } else if (type == 2) {
+        console.log("data:::::::::::",data);
+        this.show_type = 2;
+        this.storehouse_id = data.id;
+        this.title = "编辑仓库";
+        this.storehouse_code = data.storehouse_code;
+        this.ruleForm.address = data.storehouse_address;
+        this.ruleForm.status = data.storehouse_status;
+        this.ruleForm.storehouse_name = data.storehouse_name;
+        this.ruleForm.admin_name = data.storehouse_admin_name;
+        console.log("this.ruleForm.admin_name",this.ruleForm.admin_name);
+        this.dialogVisible = true;
+      }
+    },
+    // 获取仓库编码接口
+    initstorehouseData() {
+      getcode().then((res) => {
+        if (res.data.state == 1) {
+          this.storehouse_code =
+            res.data.data.list;
+        }
+      });
+    },
+    //清除表单数据
+    closePop() {
+      console.log("this.ruleForm",this.ruleForm)
+      this.dialogVisible = false;
+      this.ruleForm.storehouse_name = "";
+      this.ruleForm.region = "";
+      this.ruleForm.date1 = "";
+      this.ruleForm.date2 = "";
+      this.ruleForm.type = [];
+      this.ruleForm.status = "";
+      this.ruleForm.address = "";
+    },
+
+
+    //  验证表单内容
+    submitForm(ruleForm) {
+      if (this.show_type == 1) {
+        this.$refs[ruleForm].validate((valid) => {
+          if (valid) {
+            console.log("this.ruleForm.status",this.ruleForm.status);
+            let params = {
+              storehouse_code: this.storehouse_code || "",
+              storehouse_name: this.ruleForm.storehouse_name || "",
+              storehouse_address: this.ruleForm.address || "",
+              storehouse_status:parseInt(this.ruleForm.status)
+              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
+              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+            };
+            console.log("params::::",params)
+            console.log("status::::",this.ruleForm.status)
+            addstorehouse(params).then((res) => {
+              if (res.data.state == 1) {
+                this.$message.success("新增成功");
+                this.closePop();
+                this.$emit("init");
+              } else {
+                this.$message.error("新增失败：" + res.data.msg);
+                setTimeout(() => {
+                  this.closePop();
+                }, 2000);
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      } else if (this.show_type == 2) {
+        this.$refs[ruleForm].validate((valid) => {
+          if (valid) {
+            console.log("this.ruleForm.status",this.ruleForm.status);
+            let params = {
+              storehouse_code: this.storehouse_code || "",
+              storehouse_name: this.ruleForm.storehouse_name || "",
+              storehouse_address: this.ruleForm.address || "",
+              storehouse_status:parseInt(this.ruleForm.status),
+              id: this.storehouse_id
+              // storehouse_admin_id: this.ruleForm.storehouse_admin_id || "",
+              // storehouse_admin_name: this.ruleForm.storehouse_admin_name || "",
+            };
+            updatestorehouse(params).then((res) => {
+              if (res.data.state == 1) {
+                this.$message.success("保存成功");
+                this.closePop();
+                this.$emit("init");
+              } else {
+                this.$message.error("保存失败：" + res.data.msg);
+                setTimeout(() => {
+                  this.closePop();
+                }, 2000);
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      }
+      this.contactsinfo();
+    },
+
+
+
+
   },
 };
 </script>
@@ -88,4 +217,4 @@ export default {
     line-height: 30px;
   }
 }
-</style>
+</style>

src/xt_pages/stock/warehouseManage/query.vue

@@ -17,7 +17,7 @@
             size="small"
             style="width: 200px; margin-left: 10px"
             class="filter-item"
-            v-model.trim="keywords"
+            v-model.trim="keyword"
             placeholder="药品名称"
           />
           <el-button
@@ -30,12 +30,8 @@
           >
         </div>
         <div>
-          <el-button size="small" type="primary" @click="AddWareHouse"
-            >新增</el-button
-          >
-          <el-button size="small" type="primary" @click="toPrint"
-            >设置</el-button
-          >
+          <el-button size="small" type="primary" @click="AddWareHouse(1)">新增</el-button>
+          <el-button size="small" type="primary" @click="toPrint">设置</el-button>
         </div>
       </div>
 
@@ -51,27 +47,28 @@
       >
         <el-table-column label="仓库编号" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+            <span>{{ scope.row.storehouse_code ? scope.row.storehouse_code : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
+            <span>{{ scope.row.storehouse_name ? scope.row.storehouse_name : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库地址" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+            <span>{{ scope.row.storehouse_address ? scope.row.storehouse_address : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="仓库管理员" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+            <span>{{ scope.row.storehouse_admin_name ? scope.row.storehouse_admin_name : "" }}</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            <span v-if="scope.row.storehouse_status == 1">启用</span>
+            <span v-if="scope.row.storehouse_status == 0">禁用</span>
           </template>
         </el-table-column>
 
@@ -82,7 +79,7 @@
                 icon="el-icon-edit-outline"
                 size="small"
                 type="primary"
-                @click="toEdit(scope.row)"
+                @click="toEdit(scope.row,2)"
               >
               </el-button>
             </el-tooltip>
@@ -91,7 +88,7 @@
               <el-button
                 size="small"
                 type="danger"
-                @click="toDelete(scope.row, scope.row.$index)"
+                @click="toDisable(scope.row, scope.row.$index)"
                 ><img
                   src="../../../assets/purchase/ban.png"
                   alt=""
@@ -126,14 +123,14 @@
       </el-pagination>
     </div>
 
-    <AddWareHouse ref="AddWareHouse"></AddWareHouse>
+    <AddWareHouse ref="AddWareHouse" @init="initData" ></AddWareHouse>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getDictionaryDataConfig, getDataConfig } from "@/utils/data";
-import { getSelfStockQuery } from "@/api/drug/drug";
+import { storehouselist,updatestatus,deletestorehouse } from "@/api/warehouse";
 import AddWareHouse from "./components/AddWareHouse.vue";
 export default {
   name: "stockIn",
@@ -158,50 +155,45 @@ export default {
         { path: false, name: "库房管理" },
         { path: "/stock/warehousequery", name: "仓库管理" },
       ],
-      keywords: "",
+      keyword: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
-      end_time: "",
       page: 1,
       limit: 10,
       tableData: [],
       drugType: [],
-      type_name: 0,
       stockOutData: [],
     };
   },
   methods: {
+    initData() {
+      let params = {
+        limit: this.limit,
+        page: this.page,
+        keyword:this.keyword,
+      };
+      //请求分页接口
+      storehouselist(params).then((response) => {
+        if (response.data.state == 1) {
+          this.tableData = response.data.data.list;
+          this.total = response.data.data.total;
+        }
+      });
+    },
+
     getlist() {
       var params = {
-        type_name: this.type_name,
-        start_time: this.start_time,
-        end_time: this.end_time,
-        keywords: this.keywords,
+        keyword: this.keyword,
         page: this.page,
         limit: this.limit,
       };
       console.log("params", params);
-      getSelfStockQuery(params).then((response) => {
+      //请求分页接口
+      storehouselist(params).then((response) => {
         if (response.data.state == 1) {
-          var stockQuery = response.data.data.stockQuery;
-          console.log("入库", stockQuery);
+          this.tableData = response.data.data.list;
           this.total = response.data.data.total;
-          console.log("total", this.total);
-          var stockOutQuery = response.data.data.stockOutQuery;
-          console.log("stockOut", stockOutQuery);
-          for (let i = 0; i < stockQuery.length; i++) {
-            for (let j = 0; j < stockOutQuery.length; j++) {
-              if (stockQuery[i].drug_name_id == stockOutQuery[j].drug_name_id) {
-                stockQuery[i].outCount = stockOutQuery[j].Count;
-                stockQuery[i].total =
-                  stockQuery[i].Count - stockOutQuery[j].Count;
-              }
-            }
-          }
-          console.log("表格数据", stockQuery);
-          this.tableData = stockQuery;
         }
       });
     },
@@ -238,25 +230,65 @@ export default {
       this.getlist();
     },
     // 新增仓库
-    AddWareHouse() {
-      this.$refs.AddWareHouse.dialogVisible = true;
+    AddWareHouse(val) {
+      this.$refs.AddWareHouse.show(1, val);
     },
-    // 删除仓库
-    toDelete(val, index) {
-      this.$confirm("是否确认删除这条仓库信息?", "删除仓库信息", {
+    // 编辑仓库
+    toEdit(data,val) {
+      console.log("data is :",data)
+      this.$refs.AddWareHouse.show(data,val);
+    },
+    // 禁用仓库
+    toDisable(val, index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定将此仓库禁用?", "禁用仓库信息", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
-          this.$message.success("删除成功");
+      }).then(() => {
+        updatestatus(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+        .then(() =>{
+          this.initData();
         })
-        .catch(() => {});
+        .catch((err) => {
+          console.log(err)
+        })
+        }).catch(() => {});
     },
-    // 编辑仓库
-    toEdit() {
-        this.$refs.AddWareHouse.dialogVisible = true;
+    //删除仓库
+    toDelete(val, index) {
+      var params = {
+        id:val.id,
+      };
+      this.$confirm("是否确定将此仓库删除?", "删除仓库信息", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning",
+      }).then(() => {
+        deletestorehouse(params).then((res) => {
+          if (res.data.state == 1) {
+            this.$message.success(res.data.data.list);
+          }else {
+            this.$message.error(res.data.msg);
+          }
+        })//刷新
+          .then(() =>{
+            this.initData();
+          })
+          .catch((err) => {
+            console.log(err)
+          })
+      }).catch(() => {});
     },
+
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },

src/xt_pages/stock/warehouseManage/waresetting.vue

@@ -11,12 +11,12 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动入库仓库：
           </div>
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="h1" placeholder="请选择" @select="handleSelect1" @change="updateconfig1(h1)" >
             <el-option
               v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -25,12 +25,12 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择耗材自动出库仓库：
           </div>
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="h2" placeholder="请选择" @select="handleSelect2" @change="updateconfig2(h2)">
             <el-option
               v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -39,12 +39,12 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动入库仓库：
           </div>
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="h3" placeholder="请选择" @select="handleSelect3" @change="updateconfig3(h3)">
             <el-option
               v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -53,12 +53,12 @@
           <div style="line-height: 36px; white-space: nowrap">
             请选择药品自动出库仓库：
           </div>
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="h4" placeholder="请选择" @select="handleSelect4" @change="updateconfig4(h4)">
             <el-option
               v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.storehouse_name"
+              :label="item.storehouse_name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -70,6 +70,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getallstorehousename,findstorehouseconfig,updateinfo,updateoutinfo,updatedruginfo,updatedrugout } from "@/api/warehouse";
 export default {
   components: {
     BreadCrumb,
@@ -81,18 +82,101 @@ export default {
         { path: false, name: "仓库管理" },
         { path: false, name: "仓库设置" },
       ],
-      options:[]
+      options:[],
+      h1:"",
+      h2:"",
+      h3:"",
+      h4:"",
     };
   },
 
   created(){
-
+    this.initData()
   },
 
   methods:{
       returnTo(){
           this.$router.back(-1)
-      }
+      },
+    initData() {
+      let params = {};
+      //请求分页接口
+      getallstorehousename(params).then((response) => {
+        if (response.data.state == 1) {
+          this.options = response.data.data.list;
+        }
+      });
+      let param ={}
+      findstorehouseconfig(param).then((response) => {
+        if (response.data.state == 1) {
+          console.log("response",response)
+          this.h1 = response.data.data.storehouse_info;
+          this.h2 = response.data.data.storehouse_out_info;
+          this.h3 = response.data.data.drug_storehouse_info;
+          this.h4 = response.data.data.drug_storehouse_out;
+          console.log("h1",this.h1)
+        }
+      });
+    },
+
+    handleSelect1(item) {
+      this.h1 = item.storehouse_name;
+    },
+    handleSelect2(item) {
+      this.h2 = item.storehouse_name;
+    },
+    handleSelect3(item) {
+      this.h3 = item.storehouse_name;
+    },
+    handleSelect4(item) {
+      this.h4 = item.storehouse_name;
+    },
+    updateconfig1(h1){
+      let params = {
+        id:h1
+      };
+      //请求分页接口
+      updateinfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig2(h2){
+      let params = {
+        id:h2
+      };
+      //请求分页接口
+      updateoutinfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig3(h3){
+      let params = {
+        id:h3
+      };
+      //请求分页接口
+      updatedruginfo(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+    updateconfig4(h4){
+      let params = {
+        id:h4
+      };
+      //请求分页接口
+      updatedrugout(params).then((response) => {
+        if (response.data.state == 1) {
+          this.$message.success("修改成功");
+        }
+      });
+    },
+
+
   }
 };
 </script>
@@ -116,4 +200,4 @@ export default {
 /deep/ .el-input__inner {
   width: 202px;
 }
-</style>
+</style>