feat(env): 更新环境变量并添加新配置

- 修改 .env.development 和 .env.production 中的 API 地址
- 在 package.json 中添加 lodash-es 依赖并更新其他依赖版本
- 修改多个组件中的 API 调用路径和参数
- 优化 outpatientCharging 和 outpatientTwo 组件中的结算逻辑
- 在 vue.config.js 中添加新的环境变量输出

.env.development

@@ -10,8 +10,8 @@ VUE_APP_BASE_API = ''
 # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
 # VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
 VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
-VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
-# VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
+# VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
+VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
 VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
 # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
 # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'

.env.production

@@ -9,6 +9,6 @@ VUE_APP_BASE_API = ''
 # VUE_APP_BASE_URL = 'http://newfinance-system.fancyinfo.net'
 VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
 VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902'
-VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
+VUE_APP_BASE_URL_change = 'http://10.10.9.198:6200/fancy'
 # VUE_APP_BASE_URL = 'http://med-api.fancyinfo.net'
 # VUE_APP_BASE_URL = 'http://10.10.40.10:9902'

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
-     "build:test": "vue-cli-service build --mode test && node ./deploy-test.js",
+    "build:test": "vue-cli-service build --mode test && node ./deploy-test.js",
     "build:stage": "vue-cli-service build && node ./deploy-test.js",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
@@ -52,13 +52,14 @@
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
+    "lodash-es": "^4.17.21",
     "nprogress": "0.2.0",
-    "ssh2-sftp-client": "^11.0.0",
     "qrcodejs2": "0.0.2",
     "quickadmin-icu": "^0.3.8",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "ssh2-sftp-client": "^11.0.0",
     "swiper": "^8.4.4",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
@@ -70,6 +71,7 @@
     "vuex": "3.6.0"
   },
   "devDependencies": {
+    "@types/lodash-es": "^4.17.12",
     "@vue/cli-plugin-babel": "4.4.6",
     "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",

src/api/all.js

@@ -169,7 +169,7 @@ export const api = {
         updates:'/api/settlement/update_cost',
         preSettlementGetPatientInfo:'/api/patient/zy',//出院获取患者信
         recharge:'/outpatient-fees/pay/recharge',//出院获取患者信
-         outinvoicing:'/outpatient-fees/invoice/outinvoicing',//出院获取患者信
+         outinvoicing:'/invoice/api/outinvoicing',//出院获取患者信
         zyByIdCard:'/api/patient/zyByIdCard',//出院获取患者信
         zyByInpatientNo:'/api/patient/zyByInpatientNo',//出院获取患者信
         preSettlement:'/api/settlement',//出院获取患者信

src/components/Cardlist/index.vue

@@ -457,7 +457,7 @@ export default {
            
             printmis({
                 patient_id: e.his_patient_id,
-                settle_id: e.id
+                settle_id: e.jshid
             })
                 .then(response => {
                     this.$message({

src/components/ReadcardsSFC/index.vue

@@ -214,6 +214,7 @@ export default {
       let data = ''
       if (this.isJSON(evt.data) && evt?.data) {
         data = JSON.parse(evt.data)
+        console.log(data,'data')
       }
       // 开启读卡设备并且设置定时任务
       if (data?.MethodName === 'OpenDevice' && data?.RespCode === 0) {

src/components/invoicepost/index.vue

@@ -116,6 +116,7 @@ export default {
                         this.outinvoicform.name = this.patientData.patient.name
                         this.outinvoicform.patientId = this.patientData.patient.his_id
                         this.outinvoicform.totalAmount = this.patientData.patient_burden
+                         this.outinvoicform.rcpt_no = this.patientData.rcpt_no
                     })
                 } else {
                     return false
@@ -127,15 +128,15 @@ export default {
         // 开票
         async InvoicingFun() {
             let param = {
-                cardNo: this.outinvoicform.patient.his_id,
+                cardNo: this.outinvoicform.patientId,
                 idCard:this.outinvoicform.id_card,
                 jobNumber: localStorage.getItem('jobNumber') ?? '',
                 jshId: this.outinvoicform.jshId,
                 mobile: this.outinvoicform.mobile,
                 name: this.outinvoicform.name,
-                patientId: this.outinvoicform.patient.his_id,
+                patientId: this.outinvoicform.patientId,
                 payerType: this.outinvoicform.payerType,
-                rcptNo: this.outinvoicform.jshId,
+                rcptNo: this.outinvoicform.rcpt_no,
                 totalAmount: this.outinvoicform.totalAmount,
             }
 
@@ -147,6 +148,12 @@ export default {
                 })
                 this.isOpenCardeds = false
             }
+            else {
+                this.$message({
+                    message: res.msg,
+                    type: 'error',
+                })
+            }
         },
         // // 关闭弹窗
         // handleCloseModal() {

src/views/jiesuan/outpatientCharging.vue

@@ -2062,21 +2062,28 @@ export default {
                     this.invoicepostData=response.data
                     this.invoicepostVisible=true
                     // _this.printcard(jshidprint)
-                    this.selectCardYiboInfo()
-                    //刷新列表
-                    var obj = {
-                        patient_id: this.patientData.patient_id, //this.cardNo,
+                    if (  this.cardType == 'SOCIAL_CARD') {
+                         this.selectCardYiboInfo({
+                            sfzh:response.data.id_card_number
+                         })
+                    }else{
+                         this.selectCardYiboInfo()
                     }
-                    pdxq(obj)
-                        .then(response => {
-                            this.tableData.cost = response.data
-                            this.tableDataList = response.data
-                            this.tylist = response.data
-                            this.tiles(this.tylist)
-                        })
-                        .finally(res => {
-                            this.loading = false
-                        })
+                   
+                    //刷新列表
+                    // var obj = {
+                    //     patient_id: this.patientData.patient_id, //this.cardNo,
+                    // }
+                    // pdxq(obj)
+                    //     .then(response => {
+                    //         this.tableData.cost = response.data
+                    //         this.tableDataList = response.data
+                    //         this.tylist = response.data
+                    //         this.tiles(this.tylist)
+                    //     })
+                    //     .finally(res => {
+                    //         this.loading = false
+                    //     })
                 })
                 .finally(res => {
                      this.saveLoding=false

src/views/jiesuan/outpatientTwo.vue

@@ -436,6 +436,7 @@
         <Readcards :isOpenCarded="carddialogFormVisible" @getyibaoinfo="getyibaoinfo" @closeReadcard="closeReadcard" />
         <!-- 确认结算-新-不选择卡类型 -->
         <ReadcardsNew :isOpenCarded="yibaoshowNew" :patientcard="form" :patientData="patientData" :selectTableArr="selectTableArr" @getyibaoinfo="selectCardYiboPreselect" @close="closeSelectCard" />
+          <invoicepost :isOpenCarded="invoicepostVisible" :patientData="invoicepostData"></invoicepost>
         <!-- loaidng 动画 -->
         <div v-if="false" class="grey-cloth" id="loading">
             <div id="img">
@@ -462,6 +463,7 @@
 </template>
 <script>
 import Cardlist from '@/components/Cardlist'
+import invoicepost from '@/components/invoicepost'
 import Readcards from '@/components/Readcards'
 import editProp1 from './components/editProp' //修改自付比例
 import { pdxx, mzxx, mzxxs, mzxxs_ewm, settle_fee_self2yb, settle_fee2yb, bxxx, jsxx, hiscard, printmis, queryReadRard } from '@/api/mz'
@@ -481,6 +483,8 @@ export default {
     name: 'Outpatient',
     data() {
         return {
+            invoicepostData:{},
+            invoicepostVisible:false,
             checked: false,
             moreLoading: false,
             moreshowdata: {
@@ -1785,8 +1789,10 @@ export default {
                     this.fullscreenLoading = false
                     this.jeizhishow = false
                     const jshidprint = response.data
+                     this.invoicepostData=response.data
+                    this.invoicepostVisible=true
                     // setTimeout(function () {
-                    _this.printcard(jshidprint)
+                    // _this.printcard(jshidprint)
                     // }, 5000)
 
                     //刷新列表
@@ -2345,7 +2351,7 @@ export default {
 				</div>
 				<div style="margin:-5px 0px 0px 18px;position: relative">
 					<div class="conline"><span>姓名:</span><span class="money">${this.patientData.name}</span></div>
-                      <div class="conline"><span>性别:</span><span class="money">${this.patientData.sex}</span></div>
+                      <div class="conline"><span>性别:</span><span class="money">${this.patientData?.sex.name}</span></div>
                     <div class="conline"><span>年龄:</span><span class="money">${this.patientData.age}</span></div>
 					<div class="conline"><span>就诊卡号：</span><span class="money">${e.id_card}</span></div>
 					<div class="conline"><span>交易方式:</span><span class="money">${e.trade_type}</span></div>
@@ -2529,8 +2535,10 @@ export default {
                     this.fullscreenLoading = false
                     this.jeizhishow = false
                     const jshidprint = response.data
+                     this.invoicepostData=response.data
+                    this.invoicepostVisible=true
                     // setTimeout(function () {
-                    _this.printcard(jshidprint)
+                    // _this.printcard(jshidprint)
                     // }, 5000)
 
                     //刷新列表

vue.config.js

@@ -127,6 +127,7 @@ function judgementEnv () {
     console.log({ '当前环境:': process.env.NODE_ENV })
     console.log({ '当前地址:': process.env.VUE_APP_BASE_URL },'+++++++++++++++')
     console.log({ '当前地址:': process.env.VUE_APP_BASE_URL_SFC },'-------------')
+        console.log({ '当前地址:': process.env.VUE_APP_BASE_URL_change },'-------------')
     console.log('=========')
 }