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

src/xt_pages/data/prescription.vue

@@ -393,6 +393,24 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="8">
+                    <el-form-item label="血管通路部位：">
+                      <el-select
+                        v-model="addPlan.blood_access_part_id"
+                        placeholder="请选择"
+                      >
+                        <el-option :key="1" label="请选择" :value="0"></el-option>
+
+                        <el-option
+                          v-for="(option, index) in blood_access_part"
+                          :key="index"
+                          :label="option.name"
+                          :value="option.name"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="血管通路：">
                       <el-select
@@ -849,7 +867,8 @@ export default {
         ultrafiltration: "",
         blood_access: "",
         dialysis_dialyszers:"",
-        dialysis_irrigation:""
+        dialysis_irrigation:"",
+        blood_access_part_id:"",
       },
       system_prescription: [],
       isEdit: false,
@@ -880,6 +899,7 @@ export default {
       blood_access_option: [],
       dialysis_dialyszers:"",
       dialysis_irrigation:"",
+      blood_access_part:[],
     };
   },
   computed: {},
@@ -994,6 +1014,7 @@ export default {
         stockType:[],
         irrigations:[],
         dialyzers:[],
+        blood_access_part_id:"",
       };
 
       for (const key in tempAddPlan) {
@@ -1055,6 +1076,7 @@ export default {
           this.addPlan.dialysis_irrigation = prescription.dialysis_irrigation
           this.dialysis_dialyszers = prescription.dialysis_dialyszers
           this.dialysis_irrigation = prescription.dialysis_irrigation
+          this.addPlan.blood_access_part_id = prescription.blood_access_part_id
         }
       });
     },
@@ -1199,6 +1221,8 @@ export default {
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
     this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
     console.log("列表33333333血管通路",this.blood_access_option)
+
+    this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
     this.addPlan.mode = 1;
     this.dialyzerPerfusionApparatus = getDataConfig(
       'hemodialysis',

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -391,6 +391,12 @@
           <span v-if="this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29" class="unit">{{ displace_liqui != "0" ? "ml" : "" }}</span>
         </li>
 
+        <li v-if="isShow('血管通路部位')">
+          <label>血管通路部位: </label>
+          <span class="content">{{ this.prescription.blood_access_part_id }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>
           <span class="content">{{ blood_access }}</span>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10580){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -889,6 +889,13 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8">
+                      <el-form-item label="血管通路部位： " :prop="isName('血管通路部位')"
+                        :rules="isCheckmust('血管通路部位')" v-if="isShows('血管通路部位')">
+                        <el-input v-model="dialysisPrescription.blood_access_part_id" readonly @focus="showInnerDialog('17')"></el-input>
+                      </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('血管通路')">
                         <el-form-item label="血管通路：" prop="blood_access" :rules="isCheckmust('血管通路')">
                             <el-select
@@ -1735,6 +1742,7 @@
           chaptalization:"",
           warsh_count:"",
           washing_time:"",
+          blood_access_part_id:""
         },
 
         anticoagulant: {
@@ -1786,6 +1794,7 @@
         infoDialogVisible:false,
         selected_date:"",
         remark:"",
+        blood_access_part: [],
       }
 
     },
@@ -1882,6 +1891,14 @@ mu
             this.InnerDialogProps.type = 'dialysis_strainer'
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
             this.InnerDialogProps.isShowTextArea = false
+            break
+          case '17': // 水肿
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.dialysisPrescription.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
@@ -1963,6 +1980,9 @@ mu
           case 'dialysis_strainer':
             this.dialysisPrescription.dialysis_strainer = val.value.join(',')
             break
+          case 'blood_access_part_id':
+            this.dialysisPrescription.blood_access_part_id = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -2616,6 +2636,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10580){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10517){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
@@ -5047,12 +5075,15 @@ mu
       console.log("schedual232323323232323232",this.adminRoles)
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
       this.plasmaSeparatorList = getDataConfig('hemodialysis', 'plasma_separator')
 
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis', 'bilirubin_adsorption_column')
 
 
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
+
+     
       console.log("透析准备232323232323wo",this.educationList)
     }
   }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1165,8 +1165,8 @@
                         style="width: 600px; text-align: center"
                       >
                         {{
-                          predialysis.remark
-                            ? predialysis.remark
+                          prescription.remark
+                            ? prescription.remark
                             : "/"
                         }}
                       </div>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -14,8 +14,8 @@
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
-            <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen>
+            <printThree v-if="org_id == 10088 || org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <!-- <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen> -->
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -45,11 +45,13 @@
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>
     </div>
+
     <!-- <div class="app-container" v-if="org_id == 10567 ">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>
     </div> -->
+
     <!-- <div class="app-container" style="padding-top:30px;" v-if="org_id == 10188 || org_id == 0 ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
@@ -77,7 +79,7 @@
   import PrintEleven from './invoiceTemplate/printEleven'
   import printtwelve from './invoiceTemplate/printtwelve'
   import printthirteen from './invoiceTemplate/printthirteen'
-  // import printfourteen from './invoiceTemplate/printfourteen'
+  import printfourteen from './invoiceTemplate/printfourteen'
   import printfifteen from './invoiceTemplate/printfifteen'
   export default {
     name: "invoicePrint",
@@ -95,6 +97,7 @@
       PrintTen,
       printtwelve,
       printthirteen,
+      printfourteen,
       printfifteen
     },
     props:{

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,11 +354,18 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                    <span v-if="org_id!=0 && org_id!=0">
+                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
                     </span>
+                    </span>
+
+                    <span v-if="org_id==0 || org_id ==10480">
+                      {{(item.count * item.price).toFixed(2)}}
+                    </span>
+                  
 
                   </td>
                </tr>

src/xt_pages/user/dialysisSolution.vue

@@ -645,6 +645,25 @@
             </el-form-item>
           </el-col>
 
+         
+          
+          <el-col :span="8" v-if="isShows('血管通路部位')">
+            <el-form-item label="血管通路部位：">
+              <el-select v-model="addPlan.blood_access_part_id" placeholder="请选择">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option
+                  v-for="(option, index) in blood_access_part"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+
           <el-col :span="8" v-if="isShows('血管通路')">
             <el-form-item label="血管通路：">
               <el-select v-model="addPlan.blood_access" placeholder="请选择">
@@ -1085,6 +1104,7 @@
           amylaceum:"",
           dialysis_strainer:"",
           chaptalization:"",
+          blood_access_part_id:"",
         },
         childPlan: {
           mode: '',
@@ -1231,6 +1251,7 @@
         limitOne:10,
         startShow:false,
         solutionDetail:{},
+        blood_access_part:[],
       }
     },
     watch: {
@@ -1376,6 +1397,15 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+            case '17': // 水肿
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.addPlan.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1403,6 +1433,11 @@
           case 'dialysis_strainer':
              this.dialysis_strainer = val.value.join(',')
             break
+          case 'blood_access_part_id':
+            this.addPlan.blood_access_part_id = val.value.join(',')
+
+          console.log("数据2o",this.addPlan.blood_access_part_id)
+           break
         }
       },
       innerDialogCancle: function() {
@@ -2626,8 +2661,11 @@
       )
       this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
+     
       this.queryParams.id = this.patientID
 
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
+
 
     }
   }