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

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -18,7 +18,7 @@
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <printFive v-if="org_id == 10188 || org_id == 0" :paramsObj="invoiceParams"></printFive>
           <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
@@ -137,7 +137,7 @@
           });
         }else{
           const style =
-            '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+            '@media print {#invoice-print{font-size:15px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
           printJS({
             printable: "invoice-print",
             type: "html",

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

@@ -2,6 +2,7 @@
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index">
             <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:70+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:400+ 'px',}">{{list.order.fa_piao_number}}</div>
             <div style="display:flex;justify-content: space-between;">
                 <div :style="{position: 'absolute',top:(40 + (index * 400))  + 'px',left:80+ 'px',}"> {{ paramsObj.name }}</div>
             </div>
@@ -44,23 +45,22 @@
             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
                 <div style="display:flex;">
-                  <div style="width:150px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-                  <div style="width:150px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-                  <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
-                  <div style="width:150px">大病支出：{{list.order.hifmi_pay}}</div>
+                  <div style="width:170px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:170px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+                  <div style="width:170px">统筹支出：{{ list.order.hifp_pay }}</div>
+                  <div style="width:170px">大病支出：{{list.order.hifmi_pay}}</div>
 
                 </div>
                 <div style="display:flex;">
-                  <div style="width:150px">个人账户支付：{{ list.order.acct_pay }}</div>
-                  <div style="width:150px">现金支出：{{ list.order.psn_cash_pay }}</div>
-                  <div style="width:150px">本次账户：0</div>
-                  <div style="width:150px">上次账户：0</div>
+                  <div style="width:170px">个人账户支付：{{ list.order.acct_pay }}</div>
+                  <div style="width:170px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:170px">本次账户：0</div>
+                  <div style="width:170px">上次账户：0</div>
                 </div>
               <div style="display:flex;">
-                <div style="width:150px">账户余额：{{ list.order.balc }}</div>
-                <div style="width:150px">其他支出：{{ list.order.oth_pay }}</div>
-                <div style="width:150px">大病补充保险支出：0</div>
-                <div style="width:150px">民政支出：0</div>
+                <div style="width:170px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:170px">其他支出：{{ list.order.oth_pay }}</div>
+                <div style="width:170px">民政支出：0</div>
               </div>
               <div style="display:flex;">
                 <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -433,7 +433,7 @@
                                             <span v-else> {{ scope.row.total }}</span> -->
                                             <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
 <!--                                            //针对坐标系统的库存数据-->
-                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.zuobiao_stock_num}}</span>
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
 
                                           </template>
                                       </el-table-column>
@@ -531,13 +531,13 @@ import { uParseTime } from '@/utils/tools'
 import NextOrLastPrescription from './nextOrLastPrescription'
 import CallPrescription from './callPrescription'
 import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
-import axios from 'axios'
 
 const moment = require('moment')
 
 export default {
   props: {
     zuobiao_drug:Array,
+    zuobiao_project:Array,
     drugs:Array,
     allDrugs:Array,
     advices_template:Array,
@@ -574,9 +574,7 @@ export default {
     additionalCharges
   },
   data() {
-
     return {
-      zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register10206: [
@@ -1624,20 +1622,24 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
+      console.log('~~~~',this.search_project_keyword)
+      console.log('5555',this.tabProject)
+      console.log('6666',this.allProject)
       // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-
-
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+            // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.allProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
               arr = arr.concat(this.allProject[i])
             }
 
         }
         this.tabProject = arr
+        console.log('kkkk',this.tabProject);
       }
 
     }, searchProjectTeamAction() {
@@ -1886,6 +1888,7 @@ export default {
     },
 
     tabclickEvent(val) {
+      console.log("li3333333333333li")
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
           this.prescription_id = this.prescriptions[i].id
@@ -1953,6 +1956,7 @@ export default {
 
     },
     setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
+      console.log("诊断23333333333333",this.diagnose)
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
@@ -2068,6 +2072,7 @@ export default {
 
 
       this.diagnose = []
+      console.log("处方----------------------------------------------",info.id)
       if (info.id == 0) {
         if (last_info.diagnosis.length == 0) {
           this.diagnose = []
@@ -2119,6 +2124,8 @@ export default {
 
       }
 
+      // console.log("info233333333333333333333",info.id)
+      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
       if(info.id == 0){
         if (last_info.patient_diagnosis.length == 0) {
@@ -2147,6 +2154,7 @@ export default {
           }
 
         }
+        console.log("hhahahahah",this.patient_diagnose)
       }
 
       this.state1 = info.sick_type
@@ -2278,6 +2286,7 @@ export default {
     },
 
     moreState(tab, event) {
+      console.log("li222222222")
       if (tab == 'more') {
         return false
       }
@@ -2385,6 +2394,7 @@ export default {
           //   }
           // }
           if (index == 1) {
+            console.log(this.prescriptions)
 
             if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2464,6 +2474,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+                console.log("2o23o23o23o2o23",this.prescriptions[i].advices[b])
                 if(this.prescriptions[i].advices[b].day == NaN){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
                   this.$emit('editKeepLoad', false)
@@ -2537,6 +2548,8 @@ export default {
               'prescriptions': this.prescriptions
             }
             isLoading = true
+            console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
+            console.log('this.prescriptionsthis.prescriptions', params)
             let num = 0
             // this.prescriptions.map(item => {
             //   if (item.advices.length > 0) {
@@ -2555,6 +2568,7 @@ export default {
               var arr_one = []
               var arr_Two = []
 
+              console.log("ooo233323233232323232",this.prescriptions)
 
              //药品
               for(let i=0;i<this.prescriptions.length;i++){
@@ -3610,7 +3624,6 @@ export default {
               }
             }
 
-
             let obj = {
               id: good_info[i].id,
               project_name: good_info[i].good_name,
@@ -3635,10 +3648,8 @@ export default {
             }
             this.tabProject.push(obj)
           }
-
-
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
-          if(this.org_id == 10206) {
+          if(this.org_id == 10206 ) {
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
                 if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
@@ -3810,45 +3821,12 @@ export default {
     },
     clearSelection() {
       this.$refs.tabProjectTeam.clearSelection()
-    },getstock(){
-      if(this.org_id == 10206){
-        var that = this
-        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
-
-        })
-          .then(function(response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-              that.loadingtwo = false
-              return false
-            } else {
-              if (response.data.data.failed_code == -10) {
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
-
-                }).catch(() => {
-                })
-
-              } else {
-                that.zuobiao_project  = response.data.data.project
-              }
-            }
-          })
-          .catch(function(error) {
-          })
-      }
-
-
-    },
+    }
   }, mounted() {
     this.request_record_date = this.record_date
     // this.getInitData()
-    this.getstock()
     //获取所有项目
     this.getlist()
-
     //获取所以项目组套
     this.getAllProjectTeam()
 
@@ -3859,25 +3837,7 @@ export default {
 
   },
   watch: {
-    // tabProject:{//深度监听，可监听到对象、数组的变化
-    //   handler(val, oldVal) {
-    //     if(this.org_id == 10206 ) {
-    //       console.log("~~~~~~~")
-    //       console.log(this.zuobiao_project)
-    //       console.log(this.tabProject)
-    //       for (let i = 0; i < this.zuobiao_project.length; i++) {
-    //         for (let b = 0; b < this.tabProject.length; b++) {
-    //           if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
-    //             this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
-    //           }
-    //         }
-    //       }
-    //       console.log(this.tabProject)
-    //
-    //     }
-    //   },
-    //   deep: true
-    // },
+
     fullHeight(val) {
       if (!this.timer) {
         this.fullHeight = val