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

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-   host: 'xt.test.sgjyun.com',
-  //  host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -133,7 +133,7 @@
                                                             >预结算
                                                             </el-button>
                                                             <el-button
-                                                                    v-if="items.curPrescriptions.order.order_status == 1 && items.curPrescriptions.order.is_pre == 1 && hisPatientInfo.balance_accounts_type != 2"
+                                                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"
                                                                     size="small" @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)" type="primary"
                                                             >撤销明细
                                                             </el-button>
@@ -2001,7 +2001,7 @@
           }
 
           if (this.hisPatientInfo.id_card_type == 1) {
-            if (this.hisPatientInfo.balance_accounts_type != 2) {
+            if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088) {
               this.pwdFormVisible = true
               this.pwd = ''
             } else {

src/xt_pages/outpatientCharges/summary.vue

@@ -6,6 +6,10 @@
         <div class="app-container">
             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
+                    <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+                               <!--@click="Action">-->
+                        <!--导出-->
+                    <!--</el-button>-->
                     <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
                               class="filter-item"/>
@@ -203,7 +207,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
+  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund,getAllOrders } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   // import NewStatementPrint from './newStatementPrint'
   import NewStatementPrint from './statementPrint.vue'
@@ -632,6 +636,78 @@
         this.page = 1
         this.keywords = ''
         this.getHisOrderList()
+      },Action(){
+        getAllOrders().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            let list = []
+            for (let i = 0; i < response.data.data.order.length; i++) {
+              let order = response.data.data.order[i]
+
+
+              if (order.patient != null && order.patient.name.length > 0) {
+                name = order.patient.name
+
+              }
+
+              let time = order.setl_time
+              let name = order.his_patient.name
+              var hifmi_pay = 0.00
+              for (let b = 0; b < order.order_info.length; b++) {
+                let item_name = ""
+                let item_code = ""
+                let price = ""
+                let unit = ""
+                let spec = ""
+                let selfpay_prop = ""
+                if(order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0){
+                  item_name = order.order_info[b].project.project.project_name
+                  item_code =  order.order_info[b].project.project.medical_code
+                  price = order.order_info[b].pric
+                  unit = order.order_info[b].project.project.unit
+                }else if(order.order_info[b].advice.id > 0 && order.order_info[b].project.id == 0){
+                  item_name = order.order_info[b].advice.advice_name
+                  item_code =  order.order_info[b].advice.drug.medical_insurance_number
+                  price = order.order_info[b].pric
+                  unit = order.order_info[b].advice.prescribing_number_unit
+
+
+                }
+                selfpay_prop = order.order_info[b].selfpay_prop
+
+                let obj = {
+                  '项目名称': item_name,
+                  '项目编码': "",
+                  '医保编码': item_code,
+                  '零售价': price,
+                  '单位': unit,
+                  '规格': "",
+                  '收费时间': time,
+                  '报销比例': selfpay_prop,
+                  '患者名称': name,
+                }
+
+                list.push(obj)
+              }
+            }
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['项目名称', '项目编码', '医保编码', '零售价', '单位', '规格', '收费时间', '报销比例', '患者名称']
+              const filterVal = ['项目名称', '项目编码', '医保编码', '零售价', '单位', '规格', '收费时间', '报销比例', '患者名称']
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: '消费明细'
+              })
+            })
+
+          }
+        })
+
+
       },
       searchAction() {
         this.page = 1

src/xt_pages/workforce/components/tableWeeks.vue

@@ -421,7 +421,7 @@
         prescription_status: false,
         week: false,
         name: false,
-        zone: false,
+        zone_name: false,
         classes: false,
         number: false,
         mode: false,
@@ -874,6 +874,7 @@
       ,
       signPrint() {
         var zone = this.zone
+        console.log("zone23232",zone)
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
            newArr.push(this.zoneList[i].id)
@@ -1287,6 +1288,7 @@
       }
       ,
       printActionSetting() {
+        this.getAllZoneList()
         this.getlist()
         this.dialogVisible = true
 
@@ -1463,10 +1465,10 @@
               this.week = false
             }
             if (list.zone == 1) {
-              this.zone = true
+              this.zone_name = true
             }
             if (list.zone == 2) {
-              this.zone = false
+              this.zone_name = false
             }
             if (list.mode == 1) {
               this.mode = true

src/xt_pages/workforce/remind_print_setting.vue

@@ -29,6 +29,8 @@
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
                 </div> 
+               <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
+                <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div>用量:  
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
@@ -42,6 +44,9 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </div> 
+                <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
+                <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
+                <div v-if="org_id == 10188">体重增加:{{main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight}}</div>
                 <div>用法:静脉注射</div> 
                 <div>打印时间:{{currentDate}}</div>
               </div>
@@ -96,6 +101,7 @@
      this.type = this.$route.query.type
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
+     console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
    
      this.modeOptions = this.$store.getters.treatment_mode
@@ -115,6 +121,7 @@
        getScheduleList(params).then(response=>{
          if(response.data.state ==1){
            var list = response.data.data.list
+           console.log("本周信息",list)
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
            }

src/xt_permission.js

@@ -13,18 +13,18 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 router.beforeEach((to, from, next) => {
   // 线上注释
   // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //       store.dispatch('VerifyConfigList', []).then(() => {
-  //         next()
-  //       })
-  //     }
-  //     if (store.getters.permission_routers === undefined) {
-  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //         next()
-  //       })
-  //     } else {
-  //       next()
-  //     }
-  //   return
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start()