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/dialysisPrintOrder.vue

       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
       //
       const style4 =
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:20px;height:20px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:23px;font-weight: 200;}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style5 =
         '@media print {.dialysis-print-order {width: 960px; margin: 0 auto;}.dialysis-print-order .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.dialysis-print-order .order-title {  margin: auto;  font-weight: 600;  text-align: center;  font-size: 22px;  padding: 10px 20px 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  font-size: 14px;}.dialysis-print-order .print-table-no {  width: 100%;  text-align: center;  border-collapse: collapse;  font-size: 14px;}.dialysis-print-order .under-line {  border-bottom: 1px solid #999;  width: 95%;  text-align: center;  margin-left: 2px;}.dialysis-print-order .title-box {  text-align: center;  font-size: 16px;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  display: inline-block;  line-height: 1;  position: relative;  vertical-align: middle;}.dialysis-print-order .radio-fang {  display: inline-block;  position: relative;  border: 1px solid #000;  box-sizing: border-box;  width: 14px;  height: 14px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 15px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
       const style6 =

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
         <div class="order-title">血液透析(滤过)记录表单</div>
-        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
           <tbody>
             <tr>
               <td width="80" style="line-height:30px;">治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日</td>
             </tr>
           </tbody>
         </table>
-        <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
           <tbody>
             <tr>
               <td colspan="3">
                   </div>
                   <div style="flex: 1;">
                     透析机号:
-                    {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+                    <!-- {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }} -->
                   </div>
                 </div>
               </td>
               <td colspan="3">
                 <div style="line-height:30px;">
                   上机前病情:
-                  <label-box :isChecked="predialysis.symptom_before_dialysis==''?true :false" showValue="无特殊"></label-box>&nbsp;
-                  <label-box :isChecked="predialysis.symptom_before_dialysis!=''?true :false" showValue="出现:"></label-box>
-                  <span>{{predialysis.symptom_before_dialysis}}</span>
+                  <label-box :isChecked="predialysis.symptom_before_dialysis!=''?true :false" showValue="无特殊"></label-box>&nbsp;
+                  <label-box :isChecked="predialysis.symptom_before_dialysis==''?true :false" showValue="出现:"></label-box>
+                  <!-- <span>{{predialysis.symptom_before_dialysis}}</span> -->
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
                 </div>
               </td>
 
           </tbody>
         </table>
-        <table border="1" class="table-box" style="border-collapse: collapse;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
           <tr>
             <td style="width: 20%; line-height: 30px;">透析机：
               {{predialysis.machine_type ? predialysis.machine_type : " "}}
           </tr>
         </table>
 
-        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
           <tbody>
             <tr>
               <td colspan="12" style="padding: 5px;">治疗过程记录</td>
             <tr v-for="(monitor, monindex) in monitors" :key="monindex">
               <td style="height: 30px;">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
               <td>{{
-                monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ""
+                monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/"
                 }}
               </td>
-              <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
-              <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}</td>
-              <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : ""}}</td>
-              <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</td>
-              <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "0" }}</td>
-              <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "0" }}</td>
+              <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</td>
+              <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</td>
+              <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/"}}</td>
+              <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "/" }}</td>
+              <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</td>
+              <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}</td>
               <td>{{
                   monitor.systolic_blood_pressure
                     ? monitor.systolic_blood_pressure
-                    : ""
+                    : "/"
                 }}/{{
                   monitor.diastolic_blood_pressure
                     ? monitor.diastolic_blood_pressure
-                    : ""
+                    : "/"
                 }}
               </td>
-              <td>{{monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "0"}}</td>
+              <td>{{monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "/"}}</td>
               <!-- <td></td> -->
               <td>
                 {{ monitor.end }} {{ monitor.symptom }} &nbsp;
           </tbody>
         </table>
         <div>
-          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
+          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
             <tbody>
               <tr>
                 <td style="width:12%;height:25px;">
             </tbody>
           </table>
         </div>
-        <div style="border: 1px solid black;">
+        <div style="border: 1px solid black;width: 99%;">
           <div>
             治疗小结
             <span class="under-line">&nbsp;{{ summary.dialysis_summary }}</span>
 
 <style>
 .dialysis-print-order {
-  width: 960px;
+  width: 950px;
   margin: 0 auto;
 }
 
 
 .dialysis-print-order .is-checked-radio::after {
   content: "√";
-  font-size: 15px;
+  font-size: 20px;
+  font-weight: 200;
 }
 
 .dialysis-print-order .print-table-no tr td {

src/xt_pages/outpatientCharges/components/chargeDialog.vue

       </el-form-item>
 
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10610">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10610 && this.$store.getters.xt_user.org.id != 10537">
 
         <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537">
 
         <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
-      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ">
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
         <el-input class="number_style" v-model="form.cash_pay" ></el-input>
       </el-form-item>
 
-      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537">
         <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ">
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537">
         <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
         <el-input class="number_style" v-model="form.ali_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
+      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
         <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 

src/xt_pages/user/inspection.vue

       </div>
     </el-dialog>
 
+    <!-- 上传图片弹窗 -->
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogPicFormVisible"
 
       }
     },
+    // 上传确认保存
     submitPicNew() {
       this.formLoading = true
       if (this.form.imgs.length == 0) {
               duration: 2000
             })
             this.itemDate = this.form.inspect_date
+            console.log('111111111',this.itemDate);
             this.items = []
             for (var index in this.projects) {
               if (this.projects[index].project_id == this.form.project_id) {
               }
               console.log("items23233232",item)
               if(this.org_id!=10503){
-                if(item.item_name!=""){
+                if(item.project_name!=""){
                  this.items.push(item)
                }
               }else{
                 this.items.push(item)
               }
-
-
-             
-
+              
+              console.log('fffff',this.items);
               if(item.value.indexOf("http") <0){
                 this.isPic = true
               }