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

src/api/his/his.js

@@ -344,6 +344,17 @@ export function getHisOrderDetailCollect (params) {
 }
 
 
+export function getList (params) {
+  return request({
+    url: '/api/cost/compare',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
 
 
 

src/store/modules/globalConfig.js

@@ -1820,7 +1820,13 @@ const global_config = {
     {
       id: 27,
       name: '万u'
-    },
+    }, {
+        id: 28,
+        name: '片'
+      },{
+        id: 29,
+        name: '只'
+      },
 
     ],
     body_fluid: [{

src/xt_pages/outpatientCharges/costComparison.vue

@@ -6,13 +6,13 @@
     <div class="app-container">
       <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
         <div>
-          <el-input size="small" style="width:150px;"  v-model="keywords"
+          <el-input size="small" style="width:150px;" v-model="keywords"
                     class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
         </div>
-        <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
+        <el-button size="small" type="primary" @click="dialogFormVisible = true" >医保对账</el-button>
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
@@ -24,37 +24,48 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作机构">
-          <template slot-scope="scope"></template>
-        </el-table-column>
         <el-table-column align="center" prop="name" label="对账申请人">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{getName(scope.row.creator)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开始日期">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{getTimes(scope.row.start_time)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="结束日期">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{getTimes(scope.row.end_time)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="险种类型">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">
+            <div  v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
+            <div  v-if="scope.row.insutype == '320'">公务员医疗补助</div>
+            <div  v-if="scope.row.insutype == '330'">大额医疗费用补助</div>
+            <div  v-if="scope.row.insutype == '340'">离休人员医疗保障</div>
+            <div  v-if="scope.row.insutype == '390'">城乡居民基本医疗保险</div>
+            <div  v-if="scope.row.insutype == '392'">城乡居民大病医疗保险</div>
+            <div  v-if="scope.row.insutype == '510'">生育保险</div>
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="对账类型">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">
+            <div  v-if="scope.row.check_type == 1">总账</div>
+            <div  v-if="scope.row.check_type == 2">明细</div>
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="结算笔数">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">{{scope.row.num}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="医疗费用总数">
           <template slot-scope="scope">
+            {{scope.row.cost_total}}元
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" width="160" label="基本医疗基金总费用">
           <template slot-scope="scope">
+            {{scope.row.func_total}}元
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="个人支付总费用">
           <template slot-scope="scope">
+            {{scope.row.psn_pay}}元
           </template>
         </el-table-column>
       </el-table>
@@ -72,45 +83,46 @@
       </el-pagination>
       <el-dialog title="医保对账" :visible.sync="dialogFormVisible">
         <el-form :model="form" label-width="100px">
-            <el-form-item label="时间" :label-width="formLabelWidth">
-                <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                    @change="handleStartTimeChange" :editable="false" :clearable="false"
-                    style="width: 200px;" type="date" placeholder="选择开始日期"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    align="right"></el-date-picker>-
-
-                <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                    @change="handleEndTimeChange" :editable="false" :clearable="false"
-                    style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd"
-                    align="right"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="险种类型" :label-width="formLabelWidth">
-                <el-select v-model="value" placeholder="请选择" style="width: 200px;">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="对账类型" :label-width="formLabelWidth">
-                <el-select v-model="value" placeholder="请选择" style="width: 200px;">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
+          <el-form-item label="时间" :label-width="formLabelWidth">
+            <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
+                            @change="handleStartTimeChange" :editable="false" :clearable="false"
+                            style="width: 200px;" type="date" placeholder="选择开始日期"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            align="right"></el-date-picker>
+            -
+
+            <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
+                            @change="handleEndTimeChange" :editable="false" :clearable="false"
+                            style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            align="right"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="险种类型" :label-width="formLabelWidth">
+            <el-select v-model=" insutype" placeholder="请选择" style="width: 200px;">
+              <el-option
+                v-for="item in insutypes"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="对账类型" :label-width="formLabelWidth">
+            <el-select v-model="check_type" placeholder="请选择" style="width: 200px;">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+          <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <el-button type="primary" @click="confirm">确 定</el-button>
         </div>
       </el-dialog>
     </div>
@@ -122,8 +134,10 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, getList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  import axios from 'axios'
 
   export default {
     components: {
@@ -136,21 +150,174 @@
           { path: false, name: '医保费用对照' }
         ],
         tableData: [],
-        limit:10,
-        page:1,
-        dialogFormVisible:false
+        limit: 10,
+        page: 1,
+        dialogFormVisible: false,
+        total: 0,
+        adminUserOptions: [],
+        start_time:"",
+        end_time:"",
+        insutype:"",
+        check_type:"",
+
+        options:[
+          {
+            value:1,
+            label:"总账",
+          },  {
+            value:2,
+            label:"明细",
+          },
+        ],
+
+        insutypes:[
+          {
+            value:"310",
+            label:"职工基本医疗保险",
+          },  {
+            value:"320",
+            label:"公务员医疗补助",
+          },  {
+            value:"330",
+            label:"大额医疗费用补助",
+          },  {
+            value:"340",
+            label:"离休人员医疗保障",
+          },
+          {
+            value:"390",
+            label:"城乡居民基本医疗保险",
+          }, {
+            value:"392",
+            label:"城乡居民大病医疗保险",
+          }, {
+            value:"510",
+            label:"生育保险",
+          }
+
+
+
+        ]
+
       }
     },
     methods: {
-      handleSizeChange(limit){
-        this.limit = limit;
+      confirm(){
+        if(this.check_type == 1){
+          let params = {
+            start_time: this.start_time,
+            end_time: this.end_time,
+            insutype: this.insutype,
+            clr_type: '11'
+          }
+
+          var that = this
+
+          if (this.$store.getters.xt_user.org_id == 9919) {
+            axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.page =1
+                  this.limit = 10
+                  this.keywords = ""
+                  this.getList()
+
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          }
+
+        }else {
+          let params = {
+            start_time: this.start_time,
+            end_time: this.end_time,
+          }
+          var that = this
+          axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                this.page =1
+                this.limit = 10
+                this.keywords = ""
+                this.getList()
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+
+        }
+
+
+      },
+      getInsutype(type) {
+
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+
+          }
+        })
       },
-      handleCurrentChange(page){
-        this.page = page;
+      getName(admin_user_id) {
+        for (let i = 0; i < this.adminUserOptions.length; i++) {
+          if (this.adminUserOptions[i].id == admin_user_id) {
+            return this.adminUserOptions[i].name
+          }
+        }
+
+      },
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
+      },
+      getList() {
+        let params = {
+          'page': this.page,
+          'limit': this.limit,
+          'keywords': this.keywords
+
+        }
+        this.tableData = []
+        getList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
       },
+      handleSizeChange(limit) {
+        this.limit = limit
+        this.getList()
+      },
+      handleCurrentChange(page) {
+        this.page = page
+        this.getList()
+
+      }
     },
     created() {
-
+      this.getList()
+      this.fetchAllAdminUsers()
 
     }
   }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -70,10 +70,16 @@
 
 
           <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
-                     @click="open(4)"
+                     @click="open(20)"
                      type="primary">收费
           </el-button>
 
+
+          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+                     @click="open(4)"
+                     type="primary">预结算
+          </el-button>
+
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
@@ -1504,6 +1510,11 @@
 
           }
 
+        }else if(index == 20){
+
+
+
+
         }
       },
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1400,7 +1400,7 @@
         } else {
           let arr = []
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 || this.allProject[i].wubi.indexOf(this.search_project_keyword) != -1 || this.allProject[i].pinyin.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
           }
@@ -1415,7 +1415,7 @@
         } else {
           let arr = []
           for (let i = 0; i < this.drugs.length; i++) {
-            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1) {
+            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) {
               arr = arr.concat(this.drugs[i])
             }
           }