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

src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue

@@ -999,13 +999,32 @@ export default {
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records, "this.records");
+          
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
           //   o.assessment_before_dislysis.blood_access_part_opera_id)
           // })
-
+          // const advice = []
+          if(this.records.length>0){
+            console.log(this.records, "this.records");
+            for(let x in this.records){
+              
+              if(this.records[x].his_advices.length>0){
+                console.log(this.records, "this.records");
+                const arr = this.records[x].his_advices
+                for(let i in arr ){
+                  if(arr[i].delivery_way == '口服' || 
+                    arr[i].delivery_way == '中药口服' ||
+                    arr[i].delivery_way == '舌下含服'
+                  ){
+                    arr.splice(i,1)
+                  }
+                }
+              }
+              // this.records[x].his_advices =advice
+            }
+          }
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1162,7 +1162,16 @@ export default {
           this.assessmentafter = response.data.data.assessmentAfterDislysis
           console.log('上次透后体重', this.assessmentafter)
           var doctorAdevieInfo = response.data.data.advices
-          var tableAdvice = doctorAdevieInfo
+          console.log('var tableAdvice',tableAdvice);
+          var tableAdvice = []
+          for(let i in doctorAdevieInfo){
+            if(doctorAdevieInfo[i].delivery_way != '口服' && 
+            doctorAdevieInfo[i].delivery_way != '中药口服' &&
+            doctorAdevieInfo[i].delivery_way != '舌下含服'){
+              tableAdvice.push(doctorAdevieInfo[i]) 
+            }
+          }
+          
           if (tableAdvice.length === 0) {
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -209,7 +209,7 @@
               红冲
             </el-button>
             <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
-                       @click="yulan(scope.row)">
+                       @click="bwyulan(scope.row)">
               下载
             </el-button>
 <!--            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"-->
@@ -916,6 +916,37 @@ export default {
       // this.pdfSrc = row.result.pdf_url
       // console.log(this.pdfSrc)
 
+
+
+    },bwyulan(row){
+      var  id = row.result.id
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/download',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            // that.getHisOrderList()
+          }
+        }
+      }).catch(function(error) {
+
+      })
+
     },hongchong(row){
       var  id = row.result.id