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

src/api/drug/drug.js

@@ -775,11 +775,38 @@ export function getSelfDrugBatchNumber(params){
   })
 }
 
-export function postSelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id, warehouse_out_id){
+export function postSelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, patient_id, warehouse_out_id){
 
    return request({
-    url:"/api/drug/postsetfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehouse_out_id=' + warehouse_out_id,
+    url:"/api/drug/postsetfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&patient_id=' + patient_id + '&warehouse_out_id=' + warehouse_out_id,
     method:"post",
-    params:params,
+    data:params,
    })
+}
+
+export function getAllSelfDrugWarehouseOutList(params){
+ 
+  return request({
+    url:"/api/drug/getallselfdrugwarehouseoutlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function deleteSelfWarehouseOut(id,params){
+
+  return request({
+    url:"/api/drug/deleteselfwarehouseout?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function getSelfDrugWarehouseOutById(id,params){
+  
+  return request({
+    url:"/api/drug/getselfdrugwarehouseoutbyid?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/lang/en.js

@@ -128,6 +128,7 @@ export default {
     dialysis_batch_print: 'Batch Print Order',
     user_detail: 'user_detail',
     objectRegistration:'objectRegistration',
+    Dialysisanalysis:'Dialysisanalysis',
   },
   navbar: {
     logOut: 'Log Out',

src/router/modules/Dialysisanalysis.js

@@ -9,7 +9,8 @@ export default {
   name: 'Dialysisanalysis',
   alwaysShow: true,
   meta: {
-    title: '专业质控',
+    // title: '专业质控',
+    title:'Dialysisanalysis',
     icon: 'statistics'
   },
   children: [
@@ -25,7 +26,7 @@ export default {
     {//新专业质控
       path: '/Dialysisanalysis/qualitycontrol/new_otherIndicators',
       component: () => import('@/xt_pages/Dialysisanalysis/new_otherIndicators/index'),
-      name: 'otherIndicators',
+      name: 'new_otherIndicators',
       meta: {
         title: '透析分析',
         noCache: true

src/router/modules/selfPreparedMedicine.js

@@ -50,6 +50,14 @@ export default {
       hidden: true,
       is_menu: false,
     },
+    {
+      path: '/stock/selfwarehouse/out/edit',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/editWarehouseOut'),
+      name: 'SelfeditWarehouseOut',
+      meta: { title: '自备药编辑出库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

src/utils/tools.js

@@ -21,15 +21,15 @@ export function jsGetAge(strBirthday, splitstr) {
   // debugger
   var returnAge
   var strBirthdayArr = strBirthday.split(splitstr)
- 
+
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
- 
+
   console.log("birthYear",birthYear)
   console.log("birthMonth",birthMonth)
   console.log("birthDay",birthDay)
-  
+
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
@@ -38,7 +38,7 @@ export function jsGetAge(strBirthday, splitstr) {
   console.log("nowYear",nowYear)
   console.log("nowMonth",nowMonth)
   console.log("nowDay",nowDay)
-  
+
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
   } else {
@@ -69,7 +69,7 @@ export function jsGetAge(strBirthday, splitstr) {
 
 
 export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
- 
+
   // debugger
   var returnAge
   var strBirthdayArr = strBirthday.split(splitstr)
@@ -81,15 +81,15 @@ export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
   // var anowYear = d.getFullYear()
   // var anowMonth = d.getMonth() + 1
   // var anowDay = d.getDate()
-  
+
   // console.log("anowYear",anowYear)
   // console.log("anowMonth",anowMonth)
   // console.log("anowDay",anowDay)
-  
+
   console.log("brityYear666",strBirthdayArr[0])
   console.log("birthMonth5656",strBirthdayArr[1])
   console.log("birthDay5656",strBirthdayArr[2])
-  
+
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
   } else {
@@ -268,3 +268,95 @@ export function formatDate(date, format) {
 function padLeftZero(str) {
   return ('00' + str).substr(str.length)
 }
+
+// 数字金额转大写
+export const numToCny=(money)=>{
+	// 汉字的数字
+	var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆',
+	    '柒', '捌', '玖');
+	// 基本单位
+	var cnIntRadice = new Array('', '拾', '佰', '仟');
+	// 对应整数部分扩展单位
+	var cnIntUnits = new Array('', '万', '亿', '兆');
+	// 对应小数部分单位
+	var cnDecUnits = new Array('角', '分', '毫', '厘');
+	// 整数金额时后面跟的字符
+	var cnInteger = '整';
+	// 整型完以后的单位
+	var cnIntLast = '元';
+	// 最大处理的数字
+	var maxNum = 999999999999999.9999;
+	// 金额整数部分
+	var integerNum;
+	// 金额小数部分
+	var decimalNum;
+	// 输出的中文金额字符串
+	var chineseStr = '';
+	// 分离金额后用的数组，预定义
+	var parts;
+	if (money == '') {
+	    return '';
+	}
+	money = parseFloat(money);
+	if (money >= maxNum) {
+	    // 超出最大处理数字
+	    return '';
+	}
+	if (money == 0) {
+	    chineseStr = cnNums[0] + cnIntLast + cnInteger;
+	    return chineseStr;
+	}
+	// 转换为字符串
+	money = money.toString();
+	if (money.indexOf('.') == -1) {
+	    integerNum = money;
+	    decimalNum = '';
+	} else {
+	    parts = money.split('.');
+	    integerNum = parts[0];
+	    decimalNum = parts[1].substr(0, 4);
+	}
+	// 获取整型部分转换
+	if (parseInt(integerNum, 10) > 0) {
+	    var zeroCount = 0;
+	    var IntLen = integerNum.length;
+	    for (var i = 0; i < IntLen; i++) {
+	        var n = integerNum.substr(i, 1);
+	        var p = IntLen - i - 1;
+	        var q = p / 4;
+	        var m = p % 4;
+	        if (n == '0') {
+	            zeroCount++;
+	        } else {
+	            if (zeroCount > 0) {
+	                chineseStr += cnNums[0];
+	            }
+	            // 归零
+	            zeroCount = 0;
+	            chineseStr += cnNums[parseInt(n)]
+	                + cnIntRadice[m];
+	        }
+	        if (m == 0 && zeroCount < 4) {
+	            chineseStr += cnIntUnits[q];
+	        }
+	    }
+	    chineseStr += cnIntLast;
+	}
+	// 小数部分
+	if (decimalNum != '') {
+	    var decLen = decimalNum.length;
+	    for (var i = 0; i < decLen; i++) {
+	        var n = decimalNum.substr(i, 1);
+	        if (n != '0') {
+	            chineseStr += cnNums[Number(n)] + cnDecUnits[i];
+	        }
+	    }
+	}
+	if (chineseStr == '') {
+	    chineseStr += cnNums[0] + cnIntLast + cnInteger;
+	} else if (decimalNum == '') {
+	    chineseStr += cnInteger;
+	}
+	return chineseStr;
+}
+

src/xt_pages/dialysis/batch_print/batch_print_order_Seventysix.vue

@@ -1327,7 +1327,7 @@
                           <td width="50">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
-                          <td width="50">超滤量<br />(L)</td>
+                          <td width="50">超滤量<br />(ml)</td>
 
                           <td width="200">病情变化及处理</td>
                         </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -73,10 +73,17 @@
                 class="under_line"
                 style="width: 70px; text-align: center"
               >
-                {{
+                <!-- {{
                    record.patient.total_dialysis + record.patient.user_sys_before_count
                     ? record.patient.total_dialysis + record.patient.user_sys_before_count : "/"
-                }}
+                }} -->
+              {{
+                          record.Count +
+                          record.patient.user_sys_before_count
+                            ?  record.Count +
+                              record.patient.user_sys_before_count
+                            : "/"
+                 }}
               </div>
             </div>
           </div>
@@ -114,14 +121,9 @@
                           .blood_access_part_id
                       : 0
                   }}
-                  {{
-                    record.assessment_before_dislysis &&
-                    record.assessment_before_dislysis
-                      .blood_access_part_opera_name
-                      ? record.assessment_before_dislysis
-                          .blood_access_part_opera_name
-                      : ""
-                  }}
+                  {{ bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id) }}
+                  <!-- {{ blood_access_part_opera_name }} bloodAccessParOperaName-->
+                  
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >
@@ -467,8 +469,11 @@
                   </span>
                   <span v-else>/</span>
                 </div>
-                <span v-if="record.prescription.anticoagulant ==0"> </span>
-                <span v-else>{{ getshouji(record.prescription.anticoagulant) }}</span>
+                <span v-if="record.prescription.anticoagulant == 17">
+                  {{ getshouji(record.prescription.anticoagulant) }}
+                </span>
+                <!-- <span v-if="record.prescription.anticoagulant == 0"></span>
+                <span v-else>{{ getshouji(record.prescription.anticoagulant) }}</span> -->
               </div>
               <div class="inline_block" style="flex: 1;">
                 追加:
@@ -481,8 +486,11 @@
                   </span>
                   <span v-else>/</span>
                 </div>
-                <span v-if="record.prescription.anticoagulant ==0"> </span>
-                <span v-else>{{ getweichi(record.prescription.anticoagulant) }}</span>
+                <span v-if=" record.prescription.anticoagulant == 17">
+                  {{ getshouji(record.prescription.anticoagulant) }}
+                </span>
+                <!-- <span v-if="record.prescription.anticoagulant ==0"> </span>
+                <span v-else>{{ getweichi(record.prescription.anticoagulant) }}</span> -->
               </div>
               <div class="inline_block" style="flex: 1">
                 透前体重：
@@ -597,14 +605,13 @@
                   style="width: 100px; text-align: center"
                 > 
                   <span style="display: inline-block;height: 30px;"></span>
-                  <span v-if="setAdminUserES(record.prescription.creater) == ''">
-                    {{ getAdminUser(record.prescription.creater)}}
+                  <span v-if="setAdminUserES(record.prescription,'creater') == ''">
+                    {{ getAdminUser(record.prescription,'creater')}}
                   </span>
                   <span style="display: inline-block;" v-else>
-                    <img style="height:30px;" :src="setAdminUserES(record.prescription.creater)" alt srcset />
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
                   </span>
                 </div>
-
               </div>
             </div>
             <!-- 特殊医嘱 -->
@@ -815,7 +822,7 @@
                   <td width="50">UFR<br/>ml/h</td>
                   <td width="50">UF<br/>ml</td>
                   <td width="65">剩余肝素<br/>ml</td>
-                  <td width="65" v-if="record.prescription.mode_id == 2">置换液量<br/>L</td>
+                  <td width="65" v-if="record.prescription.mode_id == 2">置换量<br/>L</td>
                   <td width="200">病情变化</td>
                 </tr>
                 <tr v-for="(monitor_record, j) in record.monitor_records" :key="j" >
@@ -879,7 +886,7 @@
 
                   </td>
                   <td width="65" v-if="record.prescription.mode_id == 2">
-                    {{monitor_record.displacement_quantity ? monitor_record.displacement_quantity : '/'}}
+                    {{monitor_record.displacement_quantity_one ? monitor_record.displacement_quantity_one : '/'}}
                   </td>
                   <td width="200">
                     <template
@@ -937,7 +944,7 @@
                   alt=""
                   srcset=""
                   v-else
-                  style="height: 40px"
+                  style="height: 30px"
                 />
                 </div>
               </div>
@@ -956,7 +963,7 @@
                   :src="
                     setAdminUserES(
                       record.dialysis_order,
-                      'quality_nurse_id'
+                      'start_nurse'
                     )
                   "
                   alt=""
@@ -1182,7 +1189,7 @@
           </div>
           <!-- 透析小结 -->
           <div  style="width: 99%;border: 1px solid black;white-space: normal;padding:5px ;">
-            <div style="width: 100%;">
+            <div style="width: 100%;margin-bottom: 6px;">
               <div style="margin-bottom: 10px;">
                 宣教知识：
                 <span style="white-space: normal;border-bottom: 1px solid black;">
@@ -1405,15 +1412,19 @@ export default {
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
-              this.records[i].monitor_records[j].end = "【结束透析】";
-              tempmonitorflag = false;
-            }
-            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
-              this.records[i].monitor_records[j].end = "【结束透析】";
-             }
-             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
-             }
+                console.log('1111111',this.records[i].dialysis_order.end_time);
+                
+                this.records[i].monitor_records[j].end = "【结束透析】";
+                tempmonitorflag = false;
+              }
+              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+                console.log('222222',j,this.records[i].monitor_records.length - 1);
+                this.records[i].monitor_records[j].end = "【结束透析】";
+              }
+              // if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
+              //   console.log('33333',this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end);
+              //   this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+              // }
             }
           }
           for (const recordIndex in this.records) {
@@ -1634,7 +1645,7 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records, "hhh");
+      console.log(this.records, "hhh");
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -23,7 +23,7 @@
             <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;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td width="80" style="line-height:30px;">治疗日期:
@@ -32,7 +32,7 @@
                   </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: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td colspan="3">
@@ -142,7 +142,7 @@
                 </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: 100%;font-size: 16px;">
                 <tr>
                   <td style="width: 20%; line-height: 30px;">透析机：
                     {{record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : " "}}
@@ -198,7 +198,7 @@
                 </tr>
               </table>
 
-              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td colspan="12" style="padding: 5px;">治疗过程记录</td>
@@ -255,7 +255,7 @@
                 </tbody>
               </table>
               <div>
-                <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
+                <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                   <tbody>
                     <tr>
                       <td style="width:12%;height:25px;">
@@ -323,17 +323,17 @@
                       <td v-if="advice_index === 1">{{(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(1) }}kg</td>
                       <td v-if="advice_index === 2">干体重(DW):</td>
                       <td v-if="advice_index === 2">{{record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "0"}}kg</td>
-                      <td v-if="advice_index === 3">较干体重增加量:</td>
+                      <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
                       <td v-if="advice_index === 3">
                         {{(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.dry_weight -
                               record.assessment_before_dislysis.additional_weight).toFixed(2)}}kg
                       </td>
                       <td v-if="advice_index === 4">净脱水量:</td>
-                      <td v-if="advice_index === 4">{{record.assessment_after_dislysis.actual_ultrafiltration}}L</td>
-                      <td v-if="advice_index === 5">透后体重:</td>
-                      <td v-if="advice_index === 5">{{record.assessment_after_dislysis.weight_after}}kg</td>
-                      <td v-if="advice_index === 6">本次透析体重下降量:</td>
-                      <td v-if="advice_index === 6">
+                      <td v-if="advice_index === 4">{{record.assessment_after_dislysis.actual_ultrafiltration}}L</td> -->
+                      <td v-if="advice_index === 3">透后体重:</td>
+                      <td v-if="advice_index === 3">{{record.assessment_after_dislysis.weight_after}}kg</td>
+                      <td v-if="advice_index === 4">本次透析体重下降量:</td>
+                      <td v-if="advice_index === 4">
                         {{record.assessment_after_dislysis.weight_after == 0 || record.assessment_before_dislysis.weight_before == 0 ?
                         0 : ( record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after ).toFixed(2)
                       }}kg</td>
@@ -341,7 +341,7 @@
                   </tbody>
                 </table>
               </div>
-              <div style="border: 1px solid black;width: 100%;">
+              <div style="border: 1px solid black;width: 100%;font-size: 16px;">
                 <div>
                   治疗小结
                   <span class="under-line">&nbsp;
@@ -569,9 +569,9 @@
 
               if (
                 this.records[recordIndex].advices &&
-                this.records[recordIndex].advices.length < 13
+                this.records[recordIndex].advices.length < 10
               ) {
-                delghTwo = 13 - this.records[recordIndex].advices.length
+                delghTwo = 10 - this.records[recordIndex].advices.length
               } else {
                 delghTwo = 0
               }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -190,13 +190,20 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                             record.patient.total_dialysis +
                             record.patient.user_sys_before_count
                               ? record.patient.total_dialysis +
                                 record.patient.user_sys_before_count
                               : "/"
-                          }}
+                          }} -->
+                          {{
+                              record.Count +
+                              record.patient.user_sys_before_count
+                                ?  record.Count +
+                                  record.patient.user_sys_before_count
+                                : "/"
+                            }}
                         </div>
 
                         <div
@@ -1481,29 +1488,33 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="margin-left: 20px">
+                    
+                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                       <div class="inline_block">
                         上机时间：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
-                            record.dialysis_order &&
-                            record.dialysis_order.device_number &&
-                            record.dialysis_order.device_number.number.length >
-                              0
-                              ? record.dialysis_order.device_number.number
-                              : record.device_number.number
-                          }}
+                          {{getTime(record.dialysis_order.start_time, "{h}:{i}")}}
                         </div>
                       </div>
 
-                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                      <div class="inline_block" v-if="org_id == 0|| org_id ==10598" style="margin-left: 20px">
                         在线Kt/V监测：
                         <div class="under_line" style="width: 30px; text-align: center">
                            <check-box :checked="true"></check-box>
                          </div>
                       </div>
+
+                     </div>
+
+                      <!-- <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                        在线Kt/V监测：
+                        <div class="under_line" style="width: 30px; text-align: center">
+                           <check-box :checked="true"></check-box>
+                         </div>
+                      </div> -->
                       <div
                         class="row"
                         style="padding: 2px 0; line-height: 23px; display: flex"
@@ -1613,8 +1624,7 @@
                           <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
-                          <td width="60" v-if="org_id != 9836 && org_id!=10644">
-                            透析液温度(°C)
+                          <td width="60" v-if="org_id != 9836 && org_id!=10644">透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td
@@ -1655,8 +1665,8 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683  && org_id!=0">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1730,12 +1740,14 @@
                                 : ""
                             }}
                           </td>
+                          
                           <td>
                             {{
                               monitor_record.pulse_frequency
                                 ? monitor_record.pulse_frequency
                                 : ""
                             }}
+
                           </td>
                           <td v-if="org_id!=10489">
                             {{
@@ -1744,20 +1756,14 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id != 10600 && org_id != 10683">
+                          <td v-if="org_id != 10600">
                             {{
                               monitor_record.blood_flow_volume
                                 ? monitor_record.blood_flow_volume
                                 : ""
                             }}
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683"><br />
-                            {{
-                              monitor_record.ultrafiltration_rate
-                                ? monitor_record.ultrafiltration_rate
-                                : ""
-                            }}
-                          </td>
+                         
                           <td v-if="org_id == 10478 || org_id ==10510">
                             {{
                               monitor_record.arterial_pressure
@@ -1783,6 +1789,7 @@
                             </span>
 
                           </td>
+                        
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
@@ -1813,7 +1820,8 @@
                               org_id != 9675 &&
                               org_id!=10490 &&
                               org_id!=10600 &&
-                              org_id!=10644
+                              org_id!=10644 
+                             
                             "
                           >
                             {{
@@ -1869,7 +1877,7 @@
                           <td width="50" v-if="org_id == 10375"><br />
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
-                          <td>
+                          <td v-if="org_id!=10683&& org_id!=0">
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
                               monitor_record.ultrafiltration_volume
@@ -1884,8 +1892,18 @@
                                 : ""
                             }}
                             </span>
+                            
                           </td>
 
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0"><br />
+                                   
+                                    {{
+                                      monitor_record.ultrafiltration_rate
+                                        ? monitor_record.ultrafiltration_rate
+                                        : ""
+                                    }}
+                              </td>
+
                           <td
                             v-if="
                               (record.prescription.mode_id == 2 ||
@@ -3250,38 +3268,11 @@
                           }}
                         </div>
                       </div>
-
-
-                    </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      备注：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
-                      </div>
                     </div>
-                  </div>
 
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 0 || org_id ==10375"
                     >
                       <div
                         class="inline_block"
@@ -3309,6 +3300,33 @@
 
 
                     </div>
+                    
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      备注：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
+                      </div>
+                    </div>
+                  </div>
+
+                   
                   </td>
                 </tr>
                 <tr>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -30,7 +30,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -1270,6 +1270,13 @@ export default {
              ParamsQuery.weight_loss = (this.predialysis_evaluation.weight_before - this.form.weight_after).toFixed(1)
           }
 
+          if(ParamsQuery.additional_weight == 0){
+            if(this.additional_weight!=null){
+              ParamsQuery.additional_weight = this.predialysis_evaluation.additional_weight
+            }
+            
+          }
+
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)

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

@@ -12,9 +12,10 @@
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
            
             <span style="position: absolute;left: 20%;top: 3%">
-              透前体重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
+              透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             
             </span>
+           
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
@@ -33,6 +34,11 @@
             <span style="position: absolute;left: 70%;top: 3%">
               透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
             </span>
+
+            <!-- <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
+              透前体重：{{predialysis&&(predialysis.weight_before - predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+            
+            </span> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697) ||
               org_id == 10387
             "
           >
@@ -844,7 +844,7 @@
           <el-table-column
             prop="displacement_quantity"
             align="center"
-            label="置换量(ml)"
+            label="置换量(L)"
             width="100"
             v-if="isShow('置换量1')"
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697)
               || org_id == 10387
             "
           >
@@ -1802,8 +1802,8 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693)
-                && org_id!=10387 && org_id!=10694 && org_id!=10697
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
+                && org_id!=10387 && org_id!=10694
             "
           >
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
@@ -1872,9 +1872,10 @@
               org_id!=10629 &&
               org_id!=10677 &&
               org_id!=10667 &&
-              org_id!=10693
+              org_id!=10693 &&
+              org_id!=10697
               )
-              || org_id == 10387 || org_id == 10694 || org_id==10697
+              || org_id == 10387 || org_id == 10694
             "
           >
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"
@@ -2046,8 +2047,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('置换量1') && template_id == 43">
-            <el-form-item label="置换量(ml)：" :prop="isName('置换量')"
+          <el-col :span="8" v-if="isShow('置换量1')">
+            <el-form-item label="置换量(L)：" :prop="isName('置换量')"
               :rules="isCheckmust('置换量')">
               <el-input v-model="form.displacement_quantity_one"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
@@ -36,7 +36,7 @@
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567" width="92px" > 置换量(L) </th>
-          <th v-if=" isShow('置换量1')" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂1')" width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -292,35 +292,85 @@
             <td style="text-align:left;" colspan="1">
               <span style="display:inline-block;margin-left:15px;">
                 <span
-                  v-if="orderForm.url === ''"
                   style="display:flex;align-items:center;"
-                >责任护士:{{ orderForm.start_nurse }}</span>
+                >责任护士:
                 <span
-                  v-if="orderForm.url !== ''"
-                  style="display:flex;align-items:center;height:36px;"
+                  style="height: 30px; display: inline-block"
+                  v-if="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    ) == ''
+                  "
                 >
-                  责任护士:
-                  <img :src="orderForm.url" style="height:30px;" />
+                  {{
+                    getAdminUser(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  }}</span
+                >
+                <img
+                  style="height: 30px"
+                  :src="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  "
+                  alt=""
+                  srcset=""
+                  v-else
+                />
+               
                 </span>
               </span>
             </td>
             <td style="text-align:left;" colspan="1">
               <span style="display:inline-block;margin-left:15px;">
                 <span
-                  v-if="orderForm.url === ''"
                   style="display:flex;align-items:center;"
-                >上机护士:{{ orderForm.start_nurse }}</span>
+                >上机护士:
                 <span
-                  v-if="orderForm.url !== ''"
-                  style="display:flex;align-items:center;height:36px;"
+                  style="height: 30px; display: inline-block"
+                  v-if="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    ) == ''
+                  "
                 >
-                  上机护士:
-                  <img :src="orderForm.url" style="height:30px;" />
+                  {{
+                    getAdminUser(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  }}</span
+                >
+                <img
+                  style="height: 30px"
+                  :src="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  "
+                  alt=""
+                  srcset=""
+                  v-else
+                />
+               
                 </span>
               </span>
             </td>
             <td style="text-align:left;" colspan="3">
-              <span style="display:inline-block;margin-left:15px;">
+              <!-- <span style="display:inline-block;margin-left:15px;">
                 <span
                   v-if="orderForm.url === ''"
                   style="display:flex;align-items:center;"
@@ -332,6 +382,45 @@
                   抗凝剂执行护士:
                   <img :src="orderForm.url" style="height:30px;" />
                 </span>
+              </span> -->
+           
+              <span style="display:inline-block;margin-left:15px;">
+                <span
+                  style="display:flex;align-items:center;"
+                >抗凝剂执行护士:
+                <span
+                  style="height: 30px; display: inline-block"
+                  v-if="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    ) == ''
+                  "
+                >
+                  {{
+                    getAdminUser(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  }}</span
+                >
+                <img
+                  style="height: 30px"
+                  :src="
+                    setAdminUserES(
+                      dialysisOrder == null
+                        ? 0
+                        : dialysisOrder.start_nurse
+                    )
+                  "
+                  alt=""
+                  srcset=""
+                  v-else
+                />
+               
+                </span>
               </span>
             </td>
             <td style="text-align:left;" colspan="3">
@@ -997,16 +1086,49 @@
             <td style="text-align:left;" colspan="3">
               <span>
                 <span
-                  v-if="finshForm.url === ''"
                   style="display:flex;align-items:center;height:36px;"
-                >下机护士:{{ finshForm.finish_nurse }}</span>
+                >下机护士:
+
                 <span
+                    style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                </span>
+
+                <!-- <span
                   v-if="finshForm.url !== ''"
                   style="display:flex;align-items:center;height:36px;"
                 >
                   下机护士:
                   <img :src="finshForm.url" style="height:30px;" />
-                </span>
+                </span> -->
               </span>
             </td>
           </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -5,14 +5,14 @@
       <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;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
           <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: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
               <td colspan="3">
@@ -121,7 +121,7 @@
 
           </tbody>
         </table>
-        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;font-size: 16px;">
           <tr>
             <td style="width: 20%; line-height: 30px;">透析机：
               {{predialysis.machine_type ? predialysis.machine_type : " "}}
@@ -172,7 +172,7 @@
           </tr>
         </table>
 
-        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
               <td colspan="12" style="padding: 5px;">治疗过程记录</td>
@@ -230,7 +230,7 @@
           </tbody>
         </table>
         <div>
-          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
+          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
             <tbody>
               <tr>
                 <td style="width:12%;height:25px;">
@@ -278,24 +278,24 @@
                 <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
                 <td v-if="advice_index === 2">干体重(DW):</td>
                 <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
-                <td v-if="advice_index === 3">较干体重增加量:</td>
+                <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
                 <td v-if="advice_index === 3">
-                  {{ patientInfo.total_dialysis +patientInfo.user_sys_before_count >0 && afterdialysis.weight_after != 0
+                  {{ afterdialysis.weight_after != 0 && predialysis.dry_weight !=0
                     ? (afterdialysis.weight_after - predialysis.dry_weight).toFixed(2): 0 }}kg
                 </td>
                 <td v-if="advice_index === 4">净脱水量:</td>
-                <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}ml</td>
-                <td v-if="advice_index === 5">透后体重:</td>
-                <td v-if="advice_index === 5">{{ afterdialysis.weight_after }}kg</td>
-                <td v-if="advice_index === 6">本次透析体重下降量:</td>
-                <td v-if="advice_index === 6">
+                <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}L</td> -->
+                <td v-if="advice_index === 3">透后体重:</td>
+                <td v-if="advice_index === 3">{{ afterdialysis.weight_after }}kg</td>
+                <td v-if="advice_index === 4">本次透析体重下降量:</td>
+                <td v-if="advice_index === 4">
                   {{  afterdialysis.weight_after == 0 || predialysis.weight_before == 0? '0.00'
                       : (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}kg</td>
               </tr>
             </tbody>
           </table>
         </div>
-        <div style="border: 1px solid black;width: 99%;">
+        <div style="border: 1px solid black;width: 99%;font-size: 16px;">
           <div >
             治疗小结
             <span class="under-line">&nbsp;{{ summary.dialysis_summary }}</span>
@@ -1130,16 +1130,16 @@ export default {
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
-            var obj5 = { advice_name: "", start_time: "" };
-            var obj6 = { advice_name: "", start_time: "" };
+            // var obj5 = { advice_name: "", start_time: "" };
+            // var obj6 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
-            tableAdvice.push(obj5);
-            tableAdvice.push(obj6);
+            // tableAdvice.push(obj5);
+            // tableAdvice.push(obj6);
 
             this.tableAdvice = tableAdvice;
             return this.tableAdvice
@@ -1150,15 +1150,15 @@ export default {
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
-            var obj4 = { advice_name: "", start_time: "" };
-            var obj5 = { advice_name: "", start_time: "" };
+            // var obj4 = { advice_name: "", start_time: "" };
+            // var obj5 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
-            tableAdvice.push(obj4);
-            tableAdvice.push(obj5);
+            // tableAdvice.push(obj4);
+            // tableAdvice.push(obj5);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1168,14 +1168,14 @@ export default {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
-            var obj3 = { advice_name: "", start_time: "" };
-            var obj4 = { advice_name: "", start_time: "" };
+            // var obj3 = { advice_name: "", start_time: "" };
+            // var obj4 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
-            tableAdvice.push(obj3);
-            tableAdvice.push(obj4);
+            // tableAdvice.push(obj3);
+            // tableAdvice.push(obj4);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1184,13 +1184,13 @@ export default {
             console.log('444444',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
-            var obj2 = { advice_name: "", start_time: "" };
-            var obj3 = { advice_name: "", start_time: "" };
+            // var obj2 = { advice_name: "", start_time: "" };
+            // var obj3 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
-            tableAdvice.push(obj2);
-            tableAdvice.push(obj3);
+            // tableAdvice.push(obj2);
+            // tableAdvice.push(obj3);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1198,39 +1198,39 @@ export default {
           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: "" };
+            // var obj1 = { advice_name: "", start_time: "" };
+            // var obj2 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
-            tableAdvice.push(obj1);
-            tableAdvice.push(obj2);
+            // tableAdvice.push(obj1);
+            // tableAdvice.push(obj2);
 
             this.tableAdvice = tableAdvice;
             // 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: "" };
+            // 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);
+            // 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);
+          // if (tableAdvice.length === 6) {
+          //   console.log('6666666',tableAdvice.length);
+          //   var obj = { advice_name: "", start_time: "" };
+          //   tableAdvice.push(obj);
 
-            this.tableAdvice = tableAdvice;
-            // return this.tableAdvice
-          }
+          //   this.tableAdvice = tableAdvice;
+          //   // return this.tableAdvice
+          // }
 
-          if (tableAdvice.length >7) {
+          if (tableAdvice.length >5) {
             console.log('777777',tableAdvice);
             this.tableAdvice = tableAdvice;
 
@@ -1408,7 +1408,6 @@ export default {
   width: 100%;
   line-height: 25px;
   font-size: 14px;
-
 }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue

@@ -1140,7 +1140,7 @@
                               : "mmHg"
                           }})
                         </td>
-                        <td width="50">超滤量<br/>L</td>
+                        <td width="50">超滤量<br/>ml</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1855,9 +1855,13 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683"><br/>
-                           <span v-if="org_id!=10644">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
-                           <span v-if="org_id==10644">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id == 0"><br/>
+                           <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
+                           <span v-if="org_id==10644 || org_id == 0">
+                              <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                              <span v-if="monindex == monitors.length-1">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                              <span v-if="(monindex != monitors.length-1 && monindex != 0)">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                           </span>
                           </td>
                         <td
                           v-if="
@@ -3363,8 +3367,8 @@
 
 
                   </div>
-                  <div v-if="org_id!=0 && org_id!=10440">
-                    <div class="inline_block" style="flex: 1">
+                  <div v-if="org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
                       穿刺护士：
                       <div
                         class="under_line"
@@ -3403,6 +3407,86 @@
                         />
                       </div>
                     </div>
+
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
+                      换药护士：
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id==10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id!=10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
                   </div>
 
                   <div v-if="org_id==0||org_id==10440">

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -226,13 +226,13 @@
                 <span v-else>/</span>
               </div>
               <span v-if="prescription.anticoagulant_name == '肝素钠'">mg</span>
-              <span v-if="prescription.anticoagulant_name == '枸橼酸钠'">mg</span>
+              <!-- <span v-if="prescription.anticoagulant_name == '枸橼酸钠'">mg</span>
               <span v-if="prescription.anticoagulant_name == '阿加曲班'">mg</span>
               <span v-if="prescription.anticoagulant_name == '低分子肝素'">iu</span>
               <span v-if="prescription.anticoagulant_name == '普通肝素'">mg</span>
               <span v-if="prescription.anticoagulant_name == '无肝素'">mg</span>
               <span v-if="prescription.anticoagulant_name == '低分子肝素钙'">iu</span>
-              <span v-if="prescription.anticoagulant_name == '低分子肝素钠'">iu</span>
+              <span v-if="prescription.anticoagulant_name == '低分子肝素钠'">iu</span> -->
               <!-- <span v-else>mg</span>   -->
             </div>
             <div class="inline_block" style="flex: 1;">
@@ -247,13 +247,13 @@
                 <span v-else>/</span>
               </div>
               <span v-if="prescription.anticoagulant_name == '肝素钠'">mg/h</span>
-              <span v-if="prescription.anticoagulant_name == '枸橼酸钠'">ml/h</span>
+              <!-- <span v-if="prescription.anticoagulant_name == '枸橼酸钠'">ml/h</span>
               <span v-if="prescription.anticoagulant_name == '阿加曲班'">mg/h</span>
               <span v-if="prescription.anticoagulant_name == '低分子肝素'">iu/h</span>
               <span v-if="prescription.anticoagulant_name == '普通肝素'">mg/h</span>
               <span v-if="prescription.anticoagulant_name == '无肝素'">mg/h</span>
               <span v-if="prescription.anticoagulant_name == '低分子肝素钙'">iu/h</span>
-              <span v-if="prescription.anticoagulant_name == '低分子肝素钠'">iu/h</span>
+              <span v-if="prescription.anticoagulant_name == '低分子肝素钠'">iu/h</span> -->
               <!-- <span v-else>mg/h</span> -->
             </div>
             <div class="inline_block" style="flex: 1">
@@ -549,7 +549,7 @@
                 <td width="50">UFR<br/>ml/h</td>
                 <td width="50">UF<br/>ml</td>
                 <td width="65">剩余肝素<br/>ml</td>
-                <td width="65" v-if="prescription.mode == 'HDF'">置换液量<br/>L</td>
+                <td width="65" v-if="prescription.mode == 'HDF'">置换量<br/>L</td>
                 <td width="200">病情变化</td>
               </tr>
               <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="padding: 5px 0;line-height: 35px;">
@@ -612,7 +612,7 @@
                 </td>
                 <!--  -->
                 <td width="65" v-if="prescription.mode == 'HDF'">
-                  {{monitor.displacement_quantity ? monitor.displacement_quantity : '/'}}
+                  {{monitor.displacement_quantity_one ? monitor.displacement_quantity_one : '/'}}
                 </td>
                 <td width="200">
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">
@@ -633,7 +633,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block"
+              <span style="height: 30px;display: inline-block;"></span>
+                <span style="display: inline-block"
                   v-if="
                     setAdminUserES(
                       dialysisOrder == null
@@ -670,7 +671,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block"
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style="display: inline-block"
                   v-if="
                     setAdminUserES(
                       dialysisOrder == null
@@ -707,7 +709,8 @@
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >
-                <span style="height: 30px; display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                <span style="height: 30px;display: inline-block;"></span>
+                <span style=" display: inline-block" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                   {{ getAdminUser(check == null ? 0 : check.modifier) ? getAdminUser(check == null ? 0 : check.modifier) : "" }}
                 </span>
                 <img :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" style="height:30px" v-else />

src/xt_pages/management/components/UserForm.vue

@@ -846,7 +846,7 @@
                   机表(床单元、床旁桌)消毒
                 </td>
                 <td
-                  :colspan="6"
+                  :colspan="7"
                   style="text-align:center;font-size:15px"
                 >
                   液路消毒
@@ -905,6 +905,9 @@
                 <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒时长/min
                 </td>
+                <td style="text-align:center;min-width:40px;font-size:15px">
+                  结束消毒时间
+                </td>
                 <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
@@ -959,6 +962,10 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.long_time }}
                 </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{ getTimesTwo(item.disinfec_endtime) }}
+                </td>
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.disinfection_status }}
                 </td>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,8 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 ||
-          org_id==0
+          org_id==10537 
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -66,18 +65,21 @@
       <!-- 广水原生堂 -->
       <printfourteen :info="info" v-if="(org_id == 10088 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
       <!-- 盱眙恒硕 -->
-      <printfivetheen :info="info" v-if="org_id == 10633 || org_id == 0"></printfivetheen>
+      <printfivetheen :info="info" v-if="org_id == 10633"></printfivetheen>
+      <!-- 顺有好 -->
+      <printSixtheen :info="info" v-if="org_id == 10697 || org_id == 0"></printSixtheen>
+
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
+            org_id != 0 &&   org_id != 10610 && org_id !=10537 && org_id !=10697 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
-            org_id != 10028 &&
+            org_id != 10028 && org_id !=10697 &&
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510 &&org_id != 10633 && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
@@ -106,6 +108,7 @@ import printtwelve from './statementTemplate/printtwelve'
 import printthirteen from './statementTemplate/printthirteen'
 import printfourteen from './statementTemplate/printfourteen'
 import printfivetheen from './statementTemplate/printfivetheen'
+import printSixtheen from './statementTemplate/printSixtheen'
 export default {
   name: 'dialysisPrintOrder',
   components: {
@@ -125,6 +128,7 @@ export default {
     printthirteen,
     printfourteen,
     printfivetheen,
+    printSixtheen
   },
   props: {
     paramsObj: Object
@@ -729,6 +733,7 @@ export default {
     searchAction() {
     },
     getInfo(order_id, obj) {
+      console.log('obj.balance_accounts_type',obj.balance_accounts_type);
       if (obj.balance_accounts_type == 2) {
         let params = {
           his_patient_id: obj.his_patient_id,
@@ -738,7 +743,7 @@ export default {
         }
         if (
           this.org_id == 10138 ||
-          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 0
+          this.org_id == 10278 ||  this.org_id == 10610
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
@@ -811,9 +816,9 @@ export default {
               this.balanceAccounts.new_detail_list.push(obj3)
               // this.balanceAccounts.new_detail_list.push(obj4)
 
-              console.log(111, this.balanceAccounts)
+              // console.log(111, this.balanceAccounts)
               this.num = num
-              console.log('this.num', this.num)
+              // console.log('this.num', this.num)
             }
           })
         } else if (this.org_id == 10028  || this.org_id == 9504) {
@@ -951,7 +956,7 @@ export default {
               that.info['his'] = response.data.data.his
               that.info['dia_config'] = response.data.data.dia_config
 
-
+              let listarr = []
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
                 if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
                   response.data.data.order_infos[i].med_chrgitm_type = '09'
@@ -969,10 +974,56 @@ export default {
                     response.data.data.order_infos[i].med_chrgitm_type = '08'
                   }
                 }
+                let order = response.data.data.order_infos[i]
+                let obj = {
+                  name: '',
+                  spec: '',
+                  cnt: '',
+                  det_item_fee_sumamt: ''
+                }
+
+                if (order.advice_id > 0 && order.project_id == 0) {
+                  obj.name = order.advice.advice_name
+                  let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                  obj.spec = spec
+                  obj.cnt = order.cnt
+                  obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                  listarr.push(obj)
+
+                } else if (order.advice_id == 0 && order.project_id > 0) {
+                  if (order.project.type == 2) {
+                    obj.name = order.project.project.project_name
+                    obj.spec = ''
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+
+                  } else {
+                    obj.name = order.project.good_info.good_name
+                    obj.spec = order.project.good_info.specification_name
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                  }
+                  listarr.push(obj)
+                }
               }
-              console.log(response.data.data.order_infos)
-              console.log(that.info)
+              let len = Math.ceil(listarr.length / 2)
+              let L_list = []
+              let R_list = []
+              for(let i in listarr){
+                if(i<len){
+                  L_list.push(listarr[i])
+                }else{
+                  R_list.push(listarr[i])
+                }
+              }
+              console.log('L_list111',L_list)
+              console.log('R_list222',R_list)
 
+              that.info['L_list'] = L_list
+              that.info['R_list'] = R_list
+
+              console.log(response.data.data.order_infos)
+              console.log('that.info',that.info)
               var list = []
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
@@ -1016,6 +1067,7 @@ export default {
                 list.push(obj9)
               }
               that.info['new_list'] = list
+              // that.info['listarr'] = listarr
               // list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
 
               let obj = {
@@ -1086,8 +1138,8 @@ export default {
           })
         }
       } else {
-        console.log(this.org_id)
-        if (this.org_id == 1111111111) {
+        console.log('1111111',this.org_id)
+        if (this.org_id == 0) {
           let params = {
             order_id: obj.order_id,
             admin_user_id: this.$store.getters.xt_user.user.id

src/xt_pages/outpatientCharges/statementTemplate/printSixtheen.vue

@@ -0,0 +1,313 @@
+<template>
+  <div id="statement-print" class="statement-print">
+     <div class="statementTitle">南昌顺友好血液透析中心</div>
+     <div style="text-align: center;font-size: 17px;">门 &nbsp;诊 &nbsp;结 &nbsp;帐 &nbsp;票 &nbsp;据</div>
+     <div style="border: 1px solid black;width: 100%;">
+        <div style="border-bottom:1px solid black;display: flex;padding: 5px;">
+            <div style="flex: 1;">姓名:{{info.patient.name}}</div>
+            <div style="flex: 1;">门诊日期:{{getTime(info.date)}}</div>
+            <div style="flex: 1;">医疗类型:{{getmed_type(info.med_type) }}</div>
+            <div style="flex: 1;">健康ID:{{ info.patient.dialysis_no }}</div>
+            <div style="flex: 1;">门诊单据号:{{info.id}}</div>
+        </div>
+        <div style="border-bottom:1px solid black;display: flex;padding: 5px;">
+            <div style="flex: 1;">医保编码:</div>
+            <div style="flex: 1;">刷卡前余额:</div>
+            <div style="flex: 1;">刷卡后余额:</div>
+        </div>
+        <div style="border-bottom:1px solid black;display: flex;text-align: center;">
+          <div style="width: 30%;border-right:1px solid black;padding: 5px 0;">项目/规格</div>
+          <div style="width: 10%;border-right:1px solid black;padding: 5px 0;">数量</div>
+          <div style="width: 10%;border-right:1px solid black;padding: 5px 0;">金额</div>
+          <div style="width: 30%;border-right:1px solid black;padding: 5px 0;">项目/规格</div>
+          <div style="width: 10%;border-right:1px solid black;padding: 5px 0;">数量</div>
+          <div style="width: 10%;padding: 5px 0;">金额</div>
+        </div>
+        <div style="border-bottom:1px solid black;text-align: center;min-height: 100px;" >
+          <div style="display: flex;">
+            <div style="flex: 1;">
+              <div style="display: flex;width: 100%;line-height: 20px;" v-for="(item,index) in info.L_list" :key="index">
+                <div style="width: 60%;">{{ item.name }}</div>
+                <div style="width: 20%;">{{item.cnt}}</div>
+                <div style="width: 20%;">{{ item.det_item_fee_sumamt }}</div>
+              </div>
+            </div>
+            <div style="flex: 1;" >
+              <div style="display: flex;width: 100%;line-height: 20px;" v-for="(item,index) in info.R_list" :key="index">
+                <div style="width: 60%;">{{ item.name }}</div>
+                <div style="width: 20%;">{{item.cnt}}</div>
+                <div style="width: 20%;">{{ item.det_item_fee_sumamt }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="">
+          <div style="display: flex;padding: 5px;line-height: 30px;">
+            <div style="flex: 1;">基本统筹:{{info.hifp_pay}}</div>
+            <div style="flex: 1;">公务员补助:</div>
+            <div style="flex: 1;">大病基金支付:{{info.hifmi_pay}}</div>
+            <div style="flex: 1;">个人账户支付:{{info.acct_pay}}</div>
+            <div style="flex: 1;">医保个人现金:{{info.fund_pay_sumamt}}</div>
+          </div>
+          <div style="display: flex;padding: 5px;line-height: 30px;">
+            <div style="flex: 2;">费用总额(大写):{{getmoney(info.medfee_sumamt)}}</div>
+            <div style="flex: 1;">小写:{{info.medfee_sumamt}}</div>
+            <div style="flex: 1;">现金支付:{{info.psn_cash_pay}}</div>
+          </div>
+        </div>
+     </div>
+     <div style="display: flex;margin: 5px 0;">
+        <div style="flex: 1;">收款单位:南昌顺友好血液透析中心</div>
+        <div style="flex: 1;">开单科室:血透室</div>
+        <div style="flex: 1;">收款人:{{info.charge_admin.user_name}}</div>
+        <div style="flex: 1;">结账日期:{{info.setl_time}}</div>
+     </div>
+    <!--<div style="margin: 10px 0;">医疗机构名称:
+      {{info.fixmedins_name}}
+    </div>
+    <div style="display: flex;margin-bottom: 10px;">
+      <div style="flex: 1;">结算ID:
+        {{info.setl_id}}
+      </div>
+      <div style="flex: 1;">参保险种:
+        <span v-if="info.insutype == '310'">职工基本医疗保险</span>
+        <span v-if="info.insutype == '320'">公务员医疗补助</span>
+        <span v-if="info.insutype == '330'">大额医疗费用补助</span>
+        <span v-if="info.insutype == '340'">离休人员医疗保障</span>
+        <span v-if="info.insutype == '390'">城乡居民基本医疗保险</span>
+        <span v-if="info.insutype == '392'">城乡居民大病医疗保险</span>
+        <span v-if="info.insutype == '510'">生育保险</span>
+      </div>
+    </div>
+  
+    <table class="statementTable" border="1" style="text-align: left;">
+      <tr>
+        <td>患者姓名:{{info.patient.name}}</td>
+        <td>性别:{{ info.gend == '1' ? '男':'女' }}</td>
+        <td>年龄:{{info.patient.age}}</td>
+        <td>身份证号:{{info.certno}}</td>
+        <td>医保区划:</td>
+      </tr>
+      <tr>
+        <td colspan="3">个人编号:{{info.patient.id_card_no}}</td>
+        <td colspan="2">单位或地址:{{info.patient.home_address}}</td>
+      </tr>
+      <tr>
+        <td colspan="2">联系电话:{{info.patient.phone}}</td>
+        <td colspan="2">人员类别:
+          <span  v-if="info.psn_type == '11'">在职</span>
+          <span  v-else-if="info.psn_type == '1101'">职工在职</span>
+          <span  v-else-if="info.psn_type == '1102'">公务员在职</span>
+          <span  v-else-if="info.psn_type == '1103'">灵活就业人员在职</span>
+          <span  v-else-if="info.psn_type == '1160'">地方其他扩展人员</span>
+
+
+          <span  v-else-if="info.psn_type == '12'">退休人员</span>
+          <span  v-else-if="info.psn_type == '1201'">职工退休</span>
+          <span  v-else-if="info.psn_type == '1202'">公务员退休</span>
+          <span  v-else-if="info.psn_type == '1203'">灵活就业人员退休</span>
+          <span  v-else-if="info.psn_type == '1260'">地方其他扩展人员</span>
+
+
+          <span  v-else-if="info.psn_type == '13'">离休</span>
+          <span  v-else-if="info.psn_type == '1300'">离休人员</span>
+          <span  v-else-if="info.psn_type == '1360'">地方其他扩展人员</span>
+
+          <span  v-else-if="info.psn_type == '14'">居民(未成年)</span>
+          <span  v-else-if="info.psn_type == '1401'">新生儿</span>
+          <span  v-else-if="info.psn_type == '1402'">学龄前儿童</span>
+          <span  v-else-if="info.psn_type == '1403'">中小学生</span>
+          <span  v-else-if="info.psn_type == '1404'">大学生</span>
+          <span  v-else-if="info.psn_type == '1405'">未成年(未入学)</span>
+
+
+          <span  v-else-if="info.psn_type == '15'">居民(成年)</span>
+          <span  v-else-if="info.psn_type == '1501'">普通居民(成年)</span>
+          <span  v-else-if="info.psn_type == '1560'">地方其他扩展身份</span>
+
+          <span  v-else-if="info.psn_type == '16'">居民(老年)</span>
+          <span v-else></span>
+
+        </td>
+        <td colspan="1">门诊号:{{info.number}}</td>
+      </tr>
+      <tr>
+        <td colspan="2">医疗类别:门诊特殊病</td>
+        <td >就诊ID:</td>
+        <td >离院方式:</td>
+        <td>科室:医生组</td>
+      </tr>
+      <tr>
+        <td colspan="2">病种名称:</td>
+        <td colspan="2">就诊时间:{{getTime(info.new_order.settle_accounts_date)}}</td>
+        <td colspan="1">就诊天数:0</td>
+      </tr>
+      <tr>
+        <td colspan="5">诊断:{{info.diagnosis}}</td>
+      </tr>
+      <tr>
+        <td colspan="2">总费用:{{info.medfee_sumamt}}</td>
+        <td>全自费:</td>
+        <td>先行自付:{{info.preselfpay_amt}}</td>
+        <td>政策范围金额:
+          <span v-for="item in info.funds">
+            {{item.insp_pay}}
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4">报销合计:</td>
+        <td>起付线:{{info.act_pay_dedc}}</td>
+      </tr>
+      <tr>
+        <td colspan="2">基本医疗:</td>
+        <td>大病保险:{{info.new_order.hifmi_pay}}</td>
+        <td>大病补充:</td>
+        <td>医疗救助支付额:{{info.order.maf_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3">健康扶贫:</td>
+        <td>医院承担金额:</td>
+        <td>其他基金:{{info.oth_pay}}</td>
+      </tr>
+      <tr>
+        <td colspan="3">个人支付总额:{{ info.order.psn_cash_pay}}</td>
+        <td>帐户支付:</td>
+        <td>个人现金:{{info.new_order.psn_cash_pay}}</td>
+      </tr>
+      <tr>
+        <td width="10%">报销说明</td>
+        <td colspan="4"></td>
+      </tr>
+    </table>
+    <div style="display: flex;margin-top: 10px;">
+      <div style="flex: 1;">打印人:{{ info.printor_admin.user_name }} </div>
+      <div style="flex: 1;">打印日期:{{getNowTime()}}</div>
+    </div> -->
+
+  </div>
+</template>
+<script>
+ import { uParseTime,numToCny } from '@/utils/tools'
+  export default {
+    props: {
+      info: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, p_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }, charge_admin: {
+        type: Object,
+        default: function() {
+          return {}
+        }
+      }
+    },
+    data(){
+      return{
+        med_typearr:[{id:11,name:'普通门诊'},{id:12,name:'门诊挂号'},{id:13,name:'急诊'},{id:14,name:'门诊特殊病'},
+                    {id:15,name:'门诊统筹'},{id:16,name:'门诊慢性病'},{id:17,name:'普通住院'}],
+      }
+      
+    },
+    methods:{
+      getBirth(idNo){
+        var year = idNo.substring(6, 10);
+        var month = idNo.substring(10, 12);
+        var day = idNo.substring(12, 14);
+        return  year + '-' + month + '-' + day;
+      },
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
+      getNowTime: function () {
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        let hh = new Date().getHours();
+        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes();
+        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds();
+        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
+        return dateTime
+      },
+      getTime(val) {
+        if (val < 0) {
+          return ""
+        }
+        if (val == "") {
+          return ""
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
+      getmoney(value){
+        // if(vlaue == ''){
+
+        // }else{
+          return numToCny(value)
+        // }
+        
+      },
+      getmed_type(ids){
+        const options = this.med_typearr
+        for(let i in options){
+          if(options[i].id == ids){
+            return options[i].name
+          }
+        }
+      }
+    },
+    created(){
+      console.log('bbbbbbb',this.info);
+    }
+  }
+
+
+</script>
+
+
+<style lang="scss" scoped>
+  .statement-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
+
+  .statementTitle {
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  .statementTable {
+    width: 100%;
+    // text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+</style>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -106,13 +106,13 @@
           </ul>
           <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
           <ul >
-            <li style="width:30%;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
-            <li style="width:30%;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
-            <li style="width:30%;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
-            <li style="width:30%;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
-            <li style="width:30%;">个人账户支付金额:{{ order.acct_pay}}</li>
-            <li v-if="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.medfee_sumamt.toFixed(2) }}元</li>
-            <li v-else="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li style="width:90%;line-height: 25px;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
+            <li style="width:90%;line-height: 25px;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">个人账户支付金额:{{ order.acct_pay}}</li>
+            <li v-if="this.hisPatientInfo.balance_accounts_type == 2" style="width:90%;line-height: 25px;">个人支付金额:{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li v-else="this.hisPatientInfo.balance_accounts_type == 2" style="width:90%;line-height: 25px;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
           </ul>
 
         </div>

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -71,7 +71,7 @@
               highlight-current-row
               show-summary>
 
-      <el-table-column align="center" prop="name" label="患者名字">
+      <el-table-column align="center" prop="name" label="患者名字" fixed>
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">

src/xt_pages/outpatientTool/components/settle.vue

@@ -58,7 +58,7 @@
                 :summary-method="getTotal"
                 highlight-current-row>
 
-          <el-table-column align="center" prop="name" label="患者名字">
+          <el-table-column align="center" prop="name" label="患者名字" fixed>
               <template slot-scope="scope">{{ scope.row.other_name }}</template>
           </el-table-column>
         <el-table-column align="center" prop="item_name" label="身份证">

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0  && orgId!=10697">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387 || orgId == 10697">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -51,7 +51,7 @@
           <label class="title"><span class="name">出库</span> : </label>
           <el-date-picker
             size="small"
-            v-model="warehousing_time"
+            v-model="warehouse_out_time"
             prefix-icon="el-icon-date"
             :editable="false"
             style="width: 196px"
@@ -175,14 +175,14 @@
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'recordData.' + scope.$index + '.warehousing_count'"
-                  :rules="tableRules.warehousing_count"
+                  :rules="tableRules.count"
                   style="padding-top: 10px"
                 >
                   <div style="display: flex">
                   
                     <el-input
                       placeholder="请输入入库数量"
-                      v-model="scope.row.warehousing_count"
+                      v-model="scope.row.count"
                       style="width: 120px"
                     ></el-input>
                   
@@ -377,7 +377,7 @@
           { path: false, name: "新增入库单" },
         ],
         signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-        warehousing_time: "",
+        warehouse_out_time: "",
         adminUserOptions: null,
         currentIndex: 0,
         listLoading: false,
@@ -629,27 +629,33 @@
       handleEdit: function (index, row) {
         const tempObj = {};
         tempObj["id"] = 0;
-        tempObj["drug_name"] = "";
         tempObj["drug_id"] = 0;
-        tempObj["number"] = "";
-        tempObj["product_date"] = "";
-        tempObj["expiry_date"] = "";
-        tempObj["warehousing_count"] = "";
-        tempObj["retail_price"] = "";
+        tempObj["max_unit"] = "";
+        (tempObj["min_unit"] = ""), (tempObj["return_count"] = 0);
         tempObj["price"] = "";
         tempObj["remark"] = "";
-        tempObj["dealer"] = "";
         tempObj["manufacturer"] = "";
-        tempObj["min_unit"] = "";
-        tempObj["max_unit"] = "";
-        tempObj["drug_type"] = "";
         tempObj["batch_number"] = "";
+        tempObj["drug_type"] = "";
         tempObj["dose"] = "";
         tempObj["dose_unit"] = "";
+        tempObj["min_number"] = "";
         tempObj["dealer"] = "";
+        tempObj["number"] = "";
+        tempObj["warehouse_info_id"] = 0;
+        tempObj["count"] = "";
+        tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+        tempObj["retail_price"] = 0;
         tempObj["last_price"] = "";
-        tempObj["count_unit"] = "";
-        tempObj["min_number"] = "";
+        tempObj["stock_count"] = "";
+        tempObj["total_count"] = 0;
+        tempObj["max_unit_fisrt"] = 0;
+        tempObj["min_unit_fisrt"] = 0;
+        tempObj["total_price"] = 0;
+        tempObj["patient_id"] = 0
+        tempObj["product_date"] = ""
+        tempObj["expiry_date"]=""
+        tempObj["class_type"] = ""
         this.recordInfo.recordData.push(tempObj);
       },
       handleDelete: function (index, row) {
@@ -815,6 +821,7 @@
             stockOut: this.recordInfo.recordData,
           };
           console.log("param22222222",params)
+        
           const loading = this.$loading({
             lock: true,
             text: "Loading",
@@ -1173,7 +1180,7 @@
       var nowYear = nowDate.getFullYear();
       var nowMonth = nowDate.getMonth() + 1;
       var nowDay = nowDate.getDate();
-      this.warehousing_time =
+      this.warehouse_out_time =
         nowYear +
         "-" +
         (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
@@ -1207,6 +1214,7 @@
         tempObj["patient_id"] = 0
         tempObj["product_date"] = ""
         tempObj["expiry_date"]=""
+        tempObj["class_type"] = ""
         this.recordInfo.recordData.push(tempObj);
         this.propForm.goodUnit = this.$store.getters.good_unit;
   

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -151,6 +151,12 @@
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
 
+        <el-table-column label="入库时间" align="center">
+          <template slot-scope="scope">
+             {{ getTime(scope.row.record_date)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
              {{ scope.row.drug.drug_name }}

src/xt_pages/user/components/PatientDetail.vue

@@ -281,8 +281,14 @@
                 </el-checkbox-group>
               </el-form-item>
              </el-col>
+
+             <el-col :span="8">
+              <el-form-item label="家庭住址 : " prop="homeAddress">
+                <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
+              </el-form-item>
+            </el-col>
             
-             <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+             <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
                   label-width="150px"
@@ -634,11 +640,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="家庭住址 : " prop="homeAddress">
-                <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
-              </el-form-item>
-            </el-col>
+           
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">

src/xt_pages/user/components/PatientForm.vue

@@ -333,7 +333,13 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
+                  <el-input v-model="form.homeAddress" style="width: 280px;"></el-input>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
                   label-width="150px"
@@ -676,11 +682,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
-                  <el-input v-model="form.homeAddress" style="width: 350px;"></el-input>
-                </el-form-item>
-              </el-col>
+            
 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">