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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2898,6 +2898,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("切换数据", response.data.data.solution)
             this.$message.success('切换成功')
             if (response.data.data.solution != null) {
               for (const key in response.data.data.solution) {

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -378,16 +378,16 @@
 
       },
       getSingleDose(scope){
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
       getDay(scope){
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
       getProjectSingleDose(scope){
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
       },
       getProjectDay(scope){
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
       }
     },mounted(){
       this.getInitData()

src/xt_pages/outpatientCharges/summary.vue

@@ -100,7 +100,7 @@
                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919)  ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
@@ -247,8 +247,8 @@
         }
 
       },toRefund(row){
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
-          var that = this;
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+          var that = this
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -259,13 +259,13 @@
               'patient_id': row.patient_id,
               'record_time': that.getTimes(row.settle_accounts_date),
               'admin_user_id': that.$store.getters.xt_user.user.id,
-            };
+            }
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  that.$message.error(response.data.msg)
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
@@ -278,7 +278,7 @@
                     }).catch(() => {
                     })
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
                     that.getHisOrderList()
 
                   }
@@ -300,13 +300,13 @@
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date
 
-            };
+            }
             Refund(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
+                this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' });
+                this.$message({ message: '退费成功', type: 'success' })
                 this.getHisOrderList()
               }
             })
@@ -316,51 +316,51 @@
       },
       toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-          this.statementVisible9504 = true;
+          this.statementVisible9504 = true
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
             admin_user_id: this.$store.getters.xt_user.user.id
-          };
+          }
           this.orderObj9504 = obj
         } else {
-          this.statementVisible = true;
+          this.statementVisible = true
           let obj = {
             order_id: row.id
-          };
+          }
           this.orderObj = obj
         }
 
       },
       settlementPrint(row){
-        this.settlementVisible = true;
+        this.settlementVisible = true
         let obj = {
           order_id: row.id
-        };
+        }
         this.settlementObj = obj
       },
       export_detail() {
         let params = {
           start_time: this.start_time,
           end_time: this.end_time
-        };
+        }
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
 
-            let list = [];
+            let list = []
             for (let i = 0; i < response.data.data.order.length; i++) {
-              let order = response.data.data.order[i];
-              let number = '';
-              let name = '';
-              let department = '';
-              let doctor_name = '';
-              let balance_accounts = '';
+              let order = response.data.data.order[i]
+              let number = ''
+              let name = ''
+              let department = ''
+              let doctor_name = ''
+              let balance_accounts = ''
 
-              let order_status = '';
+              let order_status = ''
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
@@ -421,13 +421,13 @@
                 '收费日期': '',
                 '收费状态': order_status,
                 '退费日期': ''
-              };
+              }
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
-              const data = this.formatJson(filterVal, list);
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
+              const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
@@ -442,30 +442,30 @@
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
       changeDoctor() {
-        this.page = 1;
-        this.keywords = '';
+        this.page = 1
+        this.keywords = ''
         this.getHisOrderList()
       },
       handleSizeChange(limit) {
-        this.limit = limit;
+        this.limit = limit
         this.getHisOrderList()
 
       }, handleCurrentChange(page) {
-        this.page = page;
+        this.page = page
         this.getHisOrderList()
 
       },
       handleStartTimeChange() {
-        this.page = 1;
-        this.keywords = '';
+        this.page = 1
+        this.keywords = ''
         this.getHisOrderList()
       }, handleEndTimeChange() {
-        this.page = 1;
-        this.keywords = '';
+        this.page = 1
+        this.keywords = ''
         this.getHisOrderList()
       },
       searchAction() {
-        this.page = 1;
+        this.page = 1
         this.getHisOrderList()
 
       },
@@ -487,13 +487,13 @@
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id
-        };
+        }
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
-            this.tableData = response.data.data.order;
+            this.tableData = response.data.data.order
             this.total = response.data.data.total
           }
         })
@@ -501,7 +501,7 @@
       }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
             this.doctors = response.data.data.doctors
@@ -516,7 +516,7 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj);
+        console.log(obj)
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
@@ -524,15 +524,15 @@
           age:obj.age,
           gend:obj.gend,
           setl_time:obj.setl_time
-        };
-        this.invoiceParams = paramsObj;
+        }
+        this.invoiceParams = paramsObj
         this.invoiceVisible = true
       }
     }, created() {
 
 
-      this.fetchAllAdminUsers();
-      this.getDoctorList();
+      this.fetchAllAdminUsers()
+      this.getDoctorList()
       this.getHisOrderList()
 
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -24,7 +24,7 @@
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

src/xt_pages/user/dialysisRecord.vue

@@ -331,7 +331,7 @@
               <th>透后称重（kg）</th>
               <th>透前血压（mmhg）</th>
               <th>透后血压（mmhg）</th>
-              <th>超滤总量（L）</th>
+              <th>目标超滤量（L）</th>
               <th>血管通路</th>
               <th>抗凝剂种类 首剂/维持/总量</th>
               <th>透析器型号</th>
@@ -361,7 +361,7 @@
                   }}
                 </td>
                 <td>
-                  {{ item.predialysis_evaluation.ultrafiltration_amount }}
+                  {{ item.prescription.target_ultrafiltration }}
                 </td>
                 <td>{{ setVascularAccess(item.prescription) }}</td>
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>