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/template/DialysisPrintOrderSeventynine.vue

@@ -36,7 +36,7 @@
                     {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
                   <div style="flex: 1;">
-                    透析次数：  {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
+                    透析次数：  {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ?
                                 patientInfo.total_dialysis + patientInfo.user_sys_before_count : "/" }}
                   </div>
                 </div>
@@ -62,7 +62,7 @@
                   {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
                   mmHg
                 </div>
-                
+
               </td>
             </tr>
 
@@ -133,7 +133,7 @@
                   <div style="flex: 1;">
                     体重增加量:{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg
                   </div>
-                 
+
                 </div>
               </td>
             </tr>
@@ -200,9 +200,9 @@
             </td>
             <td style="">
               透析液:钾:
-              <span style="">2.0</span>mmol/L&nbsp; 
+              <span style="">2.0</span>mmol/L&nbsp;
               钙:
-              <span style="">1.5</span>mmol/L&nbsp; 
+              <span style="">1.5</span>mmol/L&nbsp;
               碳酸氢盐:
               <span >32</span>mmol/L&nbsp;
               钠:
@@ -215,7 +215,7 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-          
+
                 {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/' }}
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
               </div>&nbsp;&nbsp;
@@ -289,7 +289,7 @@
                   <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
                 </span>
               </td>
-              
+
               <td>
                 {{ monitor.end }} {{ monitor.symptom }} &nbsp;
                 {{monitor.dispose}} &nbsp;{{ monitor.result }}
@@ -796,7 +796,7 @@ export default {
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
           console.log("上次透后体重", this.assessmentafter);
           // var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
-          
+
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;
           console.log("透后评估", this.afterdialysis);
           this.operators = response.data.data.operators;
@@ -997,7 +997,7 @@ export default {
 
           this.advices = response.data.data.advices;
 
-          
+
           this.monitors = response.data.data.monitors;
           console.log("透析监测", this.monitors);
           this.summary = response.data.data.summary;
@@ -1174,10 +1174,11 @@ export default {
             }
           }
           console.log(this.advice_groups);
-          
+
           var advices = response.data.data.advices;
-         
+          var projects = response.data.data.projects
           var newDocArr= []
+          var projectarr = []
           for(let i=0;i<advices.length;i++){
             console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
             console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
@@ -1185,17 +1186,48 @@ export default {
               newDocArr.push(advices[i])
            }
           }
-          console.log("newDocArr----------------------",newDocArr)
-        
+          for(let i in projects){
+            if(projects[i].type ==2){
+              projectarr.push(projects[i])
+            }
+          }
+
+          console.log("newDocArr----------------------",projectarr)
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
-        
-         
-       
           var tableAdvice = newDocArr.concat(doctorAdevieInfo);
-        
+          if(projectarr.length>0){
+            for(let i in projectarr){
+              if(projectarr[i].team!= "undefined" && projectarr[i].team.id >0){
+                  projectarr[i].project_team = projectarr[i].team.project_team
+                  projectarr[i].project_team_id = projectarr[i].team.id
+                  projectarr[i].start_time = projectarr[i].start_time
+                  projectarr[i].single_dose = projectarr[i].single_dose
+                  projectarr[i].single_dose_unit = projectarr[i].unit
+                  projectarr[i].execution_time = projectarr[i].execution_time
+                  projectarr[i].execution_staff= projectarr[i].execution_staff
+                  projectarr[i].advice_name =  projectarr[i].team.project_team
+                  projectarr[i].advice_doctor = projectarr[i].doctor
+
+                  tableAdvice.push(projectarr[i])
+                  // this.doctor_advices.push(projectarr[i])
+                  // this.doctor_advices_2.push(this.project[i])
+                }else{
+                  projectarr[i].project_team = projectarr[i].project.project_name
+                  projectarr[i].advice_name = projectarr[i].project.project_name
+                  projectarr[i].start_time = projectarr[i].start_time
+                  projectarr[i].single_dose = projectarr[i].single_dose
+                  projectarr[i].single_dose_unit = projectarr[i].unit
+                  projectarr[i].execution_time = projectarr[i].execution_time
+                  projectarr[i].execution_staff= projectarr[i].execution_staff
+                  projectarr[i].advice_doctor = projectarr[i].doctor
+                  tableAdvice.push(projectarr[i])
+                  // this.doctor_advices.push(projectarr[i])
+                  // this.doctor_advices_2.push(this.projects[i])
+                }
+            }
+          }
           console.log('response.data.data', response.data.data)
           if (tableAdvice.length === 0) {
-            console.log('1111111',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1216,7 +1248,7 @@ export default {
             return this.tableAdvice
           }
           if (tableAdvice.length === 1) {
-            console.log('2222222',tableAdvice.length);
+
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1235,7 +1267,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 2) {
-            console.log('333333',tableAdvice.length);
+
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1252,7 +1284,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 3) {
-            console.log('444444',tableAdvice.length);
+
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             // var obj2 = { advice_name: "", start_time: "" };
@@ -1267,7 +1299,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 4) {
-            console.log('5555555',tableAdvice.length);
+
             var obj = { advice_name: "", start_time: "" };
             // var obj1 = { advice_name: "", start_time: "" };
             // var obj2 = { advice_name: "", start_time: "" };
@@ -1280,33 +1312,16 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 5) {
-            console.log('6666666',tableAdvice.length);
-            // var obj = { advice_name: "", start_time: "" };
-            // var obj1 = { advice_name: "", start_time: "" };
-            // var obj2 = { advice_name: "", start_time: "" };
 
-            // tableAdvice.push(obj);
-            // tableAdvice.push(obj1);
-            // tableAdvice.push(obj2);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
           }
-          // if (tableAdvice.length === 6) {
-          //   console.log('6666666',tableAdvice.length);
-          //   var obj = { advice_name: "", start_time: "" };
-          //   tableAdvice.push(obj);
-
-          //   this.tableAdvice = tableAdvice;
-          //   // return this.tableAdvice
-          // }
-
           if (tableAdvice.length >5) {
-            console.log('777777',tableAdvice);
             this.tableAdvice = tableAdvice;
 
           }
-          console.log('医嘱',this.tableAdvice.length);
+          console.log('医嘱',this.tableAdvice);
         } else {
           this.loading = false;
           this.$message.error("请求数据失败");

src/xt_pages/fapiao/settleDetail.vue

@@ -11,9 +11,15 @@
           margin-bottom: 10px;
         ">
         <div>
+          <el-button size="small" type="primary"
+                     @click="login">登录
+          </el-button>
           <el-button size="small" type="primary"
                      @click="query">查询
           </el-button>
+          <el-button size="small" type="primary"
+                     @click="login">短信登录税局
+          </el-button>
           <el-button size="small" type="primary"
                      @click="auth">认证
           </el-button>
@@ -180,7 +186,53 @@
       </el-pagination>
     </div>
 
-
+    <el-dialog
+      title="登录"
+      :visible.sync="login_dialogVisible"
+      width="40%"
+    >
+      <div>
+        <el-form :rules="rules" :label-position="labelPosition" label-width="100px" :model="formLabelAlign">
+          <el-form-item label="税局账号">
+            <el-input v-model="formLabelAlign.name"></el-input>
+          </el-form-item>
+          <el-form-item label="税局密码">
+            <el-input v-model="formLabelAlign.region"></el-input>
+          </el-form-item>
+          <el-form-item label="手机号码">
+            <el-input v-model="formLabelAlign.type"></el-input>
+          </el-form-item>
+          <el-form-item label="短信验证码" prop="verify">
+            <div style="display: inline-block;width: 50%;">
+              <el-input v-model="formLabelAlign.verify"></el-input>
+            </div>
+            <div style="display: inline-block;">
+              <el-button :disabled="countdown > 0" @click="verify_click">{{countdown > 0?countdown:'获取短信验证码'}}</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="login_dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="login_dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 二维码 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="qr_dialogVisible"
+      width="30%"
+      center
+    >
+      <div style="margin: auto;width: 120px;">
+        <div class="qrcode" ref="qrCodeUrl"></div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="qr_dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="qr_dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -203,7 +255,7 @@ import {
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
-
+import QRCode from 'qrcodejs2'
 const moment = require('moment')
 export default {
   name: 'OutpatientChargesSummary',
@@ -266,6 +318,21 @@ export default {
       settlementVisible: false,
       settlementObj: {},
       accounts_click_vi:false,
+
+      login_dialogVisible:false,
+      qr_dialogVisible:false,
+      formLabelAlign: {
+        name: '',
+        region: '',
+        type: '',
+        verify:'',
+      },
+      rules:{
+        verify:[{ required: true, message: '请输入活动名称', trigger: 'blur' },]
+      },
+      time:null,
+      countdown: 0,
+
     }
   },
 
@@ -278,7 +345,32 @@ export default {
   },
 
   methods: {
+    login(){
+      this.login_dialogVisible = true
+    },
+    verify_click(){
+      this.countdown = 60
+      this.time = setInterval(() => {
+        if (this.countdown > 0) {
+          this.countdown--
+        } else {
+          clearInterval(this.time)
+        }
+      }, 1000)
+    },
     auth(){
+        this.qr_dialogVisible =true
+        this.$nextTick(() =>{
+          var qrcode = new QRCode(this.$refs.qrCodeUrl, {
+            text: 'https://blog.csdn.net/weixin_42601136', // 需要转换为二维码的内容
+            width: 120,
+            height: 120,
+            
+            colorDark: '#000000',
+            colorLight: '#ffffff',
+            correctLevel: QRCode.CorrectLevel.H
+          })
+        })
 
     },
     query(){
@@ -578,6 +670,15 @@ export default {
 
 
     }
+  },
+  watch:{
+    countdown(news,old){
+      if(this.countdown ==0){
+        clearInterval(this.time)
+      }
+      
+    }
+
   }
 }
 </script>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -770,6 +770,7 @@
                         that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                         that.form.phone = patient.phone
                         that.form.id_card = patient.id_card_no
+                        that.form.social_type = parseInt(response.data.data.insutype)
 
                       } else {
                         that.form.id = patient.id

src/xt_pages/outpatientTool/components/settle.vue

@@ -83,6 +83,12 @@
               </template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="病种名称">
+          <template slot-scope="scope">
+            {{scope.row.sick_name}}
+          </template>
+        </el-table-column>
+
           <el-table-column align="center" prop="item_name" label="结算类型">
               <template slot-scope="scope">
                   <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
@@ -245,6 +251,13 @@
         </template>
       </el-table-column>
 
+
+      <el-table-column align="center" prop="item_name" label="病种名称">
+        <template slot-scope="scope">
+          {{scope.row.sick_name}}
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="item_name" label="结算类型">
         <template slot-scope="scope">
           <div v-if="scope.row.is_medicine_insurance == 0">自费</div>